diff options
author | Ulrich Müller <ulm@gentoo.org> | 2008-08-04 06:42:48 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2008-08-04 06:42:48 +0000 |
commit | fee7dddfec048ae69c3126be4ca11bf2009062e9 (patch) | |
tree | ed5a2f9c66cb57bf09e70902b374e57785781e07 /x11-libs/openmotif | |
parent | Removed vulnerable phpmyadmin-2.11.7 (#232007) (diff) | |
download | gentoo-2-fee7dddfec048ae69c3126be4ca11bf2009062e9.tar.gz gentoo-2-fee7dddfec048ae69c3126be4ca11bf2009062e9.tar.bz2 gentoo-2-fee7dddfec048ae69c3126be4ca11bf2009062e9.zip |
Remove intermediate version.
(Portage version: 2.2_rc3/cvs/Linux 2.6.25-gentoo-r6 i686)
Diffstat (limited to 'x11-libs/openmotif')
-rw-r--r-- | x11-libs/openmotif/ChangeLog | 5 | ||||
-rw-r--r-- | x11-libs/openmotif/openmotif-2.3.1.ebuild | 144 |
2 files changed, 4 insertions, 145 deletions
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog index b105619b7735..e0bfb6d64158 100644 --- a/x11-libs/openmotif/ChangeLog +++ b/x11-libs/openmotif/ChangeLog @@ -1,6 +1,9 @@ # 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.193 2008/07/26 12:58:21 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.194 2008/08/04 06:42:48 ulm Exp $ + + 04 Aug 2008; Ulrich Mueller <ulm@gentoo.org> -openmotif-2.3.1.ebuild: + Remove intermediate version. *openmotif-2.3.1-r1 (25 Jul 2008) diff --git a/x11-libs/openmotif/openmotif-2.3.1.ebuild b/x11-libs/openmotif/openmotif-2.3.1.ebuild deleted file mode 100644 index 2099dcd495cb..000000000000 --- a/x11-libs/openmotif/openmotif-2.3.1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# 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.1.ebuild,v 1.3 2008/07/01 19:30:39 ulm Exp $ - -inherit eutils flag-o-matic multilib autotools - -DOC_P=${PN}-2.3.0 -DESCRIPTION="Open Motif" -HOMEPAGE="http://www.motifzone.org/" -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 libXpm 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}" - - # fix linking problem on FreeBSD, bug 219040 - epatch "${FILESDIR}/${PN}-2.3.0-freebsd-libiconv.patch" - - # add missing conditional for USE=-xft, bug 229779 - epatch "${FILESDIR}/${P}-XmRenderT-no-xft.patch" - - # disable compilation of demo binaries - sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am - - # fix libtool-2.2 breakage, bug 220599 - sed -i -e 's/LT_HAVE/FINDXFT_HAVE/g' ac_find_xft.m4 - - # 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 README RELEASE RELNOTES BUGREPORT 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 -} |