Make static library optional and remove libtool archive. Move to eapi4.

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

5 files changed, 38 insertions, 105 deletions

diff --git a/media-libs/libmpeg2/ChangeLog b/media-libs/libmpeg2/ChangeLog
index 2a98ae7b4910..69ef10b434b8 100644
--- a/media-libs/libmpeg2/ChangeLog
+++ b/media-libs/libmpeg2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmpeg2
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.78 2010/09/20 22:00:06 josejx Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.79 2011/09/09 18:05:02 scarabeus Exp $
+
+  09 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libmpeg2-0.4.1.ebuild,
+  -files/libmpeg2-0.4.1-use-readelf-for-test.patch, libmpeg2-0.5.1-r1.ebuild:
+  Make static library optional and remove libtool archive. Move to eapi4.
 
   20 Sep 2010; Joseph Jezak <josejx@gentoo.org> libmpeg2-0.5.1-r1.ebuild:
   Marked ppc/ppc64 stable.
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index 63c964528e73..3d5a38e5ac54 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -1,22 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libmpeg2-0.4.1-use-readelf-for-test.patch 869 RMD160 55939dd2417015c1bf8052fe506495d55514337b SHA1 6476adaecd05519941cc70c14daeab27732e4d51 SHA256 56d43bb88a4179dbc3859c77ca445b89bbdd1223ee8d78bcc7d7148dee7ae534
 AUX libmpeg2-0.5.1-altivec.patch 688 RMD160 4eca946d82757645fb2b6479c2d969610975c1ed SHA1 2960c4b2ccfc0b6f9b726af64e27d06e432087d9 SHA256 01d23bd352fd0a072e70e9ccc0a7567a0b007bd626154ab2cdb2d5345a9df5ce
 AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 RMD160 ce216f2999be25af92392ad8b3fcbeed084f4a17 SHA1 364560cc5ef894c3dd02c40e7d1e2769d2e46ab9 SHA256 c012b21203452efc0f5bb2334e65461c45d53110c0b0e9b79efab68a7784c944
 AUX libmpeg2-0.5.1-armv4l.patch 749 RMD160 193fe881dcd423ee7a059e658caf37c91624d673 SHA1 fb9c72c1b5bfabc1162980f773c997e859bb7be2 SHA256 9136da8f10b1b8b51359855dccdb46dea69919890857264b94160e2f8774bfa7
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 RMD160 5a6ad7fcfbb493f15c8864a1a03fd5cbfee6d98a SHA1 639f8288404e499067ceb8566a7c778ad23c86bb SHA256 67fde111b731ef04c31318aa05568fac6614cc102499dbfb8afc409a78b5680f
 DIST libmpeg2-0.5.1.tar.gz 524776 RMD160 00b2d669655ed3f7a176f5eecc925045159a0301 SHA1 0f9163d8fd52db5f577ebe45636f674252641fd7 SHA256 dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4
-DIST mpeg2dec-0.4.1.tar.gz 494539 RMD160 5377ae45abdd37fabcea6d3d0a9d74e493b84483 SHA1 80be8b16dff4caa4253470d1a3b563fdc0177fcb SHA256 c74a76068f8ec36d4bb59a03bf1157be44118ca02252180e8b358b0b5e3edeee
-EBUILD libmpeg2-0.4.1.ebuild 1338 RMD160 b486051b9683d1e9b9bd3d17abec9016a2138cc5 SHA1 29656bdc81f5e16a9cfa55459eecebf6e795fce4 SHA256 7779ffee6c3c11bf82e2e7109a28ccb07f19784aa4113469b0f154104a408118
-EBUILD libmpeg2-0.5.1-r1.ebuild 1397 RMD160 5b2e774fe9da2ff84ab096ab679bdf9d05dce60f SHA1 44c59b5b3fe03d8f6d3168aa5bcb42ca82659274 SHA256 b6b702865b79b94c1a8b72d7a039c530376ef856d95f26df4cb75c7b14980073
+EBUILD libmpeg2-0.5.1-r1.ebuild 1399 RMD160 5ac7073a8b72bc5b0223901d1b09cb96c08a855c SHA1 96e4d101c6ae41e09c25679b0a5834e02a422f39 SHA256 7704feec8b149de849f4fb29bdbeccaf77d8f882cde02187d4d542f31a5e5b76
 EBUILD libmpeg2-0.5.1.ebuild 1320 RMD160 cb62eda14b9daec73411e6269244307cb0dd65bc SHA1 2e9127d8d96e70f794ddacac60c2ccbdb7cf5e47 SHA256 cbb27269523ead3124dbf436fddb2260584aa5e609515b12430d2b3230fa4637
