Clean up build and ebuild so it cross-compiles cleanly, and drop old code no longer needed.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 191 insertions, 15 deletions

diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index 68f71b74bfef..0ef756c77784 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/miniupnpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.32 2014/04/29 19:47:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.33 2014/04/29 20:58:42 vapier Exp $
+
+*miniupnpd-1.8-r1 (29 Apr 2014)
+
+  29 Apr 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/miniupnpd-1.8-build.patch, +miniupnpd-1.8-r1.ebuild:
+  Clean up build and ebuild so it cross-compiles cleanly, and drop old code no
+  longer needed.
 
   29 Apr 2014; Mike Frysinger <vapier@gentoo.org> miniupnpd-1.8.ebuild:
   Add arm love.
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 86a88f9ec1cf..e09ff8bc6844 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX miniupnpd-1.8-build.patch 4134 SHA256 9a78a72e3042af95c0c9cf08bce7ffc29bfa1a3152840da8f5196356ac1f4bbe SHA512 d6ca419177bcc34a2ab57db4bd6143b76f3714ff26ba6f14ae4c013db1fc04212c0c7f046669b4dd2c49390037dcb1365e0f695bd6bafc2a1204c7c181314578 WHIRLPOOL 47f74c89cee5011dc34e5512afbbcf59fec34f43412f92f9495002c2a7386615058d521c6f4e43026c8feefc1bdd36221753907c38aae92a003394f7b24aab9b
 AUX miniupnpd-conf.d 41 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3 SHA512 81aa2dac0643bbd1331549427c438900319adce91928b6bad6f7d470492f6f48e04e4d1af89f961db53fc132a7ff89ea52625441f051afd5a1b48680917f4ff7 WHIRLPOOL 1e7a01c6d9ae398f418fafd9d1fb23842d999635d34ed567b4b21b23e1119e43aba3fae40ea8834e179372fbb94bc74371dd37eb0e99420fa0503810ecfb9088
 AUX miniupnpd-init.d 629 SHA256 2a11cab5615550c1263448f943a62ed3fe4dd647888675588e59146a691f3643 SHA512 a25b2a444cde623fbdbe6fb26c544614cceb2cc1262a0409f40286f4c69b70ba1c05e55815552a12b0624b16ddd48d3e424dad18b278ff9da04bac335feb1d45 WHIRLPOOL 4de02748e8430803a891cc99f5c06601e1a316eca1082ea1ad43e296c9268c40e56a77d557d0ce2a8f7ee395ee0c5d598f2752d90c4e7e9982c197f5714e877f
 DIST miniupnpd-1.8.tar.gz 146679 SHA256 e453a9225a2883e759d09e15c51bb0265b8a019d1132434131e6929fef0076bb SHA512 29103718dfecd49e5ff74187051054820f569b9d4a472a3f76898db5c74684b7af34d5f937b14692b5a4a27fd1efc851841c437bd153e37aa5879ecae36aa401 WHIRLPOOL a0240df1d9770e199c04c5d1c3f8400b498c4b25957e319806532200569171d948eafa76be6871d8366f10344b2b79da1f9686b746e5cb1d3d7c8e85bce84e06
+EBUILD miniupnpd-1.8-r1.ebuild 1297 SHA256 4bea47a9a7f0304a63a7cccc7be6c270d331e776a1771efe1f0c1c43067e5115 SHA512 19d50440d7afbff5a43386ebbe50b68c05d135343a311e10383867715d12df36a0324617b02ecc76b4199fcaf48d52a3caecd4e037ae262368735f8487843dd1 WHIRLPOOL c62bc8282bbadcd67c8e463cccd8c478f750f36fa24278a709d60952ca7b7a75594fbc9442b3245a2ef1abf6662b81b6cc6c8ede96ebd1df25e17758c77a8090
 EBUILD miniupnpd-1.8.ebuild 1578 SHA256 5ef1bbcc83c8afc8e39fc1f6a42f03f3bb1dde3c86583f2d4aba27859c2c749e SHA512 e0e0b26458c65781f0cdb2e8da7128e0ad45a5c2c8884714f702c4d75ba52fe37cd9c05522a7c71b8de677dfe24eaf490e8e9093fe14e848cb2c70cd23c1e605 WHIRLPOOL 6c7a5871d45050125f30ee044f45e3c4f8c7a7a21626f15507afff45193f5c2c1cb3b080c55267a39f17fbf153c84f4f3b4965d4f77f83425efe7c7edf443879
