remove old

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

5 files changed, 17 insertions, 323 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 6b860c4d5b3f..d86b60c83720 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.152 2010/05/24 16:07:25 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.153 2010/05/24 20:08:43 aballier Exp $
+
+  24 May 2010; Alexis Ballier <aballier@gentoo.org>
+  -libquicktime-1.1.3.ebuild, -files/libquicktime-1.1.3-x264.patch,
+  -libquicktime-1.1.4.ebuild:
+  remove old
 
   23 May 2010; <nixnut@gentoo.org> libquicktime-1.1.5.ebuild:
   ppc stable #314821
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 396f3717a5a0..4e77a6171474 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,9 +1,14 @@
-AUX libquicktime-1.1.3-x264.patch 3427 RMD160 56e0f9c68c0d850c68ad43cc31e84302581cf0ab SHA1 5c66ae369f09106a161b65ce44c12dc0350d3171 SHA256 fa501f9e57bb3e387fe6f0f9de7fb0d8defdce8b221433c0854c72758060aab4
-DIST libquicktime-1.1.3.tar.gz 983330 RMD160 fee766a47f055b75d2406441c67fc491568a1757 SHA1 cd991e5d5fa8690fe22db27e169a9258d3664bfc SHA256 0d91904d6920cde25019638d1c240512c72a80032aa6b241973467a8fdfe08dd
-DIST libquicktime-1.1.4.tar.gz 995073 RMD160 52968b482b38cea08d2fe3f26f018583ba2fad56 SHA1 6c5d902e0b2cadd82d190e4643e9f706e2f10238 SHA256 60e019e3c2b6681062e0445a356c674eb58685023d353bde39289cf3a1448c6f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libquicktime-1.1.5.tar.gz 997305 RMD160 c76c86cbf6cc29b3a5f742aee87c3e4fe2d383ad SHA1 11dad92fe9dbb67aa8ef42c3404d3acba7ae2a37 SHA256 cb056c826fa9cac51f72279d146bc08dd05816197bceb186d2427a56fad86bf4
-EBUILD libquicktime-1.1.3.ebuild 2881 RMD160 f64b968e7c5295aaa226b0bfc872d8938fcea057 SHA1 10228dac8c53a284f3c563b503ea67a73a5076a5 SHA256 e9ad81d2adb96a502d33c7c1caea61b046ac060570c94e7320d93b2b150795f4
-EBUILD libquicktime-1.1.4.ebuild 2850 RMD160 7f7a6059317bd1322d196b0960161953782e6ed9 SHA1 661d463e94775b1df9b1efe516f4a803716db895 SHA256 a50d7828e5cc95d02126e521ac1242a693f73bede30496d0bd426d74d6b6853e
 EBUILD libquicktime-1.1.5.ebuild 2841 RMD160 dd66c779dcfc177144afdee8ed191f30753edb0c SHA1 32a84fb43788da3a2ad4a64afc7f756a3cc7b542 SHA256 d7bf68dd0b574aa9f5b22c34ae6bf6ec8f4338dd2bb25156051c6e1a02fe1d2a
-MISC ChangeLog 23079 RMD160 0d52be787af67daa111a78bfe494243c6f0c4802 SHA1 8d955d05af26c81aa818e8eda0afccccd363b9b4 SHA256 d7c658b96dc73fecd2cd10cf43a367b8d463a732f15d0d6022b17f269f8cb7bf
+MISC ChangeLog 23245 RMD160 e28d26c224f29cda0a5290424183b95bbe55f818 SHA1 7eb2a4468cdbc2fcd18dfdb1d2c26ee1582e79ac SHA256 95c8e75611a720055e74fca5087309a54f28df8c418ec0180e8d3cb9ce44a18d
 MISC metadata.xml 365 RMD160 3b9ef1a47d2f85224d5cdb61594ea7a99523df8b SHA1 89432e8cbc4ea43cfef9faa722fdd54ba2d4e10f SHA256 2963a8d151be35ab849e2265204e548a11e9176dd3275158905784702910906f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkv63NEACgkQvFcC4BYPU0r+qQCeMP5FR3Rj2QXV6pZjOkfdIvA3
