diff options
author | Ulrich Müller <ulm@gentoo.org> | 2008-11-08 17:59:00 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2008-11-08 17:59:00 +0000 |
commit | 3ae1f89e189d444d6975889bc695a2c86ff89732 (patch) | |
tree | 4cf5f9e4d9f1f236bb184ecd0c7c8d8cd52ce37e /x11-libs | |
parent | alpha/arm/ia64/sh/x86 stable wrt #246056 (diff) | |
download | gentoo-2-3ae1f89e189d444d6975889bc695a2c86ff89732.tar.gz gentoo-2-3ae1f89e189d444d6975889bc695a2c86ff89732.tar.bz2 gentoo-2-3ae1f89e189d444d6975889bc695a2c86ff89732.zip |
Remove old.
(Portage version: 2.2_rc13/cvs/Linux 2.6.26-gentoo-r1 i686)
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/openmotif/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/openmotif/files/motif-config-2.3 | 37 | ||||
-rw-r--r-- | x11-libs/openmotif/openmotif-2.3.0-r1.ebuild | 138 |
3 files changed, 5 insertions, 176 deletions
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog index 151c5bcadc6d..636ac62d08de 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.206 2008/11/08 17:44:15 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.207 2008/11/08 17:59:00 ulm Exp $ + + 08 Nov 2008; Ulrich Mueller <ulm@gentoo.org> -files/motif-config-2.3, + -openmotif-2.3.0-r1.ebuild: + Remove old. 08 Nov 2008; Raúl Porcel <armin76@gentoo.org> openmotif-2.3.1.1.ebuild: alpha/arm/ia64/sparc/sh stable wrt #245635 diff --git a/x11-libs/openmotif/files/motif-config-2.3 b/x11-libs/openmotif/files/motif-config-2.3 deleted file mode 100644 index 4eb58724680a..000000000000 --- a/x11-libs/openmotif/files/motif-config-2.3 +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# based on gcc-config by Martin Schlemmer <azarah@gentoo.org> -# Author: Heinrich Wendel <lanius@gentoo.org> - -# Stripped down minimal version for backwards compatibility only. -# We now just provide the info that other applications might use -# to compile and link against openmotif - Jakub Moc <jakub@gentoo.org> - -usage() { -cat << "USAGE_END" -Usage: motif-config [option] - -Options: - -L, --get-lib-path Print path where openmotif libraries are located - -I, --get-inc-path Print path where openmotif includes are located - --libs Print link flags for openmotif - --cflags Print compilation flags for openmotif -USAGE_END - exit $1 -} - -[[ $# -lt 1 ]] && usage 1 -[[ $# -gt 2 ]] && usage 1 - -case "$1" in - -L|--get-lib-path) echo "/usr/@@LIBDIR@@/" ;; - -I|--get-inc-path) echo "/usr/include/" ;; - --libs) echo "-L/usr/@@LIBDIR@@/" ;; - --cflags) echo "-I/usr/include/" ;; - -v|--version) echo "motif-config-2.3" ;; - -h|--help) usage 0 ;; - *) usage 1 ;; -esac - -exit 0 diff --git a/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild b/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild deleted file mode 100644 index 854ab638cacb..000000000000 --- a/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild +++ /dev/null @@ -1,138 +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.0-r1.ebuild,v 1.22 2008/06/29 12:39:13 ulm Exp $ - -inherit eutils flag-o-matic multilib autotools - -DESCRIPTION="Open Motif" -HOMEPAGE="http://www.motifzone.org/" -SRC_URI="ftp://ftp.ics.com/openmotif/2.3/${PV}/${P}.tar.gz - doc? ( http://www.motifzone.net/files/documents/${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 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 - 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}/${P}-sensitivity-invisible.patch" - - # disable compilation of demo binaries - sed -i -e 's/^[ \t]*demos//' Makefile.in -} - -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 xft) \ - $(use_enable jpeg) \ - $(use_enable png) - - emake -j1 || die "emake failed" -} - -src_install() { - emake -j1 DESTDIR="${D}" install || die "emake install failed" - - newbin "${FILESDIR}"/motif-config-2.3 motif-config - dosed "s:@@LIBDIR@@:$(get_libdir):g" /usr/bin/motif-config - - # mwm default configs - insinto /etc/X11/app-defaults - doins "${FILESDIR}"/Mwm.defaults - - local f - for f in /usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4; do - dosed 's:/usr/lib/X11/\(.*system\\&\.mwmrc\):/etc/X11/mwm/\1:g' ${f} - dosed 's:/usr/lib/X11/app-defaults:/etc/X11/app-defaults:g' ${f} - done - - 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 - - # documentation - 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 -} |