From 6dfba19cdc5d5b2a7953cdc964ce3b6881a30a4c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Thu, 14 Feb 2008 22:01:55 +0000
Subject: [PATCH] Remove orphaned symlinks in pkg_setup already, since
 pkg_preinst is only called after collision detection. Package-Manager:
 portage-2.1.4.4

---
 x11-libs/openmotif/Manifest                  | 12 +++-
 x11-libs/openmotif/openmotif-2.3.0-r1.ebuild | 68 ++++++++++----------
 2 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 980068c71dab..62779e233ded 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX CAN-2005-0605.patch 1118 RMD160 56a1a4433bb71d54b6d5df33fab68aca74158730 SHA1 f9198a5629998790c2dfd112f71134f39f4b3e11 SHA256 20517fc5c4b61419528b658422fdcc9ed972762cffd605a844a4cfd1f628a331
 AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
 AUX motif-config-2.3 1522 RMD160 20835773f46a8ac434385b89764b713d13d06b5c SHA1 da8e1cc36d94fc3c3b54567d82ae35e83e13a02c SHA256 afb2e7b53f6a39b01b153985d12c4e674c6a2714219597b3b599f443242fdc76
@@ -17,7 +20,14 @@ DIST openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986 RMD160 f04ccc46b82782d5
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.0.tar.gz 5661471 RMD160 317c8d13d59c6fdd4a9f0e3b63000695f6677b6c SHA1 efb5f5fdc4cc43ef6065594f4ebe98953b7af15e SHA256 81d63e4145fab729621cba38bb0e88fccfbcbb5918473319e9b01a6fbe909544
 EBUILD openmotif-2.2.3-r9.ebuild 3665 RMD160 ff360947f706ae39ef3324a839427c9763700621 SHA1 5135beaf45008d74e937dbc133e3cd5a279fcfd3 SHA256 39e9f2336b0a0469108757436a5bd6dcc88cd0f28912009b75831f84c3a14b1a
-EBUILD openmotif-2.3.0-r1.ebuild 3336 RMD160 f64e3b5385d1616d2ca3d32232e671b989e9b86d SHA1 7616d18337d0cf8f6bbcf4ab8079eca8174f550e SHA256 1ebe069eef78b2842950e6675c23750141b51c099d1ccfb076d7313ffbe73c77
+EBUILD openmotif-2.3.0-r1.ebuild 3334 RMD160 c5739c52ca4fcc23f86d66bcda67b0d1433cb77c SHA1 06ec997a2d7b39023d006b539e7e916b53e0704d SHA256 4e16c2090395621966da2b859167ffbc7d8a25d7f645ccbf7cc05eeb96339691
 EBUILD openmotif-2.3.0.ebuild 3219 RMD160 028f6b4d228e001e336120963b1b09bd5f7fe534 SHA1 091bfd65b6aaefd7edbb0fb2ad1f902c32e3215d SHA256 cac3f1c23c6c491179328b4ed608152fafc931e3038cd0d36f0e4faf59088efa
 MISC ChangeLog 24009 RMD160 c07f4b7b542c891a20510e4f0a9a7fd77a32e783 SHA1 0359bb872829fdaf0ec8e53fad26a7cf230c8d0e SHA256 93a748a857cad5d01ccf453f95030d4a7c7a1123312a4cad9bf4d43214f8145f
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.8 (GNU/Linux)
+
+iEYEARECAAYFAke0unAACgkQOeoy/oIi7uxIhwCglYzBwpjTMqJ1+eEtubnXq/gA
++zUAoJ/kl+nDBfXjkurrchtCrlcU4DrN
+=QBtJ
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild b/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild
index db1cd064845f..1f9d887ef1de 100644
--- a/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild,v 1.3 2008/02/14 17:41:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild,v 1.4 2008/02/14 22:01:55 ulm Exp $
 
 inherit flag-o-matic multilib autotools
 
@@ -18,7 +18,7 @@ IUSE="doc examples jpeg png xft"
 # since the slotting is finally gone now
 RDEPEND="!x11-libs/motif-config
 	!x11-libs/lesstif
-	!<x11-libs/openmotif-2.3.0
+	!<=x11-libs/openmotif-2.3.0
 	x11-libs/libXmu
 	x11-libs/libXaw
 	x11-libs/libXp
@@ -31,36 +31,7 @@ DEPEND="${RDEPEND}
 
 PROVIDE="virtual/motif"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# disable compilation of demo binaries
-	sed -i -e 's/^[ \t]*demos//' Makefile.in
-}
-
-src_compile() {
-	# get around some LANG problems in make (#15119)
-	unset LANG
-
-	# bug #80421
-	filter-flags -ftracer
-
-	# multilib includes don't work right in this package...
-	has_multilib_profile && append-flags "-I$(get_ml_incdir)"
-
-	# feel free to fix properly if you care
-	append-flags -fno-strict-aliasing
-
-	econf --with-x \
-		$(use_enable xft) \
-		$(use_enable jpeg) \
-		$(use_enable png)
-
-	emake -j1 || die "emake failed"
-}
-
-pkg_preinst() {
+pkg_setup() {
 	# clean up orphaned cruft left over by motif-config
 	local i count=0
 	local stalesyms="usr/bin/mwm \
@@ -85,9 +56,9 @@ pkg_preinst() {
 	done
 
 	cd "${ROOT}"usr/share/man
-	find . -type l | while read i; do
+	for i in $(find . -type l); do
 		if [[ $(readlink "${i}") =~ -(openmo|less)tif- ]]; then
-			((count++))
+			(( count++ ))
 			rm -f "${i}"
 		fi
 	done
@@ -95,6 +66,35 @@ pkg_preinst() {
 		einfo "Cleaned up ${count} orphaned symlinks in ${ROOT}usr/share/man"
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# disable compilation of demo binaries
+	sed -i -e 's/^[ \t]*demos//' Makefile.in
+}
+
+src_compile() {
+	# get around some LANG problems in make (#15119)
+	unset LANG
+
+	# bug #80421
+	filter-flags -ftracer
+
+	# multilib includes don't work right in this package...
+	has_multilib_profile && append-flags "-I$(get_ml_incdir)"
+
+	# feel free to fix properly if you care
+	append-flags -fno-strict-aliasing
+
+	econf --with-x \
+		$(use_enable xft) \
+		$(use_enable jpeg) \
+		$(use_enable png)
+
+	emake -j1 || die "emake failed"
+}
+
 src_install() {
 	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
-- 
2.26.2