Also remove stale symlinks for libraries and man pages.

(Portage version: 2.1.4.4)

3 files changed, 33 insertions, 12 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/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() {