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

Package-Manager: portage-2.1.4.4

6 files changed, 53 insertions, 93 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/Manifest b/media-libs/libnjb/Manifest
index dd3791cd9ab3..ea5e24707260 100644
--- a/media-libs/libnjb/Manifest
+++ b/media-libs/libnjb/Manifest
@@ -1,10 +1,8 @@
 AUX libnjb.rules 1773 RMD160 ccdf63f4b9e366ffa574aff02be47a93a1052a97 SHA1 1371cc0fd16a45c627f70e4a035c085cb0510cb6 SHA256 6343c2915a2ac6d9a098413905cab2480b9f8edc5bdaf85de4d9b5305cae9494
-DIST libnjb-2.1.2.tar.gz 444880 RMD160 79b647f095582374a4ab76dd35653e59712022b3 SHA1 3e9d20b483b1e586c4238141b51e77089387664e SHA256 5644cbbfeb7ce27754bcd2b97bdc929e14f291216ae88bfac130f325013edfc2
-DIST libnjb-2.2.4.tar.gz 486754 RMD160 2e06014d2ce018681005ed815d2f7b2b230c1f99 SHA1 662475c993fde5139684e1a640b31d5444b84613 SHA256 f782a584c2bda94fa243b5d61775d23da0800cc4e342248d0e1905ff977ec6c1
 DIST libnjb-2.2.5.tar.gz 495780 RMD160 a3a536e679482a665cdfd23cde73db8b32d5904f SHA1 818b3134116937dc5ef8f81939cf21e6a9b451b0 SHA256 4200028b411b56518ac640a91a5b36e34945b815fb2cae097c1721d79a2060ad
-EBUILD libnjb-2.1.2.ebuild 1087 RMD160 93d8d107b4501dfb4d9ede0c1f157d3a5785994f SHA1 119a0ccb456872d65a4ceef23e84ea53240f8dd6 SHA256 5ef2863f1588b2b2283206faff411178c1047ff1e452ecfd83804dc70d36cea5
-EBUILD libnjb-2.2.4.ebuild 1065 RMD160 9ab913a7a0422c28081423a4d1761f0c9b784658 SHA1 06b378f1f1a2aa9a7f70ebe6351c3a870fdfe5b5 SHA256 6f3f1e8dc7fe36f2d8eccbbfcb921d2ace2e7b1969b1744d4ab70cc1f0b42492
+DIST libnjb-2.2.6.tar.gz 504329 RMD160 9a81674daa7b0163682ef7bc40cc852c7b69ea8d SHA1 339c24b1c007d914d2d4969315a3e128603a046a SHA256 c6eabf1fd3d32af6d3707574e1891919b25c3af35cadfc093456c00bccf3826e
 EBUILD libnjb-2.2.5-r1.ebuild 985 RMD160 1e9e0ced66b383fee9d993b82b879e050ea6f6cd SHA1 469ab13a30cc6063d772a7457c55da7f612c89b5 SHA256 ae13f014d4decd5be491802a241a2502b25a4d4ab49135f99144e5e72b457b39
-EBUILD libnjb-2.2.5.ebuild 1106 RMD160 fe21279d7da1d474ce0e2d9bf9e9b45e01a7c405 SHA1 8f3d33ca0a1c48104201a3f5e1e412da3837ab56 SHA256 63351dea2b70832b8022a88c28653623b38c18f1b3664e386bcf6c99907a0b77
-MISC ChangeLog 5526 RMD160 d9f54f350c300ffda6fc217aca7d91ded5f9ef22 SHA1 ce0616cb075b22f44ec858de6872e5bafe8a2b3b SHA256 359729e6774b2a62a87f697abd814db807532d1753c6e72d4d25d5bcb765fbe5
+EBUILD libnjb-2.2.5.ebuild 1099 RMD160 e3f040f3a140de3476bd89db31db10a997022171 SHA1 a025b91abffe1ec021454070c94a4190dd598c49 SHA256 a4d47dd83795df0a8e3e989b9bae73c1a5add901c38ac83ac36bd3137234b29b
+EBUILD libnjb-2.2.6.ebuild 1032 RMD160 0e5eb6f9db2707e8e76aaefb5f8d66b83d5c6860 SHA1 c5c7d8de8acc61c260875155dcf4dbba412b6d46 SHA256 0592903f7a6870f986350210d97fd28751d6563ca76a45b1ad4a9e83e6aa03af
+MISC ChangeLog 5762 RMD160 b36fcae9f0684f1d59e872a5ac9f0f0b3f279afa SHA1 f01923c038e48b0f8d7927560c6d7fc8cc2b92d2 SHA256 3d0e6e3b43afedc3c975c43ed49838b2aa5d625e8449e686371ee0c88b2d43de
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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
+}