diff options
author | Michał Górny <mgorny@gentoo.org> | 2022-11-26 06:15:50 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2022-11-26 06:15:50 +0100 |
commit | 70a03a877eab63761c7f126bc1ea9616bee0a5ef (patch) | |
tree | 44638ec422db1dc9105a809776f699ef5f0c4ab4 | |
parent | dev-python/miniupnpc: Remove old (diff) | |
download | gentoo-70a03a877eab63761c7f126bc1ea9616bee0a5ef.tar.gz gentoo-70a03a877eab63761c7f126bc1ea9616bee0a5ef.tar.bz2 gentoo-70a03a877eab63761c7f126bc1ea9616bee0a5ef.zip |
net-libs/miniupnpc: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r-- | net-libs/miniupnpc/Manifest | 2 | ||||
-rw-r--r-- | net-libs/miniupnpc/files/miniupnpc-2.2.3-makefile.patch | 54 | ||||
-rw-r--r-- | net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild | 64 |
3 files changed, 0 insertions, 120 deletions
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest index a0c91537c286..6f8bb1688fd0 100644 --- a/net-libs/miniupnpc/Manifest +++ b/net-libs/miniupnpc/Manifest @@ -1,4 +1,2 @@ -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 DIST miniupnpc-2.2.4.tar.gz 102932 BLAKE2B ebfea3fe978280825b7beefb8fe799685a72b0a74c589f5f55c7fde3d8c0d4bbb3d50fa0ff3aed554fa1e24ada0a1ab578328373f0295020415998fe35cde0a0 SHA512 f6515bda86405114016474fef6332c0c09a56b9293cf4391113f549444bab67e7d031af7b94dacff5e7c96d6508527204498c00fb67d6067685ef606b2152595 DIST miniupnpc-2.2.4.tar.gz.sig 543 BLAKE2B 14a1a1979e2d248bb721c66db3e28c1d6f970477e94235bdfa77763d5f9d4c0da42b23d026e861f48cc34a17e009bf8c57aacc648435ec9e31c3c4b6c3347ffb SHA512 476d1a6cfc519f82461bf4d516f73d40cc3ef27886da68d2e805a24d9c4609c53566e258bd2b622e7716f43c81c14bc0f01b189d23b46b87afc3c76d4e6fa23e diff --git a/net-libs/miniupnpc/files/miniupnpc-2.2.3-makefile.patch b/net-libs/miniupnpc/files/miniupnpc-2.2.3-makefile.patch deleted file mode 100644 index 7578bc3f8819..000000000000 --- a/net-libs/miniupnpc/files/miniupnpc-2.2.3-makefile.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ed1dc4bb5cdc4a53963f3eb01089289e30acc5a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 29 Sep 2021 08:28:27 +0200 -Subject: [PATCH] Makefile: fix install rules to account for $(BUILD) - -Fix missing references to $(BUILD) in the install rules, as well -as incorrect shared library symlink name. Otherwise, the 'install' -phase fails either being unable to find files: - - make: *** No rule to make target 'miniupnpc.pc', needed by 'install'. Stop. - -or trying to create the symlink in the wrong subdirectory: - - ln: failed to create symbolic link '/tmp/z/usr/lib/build/libminiupnpc.so': No such file or directory ---- - miniupnpc/Makefile | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/miniupnpc/Makefile b/miniupnpc/Makefile -index 4563b28..11a17f9 100644 ---- a/Makefile -+++ b/Makefile -@@ -162,7 +162,7 @@ PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig - - FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES) - ifeq (, $(findstring amiga, $(OS))) --FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc -+FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc - endif - - -@@ -251,15 +251,15 @@ install: updateversion $(FILESTOINSTALL) - $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB) - ifeq (, $(findstring amiga, $(OS))) - $(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME) -- ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY) -+ ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(notdir $(SHAREDLIBRARY)) - $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR) -- $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR) -+ $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR) - endif - $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN) - ifneq (, $(findstring amiga, $(OS))) -- $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc -+ $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc - else -- $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc -+ $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc - endif - $(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip - ifeq (, $(findstring amiga, $(OS))) --- -2.33.0 - diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild deleted file mode 100644 index d4182dc8183b..000000000000 --- a/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# 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 -} |