diff options
-rw-r--r-- | x11-libs/openmotif/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/openmotif/openmotif-2.3.0-r1.ebuild | 17 | ||||
-rw-r--r-- | x11-libs/openmotif/openmotif-2.3.0.ebuild | 4 |
3 files changed, 15 insertions, 12 deletions
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog index f10ebd5b1031..1906ce581196 100644 --- a/x11-libs/openmotif/ChangeLog +++ b/x11-libs/openmotif/ChangeLog @@ -1,6 +1,6 @@ # 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.151 2008/02/14 10:09:57 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.152 2008/02/14 11:44:29 ulm Exp $ *openmotif-2.3.0-r1 (14 Feb 2008) @@ -8,8 +8,8 @@ +files/Mwm.defaults, openmotif-2.3.0.ebuild, +openmotif-2.3.0-r1.ebuild: Install libraries and include files without slotting. Install application defaults for Mwm and a stripped-down motif-config. Ebuild by Jakub Moc - <jakub@gentoo.org>, bug 210021. Remove demo binaries. Fix symlink for - system.mwmrc. Drop mips to unstable. + <jakub@gentoo.org>, bug 210021. Don't compile demo binaries. Fix symlink for + system.mwmrc. Drop mips to unstable. Add missing OPL licence. 13 Feb 2008; Raúl Porcel <armin76@gentoo.org> openmotif-2.3.0.ebuild: alpha/ia64/sparc stable wrt #204265 diff --git a/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild b/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild index 4ed399667b1b..eca683147167 100644 --- a/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild +++ b/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild @@ -1,6 +1,6 @@ # 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.1 2008/02/14 10:09:57 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild,v 1.2 2008/02/14 11:44:29 ulm Exp $ inherit flag-o-matic multilib autotools @@ -9,7 +9,7 @@ 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" +LICENSE="MOTIF doc? ( OPL )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="doc examples jpeg png xft" @@ -31,6 +31,14 @@ DEPEND="${RDEPEND} PROVIDE="virtual/motif" +src_unpack() { + unpack ${A} + cd "${S}" + + # 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 @@ -89,11 +97,6 @@ src_install() { mv -f "${D}"/usr/$(get_libdir)/X11/system.mwmrc "${D}"/etc/X11/mwm dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/ - # cleanup - einfo "Removing demo applications ..." - find "${D}"/usr/bin/ -type f ! -name motif-config ! -name mwm \ - ! -name uil ! -name xmbind | xargs rm -f - if use examples ; then dodir /usr/share/doc/${PF}/demos mv "${D}"/usr/share/Xm/* "${D}"/usr/share/doc/${PF}/demos diff --git a/x11-libs/openmotif/openmotif-2.3.0.ebuild b/x11-libs/openmotif/openmotif-2.3.0.ebuild index f7c645fcc751..162625b6286e 100644 --- a/x11-libs/openmotif/openmotif-2.3.0.ebuild +++ b/x11-libs/openmotif/openmotif-2.3.0.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.14 2008/02/14 10:09:57 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild,v 1.15 2008/02/14 11:44:29 ulm Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="1.6" @@ -12,7 +12,7 @@ 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" +LICENSE="MOTIF doc? ( OPL )" SLOT="0" KEYWORDS="alpha ~amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd" IUSE="doc xft jpeg png examples" |