Re-add previously dropped keywords for prefix, bug 397819. Remove old.

Package-Manager: portage-2.1.10.51/cvs/Linux x86_64

4 files changed, 23 insertions, 155 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 67ad8f47f16f..dedd856a9955 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.275 2012/03/25 19:40:37 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.276 2012/03/26 18:18:42 ulm Exp $
+
+  26 Mar 2012; Ulrich Müller <ulm@gentoo.org> -openmotif-2.3.3.ebuild,
+  openmotif-2.3.3-r1.ebuild:
+  Re-add previously dropped keywords for prefix, bug 397819. Remove old.
 
   25 Mar 2012; Naohiro Aota <naota@gentoo.org> openmotif-2.3.3-r1.ebuild:
   Add alternative dependecy for byacc on FreeBSD. Add ~x86-fbsd. #397819
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index e16d6934492e..81527049667c 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
 AUX openmotif-2.3.1-ac-editres.patch 358 RMD160 2bace990711052d7d26a405aa63d6696a33ca50c SHA1 a83e8567f5bc9998f9cbdfbfafce007ac44009a8 SHA256 6ef38a5a3532e3a8d6be85549026410340da0d98aa97dd683aeb70eb5b9c5d52
@@ -16,24 +16,23 @@ DIST openmotif-2.3.2.tar.gz 5941784 RMD160 2346a93fcec57b9c18b6657d1cc681b6001cb
 DIST openmotif-2.3.3.tar.gz 6051202 RMD160 015323e212e91ea3beaf039593de5ba75b01e4a6 SHA1 2a51e2f28078c4db7ff0c8517eb257001716b699 SHA256 c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103
 EBUILD openmotif-2.2.3-r11.ebuild 1646 RMD160 b4aed6748b443663b516929908ee3f509a014522 SHA1 b324178bb5177c125f81221be5b943209528f470 SHA256 22261a6d7234b3aa73645a2cf422f6ad86b9f596106f6f32db06e2ac0aa048ab
 EBUILD openmotif-2.3.2-r2.ebuild 4418 RMD160 95877ff23f79b46ed9fce21ec38288b65f607f16 SHA1 34ee02906228b105bd736daa80c6b5a0ffd97e27 SHA256 3d8da40608b80025c739c3bf6b41b1370dd98a2abbafc7db0ed85314ef605177
