Remove old blockers and cleanup code, motif-config is gone since > 3 years.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index dc450cce22588071cf129a4c1250f3aad0b1960d..765c763a732a1102c5938118e6486320c679ffb1 100644 (file)
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.262 2011/08/20 05:20:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.263 2011/12/19 08:43:01 ulm Exp $
+
+  19 Dec 2011; Ulrich Mueller <ulm@gentoo.org> openmotif-2.2.3-r11.ebuild,
+  openmotif-2.3.2-r2.ebuild, openmotif-2.3.3.ebuild:
+  Remove old blockers and cleanup code, motif-config is gone since > 3 years.
 
   20 Aug 2011; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.2-r2.ebuild:
   Call dosym with proper second argument. Add static-libs USE flag.

diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 64c05873bb9f1f011503982754aa71fc6645cafb..f8f1a87c6971bd8d9ebfbbeb709653a117f42ae1 100644 (file)
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
 AUX openmotif-2.3.1-ac-editres.patch 358 RMD160 2bace990711052d7d26a405aa63d6696a33ca50c SHA1 a83e8567f5bc9998f9cbdfbfafce007ac44009a8 SHA256 6ef38a5a3532e3a8d6be85549026410340da0d98aa97dd683aeb70eb5b9c5d52
@@ -14,17 +14,15 @@ DIST openMotif-2.2.3.tar.gz 5149785 RMD160 b99230d508da57bca72b6920d28fce4187bf5
 DIST openmotif-2.2.3-patches-4.tar.bz2 20601 RMD160 6f3f6492689b172e4ca4fb26510c27202ccfde96 SHA1 2964cc3d2918d9db26deb2a289ecdd5eaf2e0276 SHA256 424bc4216db5f13bbe92dade35eb14dddc781a5598508539920595590169b449
 DIST openmotif-2.3.2.tar.gz 5941784 RMD160 2346a93fcec57b9c18b6657d1cc681b6001cba28 SHA1 c98ac1bf3640ce57da34a0704bdeb2b12011ae1f SHA256 f786f3724d33133e8c4b3c9b368c89d680e981ca1c0e8c3280f496976b390c7d
 DIST openmotif-2.3.3.tar.gz 6051202 RMD160 015323e212e91ea3beaf039593de5ba75b01e4a6 SHA1 2a51e2f28078c4db7ff0c8517eb257001716b699 SHA256 c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103
-EBUILD openmotif-2.2.3-r11.ebuild 1689 RMD160 72917768fc77808514cf95cf20a19935a93b81b7 SHA1 bf58a269b857eb8dd00f16c3dc8f3c148d6c924d SHA256 61a7d065f9ea2a5f6c3f82dc20bafdcac44a0575865db04d2fccb84c92c4bc20
-EBUILD openmotif-2.3.2-r2.ebuild 5140 RMD160 80896245165ecc4ce136cc6ee2e80f8ccc5de076 SHA1 d192e7482afd0c6f575e0133c27a4fc383800c14 SHA256 da8e5849680ffd6a8ebe1628c19b1d88dfd1dcc4b20bcf60bf1095765712a54c
-EBUILD openmotif-2.3.3.ebuild 4892 RMD160 c2fae19b622c43f8f95ef7f7036740cbb72ffd35 SHA1 f24b8e9874f64a7491f6baa442ba28a08e558ddd SHA256 5cf4fa5f9134eb0cc5d354d5b2f2169a0de66b2681981b217d71796ef06b4db5
-MISC ChangeLog 38695 RMD160 d99e270c99c1ce3869417a74ca2ce0d65b674a14 SHA1 612bee154d8b09f0b9d7ba27c725fb980b135669 SHA256 375d56b44cd0c54790b24c8ff24b094be859685d2adc906c8f752330c83000da
+EBUILD openmotif-2.2.3-r11.ebuild 1646 RMD160 b4aed6748b443663b516929908ee3f509a014522 SHA1 b324178bb5177c125f81221be5b943209528f470 SHA256 22261a6d7234b3aa73645a2cf422f6ad86b9f596106f6f32db06e2ac0aa048ab
+EBUILD openmotif-2.3.2-r2.ebuild 4386 RMD160 8a2df68546b08edcd2da540843f903aab2a3413e SHA1 7b20d7febe5d6790bfceb70722eed5ffa952ca4f SHA256 4fabd2c60b61e461b8529c61055ed4451f63bab1d35456c6bcb55edf51bb3d98
+EBUILD openmotif-2.3.3.ebuild 4138 RMD160 c8fa9a7a825785e05b1cde02e7f84668f3881599 SHA1 896baf9b3e641a90919b07a9c50dfe85a92994d1 SHA256 a8f548bd03e666232491b077af8b41405016988c57dfb8b27d496e6aeef367e0
+MISC ChangeLog 38902 RMD160 5514174bfa995533262f78f93c70b6fbb6fde72a SHA1 15baa310ac55a47e7d4300a79651f34190e3a730 SHA256 e285616e2fe11f3e66fdff434a5e52262b947229e60a5c1ff836baa59d4ebcd7
 MISC metadata.xml 198 RMD160 5a208ca8de38d2f219858ad8183293139902fdd7 SHA1 334f4b42f75fe5d5f735703b5398172bf09379b2 SHA256 6998c57a835c2c7b81d26f91ae232a8df3128b85ad0348e1fa9444f157c28481
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ueoACgkQfXuS5UK5QB0fHQQAk0q4A/RZiBZ618bwM6sRJ8+f
-gi01qFvOIdlCq5zt3wXeDlZs64OeMszbx4nmz0Tv7hyS/CqbgVasY5tEh+dvrjLV
-k+DgtivZhMl2Xw+/t7TPClwv0mq1eMfDmjb+KlDHY3vGmIAIIlDabIinRbs3rY9a
-d2uIQ4lXOhz7qwAOq/s=
-=Q9l3
+iEYEARECAAYFAk7u+3YACgkQOeoy/oIi7uzxhQCfZfSHMnB9/i+FRj59vRraK6Nn
+qRMAoJUNplwRq3iXEAlDEDoSmP2rLs1x
+=0mTN
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild
index 164233e2a9b7aa7e50bf2c90ee68346488ffa9ea..70119a123331a9f6291e1d8b65f1adcd1e23a583 100644 (file)
--- a/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild,v 1.5 2011/03/07 11:04:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild,v 1.6 2011/12/19 08:43:01 ulm Exp $
 
 EAPI=3
 
