drop lzo; mplayer-bin-1.0_pre1-r2 doesn't need it anymore

Package-Manager: portage-2.1.2-r9

diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index 01e9b2a80f6ba98ecff4ac96808777975fb5a08d..467d1d43abf52947517670ff2effa471d2ac8279 100644 (file)
--- a/app-emulation/emul-linux-x86-medialibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-medialibs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.14 2007/02/19 21:57:36 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.15 2007/02/21 22:24:53 blubb Exp $
+
+*emul-linux-x86-medialibs-10.1 (21 Feb 2007)
+
+  21 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  -emul-linux-x86-medialibs-10.0.ebuild,
+  +emul-linux-x86-medialibs-10.1.ebuild:
+  drop lzo; mplayer-bin-1.0_pre1-r2 doesn't need it anymore
 
   19 Feb 2007; Simon Stelling <blubb@gentoo.org>
   emul-linux-x86-medialibs-10.0.ebuild:

diff --git a/app-emulation/emul-linux-x86-medialibs/Manifest b/app-emulation/emul-linux-x86-medialibs/Manifest
index f50dadb303dbb5dad3010b1dfbc0e3b30fdbf0cd..6d68a2b3cd21d9b17c4bf0b5059c798f92e0ee59 100644 (file)
--- a/app-emulation/emul-linux-x86-medialibs/Manifest
+++ b/app-emulation/emul-linux-x86-medialibs/Manifest
@@ -6,7 +6,6 @@ DIST lame-3.96.1.tbz2 497687 RMD160 984f0839931a55bc631ec75f6955fe0644b99c7c SHA
 DIST libdv-1.0.0-r1.tbz2 183242 RMD160 0630bcdf00a055da51750d159d54fdfe19ec565b SHA1 e0f7654bcff7e29ee15112a5d52c753c6129dd15 SHA256 62ec0af018c9889c64cfef05262b7a0e4f30c8f933cb27695292e4edb04f5c99
 DIST libmad-0.15.1b-r2.tbz2 154184 RMD160 8fa96eacfcf07be74b7904d77f30c54ae8a27577 SHA1 c6be204f1a85eb57c9fc9583253a0c368676a0ee SHA256 8c8b5095f35f205e30cdab917a461c63b249d2e0a08b7eef1a9074c44ae863e4
 DIST libtheora-1.0_alpha6-r1.tbz2 224607 RMD160 8211ee9e38aa9f2757a6ceadbf3788f49ef4576d SHA1 2bdb0b46d33bbde225f24645cd5644678d81e7c4 SHA256 d09d4141ddeafc8bdeba918b0a112cd2f2da450eabd669ee69b81d1684665779
-DIST lzo-2.02-r1.tbz2 152241 RMD160 ed5c443e7e9f8352c542594e646f7cf89abb6711 SHA1 4c3f9396d82664efa83d9a99a1b3f97b5cde6e54 SHA256 f2b081a3e64d547a0e5b9ad70cf713ef3a5e550bfee33ecfacecfd92adb7b113
 DIST xvid-1.1.0-r3.tbz2 476018 RMD160 f71a438e2478c8065793c3d836c5f2466f7ed93c SHA1 fd6f673fbb2e11deea608cd09d3f2242b20f47e0 SHA256 dcd63d6154430c942a8534ad11cc9e0f3f40e43eea74321719ca6b4c4220eb2c
 EBUILD emul-linux-x86-medialibs-1.1-r1.ebuild 744 RMD160 1c28c9932506bd7bfff0017af69457fcd1588ce5 SHA1 0e20d8fe2e95bf8ba7f37d1072e5d8005285243e SHA256 17dfed2b98f28753c49f2f731ebc98accabb41b536cddb065bb5e55c5750140a
 MD5 f3270bcf981922aae60c081220a05c16 emul-linux-x86-medialibs-1.1-r1.ebuild 744
@@ -20,14 +19,14 @@ EBUILD emul-linux-x86-medialibs-1.2.ebuild 631 RMD160 b1bf88d6c21474d35b795b2764
 MD5 61a6dd3426aa7becb3bac6fd3b492f4a emul-linux-x86-medialibs-1.2.ebuild 631
 RMD160 b1bf88d6c21474d35b795b2764cd9c1bcf58d1b4 emul-linux-x86-medialibs-1.2.ebuild 631
 SHA256 5b9f692c7f81fd337e64ce4cf231459873067e9cea4da5273f2bb128e8bffea9 emul-linux-x86-medialibs-1.2.ebuild 631