-EBUILD openmotif-2.3.3-r1.ebuild 4209 RMD160 493408b3e7ecac914b4af1fc83c79761309b9bc5 SHA1 1f86240658127e38a60de490b8c8d514bd514f28 SHA256 05ebec8b8a6ec784f1c196f22b7a59b8da65ce1edeb33f0c3f48291098533436
-EBUILD openmotif-2.3.3.ebuild 4170 RMD160 28644b247a8011c55dc4c03e835eccea099d7fc0 SHA1 4376e4433baeaa8a1f19bd3c238071987825b60a SHA256 a8f5314d9719e434d619a4e335454678b4bfc20daf610f7ee7000be2d3e3b85b
-MISC ChangeLog 40518 RMD160 4145232b66dfacaea95b320cc0c85cce3ba3f6d6 SHA1 2505c96cf399745f8ffd0275b85401fb3a07d51c SHA256 6f8432e90e7e69f979edec7d596b026379bf82ece82cda0123a9f857826bcab8
+EBUILD openmotif-2.3.3-r1.ebuild 4240 RMD160 c695d6632b54df0d87041525e379a630dc10e5ac SHA1 e2f6f5607b846c2e628f161db13cf335211e3f9f SHA256 27da618820550c8de80aafd49aea3136d0a2921cf5c333dec0459fb0f4454015
+MISC ChangeLog 40691 RMD160 3327be97cade04a1d1d464ba6a38908ad97f55c7 SHA1 d450fa1f9c40682d2840c395e84d45e5075cd4b9 SHA256 1ec73296ab0f03658b73c9dea2af7a700aa8d1b4825eb07361fde372eaa245d3
 MISC metadata.xml 198 RMD160 5a208ca8de38d2f219858ad8183293139902fdd7 SHA1 334f4b42f75fe5d5f735703b5398172bf09379b2 SHA256 6998c57a835c2c7b81d26f91ae232a8df3128b85ad0348e1fa9444f157c28481
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPb3S/AAoJEDYO1FT4VRUU8A4P/0B/NmO0KGvCSe/Q83qqH0/D
-OpeJNw2L8nwz6ezfUAeEpZVKF57dLtWwxYCOSCOKW766eoMNpy4gMFcUnGICE2BD
-Ux5zMailt/EzcyaeuTm1IZFE5txJNS/IORtcBRc0fR/hXvIw1srr/hZsKbDq1ahy
-3AbH4kHlurRKOBVJN34jc28bnpSplDkztEoewgaK5ClXDduNrGIOkiUixNda7PtW
-aPMJDijB4K8ad0fUzrZvEkGpsELmCMBuckkA3Agbq6TMb1mnKfBsfWCif/yxq0e4
-jLsTqzgceKW8lOIMofJ4omDeTbGCNIMn0DtT9bAXiyZ6d5IMtvxPAeqdtZ2ZKEg0
-F/BLcyFZYCUP3jszPE/FtMjuciMIDWijhlc1OMjF6zL1mS55SA6oIj4tSXuZtSsp
-/VuFIwyn/w8wkGheYaxOqZ934VFmJLGeip9aRz/TdnFmfS9JY27N6Xcah6Zt8Yo6
-btKTPb5pnIEXR89q8757YpWlejq4WHEJFY3lXMqVptBQvcqHWYRLcWXTG28ODv66
-npcoHkluDq1Kru656DVuuj8mQoEFgPJUHTd1ydiVAhT6GT9FScpSgKeh3bHJxSPO
-Z+V6VtAydnAorMgYqJcqazg/Aks9JnG39voeqDUsLRjUbH/6dNwwAiawWZuAb4+5
-TAclxRWQW/vlV1el7v4t
-=91k9
+iQIcBAEBAgAGBQJPcLOuAAoJEDxpGckxwJCBDFgQAIQQy842jJYIPpC3QH0f4+Kt
+wA0e6Pcm48DxnY/R0QCKJf9dxqlYyrkyKZkHk3nofvMWqBBeo/wEZ26TprTGb5Cv
+X/XOQgGHeVcoc4WjnjRYAPnhR1dLKPwuPpM8lTnKQ4AQtTJSldZ3gMB2oA5TLfgq
+Ni0H8FaS+Fwh3wCl9yegOjiDCNo9PjA2C+SlB8MffQnfrUCsfistHyAgmBwThP/H
+BLW5vzZIY8I5mEqhBq5hY4GRGrNnw23/GmEJ9ORRpyEu291z3Vrpue4ZtL04E0Eh
+Xs18zDHyOssgZe8v7gI8jtUozPtXU0SZ2JdSTBNhj6vkL3fPFKUU1bbFt41jlJ7V
+YeTJNJTpxthmuLDRGMloxeVyZCuayMSh04pV7zb4MIwzcPVeParV9mmJXHp5SIdc
+Tqjc/erF91/+DGXMg2gjnDCETNa9A7i4ZXWZ4dNvIAqJ5a1Mdmhr9jAOemGHSDIk
+EpSO0DFai5aBkOrlJ0GncirxyJFYh6N0k2mgw5ldY7Ae9PmhMKOb2UfppsaImtxx
+2+p/ozw30DKqXYQcZ/DA35W3mktWWYAElKPFKsdTLDR7HArVW6qWem3aCRSn/J/j
+IXCBDrmtQSBB1goZu+Q92FTIFRLhIGDFaWKydGhOOE5vj1Ia9jvICYgNAnNDtL/6
+f1kKuGnO17jKyRQUkMS/
+=D3Gn
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/openmotif-2.3.3-r1.ebuild b/x11-libs/openmotif/openmotif-2.3.3-r1.ebuild
index a921852c61c1..3d26ade9ece1 100644
--- a/x11-libs/openmotif/openmotif-2.3.3-r1.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3-r1.ebuild,v 1.14 2012/03/25 19:40:37 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3-r1.ebuild,v 1.15 2012/03/26 18:18:42 ulm Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz"
 
 LICENSE="MOTIF MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples jpeg png static-libs unicode xft"
 # license allows distribution only for "open source operating systems"
 RESTRICT="!kernel_linux? (
