Install fdi file for HAL.

Package-Manager: portage-2.1.4

10 files changed, 13 insertions, 241 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/Manifest b/media-libs/libmtp/Manifest
index fe5b9f402bcb..9b2265afda94 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,19 +1,8 @@
-AUX libmtp-0.0.16-udev_perm.patch 565 RMD160 20ad5de7b7c4c29e46c6be9d6177a3391c420884 SHA1 a8db54b45ac2a9852540ca2ac2527838304ce6aa SHA256 104c08cd700ee1b1277f220c3de422cce8b0e87fb01d01be06785e2c192647a9
-DIST libmtp-0.0.21.tar.gz 447358 RMD160 89b37870ea3b7f0596e13c3d24db896bda4abb03 SHA1 dea7448a2dde9c2f9384426838d1540f0b68d76a SHA256 7d7d28bc92d44f2f8f8c235535428c20a559db227e2184bbd58b22a58f8103be
-DIST libmtp-0.1.3.tar.gz 480522 RMD160 5df7bcf57d69bb8544f55d50e2c9c0825e4660e3 SHA1 b8920f7132f7efae76cd13681cf8b6931ca538d9 SHA256 d85f1950b3fbc7a8a89bf06dc4f6fae7e627d9b7b291b98f45259a87bd5b4661
-DIST libmtp-0.1.5.tar.gz 497384 RMD160 c98a9a817ee9175630953acb3eb952257b0ecf1e SHA1 8c9e0ba2cb63db3dd32e484906683b4e4ed7d770 SHA256 57131fa65e051eacf0aad5126362c08623a7fcc00147e9a03080123a3d3cb8fe
-DIST libmtp-0.2.0.tar.gz 521246 RMD160 578f3b3d0add86853d257fbffec8be3fe9caebcc SHA1 5c05a964656303bca07bf76dbbd9fd200abd0b94 SHA256 e87e048dd3c6a2b741a206e3cd031bf1d5a8d278a0af8db1287174b1971df051
-DIST libmtp-0.2.1.tar.gz 521523 RMD160 1e2d3c6993def596819f3dd09c484b55824deb02 SHA1 395a24c815967af7a2b8e2034fc0e24f19bca268 SHA256 3117a93391126e41080e11829c6cdf34ff989bbbebcaa98262cefdc51c09829b
 DIST libmtp-0.2.3.tar.gz 532134 RMD160 e5667d50a8fb26171988bce9dc4b2b259dd650cb SHA1 d2a15a6894b4bcfe6101ca9c3672c512b2ed0219 SHA256 a1e6584db1fce3fb2a35e847727b704e750c03b973cf1535ebac3f7add1af911
 DIST libmtp-0.2.4.tar.gz 529271 RMD160 31f838e640f61393ea77fc855d53aa3641c38e79 SHA1 5c6aca795598a5b01126aa74930fbe7d06c6c9c1 SHA256 973e4225624490599fd7cb7dc3a3422cb352a950b0192f62e4830affd0726a59
 DIST libmtp-0.2.5.tar.gz 530914 RMD160 1bd830338ab4869fdd87aa4420810629de076ad4 SHA1 c5297f2aa5dc47755f417a8977250d58d5a1282c SHA256 4d5ce1bd51793cc97cb3b7630d16fff11bee799ca4e9d5dbe076d46fb7f1310c
-EBUILD libmtp-0.0.21.ebuild 1050 RMD160 8b79ed2336258c886bc799086d73c59a4b8b01e8 SHA1 48f850628f8a8afd2f9fffc8fe1c27a284089b65 SHA256 13bfbce47a56c9cebdbcad2e8f77c8b348f3eb566c2c1cac56087bc24be4d113
-EBUILD libmtp-0.1.3.ebuild 1049 RMD160 a770ad534394086602004f383b39231d2ed000f5 SHA1 f3aee2f155b990bd99dcea6aba0f4c369d919622 SHA256 a187fe190c4055e42862e81256e230c2c7eb5f54c81009a3cab83cc8f35128ba
-EBUILD libmtp-0.1.5.ebuild 939 RMD160 001ae68adf2ed07ac7775923a1a3c60d5a668f10 SHA1 3db0d54d7f3f03089ad266030fa62b28d049988c SHA256 c290271ade95ec0d28de2e0bbfdeafaf51eba98b6646ab5bdc1e1776aa52762c
-EBUILD libmtp-0.2.0.ebuild 1095 RMD160 0fdd600bc63a3a0a16401f2079260354e9e26679 SHA1 e76f5f121598513b3d5fb6919ee7cacbbb0af48a SHA256 a9d322b103179a055d69753de34628e8288c231da058c89cd7ced16f99673024
-EBUILD libmtp-0.2.1.ebuild 1092 RMD160 63c9dc39241414a0efbd6666d8ae792e7f3c5fb8 SHA1 9cd2a431e45432ce8a34d44e2e94e6b7df451c84 SHA256 761f775d2031623d3b7a0ed197820421435a89c55e0a1e00a9d71b37689ad798
 EBUILD libmtp-0.2.3.ebuild 1011 RMD160 5315ceffb3c95dbcab0ddd0fca05b1106e4cf13f SHA1 fd3b3dbe05c983ebda62f56f58d2a483745fabb7 SHA256 d370d5b698b7981894071e94a5b08d510a07f1438a427f23a999ff5d55445698
 EBUILD libmtp-0.2.4.ebuild 857 RMD160 e8b93e18ede659cca2b9f6e033e30cf80ec6aa4a SHA1 c2e772adf83694088cb7b53812ade344c1c72105 SHA256 1e7c4e7aed809d6491b700bb6e59b404992a6cebe838eef53a9d911f4cb01c7f
-EBUILD libmtp-0.2.5.ebuild 817 RMD160 acf73d960f7e9c36311e4ea6eced05150442970d SHA1 0e183bef3453620abeefe08fe9374d00fbd6ff75 SHA256 613e175e612d94252e60044b46c246fff86059a509824bc1a4e4ec6852e0de0d
-MISC ChangeLog 5340 RMD160 03e862cefa5f111522294af4c742c251cd525c78 SHA1 1840d15cce3fecf44f20a8a3ee2ce76e069c1934 SHA256 96239596867605ee8a668807cab8abb984fb22620e138956ed6077aff3996004
-MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
+EBUILD libmtp-0.2.5-r1.ebuild 907 RMD160 788901363a715b74e936a03e00d5782447d7a87e SHA1 4d72fe7b4d684964fad0bfe8654ff6923b544e0a SHA256 7f40293e4345ef33be9a3a1093ba75a3c10e9274e1df963501664961c6228633
+MISC ChangeLog 5492 RMD160 67dd6efe10cd0ea216822f2cdacb942bf3c1957c SHA1 61742d8ff6a19b26f04447e1dfacf7be0faa0cfd SHA256 9a78d7fcbbabbb5f605bb35c3dec757c4a9a8d785dfc7d3527b55cdcd9fee177
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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>