fix bugs #85151, #84915

(Portage version: 2.0.51.19)

7 files changed, 34 insertions, 45 deletions

diff --git a/x11-libs/lesstif/ChangeLog b/x11-libs/lesstif/ChangeLog
index 88ad9a8f1133..6c78f210e574 100644
--- a/x11-libs/lesstif/ChangeLog
+++ b/x11-libs/lesstif/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/lesstif
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.58 2005/03/14 13:57:36 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.59 2005/03/23 18:43:43 lanius Exp $
+
+*lesstif-0.93.94-r3 (23 Mar 2005)
+
+  23 Mar 2005; Heinrich Wendel <lanius@gentoo.org> -lesstif-0.93.94-r2.ebuild,
+  +lesstif-0.93.94-r3.ebuild, -lesstif-0.94.0-r5.ebuild,
+  +lesstif-0.94.0-r6.ebuild:
+  fix bugs #85151, #84915
 
   14 Mar 2005; Heinrich Wendel <lanius@gentoo.org> lesstif-0.93.94-r2.ebuild,
   lesstif-0.94.0-r5.ebuild:
diff --git a/x11-libs/lesstif/Manifest b/x11-libs/lesstif/Manifest
index 250f23aea749..210b53ec962a 100644
--- a/x11-libs/lesstif/Manifest
+++ b/x11-libs/lesstif/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 af91b93d57f592e47b0655aab885f182 lesstif-0.93.94-r2.ebuild 2563
-MD5 6fba725731655535ef1b7df2d028ac30 lesstif-0.94.0-r5.ebuild 2426
+MD5 d4d8c4979cb48e1dc148458e81e1849c lesstif-0.94.0-r6.ebuild 2431
+MD5 ea89df5c3dbbb9496ac7e66ae9dc6914 lesstif-0.93.94-r3.ebuild 2573
 MD5 9b4f3806aa89a43b17fa8aac8775e889 lesstif-0.94.0-r2.ebuild 2111
-MD5 c0527c64ae92bbd2de9b35fdc0c4399b ChangeLog 7882
+MD5 866cb9081f4d170ef4c757d868d1e5b8 ChangeLog 8109
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 ca6ecc032ac0934b8c737650d6550162 lesstif-0.94.0.ebuild 2039
 MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0 68
 MD5 10373c1e87b0208cd26888011a4d92de files/CAN-2005-0605.patch 1194
-MD5 023d4c47c73d11f6668f99e0cbe9ed05 files/digest-lesstif-0.93.94-r2 142
+MD5 45fa63580e7de408204bea30102331f8 files/digest-lesstif-0.93.94-r3 144
 MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r2 68
-MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r5 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCNZhXevY57Fted3ERAs8iAJ418/wZ+EwHfX17PO1G6xS0k5CNDACfRG94
-1m4TNnzKQBxhgcDpJy//0bk=
-=Ref0
------END PGP SIGNATURE-----
+MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r6 68
diff --git a/x11-libs/lesstif/files/digest-lesstif-0.93.94-r2 b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r2
deleted file mode 100644
index fd0e9211880c..000000000000
--- a/x11-libs/lesstif/files/digest-lesstif-0.93.94-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae7340d91ba0566676bd3abb3842203 lesstif-0.93.94.tar.bz2 3461827
-MD5 f1f9431b0d8830fb870dc6c52a08ad9c lesstif1-1_0.93.94-11.diff.gz 63422
diff --git a/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3 b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3
new file mode 100644
index 000000000000..1ad7cd16a89f
--- /dev/null
+++ b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3
@@ -0,0 +1,2 @@
+MD5 6ae7340d91ba0566676bd3abb3842203 lesstif-0.93.94.tar.bz2 3461827
+MD5 411faaae59989c0cc06c5d5c5d1501ed lesstif1-1_0.93.94-11.1.diff.gz 63754
diff --git a/x11-libs/lesstif/files/digest-lesstif-0.94.0-r5 b/x11-libs/lesstif/files/digest-lesstif-0.94.0-r6
index 86a358232318..86a358232318 100644
--- a/x11-libs/lesstif/files/digest-lesstif-0.94.0-r5
+++ b/x11-libs/lesstif/files/digest-lesstif-0.94.0-r6
diff --git a/x11-libs/lesstif/lesstif-0.93.94-r2.ebuild b/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild
index c0abe3b75d7c..aabadf76eda6 100644
--- a/x11-libs/lesstif/lesstif-0.93.94-r2.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r2.ebuild,v 1.4 2005/03/14 13:57:36 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild,v 1.1 2005/03/23 18:43:43 lanius Exp $
+
+# disable sandbox, needed for motif-config
+SANDBOX_DISABLED="1"
 
 inherit libtool flag-o-matic multilib
 
 DESCRIPTION="An OSF/Motif(R) clone"
 HOMEPAGE="http://www.lesstif.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://debian/pool/main/l/lesstif1-1/lesstif1-1_0.93.94-11.diff.gz"
