Bump to 1.9.20150427, as requested by Nikoli in bug #539568.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

diff --git a/net-libs/miniupnpc/ChangeLog b/net-libs/miniupnpc/ChangeLog
index b98ea87cfbe371688a621355317107581a59e23a..ff15a65bd66e6ade047dc525aee78513a6cdfe52 100644 (file)
--- a/net-libs/miniupnpc/ChangeLog
+++ b/net-libs/miniupnpc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/miniupnpc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.44 2015/04/28 17:25:56 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.45 2015/04/30 13:34:36 maksbotan Exp $
+
+*miniupnpc-1.9.20150427 (30 Apr 2015)
+
+  30 Apr 2015; Maxim Koltsov <maksbotan@gentoo.org>
+  +miniupnpc-1.9.20150427.ebuild, -miniupnpc-1.9.20150424.ebuild:
+  Bump to 1.9.20150427, as requested by Nikoli in bug #539568.
 
 *miniupnpc-1.9.20150424 (28 Apr 2015)
 

diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 4ccf573f5dccd6cd21e93c537952146841f6b712..e78c12dda71975431e07ccd121f9a6f848979028 100644 (file)
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -5,22 +5,22 @@ DIST miniupnpc-1.6.20120509.tar.gz 68205 SHA256 cd023862ae3882246102594fda7dc5ef
 DIST miniupnpc-1.6.tar.gz 66454 SHA256 bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6451b7d6f184d0ae0c813994 SHA512 c635057e40aa2826fb07db51c474a335cbcecbf7bba09773826b1aff4a01024dced8a6122e2b90db544540ae499b687006392d6041f7605467b73111ccb368a8 WHIRLPOOL 13b01fd4afcb05bd3f046e00b9d86c1c1655a262dcce5c50865ad93bae4028de8e16417ee5d3219971979ec2128c71bec03d8efc350157f2fb4744ca2757a597
 DIST miniupnpc-1.7.tar.gz 68327 SHA256 16dd2456be9b4bf290667c00eeb38c77ad47eb2107569b2dadcfcee8c9af6337 SHA512 ad2a689e91da068f2e291336cced9933963c2adc619b5e82dbb684e496d3683adba6a4634dd17265bf8dcc9d8f6c783b66aee1803ce63383997c27de3c16b194 WHIRLPOOL e9c7eed931fa1247ecfa8d9064d6890f6acca7ff41d79ec32716568f78317d972e14ecdee005a61e2a01914c984d0e18c63607ef9e79fef5a3974a8ca7586909
 DIST miniupnpc-1.8.tar.gz 70624 SHA256 bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c SHA512 8eedac9ad473fc952ca8896fe534d6da6b1b234e8b6f35f721394d4c71aca84ed287ca6c4f0455b50d97a45e4cd34e27d99a6813386e0864781364aa607e13d4 WHIRLPOOL 5b76ccbb5ed7daa9bb0d481b424b7c31a5f6dc85c5c812ba10175a29aefc0d3924f3db2aa8c3529d1241be59d67d1d4c702d27aad2de8c8a07fecf3857d73169