-MISC ChangeLog 9959 RMD160 b6388a4983a6bb7b1a80070157b7add6e0c2fd36 SHA1 83e81f801d7a8a59bb2fe5e0c6cc63b4b4a7b2cc SHA256 6318bd65cb16204edbf0bdd981e1e86470ba584db23d1e67a638de7156f43213
+MISC ChangeLog 10194 RMD160 15998e286f1e1ce42d24b04af99d2c907391794d SHA1 d07e445333bf55ab6dd675bd279b51bba21eb76f SHA256 76fbddaab21a8990676a2f76a6fe468d52b357484fda4d36b1218ef5a65cc5b4
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkyX2BIACgkQcsIHjyDViGRGPgCdEphE5grbYzWLScVdLTvyp0L+
-svMAoKXLH3T9c+qvHWVfQdYjkd9V1Wf3
-=mheF
+iQIcBAEBAgAGBQJOalVZAAoJEOSiRoyO7jvoTRwP/jAgB9ciw9kl3eYIfx/kMArV
+cFBxGe3eq1plhDOG3WxvHNZo/dlKVSWPUju/VjW6LLGNeIA6gOm0MXlFtw6YIDCn
+n7KUyjHy+FXz7hpMNcAsrIr8GAzSOZH+yY1+KvsKBO1aJmP0kXrW3D7gxpylnDJP
+L0CyUUlCdQ3KynvKLiLddXduSBPY4RWQ+3ZF4l9gGNyzEBSYnFkAV2xJEo0rRhzN
+5qv9l+q7ICxjmpXAUBHGxu4pb06gcndH5dDyiB+LTwMcKL5DnSFyLhR/b1l/UhZA
+rj5oiYqQEAFikev33/MzAV2tFmS+BVHUROwa1MVDhjUhZLjsieh9Ar1OOGH+b8It
+/u7Cm4PX08I6EU7lQY0Jmcvql2GejCD09UbwIdVo4Xj5KNmWNfjShLh29ypMf5iz
+eH4brJrNUmf2XL+llkDwnCMoTiQzToisCQNqBVn1/glwY+1fGLWqdYYWF+P9bhVb
+/udEW2kkDrbSDLkSeiX8OLDe/JqPO3Rb2FyHZt8icGSYC8EP4qPlb3csJGcYxtoW
+45wgOmXnZ7BeGzm4GueXxUdNO1CLeGLqRsgm+qqolpSCX5L9WgB4Cg5RWDgHiY/x
+ZDMEgEqFvKLLJkcrHbkTdSejlq2XEX+L72oxJItkVDZSw0FKm6N0aANivOs/FmDm
+782pK+nBstJMdJx6ICiR
+=ZcMT
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmpeg2/files/libmpeg2-0.4.1-use-readelf-for-test.patch b/media-libs/libmpeg2/files/libmpeg2-0.4.1-use-readelf-for-test.patch
deleted file mode 100644
index 7d091cfbb04e..000000000000
--- a/media-libs/libmpeg2/files/libmpeg2-0.4.1-use-readelf-for-test.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- test/globals.orig	2006-04-29 19:19:59.000000000 +0200
-+++ test/globals	2006-04-29 19:24:35.000000000 +0200
-@@ -14,8 +14,9 @@
- 
- error=0
- 
--bad_globals=`nm -g --defined-only $builddir/../libmpeg2/*.o |\
--    awk '{if ($3) print $3}' | grep -v '^_\?mpeg2_'`
-+bad_globals=`readelf -s $builddir/../libmpeg2/*.o |\
-+	awk '$5=="GLOBAL" && $6!="HIDDEN" && $7!="UND" {print $8}' |\
-+	grep -v '^_\?mpeg2_'`
- 
- if test x"$bad_globals" != x""; then
-     echo BAD GLOBAL SYMBOLS:
-@@ -23,8 +24,9 @@
-     error=1
- fi
- 
--bad_globals=`nm -g --defined-only $builddir/../libmpeg2/convert/*.o |\
--    awk '{if ($3) print $3}' | grep -v '^_\?mpeg2convert_'`
-+bad_globals=`readelf -s $builddir/../libmpeg2/convert/*.o |\
-+	awk '$5=="GLOBAL" && $6!="HIDDEN" && $7!="UND" {print $8}' |\
-+	grep -v '^_\?mpeg2convert_'`
- 
- if test x"$bad_globals" != x""; then
-     echo BAD GLOBAL SYMBOLS:
diff --git a/media-libs/libmpeg2/libmpeg2-0.4.1.ebuild b/media-libs/libmpeg2/libmpeg2-0.4.1.ebuild
deleted file mode 100644
index 4b554bfcd58a..000000000000
--- a/media-libs/libmpeg2/libmpeg2-0.4.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.1.ebuild,v 1.12 2007/10/26 00:49:21 beandog Exp $
-
-inherit eutils libtool
-
-MY_P="mpeg2dec-${PV}"
-DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video"
-HOMEPAGE="http://libmpeg2.sourceforge.net/"
-SRC_URI="http://libmpeg2.sourceforge.net/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="sdl X"
-
-RDEPEND="sdl? ( media-libs/libsdl )
-	X? (
-		x11-libs/libXv
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix problem that the test for external symbols
-	# uses nm which also displays hidden symbols. Bug #130831
-	epatch "${FILESDIR}"/${P}-use-readelf-for-test.patch
-
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		--enable-shared \
-		--disable-dependency-tracking \
-		$(use_enable sdl) \
-		$(use_with X x) \
-		${myconf} \
-		|| die
-	emake \
-		OPT_CFLAGS="${CFLAGS}" \
-		MPEG2DEC_CFLAGS="${CFLAGS}" \
-		LIBMPEG2_CFLAGS="" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild
index f86bb7ec483f..a174b5fa3664 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild,v 1.6 2010/09/20 22:00:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild,v 1.7 2011/09/09 18:05:02 scarabeus Exp $
+
+EAPI=4
 
-EAPI=2
 inherit autotools eutils libtool
 
 DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video"
@@ -12,7 +13,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="sdl X"
+IUSE="sdl static-libs X"
 
 RDEPEND="sdl? ( media-libs/libsdl )
 	X? ( x11-libs/libXv
@@ -22,8 +23,11 @@ RDEPEND="sdl? ( media-libs/libsdl )
 DEPEND="${RDEPEND}
 	X? ( x11-proto/xextproto )"
 
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-arm-private-symbols.patch \
+	epatch \
+		"${FILESDIR}"/${P}-arm-private-symbols.patch \
 		"${FILESDIR}"/${P}-global-symbol-test.patch \
 		"${FILESDIR}"/${P}-armv4l.patch
 	elibtoolize
@@ -34,18 +38,20 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		$(use_enable static-libs static) \
 		--enable-shared \
-		--disable-dependency-tracking \
 		$(use_enable sdl) \
 		$(use_with X x)
 }
 
 src_compile() {
-	emake OPT_CFLAGS="${CFLAGS}" MPEG2DEC_CFLAGS="${CFLAGS}" \
-		LIBMPEG2_CFLAGS="" || die "emake failed"
+	emake OPT_CFLAGS="${CFLAGS}" \
+		MPEG2DEC_CFLAGS="${CFLAGS}" \
+		LIBMPEG2_CFLAGS=""
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }