old

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

6 files changed, 5 insertions, 186 deletions

diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index 3e1be2672913..0fbab2d97dc1 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -1,11 +1,6 @@
-AUX libmp4v2-1.5.0.1+glibc-2.10.patch 1103 RMD160 68e639aefdb2bbcaf5dd9599423809ad5db846f4 SHA1 a1d6c4771b2f74506866b0738a66a7e9ce43153f SHA256 04899e5d8b4ab1ce1628c00a3e7c998e00c5eee4704a7d911e7bddf9cca9e9eb
-AUX libmp4v2-1.5.0.1-configurebashisms.patch 340 RMD160 d3c644a68ea90232e61002ed656eb8d7fecc3517 SHA1 d35a7c2d57e8c86d83f46b14ca4920532b6f7040 SHA256 26a42d61f3197530fb8a18b9c550978fa2f9befb35c73a99aefeecc57a8675fa
-DIST mp4v2-1.9.0.tar.bz2 479264 RMD160 6e2564ae58589fd5b556f6f9713d89b98aa5756a SHA1 c7ae8d0b45be55934e39a72e7d00c8bb564bf9c4 SHA256 d2a479b9435cef6fc597dd58fcfdf6bb81075119c88ccf5438cb47cfdcb69110
 DIST mp4v2-1.9.1.tar.bz2 432943 RMD160 66aed17925589b49ec3b1241bfcb45a8e3181c08 SHA1 c62d00e99b65efce16accd83c501fb8a57206aa8 SHA256 5c381caeab2326fc48cfda0fe202bdb8ba0ae624d9c97ad7680a2b07e2c2e3b4
 DIST mpeg4ip-1.5.0.1.tar.gz 4826180 RMD160 fee5c21c17a470e6de349e07d233a1eb46b2064a SHA1 1271de695ed65284d9c39aa91bf26c5494603fd3 SHA256 23535dd818898ec75ffa0df22d9f27189e77361ce8a500d58328073ee247bcb6
 EBUILD libmp4v2-1.5.0.1-r1.ebuild 1859 RMD160 2a5c4dc5cefc790b331ed6bd7657742fff237dc9 SHA1 4af09617babc8616320b1bad3d07002463b925ea SHA256 63817e0618f005b7d477d2763cd3b4f5ebddf88eac2579585bb0c828916c3b9d
-EBUILD libmp4v2-1.5.0.1-r2.ebuild 2183 RMD160 0474ed49d4cdfd75ba988571969ce72358da8d0f SHA1 329c02655c27df15e2ea2cec54d8ffd16eb52612 SHA256 3fc6b3655c9317120ef899f3c1e398140a4fb1bf08a27299e4bcdfeb1d847988
-EBUILD libmp4v2-1.9.0.ebuild 950 RMD160 b723c11d0436a7ae0a46f02d8de87b4edec3e109 SHA1 014bf3f58c083423564c9c6e86ff1289dffd449b SHA256 8e0ea9fea6e558a811f3a66338dbe874e3bcff2f5306980ffabdfa59a42b0176
 EBUILD libmp4v2-1.9.1.ebuild 917 RMD160 a18a571fb1fc2a3f3f2535280243c673d4c8eee7 SHA1 5bb8c04998fc853c186589da9e3e6a0e144ee0e3 SHA256 d877935b53d08ddc79cbfa74c1db42dd8ce502014cf56e3d8a93f1130bf7f860
 MISC ChangeLog 7440 RMD160 31e5658ec6325f37a3d7ea3382c46dcb0ae14861 SHA1 1d99422ae313ee44f2a2e593ea98f65bb132a57b SHA256 6fbbb01d02a32bdbed55cbbd589acd4cef380344e5f3ebce680126bc5d0d821f
