Also remove stale symlinks for libraries and man pages.

Package-Manager: portage-2.1.4.4

4 files changed, 39 insertions, 18 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 1906ce581196..58eabcfd0a60 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.152 2008/02/14 11:44:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.153 2008/02/14 17:41:41 ulm Exp $
+
+  14 Feb 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0.ebuild,
+  openmotif-2.3.0-r1.ebuild:
+  Also remove stale symlinks for libraries and man pages.
 
 *openmotif-2.3.0-r1 (14 Feb 2008)
 
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 62aa8d008961..8b03d70f39e6 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -20,14 +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 2860 RMD160 b95394988530540a56e0cf0d497aec73c4feb9f8 SHA1 171c572e6a783c9faa45f07ea7ff655fbb85aa10 SHA256 d99575a22285e4ca0fc83ce8d342bba87c659fb308260328ec194afe2851a319
-EBUILD openmotif-2.3.0.ebuild 3257 RMD160 88fb9f3e7543e5f8ec3f901ed192d5d602b5a8fb SHA1 15484cc3e5aae0442cf6971a0f46d7e7ecf3d22f SHA256 2f78be45f444e2725a9fdf5f3aff4b5b1950d554c7c83bb7062ab1f9d92ecf21
-MISC ChangeLog 23749 RMD160 abef51b4ff2f5eb2565e8d90daf57961a73ee1c8 SHA1 711dfd3911da2bf9ec99fd35dccc999ff815455f SHA256 635c93ddaee699afc7b90b51e1dae9eb4a8825cdd46e4ac3338f62992035c21b
+EBUILD openmotif-2.3.0-r1.ebuild 3336 RMD160 f64e3b5385d1616d2ca3d32232e671b989e9b86d SHA1 7616d18337d0cf8f6bbcf4ab8079eca8174f550e SHA256 1ebe069eef78b2842950e6675c23750141b51c099d1ccfb076d7313ffbe73c77
+EBUILD openmotif-2.3.0.ebuild 3217 RMD160 70fb5cedec67952ac6b4955fd2ab7d35dae7ad12 SHA1 ee55e0c3a8f776f52e3f6d5fcf069754baf429ce SHA256 24b929ead4cf5dd06a76f403dca2488f1de776e03f635dd4406595ff627cfc57
+MISC ChangeLog 23908 RMD160 b3cdeb0184553cca3b06707da4b6bee0c6512fa5 SHA1 ba0ebb7084a6ecaad2a1395bf4040314bf28ed61 SHA256 e0016dc4357b35e39cd98d1d80f4cb45b928df2b8c747b3e076727b5c1c7597c
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.8 (GNU/Linux)
 
-iEYEARECAAYFAke0KcAACgkQOeoy/oIi7uxMJwCfS5VG1zXO1M0CzTOcGbJc4X8f
-wSgAoJl4gSoWxifvebeaQI6UrQKlOTfN
-=YHEg
+iEYEARECAAYFAke0fXUACgkQOeoy/oIi7uzBQQCfapuChnsfElxO7CB/5codsGEt
+JfUAn3U4H8gc70KpzQ5oVr5qWKBCF4W7
+=RWgs
 -----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 eca683147167..db1cd064845f 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.2 2008/02/14 11:44:29 ulm Exp $
+# $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 $
 
 inherit flag-o-matic multilib autotools
 
@@ -62,7 +62,7 @@ src_compile() {
 
 pkg_preinst() {
 	# clean up orphaned cruft left over by motif-config
-	local i
+	local i count=0
 	local stalesyms="usr/bin/mwm \
 				usr/bin/uil \
 				usr/bin/xmbind \
@@ -76,6 +76,23 @@ pkg_preinst() {
 			rm -f "${ROOT}"${i}
 		fi
 	done
+
+	for i in "${ROOT}"usr/$(get_libdir)/lib{Xm,Uil,Mrm}.*; do
+		if [[ -L "${i}" && $(readlink "${i}") =~ (openmo|less)tif- ]]; then
+			einfo "Cleaning up orphaned ${i} symlink ..."
+			rm -f "${i}"
+		fi
+	done
+
+	cd "${ROOT}"usr/share/man
+	find . -type l | while read i; do
+		if [[ $(readlink "${i}") =~ -(openmo|less)tif- ]]; then
+			((count++))
+			rm -f "${i}"
+		fi
+	done
+	[[ ${count} -ne 0 ]] && \
+		einfo "Cleaned up ${count} orphaned symlinks in ${ROOT}usr/share/man"
 }
 
 src_install() {
diff --git a/x11-libs/openmotif/openmotif-2.3.0.ebuild b/x11-libs/openmotif/openmotif-2.3.0.ebuild
index 162625b6286e..6356eff3cd48 100644
--- a/x11-libs/openmotif/openmotif-2.3.0.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.0.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.ebuild,v 1.15 2008/02/14 11:44:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild,v 1.16 2008/02/14 17:41:41 ulm Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.6"
@@ -69,18 +69,18 @@ src_install() {
 	done
 
 	einfo "Fixing binaries"
-	dodir /usr/$(get_libdir)/openmotif-${SLOT}
+	dodir /usr/$(get_libdir)/openmotif-2.3
 	for file in `ls "${D}"/usr/bin`
 	do
-		mv "${D}"/usr/bin/${file} "${D}"/usr/$(get_libdir)/openmotif-${SLOT}/${file}
+		mv "${D}"/usr/bin/${file} "${D}"/usr/$(get_libdir)/openmotif-2.3/${file}
 	done
 
 	einfo "Fixing libraries"
-	mv "${D}"/usr/$(get_libdir)/* "${D}"/usr/$(get_libdir)/openmotif-${SLOT}/
+	mv "${D}"/usr/$(get_libdir)/* "${D}"/usr/$(get_libdir)/openmotif-2.3/
 
 	einfo "Fixing includes"
-	dodir /usr/include/openmotif-${SLOT}/
-	mv "${D}"/usr/include/* "${D}"/usr/include/openmotif-${SLOT}
+	dodir /usr/include/openmotif-2.3/
+	mv "${D}"/usr/include/* "${D}"/usr/include/openmotif-2.3
 
 	einfo "Fixing man pages"
 	mans="1 3 4 5"
@@ -89,7 +89,7 @@ src_install() {
 		for file in `ls "${D}"/usr/share/man/man${man}`
 		do
 			file=${file/.${man}/}
-			mv "${D}"/usr/share/man/man$man/${file}.${man} "${D}"/usr/share/man/man${man}/${file}-openmotif-${SLOT}.${man}
+			mv "${D}"/usr/share/man/man$man/${file}.${man} "${D}"/usr/share/man/man${man}/${file}-openmotif-2.3.${man}
 		done
 	done
 
@@ -108,9 +108,9 @@ src_install() {
 
 	# profile stuff
 	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/openmotif-${SLOT}" > "${D}"/etc/env.d/15openmotif-${SLOT}
+	echo "LDPATH=/usr/$(get_libdir)/openmotif-2.3" > "${D}"/etc/env.d/15openmotif-2.3
 	dodir /usr/$(get_libdir)/motif
-	echo "PROFILE=openmotif-${SLOT}" > "${D}"/usr/$(get_libdir)/motif/openmotif-${SLOT}
+	echo "PROFILE=openmotif-2.3" > "${D}"/usr/$(get_libdir)/motif/openmotif-2.3
 }
 
 pkg_postinst() {