+	mirror://debian/pool/main/l/lesstif1-1/lesstif1-1_0.93.94-11.1.diff.gz"
 
 LICENSE="LGPL-2"
 SLOT="1.2"
@@ -16,14 +19,14 @@ IUSE="static"
 
 DEPEND="virtual/libc
 	virtual/x11
-	>=x11-libs/motif-config-0.5"
+	>=x11-libs/motif-config-0.6"
 
 PROVIDE="virtual/motif"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${DISTDIR}/lesstif1-1_0.93.94-11.diff.gz
+	epatch ${DISTDIR}/lesstif1-1_0.93.94-11.1.diff.gz
 }
 
 src_compile() {
@@ -87,27 +90,20 @@ src_install() {
 	rm -fR ${D}/usr/$(get_libdir)/lesstif-1.2/X11/
 	rm -fR ${D}/usr/$(get_libdir)/X11/
 
+	# profile stuff
+	motif-config --finish-install
 }
 
 # Profile stuff
 pkg_setup() {
 	motif-config --start-install
+	if has_version =x11-libs/lesstif-0.93.94*; then touch $T/upgrade; fi
 }
 
 pkg_postinst() {
-	motif-config --finish-install
 	motif-config --install lesstif-1.2
 }
 
-is_upgrade() {
-	vdb_path=`portageq vdb_path`
-	if [ "`grep -r SLOT $vdb_path/${CATEGORY}/${PN}* | grep $SLOT`" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
 pkg_postrm() {
-	is_upgrade || motif-config --uninstall lesstif-1.2
+	[ -f $T/upgrade ] || motif-config --uninstall lesstif-1.2
 }
diff --git a/x11-libs/lesstif/lesstif-0.94.0-r5.ebuild b/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild
index 72f4e3885d47..854c52b5d5d0 100644
--- a/x11-libs/lesstif/lesstif-0.94.0-r5.ebuild
+++ b/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r5.ebuild,v 1.4 2005/03/14 13:57:36 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild,v 1.1 2005/03/23 18:43:43 lanius Exp $
+
+# disable sandbox, needed for motif-config
+SANDBOX_DISABLED="1"
 
 inherit libtool flag-o-matic multilib
 
@@ -83,27 +86,20 @@ src_install() {
 	rm -fR ${D}/usr/$(get_libdir)/lesstif-2.1/X11/
 	rm -fR ${D}/usr/$(get_libdir)/X11/
 
+	# profile stuff
+	motif-config --finish-install
 }
 
 # Profile stuff
 pkg_setup() {
 	motif-config --start-install
+	if has_version ">=x11-libs/lesstif-0.94.0"; then touch $T/upgrade; fi
 }
 
 pkg_postinst() {
-	motif-config --finish-install
 	motif-config --install lesstif-2.1
 }
 
-is_upgrade() {
-	vdb_path=`portageq vdb_path`
-	if [ "`grep -r SLOT $vdb_path/${CATEGORY}/${PN}* | grep $SLOT`" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
 pkg_postrm() {
-	is_upgrade || motif-config --uninstall lesstif-2.1
+	[ -f $T/upgrade ] || motif-config --uninstall lesstif-2.1
 }