From: Ulrich Müller Date: Mon, 7 Jun 2010 13:09:38 +0000 (+0000) Subject: Remove old. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=682e974222d22bae51c71b98339c4054a49cb46c;p=gentoo.git Remove old. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog index a433780a9e57..da84250b43c2 100644 --- a/x11-libs/openmotif/ChangeLog +++ b/x11-libs/openmotif/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/openmotif # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.239 2010/06/07 12:18:26 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.240 2010/06/07 13:09:38 ulm Exp $ + + 07 Jun 2010; Ulrich Mueller -openmotif-2.3.2.ebuild: + Remove old. 07 Jun 2010; Christoph Mende openmotif-2.3.2-r2.ebuild: diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest index cb115b688d03..8fb40dc88cc2 100644 --- 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 @@ -10,18 +10,16 @@ AUX openmotif-2.3.2-ldflags.patch 654 RMD160 8756d40e95f64a851838042f9cf2152a1b6 AUX openmotif-2.3.2-libpng14.patch 339 RMD160 0c4b88048ef382c9690c467263e51b845b7240ae SHA1 1ff64ff0bf948d7a96751114c8d374b689b3cbe0 SHA256 54dde5fa69a3a1fc99455b57317c7c004dad050071d6b41e356e184e72dedf32 AUX openmotif-2.3.2-sanitise-paths.patch 734 RMD160 de091a0b8d232fc4507c9fc3b3805dd386a9a4c0 SHA1 49e5be643bbd5ee180525ef76458986d555bb038 SHA256 dfdbe238d4009588ee8d3a0a1f8eacf1fffabff746504393a3da87a643c7c086 AUX openmotif-2.3.2-solaris-2.11.patch 409 RMD160 78e04d1ea6985b663423058754b6d05fdacdf88d SHA1 dc19563eada1094f921d69d0415cdf643697e0a5 SHA256 cfd6f6dde2edd3907b3dc712d2df2096478b20ca4d4dc523b45058c50656a0b7 -DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb 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.3.2-r2.ebuild 5153 RMD160 5cffb961a77b306da159901685d419f2b9c797f9 SHA1 75ada11ad611fa585dcb4bb3af1ce7ac6d80acb8 SHA256 abd64a6afcc1ba2d7d6a7c79cae5e17f7b1f72e23d7c8634046aa47c836e50af -EBUILD openmotif-2.3.2.ebuild 4084 RMD160 7bb056c12a1856bd954b1bc614c812745dd8e4d9 SHA1 c4f85b4050c4bfea88ba4c0f5df156cb94848ad2 SHA256 f6aa28e3b4bb6104ad52d0d487b0083c96f1a871c3603c125b31d1a0f5562f0e EBUILD openmotif-2.3.3.ebuild 4924 RMD160 572df28476bd5bce9697ea3fd410b353c5d66885 SHA1 f876472795283a671ed6f364dd9df3b3b0c24001 SHA256 33b64d325ac3d533e27f79bf6b85d6ef6c984054528b6e0df72e9df694f5a5da -MISC ChangeLog 35788 RMD160 729147c0491d2c908ad9d619999d57045f856342 SHA1 b20dde32cec753824a4934f231fdc15623d78bec SHA256 ec74526e5a05283c9da287101f608d94f4a6283cf6076a15fdb7fca43e4f7bcc +MISC ChangeLog 35871 RMD160 5eab5d8c92be7e0d6c00b0c81cd676127f77752a SHA1 c3464a3c72f4a1e6d4cb5cc2090c8584815849fa SHA256 4822a09794b857eac16954e0749fae208187082c0c465a8b5d332a225d4c28e4 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iF4EAREIAAYFAkwM46YACgkQmWq1bYTyC0OdFAEAiJxY0CEQinS6FGVgcO4YP8ve -0d+NBCR4Vj9Lo96aO7AA/3nRfLgivhUIO/zswXcf6bihhQJffgJT72fosbAw6mWz -=37+Z +iEYEARECAAYFAkwM78wACgkQOeoy/oIi7uz/cgCgpAvAVwSBwrtjtbi2HLgS4ph3 +hygAnRt1DuwD8SuXGVztyhBC2y/4Tg5T +=zU44 -----END PGP SIGNATURE----- diff --git a/x11-libs/openmotif/openmotif-2.3.2.ebuild b/x11-libs/openmotif/openmotif-2.3.2.ebuild deleted file mode 100644 index b1bfd7c3b18d..000000000000 --- a/x11-libs/openmotif/openmotif-2.3.2.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2010 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.ebuild,v 1.13 2010/02/06 15:47:55 ulm Exp $ - -inherit autotools eutils flag-o-matic multilib - -DOC_P=${PN}-2.3.0 -DESCRIPTION="Open Motif" -HOMEPAGE="http://www.motifzone.net/" -SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz - doc? ( http://www.motifzone.net/files/documents/${DOC_P}-manual.pdf.tgz )" - -LICENSE="MOTIF MIT doc? ( OPL )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="doc examples jpeg png unicode xft" - -# make people unmerge motif-config and all previous slots -# since the slotting is finally gone now -RDEPEND="!x11-libs/motif-config - !x11-libs/lesstif - !<=x11-libs/openmotif-2.3.0 - x11-libs/libXmu - x11-libs/libXp - unicode? ( virtual/libiconv ) - xft? ( x11-libs/libXft ) - jpeg? ( media-libs/jpeg ) - png? ( media-libs/libpng )" - -DEPEND="${RDEPEND} - sys-devel/flex - x11-misc/xbitmaps" - -pkg_setup() { - # clean up orphaned cruft left over by motif-config - local i l count=0 - for i in "${ROOT}"usr/bin/{mwm,uil,xmbind} \ - "${ROOT}"usr/include/{Xm,uil,Mrm} \ - "${ROOT}"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 "${ROOT}"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 ${ROOT}usr/share/man" -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-2.3.1-multilist-stipple.patch" #215984 - epatch "${FILESDIR}/${PN}-2.3.1-ac-editres.patch" #82081 - epatch "${FILESDIR}/${P}-ldflags.patch" #293573 - - # disable compilation of demo binaries - sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am - - # add X.Org vendor string to aliases for virtual bindings - echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias - - AT_M4DIR=. eautoreconf -} - -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 unicode utf8) \ - $(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" - - # mwm default configs - insinto /usr/share/X11/app-defaults - newins "${FILESDIR}"/Mwm.defaults Mwm - - dodir /etc/X11/mwm - mv -f "${D}"/usr/$(get_libdir)/X11/system.mwmrc "${D}"/etc/X11/mwm - dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/ - - if use examples; then - emake -j1 -C demos DESTDIR="${D}" install-data \ - || die "installation of demos failed" - dodir /usr/share/doc/${PF}/demos - mv "${D}"/usr/share/Xm/* "${D}"/usr/share/doc/${PF}/demos - fi - rm -rf "${D}"/usr/share/Xm - - dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO - use doc && cp "${WORKDIR}"/*.pdf "${D}"/usr/share/doc/${PF} -} - -pkg_postinst() { - local line - while read line; do elog "${line}"; done <<-EOF - Gentoo is no longer providing slotted Open Motif libraries. - See bug 204249 and its dependencies for the reasons. - - From the Open Motif 2.3.0 (upstream) release notes: - "Open Motif 2.3 is an updated version of 2.2. Any applications - built against a previous 2.x release of Open Motif will be binary - compatible with this release." - - If you have binary-only applications requiring libXm.so.3, you may - therefore create a symlink from libXm.so.3 to libXm.so.4. - Please note, however, that there will be no Gentoo support for this. - Alternatively, you may install x11-libs/openmotif-compat-2.2* for - the Open Motif 2.2 libraries. - EOF -}