New version. Remove old versions.

(Portage version: 2.1_pre7-r5)

7 files changed, 49 insertions, 120 deletions

diff --git a/media-video/em8300-libraries/ChangeLog b/media-video/em8300-libraries/ChangeLog
index c351fbdbf7b1..bd653cd087db 100644
--- a/media-video/em8300-libraries/ChangeLog
+++ b/media-video/em8300-libraries/ChangeLog
@@ -1,18 +1,28 @@
 # ChangeLog for media-video/em8300-libraries
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/ChangeLog,v 1.21 2006/01/27 01:47:12 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/ChangeLog,v 1.22 2006/04/12 20:14:04 arj Exp $
+
+*em8300-libraries-0.15.3 (12 Apr 2006)
+
+  12 Apr 2006; Anders Rune Jensen <arj@gentoo.org>
+  +em8300-libraries-0.15.3.ebuild, -em8300-libraries-0.15.1.ebuild,
+  -em8300-libraries-0.15.0.ebuild:
+  New version. Remove old versions.
 
 *em8300-libraries-0.15.2-r1 (26 Jan 2006)
+
   26 Jan 2006; Anders Rune Jensen <arj@gentoo.org>
   +em8300-libraries-0.15.2-r1.ebuild:
   Patch from Karol Ostrovsky to fix installations issues
 	
 *em8300-libraries-0.15.2 (24 Nov 2005)
+
   24 Nov 2005; Anders Rune Jensen <arj@gentoo.org>
   +em8300-libraries-0.15.2.ebuild:
   new version
 
 *em8300-libraries-0.15.1 (18 Oct 2005)
+
   18 Oct 2005; Anders Rune Jensen <arj@gentoo.org>
   +em8300-libraries-0.15.1.ebuild:
   new version
@@ -29,11 +39,13 @@
   Readded to ~ppc. Please don't remove it without filing a proper bug report.
 
 *em8300-libraries-0.15.0 (03 Jun 2005)
+
   03 Jun 2005; Anders Rune Jensen <arj@gentoo.org>
   +em8300-libraries-0.15.0.ebuild:
   new version
 	
 *em8300-libraries-0.15.0_pre20050310 (10 Mar 2005)
+
   10 Mar 2005; Anders Rune Jensen <arj@gentoo.org>
   +em8300-libraries-0.15.0_pre20050310:
   Sync library with modules.
@@ -47,6 +59,7 @@
   make depend more specific
 
 *em8300-libraries-0.15.0_pre20040609 (06 Sep 2004)
+
   06 Sep 2004; Anders Rune Jensen <arj@gentoo.org> +em8300-libraries-0.15.0_pre20040906:
 
   01 Sep 2004; Anders Rune Jensen <arj@gentoo.org>
diff --git a/media-video/em8300-libraries/Manifest b/media-video/em8300-libraries/Manifest
index 64c296171836..2744b53f0b0e 100644
--- a/media-video/em8300-libraries/Manifest
+++ b/media-video/em8300-libraries/Manifest
@@ -1,12 +1,30 @@
-MD5 0b80944a5c3712da0e1518c711a3da68 ChangeLog 3658
+MD5 59cae8c336ed94c7ef896be124ae01c1 ChangeLog 3895
+RMD160 3ae73e023236813d050d25cbba696fc0535dfcfc ChangeLog 3895
+SHA256 0da4916ce51ac762ca8a4d489919e3b61da7358a396ac43332da35df361d4b78 ChangeLog 3895
 MD5 f44ec5185e2800bd9ed7c758693fefcf em8300-libraries-0.13.0-r1.ebuild 2138
-MD5 768d3285097481a24279b42e72ec5573 em8300-libraries-0.15.0.ebuild 2196
-MD5 18a9dd2a04a4b0d9b91bf24347b4d30f em8300-libraries-0.15.1.ebuild 2194
+RMD160 9831a2ec7d6dc18e580c2b107052c914e641deaa em8300-libraries-0.13.0-r1.ebuild 2138
+SHA256 ef820af97176dcc7587273ded5c5fe7e09a3b132370c35e6aa6a1e7ed38acfec em8300-libraries-0.13.0-r1.ebuild 2138
 MD5 fe2891985cb954a07a29cc0ecedcce44 em8300-libraries-0.15.2-r1.ebuild 1900
+RMD160 642cda34908fd8a8fde381d091646cd4162aa799 em8300-libraries-0.15.2-r1.ebuild 1900
+SHA256 982e0878acb58266f0a3cee98602a1eadcda8622aa34db2dc00c024da43210f0 em8300-libraries-0.15.2-r1.ebuild 1900
 MD5 1af07bdbd7d4aae825e7f9979b27a717 em8300-libraries-0.15.2.ebuild 1913