+2vEAoIs8Bz85yjnY+hWoa2ZdDh3th1jG
+=GATH
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libquicktime/files/libquicktime-1.1.3-x264.patch b/media-libs/libquicktime/files/libquicktime-1.1.3-x264.patch
deleted file mode 100644
index 119952baac94..000000000000
--- a/media-libs/libquicktime/files/libquicktime-1.1.3-x264.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Upstream status: Mailed to libquicktime-devel@sf mailing list on 26/10/2009
-Merged on 27/10/2009
-
-Index: plugins/x264/lqt_x264.c
-===================================================================
-RCS file: /cvsroot/libquicktime/libquicktime/plugins/x264/lqt_x264.c,v
-retrieving revision 1.13
-diff -u -B -r1.13 lqt_x264.c
---- plugins/x264/lqt_x264.c	6 Dec 2008 14:03:10 -0000	1.13
-+++ plugins/x264/lqt_x264.c	26 Oct 2009 11:02:55 -0000
-@@ -94,6 +94,17 @@
-       .val_max =     { .val_int = 100 },
-       .help_string = TRS("Influences how often B-frames are used"),
-     },
-+#if X264_BUILD >= 78
-+    {
-+      .name =        "x264_i_bframe_pyramid",
-+      .real_name =   TRS("B-frame pyramid"),
-+      .type =        LQT_PARAMETER_INT,
-+      .val_default = { .val_int = 0 },
-+      .val_min =     { .val_int = 0 },
-+      .val_max =     { .val_int = 2 },
-+      .help_string = TRS("Keep some B-frames as references")
-+    },
-+#else
-     {
-       .name =        "x264_b_bframe_pyramid",
-       .real_name =   TRS("B-frame pyramid"),
-@@ -103,6 +114,7 @@
-       .val_max =     { .val_int = 1 },
-       .help_string = TRS("Keep some B-frames as references")
-     },
-+#endif
-     {
-       .name =        "x264_ratecontrol",
-       .real_name =   TRS("Ratecontrol"),
-Index: plugins/x264/x264.c
-===================================================================
-RCS file: /cvsroot/libquicktime/libquicktime/plugins/x264/x264.c,v
-retrieving revision 1.30
-diff -u -B -r1.30 x264.c
---- plugins/x264/x264.c	11 Mar 2009 14:25:50 -0000	1.30
-+++ plugins/x264/x264.c	26 Oct 2009 11:02:55 -0000
-@@ -67,7 +67,11 @@
-   lqt_dump("  i_bframe:                    %d\n", params->i_bframe);          // 0.. X264_BFRAME_MAX
-   lqt_dump("  b_bframe_adaptive:           %d\n", params->b_bframe_adaptive);
-   lqt_dump("  i_bframe_bias:               %d\n", params->i_bframe_bias);
-+#if X264_BUILD >= 78
-+  lqt_dump("  i_bframe_pyramid:            %d\n", params->i_bframe_pyramid);
-+#else
-   lqt_dump("  b_bframe_pyramid:            %d\n", params->b_bframe_pyramid);
-+#endif
-   
-   lqt_dump("  b_deblocking_filter:         %d\n", params->b_deblocking_filter);
-   lqt_dump("  i_deblocking_filter_alphac0: %d\n", params->i_deblocking_filter_alphac0); // -6..6
-@@ -174,14 +178,21 @@
-   {
-   uint8_t *p = buf;
-   int i;
-+#if X264_BUILD < 76
-   int s;
-+#endif
-   
-   for(i = 0; i < nnal; i++)
-     {
-+#if X264_BUILD >= 76
-+    memcpy(p, nals[i].p_payload, nals[i].i_payload);
-+    p+=nals[i].i_payload;
-+#else
-     s = x264_nal_encode(p, &size, 1, nals + i);
-     if(s < 0)
-       return -1;
-     p += s;
-+#endif
-     }
-   
-   return p - buf;
-@@ -407,7 +417,11 @@
- 
-   pic_out.i_pts = 0;
-   /* Encode frames, get nals */
-+#if X264_BUILD >= 76
-+  if(x264_encoder_encode(codec->enc, &nal, &nnal, pic_in, &pic_out)<0)
-+#else
-   if(x264_encoder_encode(codec->enc, &nal, &nnal, pic_in, &pic_out))
-+#endif
-     return 0;
-   
-   /* Encode nals -> get h264 stream */
-@@ -782,7 +796,11 @@
-   ENUMPARAM("x264_i_bframe_adaptive", codec->params.i_bframe_adaptive, bframe_adaptives);
- #endif
-   INTPARAM("x264_i_bframe_bias", codec->params.i_bframe_bias);
-+#if X264_BUILD >= 78
-+  INTPARAM("x264_i_bframe_pyramid", codec->params.i_bframe_pyramid);
-+#else
-   INTPARAM("x264_b_bframe_pyramid", codec->params.b_bframe_pyramid);
-+#endif
- 
-   ENUMPARAM("x264_i_rc_method", codec->params.rc.i_rc_method, rc_methods);
-   INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate);
diff --git a/media-libs/libquicktime/libquicktime-1.1.3.ebuild b/media-libs/libquicktime/libquicktime-1.1.3.ebuild
deleted file mode 100644
index 9b22dfbbade9..000000000000
--- a/media-libs/libquicktime/libquicktime-1.1.3.ebuild
+++ /dev/null
@@ -1,108 +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/libquicktime/libquicktime-1.1.3.ebuild,v 1.7 2009/10/26 11:16:38 aballier Exp $
-
-inherit libtool eutils
-
-DESCRIPTION="A library based on quicktime4linux with extensions"
-HOMEPAGE="http://libquicktime.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="mmx X opengl dv gtk alsa aac encode png jpeg vorbis lame x264 ffmpeg doc schroedinger"
-
-RDEPEND="dv? ( media-libs/libdv )
-	gtk? ( >=x11-libs/gtk+-2.4.0 )
-	aac? (
-		media-libs/faad2
-		encode? ( media-libs/faac )
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	lame? ( media-sound/lame )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616 )
-	x264? ( media-libs/x264 )
-	schroedinger? ( >=media-libs/schroedinger-1.0.5 )
-	X? ( x11-libs/libXaw
-		x11-libs/libXv
-		x11-libs/libXext
-		x11-libs/libX11
-		opengl? ( media-libs/mesa )
-	)
-	virtual/libintl
-	!virtual/quicktime"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/videoproto
-		x11-proto/xextproto
-	)
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-PROVIDE="virtual/quicktime"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-x264.patch"
-
-	# Needed for sane .so versionning on g/fbsd
-	elibtoolize
-}
-
-src_compile() {
-	local MY_OPTS=""
-	if use !encode || use !aac; then
-		MY_OPTS="--without-faac"
-	fi
-
-	econf --enable-shared \
-		--enable-static \
-		--enable-gpl \
-		$(use_with doc doxygen) \
-		$(use_enable mmx asm) \
-		$(use_with X x) \
-		$(use_with gtk) \
-		$(use_with dv libdv) \
-		$(use_with alsa) \
-		$(use_with aac faad2) \
-		$(use_with png libpng) \
-		$(use_with jpeg libjpeg) \
-		$(use vorbis || echo "--without-vorbis") \
-		$(use_with lame) \
-		$(use_with x264) \
-		$(use_with ffmpeg) \
-		$(use_with opengl) \
-		$(use_with schroedinger) \
-		${MY_OPTS} \
-		--without-cpuflags || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc README TODO ChangeLog
-	# Compatibility with software that uses quicktime prefix, but
-	# don't do that when building for Darwin/MacOS
-	[[ ${CHOST} != *-darwin* ]] && \
-	dosym /usr/include/lqt /usr/include/quicktime
-}
-
-pkg_preinst() {
-	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
-		elog "For compatibility with other quicktime libraries, ${PN} was"
-		elog "going to create a /usr/include/quicktime symlink, but for some"
-		elog "reason that is a directory on your system."
-
-		elog "Please check that is empty, and remove it, or submit a bug"
-		elog "telling us which package owns the directory."
-		die "/usr/include/quicktime is a directory."
-	fi
-}
diff --git a/media-libs/libquicktime/libquicktime-1.1.4.ebuild b/media-libs/libquicktime/libquicktime-1.1.4.ebuild
deleted file mode 100644
index b73be3843012..000000000000
--- a/media-libs/libquicktime/libquicktime-1.1.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.1.4.ebuild,v 1.1 2010/01/08 13:23:25 aballier Exp $
-
-inherit libtool eutils
-
-DESCRIPTION="A library based on quicktime4linux with extensions"
-HOMEPAGE="http://libquicktime.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="mmx X opengl dv gtk alsa aac encode png jpeg vorbis lame x264 ffmpeg doc schroedinger"
-
-RDEPEND="dv? ( media-libs/libdv )
-	gtk? ( >=x11-libs/gtk+-2.4.0 )
-	aac? (
-		media-libs/faad2
-		encode? ( media-libs/faac )
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	lame? ( media-sound/lame )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616 )
-	x264? ( media-libs/x264 )
-	schroedinger? ( >=media-libs/schroedinger-1.0.5 )
-	X? ( x11-libs/libXaw
-		x11-libs/libXv
-		x11-libs/libXext
-		x11-libs/libX11
-		opengl? ( media-libs/mesa )
-	)
-	virtual/libintl
-	!virtual/quicktime"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/videoproto
-		x11-proto/xextproto
-	)
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-PROVIDE="virtual/quicktime"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Needed for sane .so versionning on g/fbsd
-	elibtoolize
-}
-
-src_compile() {
-	local MY_OPTS=""
-	if use !encode || use !aac; then
-		MY_OPTS="--without-faac"
-	fi
-
-	econf --enable-shared \
-		--enable-static \
-		--enable-gpl \
-		$(use_with doc doxygen) \
-		$(use_enable mmx asm) \
-		$(use_with X x) \
-		$(use_with gtk) \
-		$(use_with dv libdv) \
-		$(use_with alsa) \
-		$(use_with aac faad2) \
-		$(use_with png libpng) \
-		$(use_with jpeg libjpeg) \
-		$(use vorbis || echo "--without-vorbis") \
-		$(use_with lame) \
-		$(use_with x264) \
-		$(use_with ffmpeg) \
-		$(use_with opengl) \
-		$(use_with schroedinger) \
-		${MY_OPTS} \
-		--without-cpuflags || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc README TODO ChangeLog
-	# Compatibility with software that uses quicktime prefix, but
-	# don't do that when building for Darwin/MacOS
-	[[ ${CHOST} != *-darwin* ]] && \
-	dosym /usr/include/lqt /usr/include/quicktime
-}
-
-pkg_preinst() {
-	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
-		elog "For compatibility with other quicktime libraries, ${PN} was"
-		elog "going to create a /usr/include/quicktime symlink, but for some"
-		elog "reason that is a directory on your system."
-
-		elog "Please check that is empty, and remove it, or submit a bug"
-		elog "telling us which package owns the directory."
-		die "/usr/include/quicktime is a directory."
-	fi
-}