-EBUILD emul-linux-x86-medialibs-10.0.ebuild 1492 RMD160 369a337bde157bf87b02de265d7d6dffdc13c39e SHA1 61611cbfe9e82a246269f5a9442f93f2c227e035 SHA256 4abf777e57f188ef49512f854a3b07be4faad48649d4d9a4206bd938a451855a
-MD5 0ba36c1efda34850f1cd837d6217416e emul-linux-x86-medialibs-10.0.ebuild 1492
-RMD160 369a337bde157bf87b02de265d7d6dffdc13c39e emul-linux-x86-medialibs-10.0.ebuild 1492
-SHA256 4abf777e57f188ef49512f854a3b07be4faad48649d4d9a4206bd938a451855a emul-linux-x86-medialibs-10.0.ebuild 1492
-MISC ChangeLog 2778 RMD160 c0f40438beee76660d214617a15744c55af196b8 SHA1 b649bba42f64532606ea69349ba84db82b71e619 SHA256 c598bb1b19d8e6e84c42cea9fa6a98042ec1b068a0dff0208e9686a300488b80
-MD5 c7c2f076cf48b18157d0aa70f16edf31 ChangeLog 2778
-RMD160 c0f40438beee76660d214617a15744c55af196b8 ChangeLog 2778
-SHA256 c598bb1b19d8e6e84c42cea9fa6a98042ec1b068a0dff0208e9686a300488b80 ChangeLog 2778
+EBUILD emul-linux-x86-medialibs-10.1.ebuild 817 RMD160 2477a8aff6f2f3b4023a030b4aa9204ab961715c SHA1 a205d1d53bba39051083c28fa495231ece20d8a4 SHA256 82f0466bbf94f5fcf4d5f459319679c0619a258a7b8892e3333229a0e2be75c6
+MD5 e2af83b1149d63df9eb4534cb7186663 emul-linux-x86-medialibs-10.1.ebuild 817
+RMD160 2477a8aff6f2f3b4023a030b4aa9204ab961715c emul-linux-x86-medialibs-10.1.ebuild 817
+SHA256 82f0466bbf94f5fcf4d5f459319679c0619a258a7b8892e3333229a0e2be75c6 emul-linux-x86-medialibs-10.1.ebuild 817
+MISC ChangeLog 3016 RMD160 4e6bddc8e83d9b7716d6eb96be975d886edff352 SHA1 d5ad002738ffad73e11c78f6340a63cd05211643 SHA256 0c7fe659a2d661ef09f82f45d61521611b60e54bdc77839eb2a67dd534e31cd0
+MD5 ba1d36ec809137b86951c46fb583730a ChangeLog 3016
+RMD160 4e6bddc8e83d9b7716d6eb96be975d886edff352 ChangeLog 3016
+SHA256 0c7fe659a2d661ef09f82f45d61521611b60e54bdc77839eb2a67dd534e31cd0 ChangeLog 3016
 MISC metadata.xml 218 RMD160 cbc93b26738b5e98e127744c5a949cf2f0920778 SHA1 e6c4a3379b1d26bd7a87fe3a64f4b8185bf208d4 SHA256 0522168dc16d1a5fe22d19e63237544b3bdbb06dcefb1df3d4fe8c54975a6d3b
 MD5 d138fbd38b04f78fe9b3766051723a5b metadata.xml 218
 RMD160 cbc93b26738b5e98e127744c5a949cf2f0920778 metadata.xml 218
@@ -41,6 +40,6 @@ SHA256 862bce8bb609516dd40fdde4ff72906beeb42273fef1a4deaf3ed3ac7b45b447 files/di
 MD5 e493d4fbb44ccce8d7b345a6d768e1ce files/digest-emul-linux-x86-medialibs-1.2-r1 292
 RMD160 67f94ab6f73048fb4d81216d8c5ed66968d36591 files/digest-emul-linux-x86-medialibs-1.2-r1 292
 SHA256 862bce8bb609516dd40fdde4ff72906beeb42273fef1a4deaf3ed3ac7b45b447 files/digest-emul-linux-x86-medialibs-1.2-r1 292
-MD5 7a71d5079ab1348d1e322bba29484702 files/digest-emul-linux-x86-medialibs-10.0 1910
-RMD160 b486c9f4f893f01679edca4fdeb5b7ebb94b166c files/digest-emul-linux-x86-medialibs-10.0 1910
-SHA256 1393e24dc90c44816403960276b16454621f46bb2b9a8f1794b6105de8dea9b2 files/digest-emul-linux-x86-medialibs-10.0 1910
+MD5 83c8b5da22c38099e9cc0d62e668bdf0 files/digest-emul-linux-x86-medialibs-10.1 1681
+RMD160 032fb667647f75a0e2901868b486021aaeb5894f files/digest-emul-linux-x86-medialibs-10.1 1681
+SHA256 9c0c8ffd276865f82c3f32033b716f45e2502e20d08640a4c4f418634d899330 files/digest-emul-linux-x86-medialibs-10.1 1681

diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.0.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.0.ebuild
deleted file mode 100644 (file)
index f7d89a9..0000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.0.ebuild,v 1.3 2007/02/19 21:57:36 blubb Exp $
-
-DESCRIPTION="Provides precompiled 32bit libraries"
-HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
-SRC_URI="mirror://gentoo/fribidi-0.10.7.tbz2
-               mirror://gentoo/giflib-4.1.4.tbz2
-               mirror://gentoo/lame-3.96.1.tbz2
-               mirror://gentoo/libdv-1.0.0-r1.tbz2
-               mirror://gentoo/libmad-0.15.1b-r2.tbz2
-               mirror://gentoo/libtheora-1.0_alpha6-r1.tbz2
-               mirror://gentoo/lzo-2.02-r1.tbz2
-               mirror://gentoo/xvid-1.1.0-r3.tbz2"
-
-LICENSE="GPL-2 LGPL-2.1 MIT as-is xiph"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-RESTRICT="strip"
-S=${WORKDIR}
-
-DEPEND=""
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.0
-               >=app-emulation/emul-linux-x86-soundlibs-2.5-r2
-               >=app-emulation/emul-linux-x86-xlibs-10.0"
-
-pkg_setup() {
-       einfo "Note: You can safely ignore the 'trailing garbage after EOF'"
-       einfo "   warnings below"
-}
-
-src_unpack() {
-       unpack ${A}
-
-       find ${S}/usr ! -type d ! -name '*.so*' | xargs rm -f
-}
-
-src_install() {
-       for dir in etc/env.d etc/revdep-rebuild ; do
-               if [[ -d ${S}/${dir} ]] ; then
-                       for f in ${S}/${dir}/* ; do
-                               mv -f $f{,-emul}
-                       done
-               fi
-       done
-
-       # remove void directories or portage will show wierd output
-       find ${S} -type d -depth | xargs rmdir 2&>/dev/null
-
-       cp -a "${WORKDIR}"/* "${D}"/ || die "copying files failed!"
-}

diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.1.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.1.ebuild
new file mode 100644 (file)
index 0000000..f86c595
--- /dev/null
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.1.ebuild,v 1.1 2007/02/21 22:24:53 blubb Exp $
+
+inherit emul-libs
+
+SRC_URI="mirror://gentoo/fribidi-0.10.7.tbz2
+               mirror://gentoo/giflib-4.1.4.tbz2
+               mirror://gentoo/lame-3.96.1.tbz2
+               mirror://gentoo/libdv-1.0.0-r1.tbz2
+               mirror://gentoo/libmad-0.15.1b-r2.tbz2
+               mirror://gentoo/libtheora-1.0_alpha6-r1.tbz2
+               mirror://gentoo/xvid-1.1.0-r3.tbz2"
+
+LICENSE="GPL-2 LGPL-2.1 MIT as-is xiph"
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.0
+               >=app-emulation/emul-linux-x86-soundlibs-2.5-r2
+               >=app-emulation/emul-linux-x86-xlibs-10.0
+               !<media-video/mplayer-bin-1.0_rc1-r2"

diff --git a/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-10.0 b/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-10.1
similarity index 88%
rename from app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-10.0
rename to app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-10.1
index a4f452361417a0cce4005de0855832b6a564b60c..b338232356d53d5edaecfbf64960db5699d1d6a1 100644 (file)
--- a/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-10.0
+++ b/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-10.1
@@ -16,9 +16,6 @@ SHA256 8c8b5095f35f205e30cdab917a461c63b249d2e0a08b7eef1a9074c44ae863e4 libmad-0
 MD5 a9fdc2e10beaf0a08db8d4cac647c901 libtheora-1.0_alpha6-r1.tbz2 224607
 RMD160 8211ee9e38aa9f2757a6ceadbf3788f49ef4576d libtheora-1.0_alpha6-r1.tbz2 224607
 SHA256 d09d4141ddeafc8bdeba918b0a112cd2f2da450eabd669ee69b81d1684665779 libtheora-1.0_alpha6-r1.tbz2 224607
-MD5 21e8c8db97f12f1e73df22450dcec19a lzo-2.02-r1.tbz2 152241
-RMD160 ed5c443e7e9f8352c542594e646f7cf89abb6711 lzo-2.02-r1.tbz2 152241
-SHA256 f2b081a3e64d547a0e5b9ad70cf713ef3a5e550bfee33ecfacecfd92adb7b113 lzo-2.02-r1.tbz2 152241
 MD5 398350db8a8c0dcacb27435437ac42d6 xvid-1.1.0-r3.tbz2 476018
 RMD160 f71a438e2478c8065793c3d836c5f2466f7ed93c xvid-1.1.0-r3.tbz2 476018
 SHA256 dcd63d6154430c942a8534ad11cc9e0f3f40e43eea74321719ca6b4c4220eb2c xvid-1.1.0-r3.tbz2 476018