USE static-libs.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

9 files changed, 34 insertions, 186 deletions

diff --git a/media-libs/libmtp/ChangeLog b/media-libs/libmtp/ChangeLog
index c386c9282744..612288cd46f5 100644
--- a/media-libs/libmtp/ChangeLog
+++ b/media-libs/libmtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libmtp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.70 2009/05/17 14:51:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.71 2009/05/18 21:38:45 ssuominen Exp $
+
+  18 May 2009; Samuli Suominen <ssuominen@gentoo.org> libmtp-0.2.6.1.ebuild,
+  -libmtp-0.3.3.ebuild, -libmtp-0.3.4.ebuild, -libmtp-0.3.5.ebuild,
+  -libmtp-0.3.6.ebuild, libmtp-0.3.7.ebuild:
+  USE static-libs.
 
   17 May 2009; Raúl Porcel <armin76@gentoo.org> libmtp-0.3.7.ebuild:
   sparc stable wrt #267922
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index ae27e4082e4b..628cdb622fc6 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,15 +1,7 @@
 AUX libmtp-0.2.6.1-deprecated-keys.patch 531 RMD160 8ba4148e0d430ade8bfd32288bcd31a135b11328 SHA1 e04021538c0f5dd4550c9775eeb5ffd0c3df40fa SHA256 72fb3509e909e4c3cbc85c8dd536f36346b34ee49c0a1c3f13d1b76b1d6ead01
 DIST libmtp-0.2.6.1.tar.gz 534773 RMD160 fc2d7e605537513e984c318c301337e7ea4d3db9 SHA1 c91a12b24dad033f71b4dafeda113eb281991543 SHA256 f8080899dee7ec9a97047884b3d51e5bd318a627f84d35c3f4d6a967e39cdd57
-DIST libmtp-0.3.3.tar.gz 560575 RMD160 c6c40f89479cc57a23db6f39cf783df6ef22a42c SHA1 3558838bd6336401dbd86a5e638e20c8d9445ee1 SHA256 8ad66d09b4906dc6d3490b348a14142c869030c835165e4e0d357afc61cb3205
-DIST libmtp-0.3.4.tar.gz 564729 RMD160 d0b1313d818c9c04329dd1bfc853c274cfa98791 SHA1 abaf80dc38f150a07b8483dcc0ef1aa6a774439b SHA256 59ebd1100cf5100ebe9982179c2e6eee5d3ff88062bc48cc46badce795871203
-DIST libmtp-0.3.5.tar.gz 573226 RMD160 812dd1d72df78f3ff290b40be37e86ff6ac68161 SHA1 cb30a2f540c108a80904833b5eaf6f397f107b12 SHA256 92af7ac6ec8b4e99d2892b013a584702e12ab1216a63462b9e76b4bea7b0369a
-DIST libmtp-0.3.6.tar.gz 576653 RMD160 ca0d2cbe5fef171d815d1977cc297590f5989cfe SHA1 e5d1e20da29404bd3de31a878057feef6dc1c30e SHA256 8b232e7b34babdcd77a2d0766e0fd7180834582ce197af11049dcb596d54d65e
 DIST libmtp-0.3.7.tar.gz 578404 RMD160 80963e45493282cd3a00773c9f921b172d542684 SHA1 fdbcfe312fcd9e987be45bd5c2b8eef74183af58 SHA256 70c75d4a90e8953f88423989da489bc88871111c61706881e1c48b8640a21fcd