@@ -17,9 +17,7 @@ SLOT="2.2"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="!x11-libs/motif-config
-       !x11-libs/lesstif
-       x11-libs/libXmu
+RDEPEND="x11-libs/libXmu
        x11-libs/libXp"
 
 DEPEND="${RDEPEND}

diff --git a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
index 4f3c34f198959d181271f94e3a8b53d621c80922..2ac52e09f8d8797208f3a6098ffef2ce11b1e824 100644 (file)
--- a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.19 2011/08/20 05:20:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.20 2011/12/19 08:43:01 ulm Exp $
 
 EAPI=3
 
@@ -32,8 +32,6 @@ DEPEND="${RDEPEND}
        sys-devel/flex
        x11-misc/xbitmaps"
 RDEPEND="${RDEPEND}
-       !x11-libs/motif-config
-       !x11-libs/lesstif
        doc? ( app-doc/openmotif-manual )"
 
 pkg_nofetch() {
@@ -51,32 +49,6 @@ pkg_nofetch() {
        EOF
 }
 
-pkg_setup() {
-       # clean up orphaned cruft left over by motif-config
-       local i l count=0
-       for i in "${EROOT}"/usr/bin/{mwm,uil,xmbind} \
-               "${EROOT}"/usr/include/{Xm,uil,Mrm} \
-               "${EROOT}"/usr/$(get_libdir)/lib{Xm,Uil,Mrm}.*; do
-               [[ -L "${i}" ]] || continue
-               l=$(readlink "${i}")
-               if [[ ${l} == *openmotif-* || ${l} == *lesstif-* ]]; then
-                       einfo "Cleaning up orphaned ${i} symlink ..."
-                       rm -f "${i}"
-               fi
-       done
-
-       cd "${EROOT}"/usr/share/man
-       for i in $(find . -type l); do
-               l=$(readlink "${i}")
-               if [[ ${l} == *-openmotif-* || ${l} == *-lesstif-* ]]; then
-                       (( count++ ))
-                       rm -f "${i}"
-               fi
-       done
-       [[ ${count} -ne 0 ]] && \
-               einfo "Cleaned up ${count} orphaned symlinks in ${EROOT}/usr/share/man"
-}
-
 src_prepare() {
        epatch "${FILESDIR}/${PN}-2.3.1-multilist-stipple.patch" #215984
        epatch "${FILESDIR}/${PN}-2.3.1-ac-editres.patch" #82081

diff --git a/x11-libs/openmotif/openmotif-2.3.3.ebuild b/x11-libs/openmotif/openmotif-2.3.3.ebuild
index b04971604df4ff8a3483e02a0863b42eb28b7d5c..bbaaed5338d572c2cd1b8e91f7e70389279b0cb7 100644 (file)
--- a/x11-libs/openmotif/openmotif-2.3.3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3.ebuild,v 1.17 2011/03/07 11:04:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3.ebuild,v 1.18 2011/12/19 08:43:01 ulm Exp $
 
 EAPI=3
 
@@ -32,8 +32,6 @@ DEPEND="${RDEPEND}
        sys-devel/flex
        x11-misc/xbitmaps"
 RDEPEND="${RDEPEND}
-       !x11-libs/motif-config
-       !x11-libs/lesstif
        doc? ( app-doc/openmotif-manual )"
 
 pkg_nofetch() {
@@ -51,32 +49,6 @@ pkg_nofetch() {
        EOF
 }
 
-pkg_setup() {
-       # clean up orphaned cruft left over by motif-config
-       local i l count=0
-       for i in "${EROOT}"/usr/bin/{mwm,uil,xmbind} \
-               "${EROOT}"/usr/include/{Xm,uil,Mrm} \
-               "${EROOT}"/usr/$(get_libdir)/lib{Xm,Uil,Mrm}.*; do
-               [[ -L "${i}" ]] || continue
-               l=$(readlink "${i}")
-               if [[ ${l} == *openmotif-* || ${l} == *lesstif-* ]]; then
-                       einfo "Cleaning up orphaned ${i} symlink ..."
-                       rm -f "${i}"
-               fi
-       done
-
-       cd "${EROOT}"/usr/share/man
-       for i in $(find . -type l); do
-               l=$(readlink "${i}")
-               if [[ ${l} == *-openmotif-* || ${l} == *-lesstif-* ]]; then
-                       (( count++ ))
-                       rm -f "${i}"
-               fi
-       done
-       [[ ${count} -ne 0 ]] && \
-               einfo "Cleaned up ${count} orphaned symlinks in ${EROOT}/usr/share/man"
-}
-
 src_prepare() {
        epatch "${FILESDIR}/${PN}-2.3.2-darwin.patch"
        epatch "${FILESDIR}/${PN}-2.3.2-sanitise-paths.patch"