LICENSE of version 2.3.4 is LGPL-2.1+. Remove old.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

6 files changed, 25 insertions, 166 deletions

diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index b3027fd67b26..8514ba2d0600 100644
--- a/x11-libs/motif/ChangeLog
+++ b/x11-libs/motif/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/motif
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.9 2012/12/16 19:52:27 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.10 2013/01/02 00:05:11 ulm Exp $
+
+  02 Jan 2013; Ulrich Müller <ulm@gentoo.org> -files/motif-2.3.2-darwin.patch,
+  -files/motif-2.3.2-libpng14.patch, -motif-2.3.3-r1.ebuild,
+  motif-2.3.4.ebuild:
+  LICENSE of version 2.3.4 is LGPL-2.1+. Remove old.
 
   16 Dec 2012; Raúl Porcel <armin76@gentoo.org> motif-2.3.4.ebuild:
   alpha/ia64/sh/sparc stable wrt #443610
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index fcad1515b5d0..adf6731a2311 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -2,24 +2,30 @@
 Hash: SHA256
 
 AUX Mwm.defaults 536 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab WHIRLPOOL dbef57a2fb37b93f38993aa4ca04b082a4e8fbde3142867c11c4acd2e7a53ffdb65ef299d8f96cc06eb6572aa29ae8e6db8f3f9499aa46669f199f9f35023db1
-AUX motif-2.3.2-darwin.patch 598 SHA256 e08b783770b5e1bea7cd2ccd02b7cad7d655ef6d5ae1fc28698072b70ec2a9c3 SHA512 4c3af83977aec251a2c9814ce4b8fd232c0f5151e1925b46e3d1bc25e1153b36281a86e059ff51d8e06aaf2be744f9e02d4ff9f0d8fc10e864e0aeadda89b310 WHIRLPOOL 11acf9f24ecd4108b46fd06c254d99f4426b6a7da1afc51cf58ecf61870d6b404ac3ac74d6ab0d0e851cdf85817a5966a04147293af32fe5b852682c7f9636f2
-AUX motif-2.3.2-libpng14.patch 339 SHA256 54dde5fa69a3a1fc99455b57317c7c004dad050071d6b41e356e184e72dedf32 SHA512 a5daa38d7a6bf232ceb4f9d6b7bd9a0370c36b816b20c37d93e31012fc8344bbe38f75b34e71ee86af1c014da80684c99a7365571568dbd9b3e18c0d145024a3 WHIRLPOOL c6b545bdfb6f125c0beb8fb803ad3da2d6eaa6efd1f35df5927f5071605005c2ee78c9422fb7f5d0a51c12aab6de19a14d16c3e104b104521d06a8e9eee35c72
 AUX motif-2.3.2-sanitise-paths.patch 734 SHA256 dfdbe238d4009588ee8d3a0a1f8eacf1fffabff746504393a3da87a643c7c086 SHA512 336b02bf89ac049ba01552b191dc3611c060b63217387acc0be0774a2351e1ba9cf094be913d6081aba5f096d39cd4c21c9545fba5452815812f54bdb645d5be WHIRLPOOL 224f4da595f8240ae2a2c7f5e3281dee5272c3b5101c7c650b04e6768d8d1b2355969581461442918bed900fdcba659cdd23ff78b7985a982c779675646c9a93
 AUX motif-2.3.2-solaris-2.11.patch 409 SHA256 cfd6f6dde2edd3907b3dc712d2df2096478b20ca4d4dc523b45058c50656a0b7 SHA512 f9b318b62f9c64409c1867f037eb9d52f0b56c538f16b046b1808a14fbc47aa27ae234402df43e03c4cd209df2dd58a7072d969f20717f97de0c662cc72db526 WHIRLPOOL 309800a01dd44ecbc6bed7ac519ec4c9f0add5451dccdd2130e8c1204a9ae4e76b65b01ed9e03d7335155ff3fe3840f875de69536fd03928392574d2a08944db
 AUX motif-2.3.4-solaris.patch 541 SHA256 b9b6b9eb830d950214b2826d08e946440950593cbd881f9c0e8e68800ba74ec9 SHA512 aab5062aad07007241f8e5f37f73b5a6b68bea8811a0946895bb583435f09b6549657501bc61bd458bdae77c2d245e45b2544675aa41197d9f473711279b6641 WHIRLPOOL 153ca01765883e13f21dce0131db5981a2175752b0388503a4e72273999bd7f86ee87b9562d3f76c6df5e28783a9c67df2894f7edc4df2152d17b168161ff842
 DIST motif-2.3.4-src.tgz 9527040 SHA256 637efa09608e0b8f93465dbeb7c92e58ebb14c4bc1b488040eb79a65af3efbe0 SHA512 fb1033caa68f25b93282fa6700d5b7856be217b3651072d86e7c93a747df5b31219230998eb93deae22a8fa698e816b1a30e52b3ae88ae1c01c1f0aac59a2af2 WHIRLPOOL 9e4447fb1ac09a41cd6c61af52584f42fee3d026874bc15e258bc79f239f95a21bb3fe79ed7df08d86aaac370a669ec83cacc9eadb11320fbad6df6c27715d95
 DIST openMotif-2.2.3.tar.gz 5149785 SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8 WHIRLPOOL 970f3f20eefde787af9fa932dcbf77e870ca6ba248e2632c358bbb7d149c2c4fef31a33a64888bc2b2e891f1c66a803a12e1121378539a94599e0be753c04bad
 DIST openmotif-2.2.3-patches-4.tar.bz2 20601 SHA256 424bc4216db5f13bbe92dade35eb14dddc781a5598508539920595590169b449 SHA512 48490c4d031cdf1930035ad288ad85228168a9589db4f6660f2b6ccbca7e7c01d0bdf1c0e3583d3a83f0ae6b9f3dec7eb91bc0cf2e38a0f9fd35c9301c0a3428 WHIRLPOOL b3398492c05c01615ba751e6c04825415c4a168a3ab5144c35e8e110f53b8ccd96bf0568890184f8b4e54278cc0bbdf57a1d231f36a4a26b8f4179cfeeecc9df