-EBUILD libmtp-0.2.6.1.ebuild 1002 RMD160 61adb6b55be3e85dbe5ab89ddb77016becfc60bd SHA1 6f2b12be3c47df13a2819e4091efdcaa4f9ab3d0 SHA256 ca888a5e49ea20eccf9f6aac1f85366c151eb453fd583114ce1b38bc30e5e722
-EBUILD libmtp-0.3.3.ebuild 1047 RMD160 8c1e485db25ab53b789ec7a7942e09ce1339ca64 SHA1 908bcf9ab90805807209150d98dddce0d719dec7 SHA256 794ab9ca3e5540ef94f90103926f75f64632140c704b9c2c2baff6907753b821
-EBUILD libmtp-0.3.4.ebuild 1046 RMD160 a5232674c7296b3b218658c21e3c48642a573380 SHA1 5695b5dbb09770d3e1d4203d7e58a1fb516dc4e9 SHA256 3a2e8c08972a10f1f9032d422cc5dba356af4e2ecba27fefc189a239659b6abe
-EBUILD libmtp-0.3.5.ebuild 1046 RMD160 88ee276ed348c1fbddc4cc335e4a5d68d1af3e03 SHA1 0fcbdb43ca227f906a87cc51c86c1d186afc439e SHA256 616a593770b83a42af6d4982497b919da7f57eba4cc70ee3f18c723641fa8ecd
-EBUILD libmtp-0.3.6.ebuild 1039 RMD160 fdc2d1c4ea2fad1b0ec9689d2b7f380343480e2f SHA1 a5cac06f92d3ea35fa6cee98be775150f392d051 SHA256 bbc15cef28d0256ba4f417f9e747a77d2b8edca0c26351b1fc0d50acff5c880b
-EBUILD libmtp-0.3.7.ebuild 1039 RMD160 a1bfdd73afcf0611077001b5f34bc0a29ccdbf0b SHA1 2b4c9630c1d9c1631c36e647ef6de446f3ef3a31 SHA256 a7913424f2d43a6ea7c5523c2182e0babaed9232699767001d4940e889623a26
-MISC ChangeLog 8718 RMD160 8a91d71230830b3dcf8ef94516a0f1f4465ce3d8 SHA1 ad6cd441b51a347b6c957e0706e2b4ff36dcfbc1 SHA256 cb7daa94a9ce7ac0a1b6dd9358b969f6ba077cd97eb42191e7f588fb0b47b9da
-MISC metadata.xml 254 RMD160 ddc7190a5d0afe96aee20be6419e158407138eea SHA1 ae906e614944760200f6d37a0d2b8ea08f607203 SHA256 1188671143bbf35f8ad5530356359fc59adc55eeb1f55652dec3f5796d29bcf3
+EBUILD libmtp-0.2.6.1.ebuild 1009 RMD160 1840dcc9cdbce602af56e524838568406ef248e6 SHA1 950ecbfe540c26832f941a7391f9bfb0a2be6289 SHA256 7860d780a389ba5fca1925b68ca1da39bf93fb585fec04b8d5708ff647feeede
+EBUILD libmtp-0.3.7.ebuild 1076 RMD160 0434e875867a225cea9c4f598a2ae89d1c32494c SHA1 4c8193653bc7b9fa22cb9531ce3be6d38abcfaa1 SHA256 d89d90c065e73e3f223fb542f4ef9dad4077d65927e57ee31749029b720a873c
+MISC ChangeLog 8930 RMD160 e27924ba265cece2123a2d46f72cd6ebbdddde30 SHA1 d82a6a7ec993185a9089ffbe1609a55e8908e0c3 SHA256 2899001bb171d452cc2ad4255aee766e151732567f505ea42a889962db574454
+MISC metadata.xml 326 RMD160 2517b86f6d57dad69701aa3a870d84261209c5ab SHA1 d4e6f31289429188743fc9d7aeb4e92dcf42194c SHA256 18e553c8ecc062379070fdcbbd3568e6e0ef63f36f0f3b4a3d7d3038daa9ad9c
diff --git a/media-libs/libmtp/libmtp-0.2.6.1.ebuild b/media-libs/libmtp/libmtp-0.2.6.1.ebuild
index 84371fa456fa..868e1d5f5d87 100644
--- a/media-libs/libmtp/libmtp-0.2.6.1.ebuild
+++ b/media-libs/libmtp/libmtp-0.2.6.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.8 2008/07/05 11:36:46 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.2.6.1.ebuild,v 1.9 2009/05/18 21:38:45 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
@@ -11,20 +12,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc examples"
+IUSE="doc"
 
