diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-libs/miniupnpc | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'net-libs/miniupnpc')
-rw-r--r-- | net-libs/miniupnpc/Manifest | 4 | ||||
-rw-r--r-- | net-libs/miniupnpc/files/miniupnpc-2.2.3-drop-which.patch | 38 | ||||
-rw-r--r-- | net-libs/miniupnpc/metadata.xml | 11 | ||||
-rw-r--r-- | net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild | 64 |
4 files changed, 112 insertions, 5 deletions
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest index 5bbbf7cf75cd..753fb3ce2c0e 100644 --- a/net-libs/miniupnpc/Manifest +++ b/net-libs/miniupnpc/Manifest @@ -1,5 +1,7 @@ +AUX miniupnpc-2.2.3-drop-which.patch 1209 BLAKE2B 32ae4d0eee181cc428bc8afe6aee0ea6097527461c868b7133e1f1ab70c3aeb5c816b2297b8027db06fd9751e6ebf68e8bb560070e75987e72f7c3c60f61b7a6 SHA512 1e8d93c14d5b7f103782a15e007abd0e1223da60b98177d455ceb1a2c6fe5b7c3c22f2fe79da0b4dce54542ac6b3e8ec225d09a0b8bdf8742b07a14cd160b5dc AUX miniupnpc-2.2.3-makefile.patch 2179 BLAKE2B 38854b992d62f219394fae19d5038dcc2f9c2249184cbeba3a4c0948a61ca2147ae2cb7df2d19e38f76e3f6bedcec8e4ffa80d6685fb2f360fc36b8590399e1b SHA512 b332363db1e8df16a86153748a69ee5499a115df215d46cc3d2012e26574991a9545e81ce966f0b051f69601639dddde10a632555075c92c06d132624936a28d DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad040fd7eab64be5b5716cb06047e86e3ed6a9c17f697fd3210af0fb0a6ae032b6ef0a5c1f0d96a2e185db97b0d06e8 SHA512 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e +EBUILD miniupnpc-2.2.3-r1.ebuild 1552 BLAKE2B e5bc7b99983f099719c7880101b973f77da957f42a529b3dfc2146439fe171df02f7611ba663bd3f61489025ce35ce4a572aa9a110608bee03a9ecb21eaea41a SHA512 21705b5d12e7d77a401a1c92e1e8fbdb2f60bbf7bf759a020bd6e521c2fbb2f9b797d6a73d56ec9deb2b3bc6b0fdd1cdd44aebad709403cbf66aaeb505db196d EBUILD miniupnpc-2.2.3.ebuild 1521 BLAKE2B 066d26958db1796f5566383fbaf99a1ff837c2d3267cb8062b3a09c222984876ab0d96ee6181860b6cecaec3dfdafac2596428e017217a79851a557059bffa63 SHA512 bface54f8a84857ab38898a9db0eec8f97063765a06e5d856d3c55de11b3eed3b2aff6473f5cc60dd0eb5f014e31fea5ceaab865c0a9678e09fbd534570848bb -MISC metadata.xml 244 BLAKE2B a3306e4b6476e267c2dd1f4e24a57bcba54d6ac43270610af57976f19046bb17d1f9afdeadf07407c045b9c66afe1c5b631e0955ff1346e49151e604717dc1be SHA512 b2b16db336068dd5e6c40f2721e1b1e8a6626954196287bf409082db21ff804375fd740a76c5d2ee6b4ec13abf25dfa3f941944a7b25eb332b90a1da9c740868 +MISC metadata.xml 330 BLAKE2B 02b7193f99aee0f3cad145954d1a6f7f9b2f63e21cc23d02ae3048d89618050a5a8df2e206d771a3d0853664d4a0de9a09f44660b108eb280618d9136d1c86be SHA512 6a395c2a579f4ce8c891261da25c031284904a8d6366733c14a201a948e6744ae0037067f178f799d6134e4be670f1be3582f257414e067de654e8050963b972 diff --git a/net-libs/miniupnpc/files/miniupnpc-2.2.3-drop-which.patch b/net-libs/miniupnpc/files/miniupnpc-2.2.3-drop-which.patch new file mode 100644 index 000000000000..fc578e5e6147 --- /dev/null +++ b/net-libs/miniupnpc/files/miniupnpc-2.2.3-drop-which.patch @@ -0,0 +1,38 @@ +Not upstream b/c already done in 2.3.0: +https://github.com/miniupnp/miniupnp/commit/c88178650e2551226a88cbc87084014781f81184 +https://github.com/miniupnp/miniupnp/commit/d2f558f659da923144f591be418380a7ff8a8677 +--- a/Makefile ++++ b/Makefile +@@ -15,7 +15,7 @@ VERSION = $(shell cat VERSION) + + ifneq (, $(findstring darwin, $(OS))) + JARSUFFIX=mac +-LIBTOOL ?= $(shell which libtool) ++LIBTOOL ?= $(shell command -v libtool) + endif + ifneq (, $(findstring linux, $(OS))) + JARSUFFIX=linux +--- a/testminiwget.sh ++++ b/testminiwget.sh +@@ -24,8 +24,8 @@ EXPECTEDFILE="${TMPD}/expectedfile" + DOWNLOADEDFILE="${TMPD}/downloadedfile" + PORT= + RET=0 +-IPCONFIG=$(which ifconfig) +-IP=$(which ip) ++IPCONFIG=$(command -v ifconfig) ++IP=$(command -v ip) + if [ "$IP" ] ; then + if ! $IP addr | grep inet6 ; then + HAVE_IPV6=no +--- a/updateminiupnpcstrings.sh ++++ b/updateminiupnpcstrings.sh +@@ -26,7 +26,7 @@ if [ -f /etc/debian_version ]; then + OS_VERSION=`cat /etc/debian_version` + fi + # use lsb_release (Linux Standard Base) when available +-LSB_RELEASE=`which lsb_release` ++LSB_RELEASE=`command -v lsb_release` + if [ 0 -eq $? -a -x "${LSB_RELEASE}" ]; then + OS_NAME=`${LSB_RELEASE} -i -s` + OS_VERSION=`${LSB_RELEASE} -r -s` diff --git a/net-libs/miniupnpc/metadata.xml b/net-libs/miniupnpc/metadata.xml index a3c057ba374d..c89549110c7c 100644 --- a/net-libs/miniupnpc/metadata.xml +++ b/net-libs/miniupnpc/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> -</maintainer> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> + <upstream> + <remote-id type="github">miniupnp/miniupnp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild new file mode 100644 index 000000000000..90a944cd2301 --- /dev/null +++ b/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs verify-sig + +DESCRIPTION="UPnP client library and a simple UPnP client" +HOMEPAGE="http://miniupnp.free.fr/" +SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz + verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )" + +LICENSE="BSD" +SLOT="0/17" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="ipv6" + +RDEPEND="" +BDEPEND=" + kernel_linux? ( sys-apps/lsb-release ) + verify-sig? ( sec-keys/openpgp-keys-miniupnp )" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc + +src_prepare() { + local PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-drop-which.patch + ) + default + + local exprs=( + # These bins are not installed, upnpc-static requires building static lib + -e '/EXECUTABLES =/s/ upnpc-static listdevices//' + # Prevent gzipping manpage. + -e '/gzip/d' + # Disable installing the static library + -e '/FILESTOINSTALL =/s/ $(LIBRARY)//' + -e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' + ) + sed -i "${exprs[@]}" Makefile || die +} + +# Upstream cmake causes more trouble than it fixes, +# so we'll just stay with the Makefile for now. + +src_compile() { + tc-export CC AR + emake build/upnpc-shared +} + +src_test() { + emake -j1 HAVE_IPV6=$(usex ipv6) check +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \ + install + + dodoc README Changelog.txt +} |