-DIST openmotif-2.3.3.tar.gz 6051202 SHA256 c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103 SHA512 276d890692f2107aba14c927e0ff99514165621ef5ef53366a5dbd9a89b569b5327cef42efb67a44a0c27676a097d8fe85ab51a4165438ab9062f97d586737f6 WHIRLPOOL e52fe3585751ef972f92f57f2be6204ec693e79ce71a7729f4945c0478cf09ec2b35d35405265a5dffa7242b0d439fd461b6f8a06443756268bdddff83dbc6c0
 EBUILD motif-2.2.3-r11.ebuild 1649 SHA256 ab7c1ba8b77bfa9bd88793aa4a87ffdabda86670d03b7b800914ea4fa8ae0051 SHA512 129297b11c977ee879a34aafc5a22bdd05f0dfab18f50192d7116b1d550c92d7901ac2872d4f418f8bd3cf55da5b5ccda68aae7651e1e009e2602a459888e1f4 WHIRLPOOL e751d5ea8ae0ed54437c73ce81da716ca683994e5efa1dcda06689f905e73a7f9d3c483a0bcb2697938b023f5b8049f683a11990f83b58993877b0a73ac29785
-EBUILD motif-2.3.3-r1.ebuild 3628 SHA256 d05daaf41722c4e77990fae27373c0d13ab42288a7e2f6185d729817e1b8f0fd SHA512 6c4254e5c70763213c7b22049ea438b4d16dcc99758e4ae77cfb3cc26a0fb648a93a1d7ae7ca7c5ea41a792ea00a3b70226898608d9bcf3d49331237f1e563fe WHIRLPOOL 3dcf5372927f72177f91142795b49cc7ce3f63bcd9071f7cd975bd78cf2e008ecc40e2e0ec39aff9e5568dffa78703a83a3fadbdd3af19ea1ab058c33edf36ec
-EBUILD motif-2.3.4.ebuild 2861 SHA256 cc1379fa526c8885eac5d1f3e5e097d91e26c58f2951670e468d33412429b9ec SHA512 6a765b1d9ae5f15cca9d4836cae4a04aee5637265eaec019f4921cf87bf171883ef8658996486fe8f748bf9688eaf79057399a361460eed03cbef916746be0cf WHIRLPOOL 98530bc5e063eb71dad566db0c0a41b8f10124058082067a4bcaf74bf621f075163e78fe6620aaf9dac22b29eb8bb98411a9c89d31f189f1fb50a0f1f388b555
-MISC ChangeLog 42483 SHA256 784bae9d7dc756a55af887197345d13f95b7e84bad374fd9e827569988150fba SHA512 fa200afff4995a223b5dc420cc53b645387ea2b880fac64f37ef66eda3db1794e0260f3b4eb4da621736ca373ae092a4fec0ee91e31ab9f49794a5dba83fcdd3 WHIRLPOOL addaefe8a9c969358dfcf871354b03fa650c1b8ee4ee9789cd2e9ea7435bad373eb6a089537a6de8dc50bc07ba89f69597e296cc97641319841a6c23cc84e8a5
+EBUILD motif-2.3.4.ebuild 2860 SHA256 63f24e3347816d44cd0c30e3bf10c37c001479635010adb2a134273a83bd1327 SHA512 6079667eea1d14a60a4d9f6cf77d7507c3cec68af48e58dcbf47a7703e09260680ea4b96e3dcfdced16f32d3005fd4433c5ddf0b447594a6ba3765582b84424b WHIRLPOOL 3eb8192bab18f95d5d9e5d567f0e163159d161368e53f22f06821b72d9eb4626137a9d463e2260229336c1ef450e27cb71a9c716c68e0cc07c33ddadfb18ac12
+MISC ChangeLog 42697 SHA256 771fbdf04284135a207ed870e7f68ece1f28febb7727d51a68cf4140408e4347 SHA512 54040c2b0626211883359396eadd79d77b264fda18f3415400fa7f6cdbc6b1e1555b12e504e3f508729a5644337631e5fd2ae3c096a253e83b195d89485708cb WHIRLPOOL 7a34b1a57b2e9d8885532ddd520d7687fcaa84c2198e0033d171e8d3e9f45c125b321c779548d0be0e23eeab44a2e318ce3bccf48d175c3bd2b64f0d7408ce53
 MISC metadata.xml 198 SHA256 6998c57a835c2c7b81d26f91ae232a8df3128b85ad0348e1fa9444f157c28481 SHA512 5607a8c66738198e21639247c46f41240819c2e0894855a05543e88edd7bac8ef5c5e2f3ca762f9c9bcf85f033235f013d8b40406acda50c1857c4ad51945c40 WHIRLPOOL 60b0c8b7be2ee31dc62d3668b6347266085a756f3f565cb3a962a91877afc1f6beaff21a36b7a2d4de1a4eb5798a9baa1533e2a9495b1552517036d733308873
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDOJn0ACgkQuQc30/atMkB0CwCfcFvUMbGhpSb1/Cg0QOtTo3Lb
-JxAAnRiYSfb36cJqGxy/cqIgVCbwt2mF
-=OxiE
+iQIcBAEBCAAGBQJQ43pJAAoJEDxpGckxwJCB7FAP/RIuopgCgh3G0tLFknwzGfyB
+khGh0YxmhmK2xYPJ2bu5XQ4H8+5cOOPsAGcOq9MTY+N7vNXhQyHGxQK+KBONlbqX
+/NthvtQ1p79Bqh2Qw5CX+9L6Ybp0JQxWZdbW797WgAzBlBKZ9mLnXUoFzAYYaKT1
+LDWWeYq034vqr1PODi9VTDbaVW2RYsR86DcerpOMSkotB45QzsMv3z8+d44uIMbX
+C95JigiOi4yM12o84lLuD3teL5mabSV7Ye2fMNmO7iLM53qLWI6DFTpsacAFawpl
+KHuZXz+frr2ekrrbF+LIOoFBJDpGX1Y+MGt2Fi9oj6o8O5ZdrpVCIUTlw4COiuu2
+iq/dSfZ+JoDRxl3iUBG71/t+9atnmmPcEDH153ljaKreNF2t2oZDmt1PGCJh6gXJ
+Gu3BIamt6guBegueUm36ooM3rIxmyaS772sX9MMJHBbWQFynrEAhYJ1of/uhNkZm
+ZxjFbQHEfOTe5xdNeVK3MqkAccDfwVv40z6HhPtFAwl8SRCAJd3wxkLE8Zkn6WGq
+KPCd4yUjtwyHx5dojbqIsONt+cl2XHC8xORKc/SHGftVqT0MC9g/kGiCMZka8wxB
+AoRbgJJUopeMZJ0BOcoiC/FgNar01Tuzoa9E8Aw+X35FT9LReNyYsVxnKAfqSrhu
++IcWc6BonMw8C0UPu6HU
+=dxZ0
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/motif/files/motif-2.3.2-darwin.patch b/x11-libs/motif/files/motif-2.3.2-darwin.patch
deleted file mode 100644
index 859fcf3c4047..000000000000
--- a/x11-libs/motif/files/motif-2.3.2-darwin.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.motifzone.net/showattachment.cgi?attach_id=259
-http://bugs.motifzone.net/long_list.cgi?buglist=1479
-
-Extend the patch to include guard for sun to solve the exact same
-compilation issue on Solaris.
-
---- openmotif-2.3.2.org/clients/uil/UilDefI.h	2004-11-18 08:54:32.000000000 +0000
-+++ openmotif-2.3.2/clients/uil/UilDefI.h	2009-11-08 13:24:29.000000000 +0000
-@@ -283,7 +283,7 @@
- #include "UilIODef.h"
- #include "UilDiagDef.h"
- #include "UilSarDef.h"
--#if defined(linux)
-+#if defined(linux) || defined(__APPLE__) || defined(sun)
- #define YYSTYPE yystype
- #endif
- #include "UilLexPars.h"
diff --git a/x11-libs/motif/files/motif-2.3.2-libpng14.patch b/x11-libs/motif/files/motif-2.3.2-libpng14.patch
deleted file mode 100644
index 5b817719c7dc..000000000000
--- a/x11-libs/motif/files/motif-2.3.2-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg207680.html
-
---- lib/Xm/Png.c
-+++ lib/Xm/Png.c
-@@ -144,7 +144,7 @@
-     png_bytepp row_pointers = NULL;
- 
-     fread(sig, 1, 8, infile);
--    if (!png_check_sig(sig, 8))
-+    if (png_sig_cmp(sig, 0, 8))
-         return 1;               /* bad signature */
- 
-     png_ptr =
diff --git a/x11-libs/motif/motif-2.3.3-r1.ebuild b/x11-libs/motif/motif-2.3.3-r1.ebuild
deleted file mode 100644
index 19fa8338d2db..000000000000
--- a/x11-libs/motif/motif-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,122 +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/motif/motif-2.3.3-r1.ebuild,v 1.2 2012/10/26 23:35:11 ulm Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Open Motif"
-HOMEPAGE="http://www.motifzone.net/"
-SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/openmotif-${PV}.tar.gz"
-
-LICENSE="MOTIF MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="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
-	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
-	x11-misc/xbitmaps"
-
-S="${WORKDIR}/openmotif-${PV}"
-
-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
-
-	# "bison -y" causes runtime crashes #355795
-	export YACC=byacc
-
-	econf --with-x \
-		$(use_enable static-libs static) \
-		$(use_enable unicode utf8) \
-		$(use_enable xft) \
-		$(use_enable jpeg) \
-		$(use_enable png)
-}
-
-src_compile() {
-	make clean			# remove pre-made bison parsers
-	emake -j1 MWMRCDIR="${EPREFIX}"/etc/X11/mwm
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" MWMRCDIR="${EPREFIX}"/etc/X11/mwm install
-
-	# 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
-		dodir /usr/share/doc/${PF}/demos
-		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
-	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
-}
diff --git a/x11-libs/motif/motif-2.3.4.ebuild b/x11-libs/motif/motif-2.3.4.ebuild
index 9a2dbf09e5c6..fc459f8a9a20 100644
--- a/x11-libs/motif/motif-2.3.4.ebuild
+++ b/x11-libs/motif/motif-2.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4.ebuild,v 1.9 2012/12/16 19:52:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4.ebuild,v 1.10 2013/01/02 00:05:11 ulm Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.net/projects/motif/
 	http://motif.ics.com/"
 SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}-src.tgz"
 
-LICENSE="LGPL-2+ MIT"
+LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg png static-libs unicode xft"