-RDEPEND="dev-libs/libusb"
+# Please don't delete this ebuild before I know if pympd
+# work with 0.3.x versions, thanks, ssuominen.
+RDEPEND="virtual/libusb"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_configure() {
 	epatch "${FILESDIR}"/${P}-deprecated-keys.patch
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README TODO
 
 	insinto /etc/udev/rules.d
@@ -32,9 +33,4 @@ src_install() {
 
 	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
 }
diff --git a/media-libs/libmtp/libmtp-0.3.3.ebuild b/media-libs/libmtp/libmtp-0.3.3.ebuild
deleted file mode 100644
index 572c4cce2acd..000000000000
--- a/media-libs/libmtp/libmtp-0.3.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.3.3.ebuild,v 1.2 2008/09/27 00:34:44 mr_bones_ 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libusb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	econf --enable-shared --disable-static || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	rm -f $(find "${D}" -name '*.la')
-	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
-}
diff --git a/media-libs/libmtp/libmtp-0.3.4.ebuild b/media-libs/libmtp/libmtp-0.3.4.ebuild
deleted file mode 100644
index c3bfffead32d..000000000000
--- a/media-libs/libmtp/libmtp-0.3.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.3.4.ebuild,v 1.1 2008/11/24 00:42:27 loki_val 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libusb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	econf --enable-shared --disable-static || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	rm -f $(find "${D}" -name '*.la')
-	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
-}
diff --git a/media-libs/libmtp/libmtp-0.3.5.ebuild b/media-libs/libmtp/libmtp-0.3.5.ebuild
deleted file mode 100644
index 0fc8785ba3dc..000000000000
--- a/media-libs/libmtp/libmtp-0.3.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.3.5.ebuild,v 1.1 2008/12/30 22:27:08 loki_val 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libusb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	econf --enable-shared --disable-static || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	rm -f $(find "${D}" -name '*.la')
-	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
-}
diff --git a/media-libs/libmtp/libmtp-0.3.6.ebuild b/media-libs/libmtp/libmtp-0.3.6.ebuild
deleted file mode 100644
index 620385ef603b..000000000000
--- a/media-libs/libmtp/libmtp-0.3.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.3.6.ebuild,v 1.5 2009/03/18 06:34:45 josejx 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 ~hppa ppc ppc64 sparc x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libusb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	econf --enable-shared --disable-static
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	rm -f $(find "${D}" -name '*.la')
-	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
-
-	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
-}
diff --git a/media-libs/libmtp/libmtp-0.3.7.ebuild b/media-libs/libmtp/libmtp-0.3.7.ebuild
index b0fd0fb91764..119802494da4 100644
--- a/media-libs/libmtp/libmtp-0.3.7.ebuild
+++ b/media-libs/libmtp/libmtp-0.3.7.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.3.7.ebuild,v 1.6 2009/05/17 14:51:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.3.7.ebuild,v 1.7 2009/05/18 21:38:45 ssuominen Exp $
 
+EAPI=2
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
 HOMEPAGE="http://libmtp.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -9,19 +10,22 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc examples"
+IUSE="doc examples static-libs"
 
-RDEPEND="dev-libs/libusb"
+RDEPEND="virtual/libusb"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	sys-apps/findutils"
 
-src_compile() {
-	econf --enable-shared --disable-static
-	emake || die "emake failed"
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
+
 	rm -f $(find "${D}" -name '*.la')
 	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
 
diff --git a/media-libs/libmtp/metadata.xml b/media-libs/libmtp/metadata.xml
index 37ba3e4f2765..9fd2d07c632d 100644
--- a/media-libs/libmtp/metadata.xml
+++ b/media-libs/libmtp/metadata.xml
@@ -6,4 +6,7 @@
 		<email>ken69267@gentoo.org</email>
 		<name>Kenneth Prugh</name>
 	</maintainer>
+	<use>
+	<flag name='static-libs'>Compile static archives</flag>
+	</use>
 </pkgmetadata>