version bump

(Portage version: 2.0.51.16)

7 files changed, 91 insertions, 23 deletions

diff --git a/media-libs/libnjb/ChangeLog b/media-libs/libnjb/ChangeLog
index 5d56c57c991e..a0799fbb8e16 100644
--- a/media-libs/libnjb/ChangeLog
+++ b/media-libs/libnjb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libnjb
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/ChangeLog,v 1.15 2004/12/19 05:44:38 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/ChangeLog,v 1.16 2005/02/11 00:32:18 axxo Exp $
+
+*libnjb-2.0_pre20050208 (11 Feb 2005)
+
+  11 Feb 2005; Thomas Matthijs <axxo@gentoo.org> metadata.xml,
+  +files/libnjb-2.0_pre20050208-gentoo-multilib.patch,
+  +libnjb-2.0_pre20050208.ebuild:
+  version bump
 
   18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> -libnjb-1.0.ebuild,
   libnjb-1.2.ebuild:
diff --git a/media-libs/libnjb/Manifest b/media-libs/libnjb/Manifest
index 4d6e2c11adb4..7a039690c1e5 100644
--- a/media-libs/libnjb/Manifest
+++ b/media-libs/libnjb/Manifest
@@ -1,19 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 82feb9ac0d027157a7474bbce4db7b8f libnjb-1.2.ebuild 1213
-MD5 6140a48bba17abe7c3ab35428b0f9016 ChangeLog 2040
-MD5 07e5c184122c288a31b1655f5a5779a4 libnjb-1.1.ebuild 1087
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 ee354651ff3fa41baa3e00119f65563b files/digest-libnjb-1.2 62
+MD5 e7f89ec7f29844fa3ccfbb91eb3848ed libnjb-1.1.ebuild 1087
+MD5 881292e821a91b1e5a85d10614674f9e libnjb-2.0_pre20050208.ebuild 1270
+MD5 71e4fc18325f938d561625f0bdd89f0a libnjb-1.2.ebuild 1213
+MD5 1c0a9459868c0028abee3b731ccc3836 ChangeLog 2040
+MD5 3616c134c23d06dd541fff40e53704b7 metadata.xml 219
 MD5 183761c55fa4b0585a903ec9910f4382 files/digest-libnjb-1.1 62
-MD5 eccde352d9d2ac120ddcaa4183003577 files/libnjb-errno.patch 278
-MD5 b8b03bca7250e43640fce00915a54f69 files/nomadjukebox 1048
+MD5 ee354651ff3fa41baa3e00119f65563b files/digest-libnjb-1.2 62
 MD5 abf7c2c90f2fa0bda8417050514e1e2d files/libnjb-1.2-gentoo-multilib.patch 640
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBxRV6ArHZZzCEUG0RAhUPAJwJbAoFnQcDSLSp2usiwjvty18U2QCeL+xM
-Z4RpSfu6i4DYq6c7HfqkWoA=
-=mDji
------END PGP SIGNATURE-----
+MD5 786a98942a3fda4f8367f518f413731d files/libnjb-2.0-0.20050120-gentoo-multilib.patch 640
+MD5 9f30cc9a2981cbfa901ba3b3b549da5a files/digest-libnjb-2.0_pre20050120 73
+MD5 cfb051a37eee257bdd089d45b96303cb files/digest-libnjb-2.0_pre20050208 73
+MD5 b8b03bca7250e43640fce00915a54f69 files/nomadjukebox 1048
+MD5 eccde352d9d2ac120ddcaa4183003577 files/libnjb-errno.patch 278
diff --git a/media-libs/libnjb/files/digest-libnjb-2.0_pre20050208 b/media-libs/libnjb/files/digest-libnjb-2.0_pre20050208
new file mode 100644
index 000000000000..1f58671e0df9
--- /dev/null
+++ b/media-libs/libnjb/files/digest-libnjb-2.0_pre20050208
@@ -0,0 +1 @@
+MD5 3061fb38870c8f50524416b0274d778f libnjb-2.0-0.20050208.tar.gz 412413
diff --git a/media-libs/libnjb/files/libnjb-2.0_pre20050208-gentoo-multilib.patch b/media-libs/libnjb/files/libnjb-2.0_pre20050208-gentoo-multilib.patch
new file mode 100644
index 000000000000..1364be4d4489
--- /dev/null
+++ b/media-libs/libnjb/files/libnjb-2.0_pre20050208-gentoo-multilib.patch
@@ -0,0 +1,20 @@
+diff -Naur libnjb-2.0.orig/Makefile.in libnjb-2.0/Makefile.in
+--- libnjb-2.0.orig/Makefile.in	2004-05-25 07:38:21.000000000 -0700
++++ libnjb-2.0/Makefile.in	2004-10-08 02:41:10.801812805 -0700
+@@ -1,4 +1,5 @@
+ prefix=@prefix@
++libdir=@libdir@
+ exec_prefix=@exec_prefix@
+ top_builddir=@top_builddir@
+ mandir=@mandir@
+@@ -23,8 +24,8 @@
+ 
+ install-lib: lib
+ 	cd src && $(MAKE) install prefix=$(prefix) exec_prefix=$(exec_prefix)
+-	$(INSTALL) -d $(prefix)/lib/pkgconfig
+-	$(INSTALL) libnjb.pc $(prefix)/lib/pkgconfig
++	$(INSTALL) -d $(libdir)/pkgconfig
++	$(INSTALL) libnjb.pc $(libdir)/pkgconfig
+ 
+ install-docs:
+ 	$(INSTALL) -d $(mandir)/man3
diff --git a/media-libs/libnjb/libnjb-1.1.ebuild b/media-libs/libnjb/libnjb-1.1.ebuild
index 2410afa607be..ad6624e5ae15 100644
--- a/media-libs/libnjb/libnjb-1.1.ebuild
+++ b/media-libs/libnjb/libnjb-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-1.1.ebuild,v 1.5 2004/10/08 09:46:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-1.1.ebuild,v 1.6 2005/02/11 00:32:19 axxo Exp $
 
 inherit eutils
 
