Fix #22593 by touching the installation tree. This ensures that the different ebuild revisions will have "different" files for what portage is concerned

4 files changed, 38 insertions, 9 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 6c03de14a5d3..bfb3dcab86c6 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.19 2003/06/19 20:50:18 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.20 2003/06/19 21:24:10 pauldv Exp $
+
+  19 Jun 2003; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-bin-1.1_beta-r1.ebuild, openoffice-bin-1.1_beta2.ebuild:
+  Make sure that the timestamps of files are updated so the files are not
+  removed when portage believes it are old files:#22593
 
 *openoffice-bin-1.1_beta2 (19 Jun 2003)
 
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 97f90cfa36e3..0729a31713a7 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,12 +1,12 @@
-MD5 8b9a7b46a74362b5a749e664a9e950c2 ChangeLog 4051
+MD5 53f46a3a8b2b766d3c8a753e1cf47d8c ChangeLog 4302
 MD5 583bb2a3fcf66696f1c3c389874b82c9 openoffice-bin-1.0.0-r3.ebuild 2912
 MD5 b221cf945d38e9e31215107f8d084063 openoffice-bin-1.0.1.ebuild 5603
 MD5 7641bbaef9471705b1ed80f92485d707 openoffice-bin-1.0.2.ebuild 6176
 MD5 d75508db43d161514ce1f1288c5d67d2 openoffice-bin-1.0.3.ebuild 6177
 MD5 286e13ebb4c41e2b2a502ac3b12fa6b4 openoffice-bin-1.0.3.1.ebuild 6448
-MD5 ceb4d00de66bf00ce512ed115b798a4e openoffice-bin-1.1_beta-r1.ebuild 5977
+MD5 4c18a84bc75b5859b4ffd053f8762759 openoffice-bin-1.1_beta-r1.ebuild 6254
 MD5 1d8dc5e17ece7fe099b2297b2fe64d04 openoffice-bin-1.1_beta.ebuild 5963
-MD5 5dcfed00f1688ad3b651210a34f50d2e openoffice-bin-1.1_beta2.ebuild 5994
+MD5 4bd3dd7b3ac4470c65401f5b99e2e6c2 openoffice-bin-1.1_beta2.ebuild 6271
 MD5 9f6fa2caffbec422160157fb68966b37 files/digest-openoffice-bin-1.0.0-r3 82
 MD5 9f9a6ba9924997dd5a42c2b374ea6aa8 files/digest-openoffice-bin-1.0.1 165
 MD5 6bb2dccd6a53a5457be6670d628c77d3 files/digest-openoffice-bin-1.0.2 168
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1_beta-r1.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1_beta-r1.ebuild
index 82bd0f599847..e367fabcb440 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1_beta-r1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1_beta-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_beta-r1.ebuild,v 1.1 2003/06/08 10:45:55 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_beta-r1.ebuild,v 1.2 2003/06/19 21:24:10 pauldv Exp $
 
 IUSE="kde gnome"
 
@@ -30,6 +30,15 @@ SRC_URI="x86? ( http://ny1.mirror.openoffice.org/stable/${MY_PV}/OOo_${MY_PV}_Li
 HOMEPAGE="http://www.openoffice.org"
 
 DEPEND="virtual/glibc
+	sys-apps/findutils
+	>=dev-lang/perl-5.0
+	virtual/x11
+	app-arch/zip
+	app-arch/unzip
+	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
+	!app-office/openoffice"
+
+$DEPEND="virtual/glibc
 	>=dev-lang/perl-5.0
 	virtual/x11
 	app-arch/zip
@@ -163,7 +172,7 @@ src_install() {
 		doins ${kdeloc}/.order
 		dodir /usr/share
 		# Install the icons and mime info
-		cp -a ${D}${INSTDIR}/share/kde/net/mimelnk/share/* ${D}/usr/share
+		cp -r ${D}${INSTDIR}/share/kde/net/mimelnk/share/* ${D}/usr/share
 		
 		for x in ${kdeloc}/*.desktop
 		do
@@ -187,6 +196,9 @@ src_install() {
 	keepdir ${INSTDIR}/user/config/registry/instance/org/openoffice/{Office,ucb}
 	keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
 	keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
+
+	#touch files to make portage uninstalling happy (#22593)
+	find ${D} -type f -exec touch {} \;
 }
 
 pkg_preinst() {
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild
index 3ddab8d0657a..e44e06399af3 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild,v 1.1 2003/06/19 20:50:18 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild,v 1.2 2003/06/19 21:24:10 pauldv Exp $
 
 IUSE="kde gnome"
 
@@ -29,7 +29,16 @@ SRC_URI="x86? ( http://vlaai.snt.utwente.nl/pub/software/openoffice/stable/${MY_
  	 ppc? ( ftp://ftp.yellowdoglinux.com/pub/yellowdog/software/openoffice/OOo_${MY_PV}_LinuxPowerPC_installer.tar.gz )"
 HOMEPAGE="http://www.openoffice.org"
 
-DEPEND="virtual/glibc
+DEPEND="sys-apps/findutils
+	virtual/glibc
+	>=dev-lang/perl-5.0
+	virtual/x11
+	app-arch/zip
+	app-arch/unzip
+	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
+	!app-office/openoffice"
+
+RDEPEND="virtual/glibc
 	>=dev-lang/perl-5.0
 	virtual/x11
 	app-arch/zip
@@ -162,7 +171,7 @@ src_install() {
 		doins ${kdeloc}/.order
 		dodir /usr/share
 		# Install the icons and mime info
-		cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
+		cp -r ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
 		
 		for x in ${kdeloc}/*.desktop
 		do
@@ -187,6 +196,9 @@ src_install() {
 	keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb}
 	keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
 	keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
+
+	#touch files to make portage uninstalling happy (#22593)
+	find ${D} -type f -exec touch {} \;
 }
 
 pkg_preinst() {