Don't compile demo binaries. Add OPL licence.

Package-Manager: portage-2.1.4.4

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index f10ebd5b1031f74f00b1008ff97bb016675d29b5..1906ce5811962e84c7bfd768e9fc1b732df04cf7 100644 (file)
--- 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/Manifest b/x11-libs/openmotif/Manifest
index 8056fee4c3146811cf223b25af48cbd403230345..62aa8d008961d620480b9d425de5582a0bc96a29 100644 (file)
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -20,14 +20,14 @@ DIST openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986 RMD160 f04ccc46b82782d5
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.0.tar.gz 5661471 RMD160 317c8d13d59c6fdd4a9f0e3b63000695f6677b6c SHA1 efb5f5fdc4cc43ef6065594f4ebe98953b7af15e SHA256 81d63e4145fab729621cba38bb0e88fccfbcbb5918473319e9b01a6fbe909544
 EBUILD openmotif-2.2.3-r9.ebuild 3665 RMD160 ff360947f706ae39ef3324a839427c9763700621 SHA1 5135beaf45008d74e937dbc133e3cd5a279fcfd3 SHA256 39e9f2336b0a0469108757436a5bd6dcc88cd0f28912009b75831f84c3a14b1a
-EBUILD openmotif-2.3.0-r1.ebuild 2882 RMD160 37f302673f38eb697569cd007444bd1a23280556 SHA1 098e53f81c176484fa0f61e72047bea156122f79 SHA256 33a8a7788077c2112ae345f95f6151de5de306ea6086c395a382ae639b0f0666
-EBUILD openmotif-2.3.0.ebuild 3244 RMD160 b35036e0e2a6466813056537feb10f2872bdc342 SHA1 7e15bcf6e186f93c2a12cb8b4be59f5e4a78c909 SHA256 be71f3b21b980441ba83117b3f31604b702c76bd3c58bbcec0d44a6335cfea8a
-MISC ChangeLog 23717 RMD160 fde5d5bb0af0742dc871599599cfb31a32e4e135 SHA1 66d4c393c1031803e31e2a59f76a0f13fb295ebe SHA256 b5a8a184696617571b1bcbca5eb3da4e85ff76420b4a038c91185ff41e796d3d
+EBUILD openmotif-2.3.0-r1.ebuild 2860 RMD160 b95394988530540a56e0cf0d497aec73c4feb9f8 SHA1 171c572e6a783c9faa45f07ea7ff655fbb85aa10 SHA256 d99575a22285e4ca0fc83ce8d342bba87c659fb308260328ec194afe2851a319
+EBUILD openmotif-2.3.0.ebuild 3257 RMD160 88fb9f3e7543e5f8ec3f901ed192d5d602b5a8fb SHA1 15484cc3e5aae0442cf6971a0f46d7e7ecf3d22f SHA256 2f78be45f444e2725a9fdf5f3aff4b5b1950d554c7c83bb7062ab1f9d92ecf21
+MISC ChangeLog 23749 RMD160 abef51b4ff2f5eb2565e8d90daf57961a73ee1c8 SHA1 711dfd3911da2bf9ec99fd35dccc999ff815455f SHA256 635c93ddaee699afc7b90b51e1dae9eb4a8825cdd46e4ac3338f62992035c21b
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.8 (GNU/Linux)
 
-iEYEARECAAYFAke0E5gACgkQOeoy/oIi7uxBxACeK9cGJ1+oyp9misUaIu5fPZnU
-E8YAoL757GZdMIEHs+nPgOivRqwzgxRC
-=x7dp
+iEYEARECAAYFAke0KcAACgkQOeoy/oIi7uxMJwCfS5VG1zXO1M0CzTOcGbJc4X8f
+wSgAoJl4gSoWxifvebeaQI6UrQKlOTfN
+=YHEg
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild b/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild
index 4ed399667b1bb0cd3f7448f6141c93ad0661d08f..eca683147167f38a7f140f0c493f3f60119aeda0 100644 (file)
--- 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 f7c645fcc75129db89a342c1cfc3d4360b35db35..162625b6286e5b9a0a9ad4aa56a14673712cc78f 100644 (file)
--- 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"