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

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)

5 files changed, 10 insertions, 157 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/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"