-DIST miniupnpc-1.9.20150424.tar.gz 325578 SHA256 bf7397a6f6981c2bb11f7ea298848892e5f50a280dc22448a5d253af556ce898 SHA512 d77da94f9da494954d545b933d16a1e1d70a22ded47e4bd714e70bca80a49ffe4dd42e436e14428ac934bbb559142c0851a4a73b479415142f03d9033b3a42c8 WHIRLPOOL af1bfecc836e5c9ab42346d8de52e68fe9f6328be248622d3fa14099816e59882e8371f3d017244ceb12b475de1c25e9c446a6c01399c2289063154dd63313b7
+DIST miniupnpc-1.9.20150427.tar.gz 78424 SHA256 b3207ddc0b0001887d6a29260e8d609d0ad2c35bec99a2358281bb8951919837 SHA512 463758b3c104cdc768d99e044acdf607d457eaaefec12fc20e0086de523b9c61ed6354dd2269052ae367b22957158fd813440dce4f51a8d60f8d251d2c85f336 WHIRLPOOL e6f635d1dd5e728a75e9852e0f2e0e6b8c3dfb200d479133fd183e8741628d7c0dd016ffacc7d0d2bfb13798cd7d2e57b26b48a36e1555c721b4c58038c1c5ee
 EBUILD miniupnpc-1.6-r1.ebuild 1259 SHA256 73872dc606c8391a4a9b29cb2394b02a13af269695286c8a0311a604e3f9a39b SHA512 0e31b2602f9ec219675c9ee423d1f5206059ed8e1db2ac44fe60cefc28e50670f654ba0c8f0786e6dd5dd84a48eb1fcdf61f1c367e26f665f112e91f24264048 WHIRLPOOL de7a1a51dbe4a231a27a58a66eca145492480f76e76af4370d966a849e62bba249cdc65269158f7d9dfcf72396de4c3b93b8dd1b9aa3d0312fa748ca1b6e36d1
 EBUILD miniupnpc-1.6.20120509.ebuild 1057 SHA256 f7ae9dbf57c81cb50aded8df114afc774515773cc5ddde09cfb1e2767a78cd4d SHA512 ba66b1c4264b083c9e10002b3335f60dcdcf38b5f45b192133473a06f67b79de1c0e6b33357ed39e33b4c532a54cd8e3ddbfdc2ddedf441c8e51775a77cf12db WHIRLPOOL a65664f1c07e3044d3b95fa662b97748885cabb4a88ebbaf5539afe72112a61560072e6fa7b0df2fe0ee2ad3aa83596f97b6ae65f653c3d5e16f46533905d1c4
 EBUILD miniupnpc-1.7.ebuild 1200 SHA256 59597c5a54d57e8b3d9dbb65bcb80707cf960e198a07346e0efaac400f3a5201 SHA512 7c333e83808311f71a8039f55ce24f59f5fab11b694d1df1d79d4562e6dca60aa3e227e679217e8b60ec9f42552c8e0ab24b51174d267c3940d8af44e5a16d6c WHIRLPOOL d85dfebb6a4897dc3172aced2a8fc7af1ead44d819cfda9cb8d73a7fac229fc335b59ed5906690eedb72373ec50a49f73daae9f8d79ae35d7bf403b80b6cb276
 EBUILD miniupnpc-1.8.ebuild 1196 SHA256 34b92a0aebf0f70944d68b13f0d708cb2d5aa0dd5656a06d4c35708f9722d76b SHA512 c098b5ba963e79262adee1f35439ae3c6d6e848ac1a5e162581f4add3fd037155b804997075cf2e738214c14bf214f268856c5df53d26a0d9b9a721e6f2639e4 WHIRLPOOL d9ff0e0e20b50b94fcad05ffc5e23b919887d3fa4f1aa0c400c7ba26945a3f2f04be2698a082f9f9eaa6b2d22add47fc8c36712732b0e0376ac3015e72835c81
-EBUILD miniupnpc-1.9.20150424.ebuild 1461 SHA256 d8e04dad3876fd44fc2fbda80ff33500e6cb54d8ccf3511ee117c762786e93ee SHA512 28beab24bcc9066bf2897513ecbf5e121c8ae14a5365b3009bab38e3160c8079a390d00d057b99ec8eecc6e14c7ecbc3e96d3085f2c9b9a54004f8a7be7a7902 WHIRLPOOL 43fd0f5a7543a1a0152baaa62122db13a20156120743f1a8fc896e47ff8f97b8b9919cbe82825ed03a80bb925138d5a45213a710af665de4cbab7f7a760486c3
-MISC ChangeLog 6293 SHA256 4d2e7721396f930932bb9ac138900363302f8ebe362d9d52b9f61fb229abdd9c SHA512 04b6f005dec1ca62a919301deb90f3c797e8cf7c8931a0b89711de38d4b16c036f951b9487309b7d17634da67dc4ee28f66e182d4fcc331a3e4bf6324c968c70 WHIRLPOOL 2a95b2b71ec86b31756254a56894b590d2abed8c4ffd4d36761414f6cac1dd2bac4483d137977970b79b479babe84996efa492ce5b6017409a7bd87a93ad33c5
+EBUILD miniupnpc-1.9.20150427.ebuild 1383 SHA256 66e5a2d0f835fc37aacf8419fe9e6ecf0f84e4c3ad69ce18f696e75d64d97b20 SHA512 9f9522cc460fc9dbb5173c058e77ede48b41d1682a6ca137e751b6cb11e32c45e2fec3c0adc0017bc5b07c3fd912aa4182c79d64791e06838efffce18026bbf6 WHIRLPOOL 9a9396559f7954503780790bed5384e614a32d45fceaa7960f6d3976c852e79079e05c7216187f83a45b03fc1ce30deca9b8bf4f6ef7682a69be2e4f6164b7e0
+MISC ChangeLog 6514 SHA256 bf24a161ef7dba7be7ae7511c70714cd029bd6026853bc61f8688c64095a3240 SHA512 69e8c332b1bef1a076dee904fbe65647a5031387e6bb70b22e0b2999ec9a31a39f0d2a031ded5af7379af50671af36bf7dc94be8e81f0e018004e546c82466ce WHIRLPOOL fac0f5730c93993dafd16ad3b8d48fd51a1ca7ee94b52ebb8de127c4c3dd2880efb4dddad5d8a08e8dd4c59908f2aa3d319cf62ba4dc986ee3877c243a5bc334
 MISC metadata.xml 338 SHA256 3de89305fee04e6757c25966f3edb3ed3a5c1d19ff8f95452286cee3fa8a9b51 SHA512 2acb780e7cdbbcb8e7c6d6ca4573adaa015cd5ba00dbbcae0b40c46517f6b7c1c7e1b72c3f5b7514308a47bbbd3af59bb853ecaac1c0319913daa401a7f078e2 WHIRLPOOL 5c25922c90a8d9393a23c131889ce7fd5b0fdf03a7968e225e05c11466ca2d8fabcad6f055423d9225798393a9b315c84838e83770ed59b3d9d89b7f761c5f80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVP8KPAAoJEAmJmMX429revpAIAJ8vhmJ4gu2YlvcajpjigORQ
