Stop installing HAL .fdi file.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 14 insertions, 14 deletions

diff --git a/media-libs/libmtp/ChangeLog b/media-libs/libmtp/ChangeLog
index ebf68bc368d8..e47ab334cb74 100644
--- a/media-libs/libmtp/ChangeLog
+++ b/media-libs/libmtp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libmtp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.93 2011/02/11 19:04:12 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.94 2011/03/25 15:49:30 ssuominen Exp $
+
+  25 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> libmtp-1.0.6.ebuild:
+  Stop installing HAL .fdi file.
 
 *libmtp-1.0.6 (11 Feb 2011)
 
diff --git a/media-libs/libmtp/libmtp-1.0.6.ebuild b/media-libs/libmtp/libmtp-1.0.6.ebuild
index 2bbc122b4d68..2b0869b7a9f0 100644
--- a/media-libs/libmtp/libmtp-1.0.6.ebuild
+++ b/media-libs/libmtp/libmtp-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.0.6.ebuild,v 1.1 2011/02/11 19:04:12 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.0.6.ebuild,v 1.2 2011/03/25 15:49:30 ssuominen Exp $
 
 EAPI=2
 inherit eutils multilib
@@ -36,13 +36,10 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	find "${D}" -name '*.la' -exec rm -f '{}' +
+	find "${D}" -name '*.la' -exec rm -f {} +
 
 	dodoc AUTHORS ChangeLog README TODO || die
 
-	insinto /usr/share/hal/fdi/information/20thirdparty
-	newins libmtp.fdi 10-libmtp.fdi
-
 	if use examples; then
 		docinto examples
 		dodoc examples/*.{c,h,sh}
diff --git a/media-libs/libnjb/ChangeLog b/media-libs/libnjb/ChangeLog
index 0bfed0ecf10e..abee4256f671 100644
--- a/media-libs/libnjb/ChangeLog
+++ b/media-libs/libnjb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libnjb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/ChangeLog,v 1.45 2011/03/15 16:09:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/ChangeLog,v 1.46 2011/03/25 15:46:25 ssuominen Exp $
+
+  25 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> libnjb-2.2.6.ebuild:
+  Stop installing HAL .fdi file.
 
   15 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> libnjb-2.2.6.ebuild:
   USE="static-libs" and remove useless libtool archive.
diff --git a/media-libs/libnjb/libnjb-2.2.6.ebuild b/media-libs/libnjb/libnjb-2.2.6.ebuild
index 3431f5246983..89a016bd9a9a 100644
--- a/media-libs/libnjb/libnjb-2.2.6.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 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.7 2011/03/15 16:09:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-2.2.6.ebuild,v 1.8 2011/03/25 15:46:25 ssuominen Exp $
 
 EAPI=2
-inherit libtool
+inherit libtool multilib
 
 DESCRIPTION="a C library and API for communicating with the Creative Nomad JukeBox digital audio player."
 HOMEPAGE="http://libnjb.sourceforge.net"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	sed -i \
-		-e "s:SUBDIRS = src sample doc:SUBDIRS = src doc:" \
+		-e 's:SUBDIRS = src sample doc:SUBDIRS = src doc:' \
 		Makefile.in || die
 
 	elibtoolize
@@ -36,11 +36,8 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog* FAQ HACKING README
 
-	insinto /lib/udev/rules.d
+	insinto /$(get_libdir)/udev/rules.d
 	newins "${FILESDIR}"/${PN}.rules 80-${PN}.rules
 
-	insinto /usr/share/hal/fdi/information/20thirdparty
-	newins ${PN}.fdi 10-${PN}.fdi
-
 	find "${D}" -name '*.la' -exec rm -f {} +
 }