From f9089e7795416d44115a3ac59f36eb58a193332a Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Thu, 4 Jan 2007 19:12:18 +0000 Subject: Drop ppc-macos keyword, remove darwin patch and conditionals. Package-Manager: portage-2.1.1-r2 --- x11-libs/openmotif/ChangeLog | 10 ++++++++-- x11-libs/openmotif/openmotif-2.1.30-r14.ebuild | 15 +++++---------- x11-libs/openmotif/openmotif-2.2.3-r3.ebuild | 16 ++++------------ x11-libs/openmotif/openmotif-2.2.3-r8.ebuild | 16 ++++------------ x11-libs/openmotif/openmotif-2.2.3-r9.ebuild | 6 +++--- 5 files changed, 24 insertions(+), 39 deletions(-) (limited to 'x11-libs/openmotif') diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog index 8525b427ff67..c4deda168ada 100644 --- a/x11-libs/openmotif/ChangeLog +++ b/x11-libs/openmotif/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/openmotif -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.133 2006/10/02 04:21:28 flameeyes Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.134 2007/01/04 19:12:18 grobian Exp $ + + 04 Jan 2007; Fabian Groffen + -files/openmotif-2.1.30-darwin-netbsd.diff, openmotif-2.1.30-r14.ebuild, + openmotif-2.2.3-r3.ebuild, openmotif-2.2.3-r8.ebuild, + openmotif-2.2.3-r9.ebuild: + Drop ppc-macos keyword, remove darwin patch and conditionals. 02 Oct 2006; Diego Pettenò openmotif-2.2.3-r9.ebuild: diff --git a/x11-libs/openmotif/openmotif-2.1.30-r14.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r14.ebuild index 59b80bf46496..651d3ee7c442 100644 --- a/x11-libs/openmotif/openmotif-2.1.30-r14.ebuild +++ b/x11-libs/openmotif/openmotif-2.1.30-r14.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r14.ebuild,v 1.4 2006/10/01 17:08:10 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r14.ebuild,v 1.5 2007/01/04 19:12:18 grobian Exp $ inherit eutils flag-o-matic multilib @@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz mirror://gentoo//${P}-CAN-2004-0914-newer.patch.bz2" LICENSE="MOTIF" -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc-macos ppc64 sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="" PROVIDE="virtual/motif" @@ -69,7 +69,6 @@ src_unpack() { # compile on gcc 2.9x epatch ${FILESDIR}/${PN}-2.1.30-imake-ansi.patch epatch ${FILESDIR}/${PN}-2.1.30-uil-bad_grammar_fix.diff - use ppc-macos && epatch ${FILESDIR}/${PN}-2.1.30-darwin-netbsd.diff if use amd64 && has_multilib_profile && [[ ${ABI} == "amd64" ]] ; then sed -i 's:__i386__:__x86_64__:g' ${S}/config/cf/*.cf ${S}/config/imake/* ${S}/config/makedepend/* @@ -112,12 +111,8 @@ src_install() { f="${D}/usr/X11R6/bin/${nib}"; rm "$f" || die "rm $f" done for nim in ${NOINSTMAN1}; do - if useq ppc-macos ; then - f="${D}/usr/X11R6/man/man1/${nim}.1" - else - f="${D}/usr/X11R6/man/man1/${nim}.1x" - fi - rm "$f" || die "rm $f" + f="${D}/usr/X11R6/man/man1/${nim}.1x" + rm "$f" || die "rm $f" done rm -rf "${D}/usr/X11R6/lib/X11" || die "rm config" rm -rf "${D}/usr/X11R6/include/X11" || die "rm config" diff --git a/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild index 4438b84b90ad..21fa9d274c33 100644 --- a/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild +++ b/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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-r3.ebuild,v 1.16 2006/10/01 17:08:10 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild,v 1.17 2007/01/04 19:12:18 grobian Exp $ inherit eutils libtool flag-o-matic multilib @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz LICENSE="MOTIF" SLOT="2.2" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86" IUSE="" DEPEND="virtual/libc @@ -22,7 +22,7 @@ DEPEND="virtual/libc x11-libs/libXp x11-proto/printproto >=sys-apps/sed-4 - !ppc-macos? ( =sys-devel/automake-1.4* ) + =sys-devel/automake-1.4* sys-devel/autoconf !virtual/motif" RDEPEND="virtual/libc @@ -50,22 +50,14 @@ src_unpack() { epatch ${FILESDIR}/${P}-XmResizeHashTable.patch epatch ${FILESDIR}/${P}-utf8.patch epatch ${FILESDIR}/${P}-no_demos.patch - use ppc-macos && epatch ${FILESDIR}/${P}-automake.patch epatch ${FILESDIR}/CAN-2005-0605.patch # autotool stuff export WANT_AUTOCONF=2.5 - # Patched Makefile.am to work with version 1.6 on ppc-macos. - # Untested elsewhere - use ppc-macos || export WANT_AUTOMAKE=1.4 - libtoolize --force --copy aclocal || die AUTOMAKE_OPTS="--foreign" - # For some reason ppc-macos complains about missing depcomp and compile - # files - use ppc-macos && AUTOMAKE_OPTS="-a -c -f ${AUTOMAKE_OPTS}" automake ${AUTOMAKE_OPTS} || die autoconf || die } diff --git a/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild index 627d6c30657d..6dbdb70c7c1e 100644 --- a/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild +++ b/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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-r8.ebuild,v 1.16 2006/10/01 17:08:10 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild,v 1.17 2007/01/04 19:12:18 grobian Exp $ inherit eutils libtool flag-o-matic multilib @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz LICENSE="MOTIF" SLOT="2.2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc-macos ppc64 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86" IUSE="" RDEPEND="virtual/libc @@ -24,7 +24,7 @@ RDEPEND="virtual/libc >=x11-libs/motif-config-0.9" DEPEND="${RDEPEND} >=sys-apps/sed-4 - !ppc-macos? ( =sys-devel/automake-1.4* ) + =sys-devel/automake-1.4* sys-devel/autoconf x11-misc/xbitmaps" @@ -51,22 +51,14 @@ src_unpack() { epatch ${FILESDIR}/${P}-utf8.patch epatch ${FILESDIR}/${P}-no_demos.patch epatch ${FILESDIR}/${P}-CVE-2005-3964.patch - use ppc-macos && epatch ${FILESDIR}/${P}-automake.patch epatch ${FILESDIR}/CAN-2005-0605.patch # autotool stuff export WANT_AUTOCONF=2.5 - # Patched Makefile.am to work with version 1.6 on ppc-macos. - # Untested elsewhere - use ppc-macos || export WANT_AUTOMAKE=1.4 - libtoolize --force --copy aclocal || die AUTOMAKE_OPTS="--foreign" - # For some reason ppc-macos complains about missing depcomp and compile - # files - use ppc-macos && AUTOMAKE_OPTS="-a -c -f ${AUTOMAKE_OPTS}" automake ${AUTOMAKE_OPTS} || die autoconf || die } diff --git a/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild index 11ce5e2703cf..cc18a2a3e4b8 100644 --- a/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild +++ b/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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-r9.ebuild,v 1.12 2006/10/02 04:21:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild,v 1.13 2007/01/04 19:12:18 grobian Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="1.6" @@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz LICENSE="MOTIF" SLOT="2.2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" IUSE="" RDEPEND="virtual/libc -- cgit v1.2.3-65-gdbad