+RMD160 d4a4c9426a17cdea9076093918477c205f87ca41 em8300-libraries-0.15.2.ebuild 1913
+SHA256 7c2d78cf116414c494b16197a2158fc106bee5e6e6c4f7ea91eb37ebaee93450 em8300-libraries-0.15.2.ebuild 1913
+MD5 fe2891985cb954a07a29cc0ecedcce44 em8300-libraries-0.15.3.ebuild 1900
+RMD160 642cda34908fd8a8fde381d091646cd4162aa799 em8300-libraries-0.15.3.ebuild 1900
+SHA256 982e0878acb58266f0a3cee98602a1eadcda8622aa34db2dc00c024da43210f0 em8300-libraries-0.15.3.ebuild 1900
 MD5 29a6f23e30a4e4d57e5a0daf1d61f8c5 files/digest-em8300-libraries-0.13.0-r1 65
-MD5 ee5ed479a61194274ece9b4d034bf598 files/digest-em8300-libraries-0.15.0 65
-MD5 f0b1bbd962955837a701644a03b32eed files/digest-em8300-libraries-0.15.1 65
+RMD160 3da4fd648a17cfe9fb0bb04ac5968c2ae016e814 files/digest-em8300-libraries-0.13.0-r1 65
+SHA256 d51ad77ce4a9568438564edc9d71061075e9f2ce7e040291e18b1aab78a94d95 files/digest-em8300-libraries-0.13.0-r1 65
 MD5 6f479468d3de42a272181c79f6fd0f06 files/digest-em8300-libraries-0.15.2 65
+RMD160 c779855560db27bc0614504e02e20b0b7c013c94 files/digest-em8300-libraries-0.15.2 65
+SHA256 2342324382135375452295a073aa289d878631044a7bf2f1ea24af4289dffa08 files/digest-em8300-libraries-0.15.2 65
 MD5 6f479468d3de42a272181c79f6fd0f06 files/digest-em8300-libraries-0.15.2-r1 65
+RMD160 c779855560db27bc0614504e02e20b0b7c013c94 files/digest-em8300-libraries-0.15.2-r1 65
+SHA256 2342324382135375452295a073aa289d878631044a7bf2f1ea24af4289dffa08 files/digest-em8300-libraries-0.15.2-r1 65
+MD5 f77251f445a951b1c154606c895acc0e files/digest-em8300-libraries-0.15.3 241
+RMD160 689b89cc9ac4cd76a4b01b0066bc412ac1dbc67d files/digest-em8300-libraries-0.15.3 241
+SHA256 9c324ceae1dd7f03998b2e4fc4d68ab2c988ecbe88c7e88aee934ad79d9830c2 files/digest-em8300-libraries-0.15.3 241
 MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
