Version bump wrt #208310 and install fdi file for hal by Jeff Mitchell.

(Portage version: 2.1.4.4)

5 files changed, 49 insertions, 87 deletions

diff --git a/media-libs/libnjb/ChangeLog b/media-libs/libnjb/ChangeLog
index 11cc77d13857..83cf7989271a 100644
--- a/media-libs/libnjb/ChangeLog
+++ b/media-libs/libnjb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libnjb
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/ChangeLog,v 1.38 2007/08/13 21:05:15 dertobi123 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/ChangeLog,v 1.39 2008/02/15 13:06:50 drac Exp $
+
+*libnjb-2.2.6 (15 Feb 2008)
+
+  15 Feb 2008; Samuli Suominen <drac@gentoo.org> -libnjb-2.1.2.ebuild,
+  -libnjb-2.2.4.ebuild, libnjb-2.2.5.ebuild, +libnjb-2.2.6.ebuild:
+  Version bump wrt #208310 and install fdi file for hal by Jeff Mitchell.
 
   13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> libnjb-2.2.5.ebuild:
   ppc. stable
diff --git a/media-libs/libnjb/libnjb-2.1.2.ebuild b/media-libs/libnjb/libnjb-2.1.2.ebuild
deleted file mode 100644
index 8aa83dae4a4c..000000000000
--- a/media-libs/libnjb/libnjb-2.1.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.1.2.ebuild,v 1.5 2005/11/21 19:58:40 chainsaw 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:SUBDIRS = src sample doc:SUBDIRS = src doc:" Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	econf --enable-hotplugging || die "./configure failed."
-	emake -j1 || die "make failed."
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "failed to install"
-
-	# Backwards compatibility
-	dosym libnjb.so /usr/$(get_libdir)/libnjb.so.0
-
-	dodoc FAQ INSTALL CHANGES README
-	exeinto /etc/hotplug/usb/
-	doexe nomadjukebox
-}
diff --git a/media-libs/libnjb/libnjb-2.2.4.ebuild b/media-libs/libnjb/libnjb-2.2.4.ebuild
deleted file mode 100644
index c4b6d0b5a388..000000000000
--- a/media-libs/libnjb/libnjb-2.2.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-2.2.4.ebuild,v 1.5 2007/07/12 03:10:24 mr_bones_ Exp $
-
-inherit eutils
-
-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/${P}.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:SUBDIRS = src sample doc:SUBDIRS = src doc:" Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	econf --enable-hotplugging || die "./configure failed."
-	emake -j1 || die "make failed."
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "failed to install"
-
-	# Backwards compatability
-	dosym libnjb.so /usr/$(get_libdir)/libnjb.so.0
-
-	dodoc HACKING FAQ INSTALL ChangeLog README
-	exeinto /etc/hotplug/usb/
-	doexe nomadjukebox
-}
diff --git a/media-libs/libnjb/libnjb-2.2.5.ebuild b/media-libs/libnjb/libnjb-2.2.5.ebuild
index cac183859204..51d642ea5fca 100644
--- a/media-libs/libnjb/libnjb-2.2.5.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-2.2.5.ebuild,v 1.6 2007/08/13 21:05:15 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-2.2.5.ebuild,v 1.7 2008/02/15 13:06:50 drac Exp $
 
 inherit eutils libtool
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libnjb/${P}.tar.gz"
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 ~x86 ~x86-fbsd"
 
 DEPEND=">=dev-libs/libusb-0.1.7"
 
diff --git a/media-libs/libnjb/libnjb-2.2.6.ebuild b/media-libs/libnjb/libnjb-2.2.6.ebuild
new file mode 100644
index 000000000000..b24144df9587
--- /dev/null
+++ b/media-libs/libnjb/libnjb-2.2.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-2.2.6.ebuild,v 1.1 2008/02/15 13:06:50 drac Exp $
+
+inherit libtool
+
+DESCRIPTION="a C library and API for communicating with the Creative Nomad JukeBox digital audio player."
+HOMEPAGE="http://libnjb.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/libusb-0.1.7"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s:SUBDIRS = src sample doc:SUBDIRS = src doc:" Makefile.in
+	elibtoolize
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+# what?
+#	dosym ${PN}.so /usr/$(get_libdir)/${PN}.so.0
+
+	dodoc AUTHORS ChangeLog* FAQ HACKING README
+
+	insinto /etc/udev/rules.d
+	newins "${FILESDIR}"/${PN}.rules 80-${PN}.rules
+
+	insinto /usr/share/hal/fdi/information/20thirdparty
+	newins ${PN}.fdi 10-${PN}.fdi
+}