-MISC ChangeLog 7336 SHA256 3b1ff042a16e29b4c1208a5056fb67c96f90e741eb7eecf2f752f6b510af01d4 SHA512 4c156d64960f5c4d73c00b40e4549636aafd79d4f5257d1404df59f8450a8f1b8c44a89d984fc1c889a2ae415098968361dac51f1992f9deb497c6ece5623539 WHIRLPOOL 112eec350a420fd1fa22c207cee0d24e878d1eed52a3e6948983d6c71aeb5dd36fecca57eec572798bc3c706a22da428d3c9774d56610e1f63db4644c1c55514
+MISC ChangeLog 7578 SHA256 aa7b55a4ccb1b92a127751c562470b8872e9ff0af8d86166b79b20e3eb4db2f0 SHA512 a545d9f61821893510f5f79fb104467ef9bcd35fa760af3b8ab9862ab97a3742758fd2f3be3a071597f24a746b6910403e38de548ed5bd73dca6246409582f66 WHIRLPOOL 540a36af3b056e3d6bb4aa0aa22ca774241b41b7e024d376701b403d2e23d609347b7042c3c0589a29fa0fd57dbf2062c381f7044f22dc8b506ef72dea0191b0
 MISC metadata.xml 380 SHA256 cbfddfa590d65e994e3e3c45bdfa0f4d94cb2b446f5cd8815ed93cd1d7fcf727 SHA512 937b31ef4f1881a4e252aec0f7a1064b5151b0a5f8e77f5861c70f3ea2b308f94746ed5409aeb15080070fde56dacc362f1b6b10216a60b79f330854f63e793b WHIRLPOOL 0c387658aa3f54ebc27b813de32899804a8c7d148c02cc1b512d4dd6d838137f45a7b968c700b31e6accd52d203c84e92c7879979386b1c11bf9ca73e0f3eda6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTYAHbAAoJEPGu1DbS6WIAaq8P/0Ctdir0c5xoY2M1pBwX2wu2