-iVxx5nhoxHygHRBDHFibLAZofYENGeSZVBuhbTA+OKUlChhrQvPGeqm+lzuvdTaX
-uDCODWYjkmVMi0REvxt/VY6Mia7fbZ+5u3a5txQDHz81F5gEvWqIH1D1gWd4mpY5
-70I2nhOdJ0lG+EOvGxnmYqTTMW/Dc8CM36U9I0M8jyo4/RmiTGcR+TnHiqBnu/k7
-5BFT2upALpS4fXaXi+NvBY5Mt50coSu2NUPO/e2Q4TG91sg8NvE0uo1Yheer+Dfg
-VaMXjbzWnM3spNxOCieJhY2HFQVNkwW19+MLyR1BWbbSNCOpfZzbhxu+re2fUn4=
-=tox+
+iQEcBAEBCAAGBQJVQi9TAAoJEAmJmMX429ret6IIAKZ+D52ayBpwebfHgTjAI73I
+sFgOLMZTEDo1ZXfRkPEsR2tH8jDn39zsF5wzsQYHBtIk2qYPpBQpZyAGvvf5IE0y
+sA97XXwxEnYjvOehxAhcXMC3OrAw7Bnmatljc5RAmvvdZk4S+AqVhp7vgzD8IuF0
+4FNp3NSFdUlCeLptnvgKXl54ZFP+O6q45VaF1lYuSt0BCu/nY9M8HsX8+iZMVrUL
+YX+qoPgB9rJCGAjGi1GxX3Q3lpA9570HoBx98vRfAvS3HUEFZN6Ilp5iDMynM692
+wMBLLKDrwegGnBl+uKry0/dP/IGqwkuvmEcOG7tFMAwHHDK9IiK2yaLCa6bS5Sc=
+=WVl8
 -----END PGP SIGNATURE-----

diff --git a/net-libs/miniupnpc/miniupnpc-1.9.20150424.ebuild b/net-libs/miniupnpc/miniupnpc-1.9.20150427.ebuild
similarity index 71%
rename from net-libs/miniupnpc/miniupnpc-1.9.20150424.ebuild
rename to net-libs/miniupnpc/miniupnpc-1.9.20150427.ebuild
index d0d387f5d55ad4319e432d898079772aeb386ba6..93ed09ff9d104ed7ad3aa04c984894879f8666a7 100644 (file)
--- a/net-libs/miniupnpc/miniupnpc-1.9.20150424.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-1.9.20150427.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.9.20150424.ebuild,v 1.1 2015/04/28 17:25:56 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.9.20150427.ebuild,v 1.1 2015/04/30 13:34:36 maksbotan Exp $
 
 EAPI=5
 
@@ -8,10 +8,7 @@ inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="UPnP client library and a simple UPnP client"
 HOMEPAGE="http://miniupnp.free.fr/"
-#SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-# https://github.com/miniupnp/miniupnp/issues/111
-MY_COMMIT="e501f5625dd171d0133fadd31ba1d3ce7cb5424f"
-SRC_URI="https://github.com/miniupnp/miniupnp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/12"
@@ -21,15 +18,16 @@ IUSE="ipv6 kernel_linux static-libs"
 RDEPEND=""
 DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
 
-S="${WORKDIR}/miniupnp-${MY_COMMIT}/${PN}"
-
 src_prepare() {
        epatch_user
 
+       # These bins are not installed, upnpc-static requires building static lib
+       sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+
        if ! use static-libs; then
                sed -i \
                        -e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-                       -e '/$(INSTALL) -m 644 $(LIBRARY) $(INSTALLDIRLIB)/d' \
+                       -e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
                        Makefile || die
        fi
 }