-MISC metadata.xml 233 RMD160 c20d298ac187e070edc6971a6010e07151c56b57 SHA1 e13e0c923a9ec6b4e64279413e4251168a079da6 SHA256 9a0a929d8d8181248f6cafff6d42e982b38f016167bb7b52da84d873599ab340
+MISC metadata.xml 238 RMD160 30bda44ac5971801f2358e71491851a322fc6fc0 SHA1 cc2f121fc2e8c60aaae3d301e30f54e4a8eab5e6 SHA256 aa4ddeb9b46990cd6cbcac24eae65ca117d93ea49485a00ab40e867035b9643a
diff --git a/media-libs/libmp4v2/files/libmp4v2-1.5.0.1+glibc-2.10.patch b/media-libs/libmp4v2/files/libmp4v2-1.5.0.1+glibc-2.10.patch
deleted file mode 100644
index 763366e69e0b..000000000000
--- a/media-libs/libmp4v2/files/libmp4v2-1.5.0.1+glibc-2.10.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- mpeg4ip-1.5.0.1.orig/configure.in
-+++ mpeg4ip-1.5.0.1/configure.in
-@@ -266,7 +266,8 @@ dnl Checks for typedefs, structures, and
- 
- dnl Checks for library functions.
- AC_CHECK_FUNCS(strerror strcasestr poll getopt getopt_long getopt_long_only getrusage socketpair strsep inet_ntoa)
--
-+AC_GNU_SOURCE
-+AC_CHECK_DECLS([strcasestr], , ,[#include <string.h>])
- 
- AC_CHECK_TYPES([in_port_t, socklen_t], , , 
- 	[#include <sys/types.h>
---- mpeg4ip-1.5.0.1.orig/include/mpeg4ip.h
-+++ mpeg4ip-1.5.0.1/include/mpeg4ip.h
-@@ -120,6 +120,7 @@
- #endif
- #include <sys/param.h>
- 
-+#if !defined(HAVE_DECL_STRCASESTR) || !HAVE_DECL_STRCASESTR
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -127,6 +128,7 @@ char *strcasestr(const char *haystack, c
- #ifdef __cplusplus
- }
- #endif
-+#endif
- 
- #define OPEN_RDWR O_RDWR
- #define OPEN_CREAT O_CREAT 
---- mpeg4ip-1.5.0.1.orig/lib/mp4v2/rtphint.cpp
-+++ mpeg4ip-1.5.0.1/lib/mp4v2/rtphint.cpp
-@@ -314,7 +314,7 @@ void MP4RtpHintTrack::GetPayload(
- 	char **ppEncodingParams)
- {
-   const char* pRtpMap;
--  char* pSlash;
-+  const char* pSlash;
-   u_int32_t length;
- 	InitPayload();
- 
diff --git a/media-libs/libmp4v2/files/libmp4v2-1.5.0.1-configurebashisms.patch b/media-libs/libmp4v2/files/libmp4v2-1.5.0.1-configurebashisms.patch
deleted file mode 100644
index 85757a6d91b0..000000000000
--- a/media-libs/libmp4v2/files/libmp4v2-1.5.0.1-configurebashisms.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mpeg4ip-1.5.0.1/configure.in.old	2009-06-10 09:13:55 +0000
-+++ mpeg4ip-1.5.0.1/configure.in	2009-06-10 09:15:45 +0000
-@@ -7,7 +7,7 @@
-    AC_MSG_ERROR([Please run bootstrap first])
-    exit -1
- fi
--rm -f config.h >&/dev/null
-+rm -f config.h
- touch config.h
- dnl Detect the canonical host and target build environment
- AC_CANONICAL_HOST
diff --git a/media-libs/libmp4v2/libmp4v2-1.5.0.1-r2.ebuild b/media-libs/libmp4v2/libmp4v2-1.5.0.1-r2.ebuild
deleted file mode 100644
index 3f605a12f912..000000000000
--- a/media-libs/libmp4v2/libmp4v2-1.5.0.1-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/libmp4v2-1.5.0.1-r2.ebuild,v 1.8 2009/08/01 16:14:20 jer Exp $
-
-inherit libtool autotools
-
-DESCRIPTION="libmp4v2 extracted from mpeg4ip"
-HOMEPAGE="http://www.mpeg4ip.net/"
-SRC_URI="mirror://sourceforge/mpeg4ip/mpeg4ip-${PV}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!<media-video/mpeg4ip-1.4.1
-	!<media-libs/faad2-2.0-r9"
-
-S=${WORKDIR}/mpeg4ip-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:nasm -r:nasm -v:g' configure.in || die "sed nasm"
-
-	epatch "${FILESDIR}"/${P}+glibc-2.10.patch
-	epatch "${FILESDIR}"/${P}-configurebashisms.patch
-
-	# We don't give a damn about these two, just remove the two calls
-	# so we don't have to have the macros to eautoreconf properly.
-	sed -i -e '/AM_PATH_\(GLIB\|GTK\|ALSA\)/d' configure.in || die
-
-	AT_NO_RECURSIVE="yes" eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	touch bootstrapped
-	econf \
-		--disable-warns-as-err \
-		--disable-server \
-		--disable-player \
-		--disable-mp4live \
-		--disable-id3tags \
-		--disable-xvid \
-		--disable-a52dec \
-		--disable-mad \
-		--disable-mpeg2dec \
-		--disable-srtp \
-		--disable-mp3lame \
-		--disable-faac \
-		--disable-ffmpeg \
-		--disable-x264 \
-		|| die "econf failed"
-
-	cd "${S}/lib/mp4v2"
-
-	sed -i -e 's:SUBDIRS = . test util:SUBDIRS = .:' Makefile \
-		 || die "sed failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd "${S}/lib/mp4v2"
-
-	make DESTDIR="${D}" install || die
-
-	dodoc README INTERNALS API_CHANGES TODO
-
-	sed -i -e 's:"mpeg4ip.h":<libmp4v2/mpeg4ip.h>:' \
-		"${D}/usr/include/mp4.h" || die "sed failed"
-
-	dodir /usr/include/libmp4v2
-
-	cp "${S}/include/mpeg4ip.h"  "${D}/usr/include/libmp4v2/"
-	sed -i -e 's:mpeg4ip_config.h:libmp4v2/mpeg4ip_config.h:' \
-		-e 's:"mpeg4ip_version.h":<libmp4v2/mpeg4ip_version.h>:' \
-		 "${D}/usr/include/libmp4v2/mpeg4ip.h"  || die "sed failed"
-
-	cp "${S}/include/mpeg4ip_version.h" "${D}/usr/include/libmp4v2/"
-	cp "${S}/mpeg4ip_config.h" "${D}/usr/include/libmp4v2/"
-}
diff --git a/media-libs/libmp4v2/libmp4v2-1.9.0.ebuild b/media-libs/libmp4v2/libmp4v2-1.9.0.ebuild
deleted file mode 100644
index 227a014b4a8f..000000000000
--- a/media-libs/libmp4v2/libmp4v2-1.9.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/libmp4v2-1.9.0.ebuild,v 1.6 2009/07/16 20:19:37 ssuominen Exp $
-
-EAPI=2
-inherit flag-o-matic libtool
-
-DESCRIPTION="Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard"
-HOMEPAGE="http://code.google.com/p/mp4v2"
-SRC_URI="http://mp4v2.googlecode.com/files/${P/lib}.tar.bz2"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="utils"
-
-RDEPEND=""
-DEPEND="utils? ( sys-apps/help2man )
-	!media-video/mpeg4ip
-	sys-apps/sed"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${P/lib}
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	replace-flags -ggdb3 -ggdb2
-	econf \
-		$(use_enable utils util) \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc doc/*.txt README
-}
diff --git a/media-libs/libmp4v2/metadata.xml b/media-libs/libmp4v2/metadata.xml
index 15e885912ec1..06366c0cd35a 100644
--- a/media-libs/libmp4v2/metadata.xml
+++ b/media-libs/libmp4v2/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<use>
-		<flag name='utils'>Install command-line utilities</flag>
-	</use>
+  <herd>sound</herd>
+  <use>
+    <flag name='utils'>Install command-line utilities</flag>
+  </use>
 </pkgmetadata>