+RMD160 0b4ae278181365a665506f0042648b7da9ce0c7f metadata.xml 247
+SHA256 170119da5689d0b770a34cb780ffecf0642fca90ed5525e9565781ad97bdcc57 metadata.xml 247
diff --git a/media-video/em8300-libraries/em8300-libraries-0.15.0.ebuild b/media-video/em8300-libraries/em8300-libraries-0.15.0.ebuild
deleted file mode 100644
index 86c4a42f0813..000000000000
--- a/media-video/em8300-libraries/em8300-libraries-0.15.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/em8300-libraries-0.15.0.ebuild,v 1.2 2005/06/15 13:43:37 dholm Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card libraries"
-HOMEPAGE="http://dxr3.sourceforge.net"
-SRC_URI="mirror://sourceforge/dxr3/${P/-libraries/}.tar.gz"
-
-DEPEND="media-video/em8300-modules
-	gtk? ( x11-libs/gtk+ )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk"
-
-src_unpack () {
-
-	unpack ${A}
-
-	cd ${WORKDIR}
-	mv ${A/.tar.gz/} ${P}
-
-	cd ${S}
-	#Eliminate extra compiling and prune out some disk space usage
-	sed -e "s:modules/\ ::g" \
-	    -e "s:\ modules.tar.gz::g" \
-	    Makefile.in > Makefile.in.hacked
-	mv Makefile.in.hacked Makefile.in
-
-	cd em8300setup
-	mv em8300setup.c em8300setup.c.old
-	sed -e "s:/usr/share/misc/em8300.uc:/usr/share/em8300/em8300.uc:g" \
-	       < em8300setup.c.old > em8300setup.c
-	rm em8300setup.c.old
-
-}
-
-src_compile ()	{
-
-	use amd64 && append-flags -fPIC
-
-	local myconf
-	use gtk || myconf="${myconf} --disable-gtktest"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--datadir=/usr/share || die
-	make all || die
-
-}
-
-src_install () {
-
-	cd ${S}/scripts
-	mv microcode_upload.pl microcode_upload.pl.old
-	sed -e "s:/usr/share/misc/em8300.uc:/usr/share/em8300/em8300.uc:g" \
-		< microcode_upload.pl.old > microcode_upload.pl
-	rm microcode_upload.pl.old
-	cd ${S}
-
-	make em8300incdir=${D}/usr/include/linux/ \
-		prefix=${D}/usr \
-		datadir=${D}/usr/share \
-		sysconfdir=/etc \
-		oldincludedir=${D}/usr/include \
-		install || die
-
-	insinto /usr/share/em8300
-	doins modules/em8300.uc
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "The em8300 libraries and modules have now beein installed,"
-	einfo "you will probably want to add /usr/bin/em8300setup to your"
-	einfo "/etc/conf.d/local.start so that your em8300 card is "
-	einfo "properly initialized on boot."
-	einfo
-	einfo "If you still need a microcode other than the one included"
-	einfo "with the package, you can simply use em8300setup <microcode.ux>"
-	einfo
-
-}
diff --git a/media-video/em8300-libraries/em8300-libraries-0.15.1.ebuild b/media-video/em8300-libraries/em8300-libraries-0.15.3.ebuild
index f401bb7e8e50..fa0b61a13137 100644
--- a/media-video/em8300-libraries/em8300-libraries-0.15.1.ebuild
+++ b/media-video/em8300-libraries/em8300-libraries-0.15.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/em8300-libraries-0.15.1.ebuild,v 1.1 2005/10/18 14:43:39 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/em8300-libraries-0.15.3.ebuild,v 1.1 2006/04/12 20:14:04 arj Exp $
 
 inherit flag-o-matic
 
@@ -30,11 +30,9 @@ src_unpack () {
 	    Makefile.in > Makefile.in.hacked
 	mv Makefile.in.hacked Makefile.in
 
-	cd em8300setup
-	mv em8300setup.c em8300setup.c.old
-	sed -e "s:/usr/share/misc/em8300.uc:/usr/share/em8300/em8300.uc:g" \
-	       < em8300setup.c.old > em8300setup.c
-	rm em8300setup.c.old
+	# fix bug in Makefile
+	sed -e "s:test -z \"\$(firmwaredir)\":test -z \"\$(DESTDIR)(firmwaredir)\":g" Makefile.am > Makefile.am.hacked
+	mv Makefile.am.hacked Makefile.am
 
 }
 
@@ -55,23 +53,13 @@ src_compile ()	{
 
 src_install () {
 
-	cd ${S}/scripts
-	mv microcode_upload.pl microcode_upload.pl.old
-	sed -e "s:/usr/share/misc/em8300.uc:/usr/share/em8300/em8300.uc:g" \
-		< microcode_upload.pl.old > microcode_upload.pl
-	rm microcode_upload.pl.old
-	cd ${S}
-
-	make em8300incdir=${D}/usr/include/linux/ \
-		prefix=${D}/usr \
-		datadir=${D}/usr/share \
+	make DESTDIR=${D} em8300incdir=/usr/include/linux/ \
+		prefix=/usr \
+		datadir=/usr/share \
 		sysconfdir=/etc \
-		oldincludedir=${D}/usr/include \
+		oldincludedir=/usr/include \
 		install || die
 
-	insinto /usr/share/em8300
-	doins modules/em8300.uc
-
 	dodoc AUTHORS COPYING ChangeLog NEWS README
 
 }
diff --git a/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.0 b/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.0
deleted file mode 100644
index 7d2215fa7bcc..000000000000
--- a/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5d6e1f319bb9d2652027329015ea050 em8300-0.15.0.tar.gz 446349
diff --git a/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.1 b/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.1
deleted file mode 100644
index 3af325203ca8..000000000000
--- a/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c6e7bd38294519d94d5a59a02a73edf em8300-0.15.1.tar.gz 322604
diff --git a/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.3 b/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.3
new file mode 100644
index 000000000000..f1e70c040a5f
--- /dev/null
+++ b/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.3
@@ -0,0 +1,3 @@
+MD5 58a6765d469cc507c1e0dff152ce3d30 em8300-0.15.3.tar.gz 327572
+RMD160 9beb731d24c02408879c64e4b9d0439033be3882 em8300-0.15.3.tar.gz 327572
+SHA256 84d952406c2596b9e5a81002017cf91006546d7c2b650dde0c4ba332e1585da2 em8300-0.15.3.tar.gz 327572