-XbCPOTkSvMGmZGLjkhxBu1Te2q7pJiHjDrNDJEVccRsb2KRqXdIjo58Nm46FEUBm
-wfchOMKxxbdF9X2XfTTeECGg2BxOIDX4gqZtGkwFMEqfXt/RL48WyLcgdX0BNv6O
-quI72LQgYMC+dELwonsm9ZADQQE7TiSbcteekFScSTB5yvtN0dTpIkmhNERnLGru
-2aezAAqRVlzcLrsOwo2tyymdCOjYgMBFxRmk1dsio9yd2QUia3KAPDsqUpxiHtmE
-MOarHXZZKbLS7Tt2I80AXti3SR9VQep/8PeNTqs2dsSU9qCxe/iyBO5Vtp2wxw/3
-GVBnto9rBazXrHu6XPY5691QD/G96IEDtZVOLGatF0tXC7VHDOYxlAFx36cbWQOh
-cfhcQv/c1m8uqTb01UQlO/JODj4pSYP5Zx5HecAZ1C1OSbUTAsanGbIo5b/Ri422
-NVGinOgYzLIlVT4nsOuw5DDPgqTjMPAxMiU9Q12cnb2b+zz5FxfliiqKlWmlZ95Z
-b4HQacYiVjvJ86P6aHY4BeWp9iTtm7gCZajNa8PU/ivmxVYyL5c11W1fSwUu8dUK
-mmmsuu/IJP33bldVF2EZRoNMQ3ctjOlX+voJdjj4TnsU3BDOknc35MGAL8VwXVwl
-BxA14ihKKpQFyA0/OqQd
-=wcoT
+iQIcBAEBCAAGBQJTYBKHAAoJEPGu1DbS6WIA4DYP/3f+haSx2PACL0Gu7A/gbxdA
+lveGrg8lXB6EfAFZUIyhxxC+mq/xQ8aD85S5XFhqdkDgnLOb/HV/t4q3a6t+qRwo
+4lsXZjSwllLO9U5paoq8mPfznETvmG+4tXwT7YPHl7WmACuC2niMpSVg3V3716iw
+m8N27r2+Jtl8KbU23B0I6GskRxjjG/crEDIj0zSLMoDipXtP4WrfVOZMsixwvg6E
+mPfTOq9tTDpAJVEGEsFL38g1CUG4fc476QZO3p+eqVmIN0fLREy8ZlO7TGlkxoPR
+p6y6NiJT7Vqw7e5yrcqdai154IgqJxkID0rS8VMqYkgbzzbK+DNYnt6V2wosOSzb
+LsyEDh2nmB7dzHIyayAvN+AQzZAzSETGV5PmnQjFx88ugoTSbrqopnvJWVPxAl0B
+Cc0JWIL3h3G54CGyFKmCty+lh3VvSKMCvXqgucJG86fTMFhpUgkP0PmyBWMH6GWB
+yWyV6fWniTtcx2SinBCOIUHf0EfpFE/haN424EHsY33VVNxHAs37UVtMo8Tr1TAQ
+WBgnix6GkJZ+kxoeSN1Jt26A5t3zW/mvxw8e9faudFsC3CgoxgdWNyA8RxzEs0Mm
+o/abQSvc1UEDlJhHCjQTsm2BBII5KdEdytOpJ+lNUWY5/gHag39xADL376I0cHJO
+akjlZIzavvKoxo/9FwCa
+=buho
 -----END PGP SIGNATURE-----
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.8-build.patch b/net-misc/miniupnpd/files/miniupnpd-1.8-build.patch
new file mode 100644
index 000000000000..007c6a030644
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-1.8-build.patch
@@ -0,0 +1,108 @@
+https://github.com/miniupnp/miniupnp/pull/70
+
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -21,10 +21,9 @@
+ # $ IPTABLESPATH=/path/to/iptables-1.4.1 make -f Makefile.linux
+ #
+ #CFLAGS = -O -g -DDEBUG
+-CFLAGS ?= -Os
+ CFLAGS += -fno-strict-aliasing
+ CFLAGS += -fno-common
+-CFLAGS += -D_GNU_SOURCE
++CPPFLAGS += -D_GNU_SOURCE
+ CFLAGS += -Wall
+ CFLAGS += -Wextra -Wstrict-prototypes -Wdeclaration-after-statement
+ #CFLAGS += -Wno-missing-field-initializers
+@@ -53,69 +52,8 @@ NETFILTEROBJS = netfilter/iptcrdr.o netfilter/iptpinhole.o
+ 
+ ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
+ 
+-ifeq "$(wildcard /etc/gentoo-release )" ""
+-LIBS ?= -liptc
+-else # gentoo
+-# the following is better, at least on gentoo with iptables 1.4.6
+-# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1618
+-# and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183
+-LIBS ?= -lip4tc
+-CFLAGS := -DIPTABLES_143 $(CFLAGS)
+-endif
+-
+-ARCH ?= $(shell uname -m | grep -q "x86_64" && echo 64)
+-ifdef IPTABLESPATH
+-CFLAGS := $(CFLAGS) -I$(IPTABLESPATH)/include/
+-LDFLAGS := $(LDFLAFGS) -L$(IPTABLESPATH)/libiptc/
+-# get iptables version and set IPTABLES_143 macro if needed
+-ifeq ($(TARGET_OPENWRT),)
+-IPTABLESVERSION := $(shell grep "\#define VERSION" $(IPTABLESPATH)/config.h | tr -d \" |cut -d" " -f3 )
+-IPTABLESVERSION1 := $(shell echo $(IPTABLESVERSION) | cut -d. -f1 )
+-IPTABLESVERSION2 := $(shell echo $(IPTABLESVERSION) | cut -d. -f2 )
+-IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 )
+-# test if iptables version >= 1.4.3
+-TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 )
+-ifeq ($(TEST), 1)
+-CFLAGS := $(CFLAGS) -DIPTABLES_143
+-# the following sucks, but works
+-LIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o
+-#LIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a
+-else # ifeq ($(TEST), 1)
+-LIBS = $(IPTABLESPATH)/libiptc/libiptc.a
+-endif # ifeq ($(TEST), 1)
+-else # ($(TARGET_OPENWRT),)
+-# openWRT :
+-# check for system-wide iptables files. Test if iptables version >= 1.4.3
+-# the following test has to be verified :
+-TEST := $(shell test -f /usr/include/iptables/internal.h && grep -q "\#define IPTABLES_VERSION" /usr/include/iptables/internal.h && echo 1)
+-ifeq ($(TEST), 1)
+-CFLAGS := $(CFLAGS) -DIPTABLES_143
+-LIBS = -liptc
+-endif  # ($(TEST), 1)
+-TEST_LIB := $(shell test -f /usr/lib$(ARCH)/libiptc.a && echo 1)
+-ifeq ($(TEST_LIB), 1)
+-LIBS = -liptc /usr/lib$(ARCH)/libiptc.a
+-endif # ($(TEST_LIB), 1)
+-endif # ($(TARGET_OPENWRT),)
+-else # ifdef IPTABLESPATH
+-# IPTABLESPATH not defined
+-# the following test has to be verified :
+-TEST := $(shell test -f /usr/include/xtables.h && grep -q "XTABLES_VERSION_CODE" /usr/include/xtables.h && echo 1)
+-ifeq ($(TEST), 1)
+-CFLAGS := $(CFLAGS) -DIPTABLES_143
+-LIBS = -liptc
+-TESTIP4TC := $(shell test -f /lib/libip4tc.so && echo 1)
+-ifeq ($(TESTIP4TC), 1)
+-LIBS := $(LIBS) -lip4tc
+-endif # ($(TESTIP4TC), 1)
+-TESTIP6TC := $(shell test -f /lib/libip6tc.so && echo 1)
+-ifeq ($(TESTIP6TC), 1)
+-LIBS := $(LIBS) -lip6tc
+-endif # ($(TESTIP6TC), 1)
+-endif # ($(TEST), 1)
+-endif # ifdef IPTABLESPATH
+-
+-LIBS += -lnfnetlink
++LDLIBS = -lip4tc -lnfnetlink
++CPPFLAGS += -DIPTABLES_143
+ 
+ TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
+ 
+@@ -150,8 +88,8 @@ install:	miniupnpd miniupnpd.8 miniupnpd.conf genuuid \
+ 	$(INSTALL) --mode=0644 -b miniupnpd.conf $(ETCINSTALLDIR)
+ 	$(INSTALL) -d $(PREFIX)/etc/init.d
+ 	$(INSTALL) linux/miniupnpd.init.d.script $(PREFIX)/etc/init.d/miniupnpd
++	$(INSTALL) -d $(MANINSTALLDIR)
++	$(INSTALL) --mode=0644 miniupnpd.8 $(MANINSTALLDIR)
+-	$(INSTALL) miniupnpd.8 $(MANINSTALLDIR)
+-	gzip $(MANINSTALLDIR)/miniupnpd.8
+ 
+ # genuuid is using the uuidgen CLI tool which is part of libuuid
+ # from the e2fsprogs
+@@ -162,7 +100,7 @@ else
+ 	sed -i -e "s/^uuid=[-0-9a-f]*/uuid=`($(STAGING_DIR_HOST)/bin/genuuid||$(STAGING_DIR_HOST)/bin/uuidgen||$(STAGING_DIR_HOST)/bin/uuid) 2>/dev/null`/" miniupnpd.conf
+ endif
+ 
+-miniupnpd:	$(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) $(LIBS)
++miniupnpd:	$(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
+ 
+ testupnpdescgen:	$(TESTUPNPDESCGENOBJS)
+ 
diff --git a/net-misc/miniupnpd/miniupnpd-1.8-r1.ebuild b/net-misc/miniupnpd/miniupnpd-1.8-r1.ebuild
new file mode 100644
index 000000000000..1ba6c4ec32d7
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-1.8-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.8-r1.ebuild,v 1.1 2014/04/29 20:58:42 vapier Exp $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+MY_PV=1.8
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=net-firewall/iptables-1.4.6
+	net-libs/libnfnetlink"
+DEPEND="${RDEPEND}
+	sys-apps/util-linux
+	sys-apps/lsb-release"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8-build.patch
+	mv Makefile.linux Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+	export STRIP=true
+
+	emake config.h
+	sed -i -r \
+		-e '/#define ENABLE_LEASEFILE/s:(/[*]|[*]/)::g' \
+		config.h || die
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests we don't run.
+	emake CC="$(tc-getCC)" miniupnpd
+}
+
+src_install() {
+	emake install PREFIX="${ED}"
+
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}