Fixup gcc4 patch.

Package-Manager: portage-2.0.53_rc7

4 files changed, 113 insertions, 4 deletions

diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index 52e751e0ef89..6a2376f3e8bd 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmpeg3
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.37 2005/05/15 02:16:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.38 2005/11/02 13:09:30 azarah Exp $
+
+*libmpeg3-1.5.2-r2 (02 Nov 2005)
+
+  02 Nov 2005; Martin Schlemmer <azarah@gentoo.org>
+  +libmpeg3-1.5.2-r2.ebuild:
+  Fixup gcc4 patch.
 
   15 May 2005; Diego Pettenò <flameeyes@gentoo.org> libmpeg3-1.5.2.ebuild,
   libmpeg3-1.5.2-r1.ebuild:
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 673613a38e5f..9cb95039caf3 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -1,6 +1,18 @@
-MD5 640d99851ea2ef01f58235d840851a14 ChangeLog 6250
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e6168faa9a191084a056e39782fe83f5 ChangeLog 6383
+MD5 eab6c819f36fbf2566019eee669caa90 files/digest-libmpeg3-1.5.2 140
+MD5 eab6c819f36fbf2566019eee669caa90 files/digest-libmpeg3-1.5.2-r1 140
+MD5 80a0c734edfea0d53c9ea85e058f5c26 files/digest-libmpeg3-1.5.2-r2 140
 MD5 8ffc35485a974d9d7f5482edc1fe05af libmpeg3-1.5.2-r1.ebuild 2649
+MD5 5df8d27e706806c6af30d56ab4dfcfbc libmpeg3-1.5.2-r2.ebuild 2722
 MD5 9b5b6dab0cf8028666f463929d062ce8 libmpeg3-1.5.2.ebuild 2008
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 eab6c819f36fbf2566019eee669caa90 files/digest-libmpeg3-1.5.2 140
-MD5 eab6c819f36fbf2566019eee669caa90 files/digest-libmpeg3-1.5.2-r1 140
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaLth1ZcsMnZjRyIRAtpzAKCAhD3yY4q9vqCavm/v1ewpMfXYhQCePyaL
+VJFpLuQB/jzrGvQVL0wa9Tg=
+=eoE1
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r2 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r2
new file mode 100644
index 000000000000..ce447bc53938
--- /dev/null
+++ b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r2
@@ -0,0 +1,2 @@
+MD5 d2b12624e8e2eed1a03c4f837f33a90f libmpeg3-1.5.2-src.tar.bz2 625682
+MD5 84f32e19c88437cbb043367cdc87d2c4 libmpeg3-patches-3.tar.bz2 4251
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r2.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r2.ebuild
new file mode 100644
index 000000000000..914f23e6f669
--- /dev/null
+++ b/media-libs/libmpeg3/libmpeg3-1.5.2-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r2.ebuild,v 1.1 2005/11/02 13:09:30 azarah Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+PATCHLEVEL="3"
+DESCRIPTION="An mpeg library for linux"
+HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
+SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
+	http://dev.gentoo.org/~azarah/libmpeg3/${PN}-patches-${PATCHLEVEL}.tar.bz2
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mmx"
+
+RDEPEND="sys-libs/zlib
+	media-libs/jpeg
+	media-libs/a52dec"
+DEPEND="${RDEPEND}
+	mmx? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# The Makefile is patched to install the header files as well.
+	# This patch was generated using the info in the src.rpm that
+	# SourceForge provides for this package.
+	[ "`gcc-version`" == "3.4" -o "`gcc-major-version`" -ge 4 ] || \
+		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 08_all_gcc34.patch"
+	[ "`gcc-major-version`" -ge 4 ] || \
+		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 09_all_gcc4.patch"
+
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
+
+	# remove a52 crap
+	echo > Makefile.a52
+	rm -rf a52dec-0.7.3/*
+	ln -s /usr/include/a52dec a52dec-0.7.3/include
+	local libs
+	libs=" -la52"
+	if ! [ -f "${ROOT}/usr/$(get_libdir)/liba52.so" ]; then
+		if grep -q djbfft ${ROOT}/usr/$(get_libdir)/liba52.a; then
+			libs="${libs} -ldjbfft"
+		fi
+	fi
+	sed -i "/LIBS = /s:$: -L\${ROOT}usr/$(get_libdir) ${libs}:" Makefile
+
+	if ! use mmx || has_pic ; then
+		sed -i -e 's:^NASM =.*:NASM =:' \
+		       -e 's|^HAVE_NASM :=.*|HAVE_NASM=n|' \
+		       -e 's|USE_MMX = 1|USE_MMX = 0|' \
+		       Makefile
+	fi
+}
+
+src_compile() {
+	local obj_dir=$(uname --machine)
+
+	rm -f ${obj_dir}/*.o &> /dev/null
+
+	make CC="$(tc-getCC)" ${obj_dir}/libmpeg3.a || die "Failed libmpeg3.a"
+	rm -f ${obj_dir}/{video/,audio/,}*.o
+
+	# x86 asm is not pic safe
+	if ! use mmx || has_pie; then
+		append-flags -fPIC
+	fi
+
+	make CC="$(tc-getCC)" ${obj_dir}/libmpeg3.so || die "Failed libmpeg3.so"
+
+	# This would add -fno-pie to CFLAGS, so don't change to it! --eradicator
+	# filter-flags -fPIC
+	CFLAGS=${CFLAGS//-fPIC/}
+
+	touch ${obj_dir}/libmpeg3.a
+	make CC="$(tc-getCC)" || die "Failed to build utilities"
+}
+
+src_install() {
+	# This patch patches the .h files that get installed into /usr/include
+	# to show the correct include syntax '<>' instead of '""'  This patch
+	# was also generated using info from SF's src.rpm
+	epatch ${WORKDIR}/${PV}/gentoo-p2.patch
+	make DESTDIR="${D}/usr" LIBDIR="$(get_libdir)" install || die
+	dohtml -r docs
+}