diff --git a/x11-libs/openmotif/openmotif-2.3.3.ebuild b/x11-libs/openmotif/openmotif-2.3.3.ebuild
deleted file mode 100644
index e9e0ed83a96b..000000000000
--- a/x11-libs/openmotif/openmotif-2.3.3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3.ebuild,v 1.19 2012/01/15 22:10:58 ulm Exp $
-
-EAPI=3
-
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Open Motif"
-HOMEPAGE="http://www.motifzone.net/"
-SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz"
-
-LICENSE="MOTIF MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples jpeg png static-libs unicode xft"
-# license allows distribution only for "open source operating systems"
-RESTRICT="!kernel_linux? (
-	!kernel_FreeBSD? (
-	!kernel_Darwin? (
-		fetch bindist
-	) ) )"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libXp
-	unicode? ( virtual/libiconv )
-	xft? ( x11-libs/libXft )
-	jpeg? ( virtual/jpeg )
-	png? ( >=media-libs/libpng-1.4 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	x11-misc/xbitmaps"
-RDEPEND="${RDEPEND}
-	doc? ( app-doc/openmotif-manual )"
-
-pkg_nofetch() {
-	local line
-	while read line; do einfo "${line}"; done <<-EOF
-	From the Open Motif license: "The rights granted under this license are
-	limited solely to distribution and sublicensing of the contribution(s)
-	on, with, or for operating systems which are themselves open source
-	programs. Contact The Open Group for a license allowing distribution and
-	sublicensing of the original program on, with, or for operating systems
-	which are not open source programs."
-
-	If above conditions are fulfilled, you may download the file:
-	${SRC_URI}
-	and place it in ${DISTDIR}.
-	EOF
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.3.2-darwin.patch"
-	epatch "${FILESDIR}/${PN}-2.3.2-sanitise-paths.patch"
-	epatch "${FILESDIR}/${PN}-2.3.2-libpng14.patch"
-	[[ ${CHOST} == *-solaris2.11 ]] \
-		&& epatch "${FILESDIR}/${PN}-2.3.2-solaris-2.11.patch"
-
-	# disable compilation of demo binaries
-	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
-
-	# 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_configure() {
-	# get around some LANG problems in make (#15119)
-	LANG=C
-
-	# bug #80421
-	filter-flags -ftracer
-
-	# feel free to fix properly if you care
-	append-flags -fno-strict-aliasing
-
-	# For Solaris Xos_r.h :(
-	[[ ${CHOST} == *-solaris2.11 ]] && append-flags -DNEED_XOS_R_H=1
-
-	if use !elibc_glibc && use !elibc_uclibc && use unicode; then
-		# libiconv detection in configure script doesn't always work
-		# http://bugs.motifzone.net/show_bug.cgi?id=1423
-		export LIBS="${LIBS} -liconv"
-	fi
-
-	econf --with-x \
-		$(use_enable static-libs static) \
-		$(use_enable unicode utf8) \
-		$(use_enable xft) \
-		$(use_enable jpeg) \
-		$(use_enable png)
-}
-
-src_compile() {
-	emake -j1 MWMRCDIR="${EPREFIX}"/etc/X11/mwm || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" MWMRCDIR="${EPREFIX}"/etc/X11/mwm install \
-		|| die "emake install failed"
-
-	# mwm default configs
-	insinto /usr/share/X11/app-defaults
-	newins "${FILESDIR}"/Mwm.defaults Mwm
-
-	if use examples; then
-		emake -j1 -C demos DESTDIR="${D}" install-data \
-			|| die "installation of demos failed"
-		dodir /usr/share/doc/${PF}/demos
-		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos
-	fi
-	rm -rf "${ED}"/usr/share/Xm
-
-	# don't install libtool archives
-	rm -f "${ED}"/usr/$(get_libdir)/*.la
-
-	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
-}
-
-pkg_postinst() {
-	local line
-	while read line; do elog "${line}"; done <<-EOF
-	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 slot 2.2 of x11-libs/openmotif for
-	the Open Motif 2.2 libraries.
-	EOF
-}