Version bump, and replace deprecated keys for HAL wrt #212287, thanks to Doug Goldstein.

Package-Manager: portage-2.1.5_rc3

4 files changed, 63 insertions, 2 deletions

diff --git a/media-libs/libmtp/ChangeLog b/media-libs/libmtp/ChangeLog
index effabd72449e..a0ef5b05134e 100644
--- a/media-libs/libmtp/ChangeLog
+++ b/media-libs/libmtp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.45 2008/02/21 14:09:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.46 2008/04/16 16:45:01 drac Exp $
+
+*libmtp-0.2.6.1 (16 Apr 2008)
+
+  16 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/libmtp-0.2.6.1-deprecated-keys.patch, +libmtp-0.2.6.1.ebuild:
+  Version bump, and replace deprecated keys for HAL wrt #212287, thanks to
+  Doug Goldstein.
 
   21 Feb 2008; Raúl Porcel <armin76@gentoo.org> libmtp-0.2.4.ebuild:
   alpha/sparc/x86 stable
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 9add959c01c6..5214e4266b0b 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,8 +1,11 @@
+AUX libmtp-0.2.6.1-deprecated-keys.patch 531 RMD160 8ba4148e0d430ade8bfd32288bcd31a135b11328 SHA1 e04021538c0f5dd4550c9775eeb5ffd0c3df40fa SHA256 72fb3509e909e4c3cbc85c8dd536f36346b34ee49c0a1c3f13d1b76b1d6ead01
 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
+DIST libmtp-0.2.6.1.tar.gz 534773 RMD160 fc2d7e605537513e984c318c301337e7ea4d3db9 SHA1 c91a12b24dad033f71b4dafeda113eb281991543 SHA256 f8080899dee7ec9a97047884b3d51e5bd318a627f84d35c3f4d6a967e39cdd57
 EBUILD libmtp-0.2.3.ebuild 1011 RMD160 5315ceffb3c95dbcab0ddd0fca05b1106e4cf13f SHA1 fd3b3dbe05c983ebda62f56f58d2a483745fabb7 SHA256 d370d5b698b7981894071e94a5b08d510a07f1438a427f23a999ff5d55445698
 EBUILD libmtp-0.2.4.ebuild 856 RMD160 bba9c9cbf2a7275236ec231fb8afbb47024dc849 SHA1 5cada2cf370c4b24ac2c0b0393d8f00be7bccb2f SHA256 a09560301da0979dc9eb1f33ae4caae5d7ce732d2cf6e028774331c19fed75c2
 EBUILD libmtp-0.2.5-r1.ebuild 907 RMD160 788901363a715b74e936a03e00d5782447d7a87e SHA1 4d72fe7b4d684964fad0bfe8654ff6923b544e0a SHA256 7f40293e4345ef33be9a3a1093ba75a3c10e9274e1df963501664961c6228633
-MISC ChangeLog 5680 RMD160 28365f09f28e38fba3da23e847da16434bdd9639 SHA1 131f4cae52e31a402bc1c167d338cbd8196e362e SHA256 aa7dbc8f442e5eb03d157eef1137dd68a90697846a0196341e8bc4fb9858ba47
+EBUILD libmtp-0.2.6.1.ebuild 1013 RMD160 42df4b5ba5dce643888b08b7120953e06ab01534 SHA1 924c4ad2b359bc0a4ea75bdc2f897a0155ebc5e0 SHA256 025a7ad329b80f3e448bee419248fbe702ed8fc3258cbfd928e552ef94c4811a
+MISC ChangeLog 5922 RMD160 3304603524a9be7229e1b78f2c88c107b63c8639 SHA1 ea8bf419810599791674e56d3e589d3b012d8554 SHA256 ff1dae6904df02280a6095f14c6e481b9915aaf418c90ed8e373b65a07b8da19
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-libs/libmtp/files/libmtp-0.2.6.1-deprecated-keys.patch b/media-libs/libmtp/files/libmtp-0.2.6.1-deprecated-keys.patch
new file mode 100644
index 000000000000..de0868ec5587
--- /dev/null
+++ b/media-libs/libmtp/files/libmtp-0.2.6.1-deprecated-keys.patch
@@ -0,0 +1,11 @@
+--- examples/hotplug.c_save	2008-03-04 00:48:38.000000000 +0100
++++ examples/hotplug.c	2008-03-04 00:49:07.000000000 +0100
+@@ -105,7 +105,7 @@
+       printf("<!-- This file was generated by %s - - fdi -->\n", argv[0]);
+       printf("<deviceinfo version=\"0.2\">\n");
+       printf("  <device>\n");
+-      printf("    <match key=\"info.bus\" string=\"usb\">\n");
++      printf("    <match key=\"info.subsystem\" string=\"usb\">\n");
+       break;
+     case style_usbids:
+       printf("# usb.ids style device list from libmtp\n");
diff --git a/media-libs/libmtp/libmtp-0.2.6.1.ebuild b/media-libs/libmtp/libmtp-0.2.6.1.ebuild
new file mode 100644
index 000000000000..764b1aae56a2
--- /dev/null
+++ b/media-libs/libmtp/libmtp-0.2.6.1.ebuild
@@ -0,0 +1,40 @@
+# 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.6.1.ebuild,v 1.1 2008/04/16 16:45:01 drac 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="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/libusb"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-deprecated-keys.patch
+}
+
+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
+
+	insinto /usr/share/hal/fdi/information/20thirdparty
+	newins libmtp.fdi 10-libmtp.fdi
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,sh}
+	fi
+}