Install fdi file for HAL.

(Portage version: 2.1.4)

9 files changed, 10 insertions, 227 deletions

diff --git a/media-libs/libmtp/ChangeLog b/media-libs/libmtp/ChangeLog
index 6eb29b91d8b3..4fef8134e5bd 100644
--- a/media-libs/libmtp/ChangeLog
+++ b/media-libs/libmtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libmtp
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.42 2008/01/29 12:58:03 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.43 2008/01/31 16:00:53 drac Exp $
+
+*libmtp-0.2.5-r1 (31 Jan 2008)
+
+  31 Jan 2008; Samuli Suominen <drac@gentoo.org> +libmtp-0.2.5-r1.ebuild:
+  Install 10-libmtp.fdi for HAL wrt #208311.
 
 *libmtp-0.2.5 (29 Jan 2008)
 
diff --git a/media-libs/libmtp/files/libmtp-0.0.16-udev_perm.patch b/media-libs/libmtp/files/libmtp-0.0.16-udev_perm.patch
deleted file mode 100644
index 844bcc60ee5d..000000000000
--- a/media-libs/libmtp/files/libmtp-0.0.16-udev_perm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libmtp-0.0.16.orig/examples/hotplug.c libmtp-0.0.16/examples/hotplug.c
---- libmtp-0.0.16.orig/examples/hotplug.c	2006-09-02 01:38:32.000000000 -0400
-+++ libmtp-0.0.16/examples/hotplug.c	2006-09-02 01:39:07.000000000 -0400
-@@ -23,7 +23,7 @@
-   extern int optind;
-   extern char *optarg;
-   char *udev_action = NULL;
--  char default_udev_action[] = "SYMLINK+=\"libmtp-%k\", MODE=\"666\"";
-+  char default_udev_action[] = "SYMLINK+=\"libmtp-%k\", GROUP=\"plugdev\", MODE=\"660\"";
- 
-   while ( (opt = getopt(argc, argv, "ua:")) != -1 ) {
-     switch (opt) {
diff --git a/media-libs/libmtp/libmtp-0.0.21.ebuild b/media-libs/libmtp/libmtp-0.0.21.ebuild
deleted file mode 100644
index 33143591bde3..000000000000
--- a/media-libs/libmtp/libmtp-0.0.21.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.0.21.ebuild,v 1.7 2007/01/23 15:48:33 beandog Exp $
-
-inherit eutils
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
-HOMEPAGE="http://libmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libusb-0.1.7
-	sys-libs/ncurses
-	sys-libs/zlib"
-
-DEPEND="doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}"/libmtp-0.0.16-udev_perm.patch
-}
-
-src_compile() {
-	econf --enable-hotplugging || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	insinto /etc/udev/rules.d
-	newins libmtp.rules 65-mtp.rules
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
diff --git a/media-libs/libmtp/libmtp-0.1.3.ebuild b/media-libs/libmtp/libmtp-0.1.3.ebuild
deleted file mode 100644
index d24fdd561129..000000000000
--- a/media-libs/libmtp/libmtp-0.1.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.1.3.ebuild,v 1.5 2007/02/24 10:08:25 corsair Exp $
-
-inherit eutils
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
-HOMEPAGE="http://libmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libusb-0.1.7
-	sys-libs/ncurses
-	sys-libs/zlib"
-
-DEPEND="doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}"/libmtp-0.0.16-udev_perm.patch
-}
-
-src_compile() {
-	econf --enable-hotplugging || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	insinto /etc/udev/rules.d
-	newins libmtp.rules 65-mtp.rules
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
diff --git a/media-libs/libmtp/libmtp-0.1.5.ebuild b/media-libs/libmtp/libmtp-0.1.5.ebuild
deleted file mode 100644
index 702c08cf3ead..000000000000
--- a/media-libs/libmtp/libmtp-0.1.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.1.5.ebuild,v 1.3 2007/08/06 15:50:35 chainsaw Exp $
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
-HOMEPAGE="http://libmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libusb-0.1.7
-	sys-libs/ncurses
-	sys-libs/zlib"
-
-DEPEND="doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-src_compile() {
-	econf --enable-hotplugging || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	insinto /etc/udev/rules.d
-	newins libmtp.rules 65-mtp.rules
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
diff --git a/media-libs/libmtp/libmtp-0.2.0.ebuild b/media-libs/libmtp/libmtp-0.2.0.ebuild
deleted file mode 100644
index 452a41d98d5e..000000000000
--- a/media-libs/libmtp/libmtp-0.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.2.0.ebuild,v 1.1 2007/08/04 22:55:08 chainsaw Exp $
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
-HOMEPAGE="http://libmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libusb-0.1.7
-	sys-libs/ncurses
-	sys-libs/zlib"
-
-DEPEND="doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-src_compile() {
-	econf --enable-hotplugging || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	insinto /etc/udev/rules.d
-	newins libmtp.rules 65-mtp.rules
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
-
-pkg_postinst() {
-	elog "Please note that the ABI for libmtp has changed. Please run revdep-rebuild to automatically recompile any affected programs."
-}
diff --git a/media-libs/libmtp/libmtp-0.2.1.ebuild b/media-libs/libmtp/libmtp-0.2.1.ebuild
deleted file mode 100644
index 7bfc0ca82ab2..000000000000
--- a/media-libs/libmtp/libmtp-0.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.2.1.ebuild,v 1.3 2007/12/01 17:25:53 corsair Exp $
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
-HOMEPAGE="http://libmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libusb-0.1.7
-	sys-libs/ncurses
-	sys-libs/zlib"
-
-DEPEND="doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-src_compile() {
-	econf --enable-hotplugging || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	insinto /etc/udev/rules.d
-	newins libmtp.rules 65-mtp.rules
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
-
-pkg_postinst() {
-	elog "Please note that the ABI for libmtp has changed. Please run revdep-rebuild to automatically recompile any affected programs."
-}
diff --git a/media-libs/libmtp/libmtp-0.2.5.ebuild b/media-libs/libmtp/libmtp-0.2.5-r1.ebuild
index 93325fb44576..f385c01bc8a5 100644
--- a/media-libs/libmtp/libmtp-0.2.5.ebuild
+++ b/media-libs/libmtp/libmtp-0.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.2.5.ebuild,v 1.1 2008/01/29 12:58:03 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.2.5-r1.ebuild,v 1.1 2008/01/31 16:00:53 drac Exp $
 
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
 HOMEPAGE="http://libmtp.sourceforge.net"
@@ -22,6 +22,9 @@ src_install() {
 	insinto /etc/udev/rules.d
 	newins libmtp.rules 65-mtp.rules
 
+	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/libmtp/metadata.xml b/media-libs/libmtp/metadata.xml
index a025c77c7636..e1774e3d9ad7 100644
--- a/media-libs/libmtp/metadata.xml
+++ b/media-libs/libmtp/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
 </pkgmetadata>