diff --git a/media-libs/libnjb/libnjb-1.2.ebuild b/media-libs/libnjb/libnjb-1.2.ebuild
index 0c204a5cf016..a01c0ff96c8f 100644
--- a/media-libs/libnjb/libnjb-1.2.ebuild
+++ b/media-libs/libnjb/libnjb-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-1.2.ebuild,v 1.5 2004/12/19 05:44:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-1.2.ebuild,v 1.6 2005/02/11 00:32:19 axxo Exp $
 
 IUSE=""
 
diff --git a/media-libs/libnjb/libnjb-2.0_pre20050208.ebuild b/media-libs/libnjb/libnjb-2.0_pre20050208.ebuild
new file mode 100644
index 000000000000..ef99a8f3f481
--- /dev/null
+++ b/media-libs/libnjb/libnjb-2.0_pre20050208.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-2.0_pre20050208.ebuild,v 1.1 2005/02/11 00:32:19 axxo Exp $
+
+inherit eutils
+
+MY_PV=${PV/_pre/-0.}
+
+DESCRIPTION="libnjb is a C library and API for communicating with the Creative Nomad JukeBox digital audio player under BSD and Linux."
+HOMEPAGE="http://libnjb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libnjb/${PN}-${MY_PV}.tar.gz"
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=dev-libs/libusb-0.1.7"
+
+S=${WORKDIR}/${PN}-${PV/_*}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	sed -i "s:all\: lib samples filemodes:all\: lib filemodes:g" Makefile.in
+	epatch ${FILESDIR}/${P}-gentoo-multilib.patch
+}
+
+src_compile() {
+	econf || die "./configure failed."
+	emake -j1 || die "make failed."
+}
+
+src_install() {
+	# borks make DESTDIR=${D} install || die
+	einstall || die
+
+	# Backwards compatability
+	dosym libnjb.so /usr/$(get_libdir)/libnjb.so.0
+	prepalldocs
+	dodoc FAQ LICENSE INSTALL CHANGES README
+	exeinto /etc/hotplug/usb/
+	doexe ${FILESDIR}/nomadjukebox
+	cp ${ROOT}/etc/hotplug/usb.usermap ${D}/etc/hotplug/usb.usermap
+	cat nomad.usermap >> ${D}/etc/hotplug/usb.usermap
+}