Bumping to 1.6.14

Package-Manager: portage-2.2.0_alpha81/cvs/Linux i686

3 files changed, 35 insertions, 26 deletions

diff --git a/net-libs/libupnp/ChangeLog b/net-libs/libupnp/ChangeLog
index 93ae5a8bc927..6b4a236f47c6 100644
--- a/net-libs/libupnp/ChangeLog
+++ b/net-libs/libupnp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libupnp
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/ChangeLog,v 1.25 2010/10/11 10:53:24 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/ChangeLog,v 1.26 2011/12/15 21:32:52 gurligebis Exp $
+
+*libupnp-1.6.14 (15 Dec 2011)
+
+  15 Dec 2011; <gurligebis@gentoo.org> -libupnp-1.6.6-r1.ebuild,
+  +libupnp-1.6.14.ebuild:
+  Bumping to 1.6.14, fixing bug #393077
 
   11 Oct 2010; Markos Chandras <hwoarang@gentoo.org> libupnp-1.6.6.ebuild,
   libupnp-1.6.6-r1.ebuild:
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index ebb90cf67477..469a4df44809 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX libupnp-1.6.6-patch-statevar-query.patch 600 RMD160 13cd0b19b7715d6106c66ecb8c050775101fa3c8 SHA1 241324470006905f685444621d588fcd8b4f4e99 SHA256 d6b48f2a221551fd9c6f76ef34201845c6aa1f2f462440c99e43e823512f686c
+DIST libupnp-1.6.14.tar.bz2 1199033 RMD160 ee9abe9972739f076d78853d3a8debe38a5c41b3 SHA1 8c211573609909e3ee0ce3da5d2a9a10224d86f4 SHA256 661fedf7fef36923e1c415d0501a446ff50aaa7433c6925726734e47d2e91a46
 DIST libupnp-1.6.6.tar.bz2 1146854 RMD160 25ff0390793cfa48cca32a335b4d633283b1fe64 SHA1 24c2c349cb52ed3d62121fbdae205c8d9dc0f5fa SHA256 58d7cabec2b21c80e28a4e5090bba94a849a8f02450e26c1b985318a36b0bbb3
-EBUILD libupnp-1.6.6-r1.ebuild 1347 RMD160 4851f86c86e8b78212a1b97b73ef5c069d4ad6af SHA1 5e3effc727276d8537ddddf8e277d8aec33bcf53 SHA256 34e4a17e0d48487aa02e267173bcde4455262ebdeb5da4c436472b848b388dac
+EBUILD libupnp-1.6.14.ebuild 1479 RMD160 326f2dd89db56e5e6be5f7be5a65e7d32b39a573 SHA1 a885d0857841c541f0af91db321c8f43f991319f SHA256 9f3d7a62bdbb3298393ed48f5f50ee45fc397ec28d849cbabc0d5c41fa55797a
 EBUILD libupnp-1.6.6.ebuild 1277 RMD160 806c7ee3963862eecccfbd3f7de893adf4397119 SHA1 dab44a71c5df77d12d9d739a0a6d66bf4d03f906 SHA256 2b2767211bd69dda0bf114cc326c481e167d3abd9e372ef2de68303909209e0f
-MISC ChangeLog 5564 RMD160 adecf66e8a975b06844eb8efda9e4ff09f123c7a SHA1 a9f767a5fb2b68e11fc5993a9a0b0dfdc913d89f SHA256 406d7828f6668a8ea94860cf447deb3234b91f75b6a0a330c4bf851d6cc03156
+MISC ChangeLog 5729 RMD160 6844a4db448a374968963bdb4db99426ab2afc7f SHA1 e868b855c3599614af4cc853b3eb4c542de8e592 SHA256 e1f8a8c5c7b47b11feebb894e2a255859e3d91ee7d8b7c88d1dfc6c574578ad7
 MISC metadata.xml 337 RMD160 4b96304608ebda0c9070bc6657fc52694f52e3d9 SHA1 181186b1aed6eacda0ce728048c900f10ae79f6b SHA256 e75f8af04c2deb2fe9616129baf04661e5a00c25d1e353146fe1ca7fd978d228
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rVMACgkQfXuS5UK5QB3mLQP+JLB9r84HSz2drlXtemR1I6WS
-iN1L4Ojbbw4FVgAoYchHCtUDS7DsEyskLSF5xyRIN0bE0sg6VS3xpBrRKGt29l7M
-YRlkTBtInhwspsmbqLa367XPRwAwrJtNne8lX6Y/CGrixm+LRKhA0ttf2rn2S7hR
-Fp+UHSxhS4l+P1Q+PVI=
-=6xf5
+iEYEARECAAYFAk7qZ40ACgkQsR7PQhRXYElBiACfbMOz8QZ2SrnvyjRCpKJ7DNVV
+zg4AnA7WEx5UeBBwe9xXFt95FW0fMmQ+
+=OUV+
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libupnp/libupnp-1.6.6-r1.ebuild b/net-libs/libupnp/libupnp-1.6.14.ebuild
index cdc589c906ba..38ad8ac1d578 100644
--- a/net-libs/libupnp/libupnp-1.6.6-r1.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.14.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/libupnp-1.6.6-r1.ebuild,v 1.3 2010/10/11 10:53:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/libupnp-1.6.14.ebuild,v 1.1 2011/12/15 21:32:52 gurligebis Exp $
 
+EAPI="4"
 WANT_AUTOMAKE=1.9
 
 inherit eutils flag-o-matic autotools
@@ -13,33 +14,37 @@ SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
+IUSE="debug doc ipv6 static-libs"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+RDEPEND=""
+DEPEND="${RDEPEND}"
 
-	epatch "${FILESDIR}/${P}-patch-statevar-query.patch"
+DOCS="NEWS README ChangeLog"
 
-	AT_M4DIR="m4" eautoreconf
+src_prepare() {
+	sed -e '/AX_CFLAGS_GCC_OPTION/s:-Os::g' \
+		-i "${S}/configure.ac" || die
 
 	# fix tests
-	chmod +x ixml/test/test_document.sh
+	chmod +x ixml/test/test_document.sh || die
+
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	use x86-fbsd &&	append-flags -O1
 	# w/o docdir to avoid sandbox violations
 	econf \
 		$(use_enable debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_enable ipv6) \
+		$(use_enable static-libs static) \
+		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin upnp/sample/upnp_tv_{ctrlpt,device,combo}
-	dodoc NEWS README ChangeLog
+	default
+	dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
+	use static-libs || find "${ED}" -type f -name '*.la' -delete
 }
 
 pkg_postinst() {
@@ -49,5 +54,4 @@ pkg_postinst() {
 	ewarn ""
 	ewarn "The revdep-rebuild script is part of the"
 	ewarn "app-portage/gentoolkit package."
-	ebeep
 }