Initial import, bug #241120, thank Michał Górny and Nikoli for this job.

(Portage version: 2.1.9.5/cvs/Linux x86_64)

6 files changed, 198 insertions, 0 deletions

diff --git a/net-libs/miniupnpc/ChangeLog b/net-libs/miniupnpc/ChangeLog
new file mode 100644
index 000000000000..9ee7193ad417
--- /dev/null
+++ b/net-libs/miniupnpc/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for net-libs/miniupnpc
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.1 2010/09/15 08:40:36 pva Exp $
+
+*miniupnpc-1.4.20100609 (15 Sep 2010)
+
+  15 Sep 2010; Peter Volkov <pva@gentoo.org>
+  +files/0003-Move-non-used-and-non-installed-test-executables-to-.patch,
+  +miniupnpc-1.4.20100609.ebuild,
+  +files/0004-Move-minixml-validation-test-to-check-target.patch,
+  +files/miniupnpc-Respect-LDFLAGS.patch, +metadata.xml:
+  Initial import, bug #241120, thank Michał Górny and Nikoli for this job.
+
diff --git a/net-libs/miniupnpc/files/0003-Move-non-used-and-non-installed-test-executables-to-.patch b/net-libs/miniupnpc/files/0003-Move-non-used-and-non-installed-test-executables-to-.patch
new file mode 100644
index 000000000000..dd73b134d459
--- /dev/null
+++ b/net-libs/miniupnpc/files/0003-Move-non-used-and-non-installed-test-executables-to-.patch
@@ -0,0 +1,41 @@
+From 154d2f3e29e221e9bb66582ba5defa4c269d75bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
+Date: Tue, 7 Sep 2010 22:48:13 +0200
+Subject: [PATCH 3/6] Move non-used and non-installed test executables to everything target.
+
+---
+ Makefile |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 427315c..199be58 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,8 +55,8 @@ else
+   SONAME = $(SHAREDLIBRARY).$(APIVERSION)
+ endif
+ 
+-EXECUTABLES = upnpc-static \
+-              testminixml minixmlvalid testupnpreplyparse \
++EXECUTABLES = upnpc-static
++EXECUTABLES_ADDTESTS = testminixml minixmlvalid testupnpreplyparse \
+ 			  testigddescparse testminiwget
+ 
+ TESTMINIXMLOBJS = minixml.o igd_desc_parse.o testminixml.o
+@@ -89,10 +89,12 @@ FILESTOINSTALL := $(FILESTOINSTALL) $(SHAREDLIBRARY)
+ endif
+ 
+ 
+-.PHONY:	install clean depend all installpythonmodule
++.PHONY:	install clean depend all everything installpythonmodule
+ 
+ all:	validateminixml $(LIBRARY) $(EXECUTABLES)
+ 
++everything:	all $(EXECUTABLES_ADDTESTS)
++
+ pythonmodule:	$(LIBRARY) miniupnpcmodule.c setup.py
+ 	python setup.py build
+ 	touch $@
+-- 
+1.7.2.2
+
diff --git a/net-libs/miniupnpc/files/0004-Move-minixml-validation-test-to-check-target.patch b/net-libs/miniupnpc/files/0004-Move-minixml-validation-test-to-check-target.patch
new file mode 100644
index 000000000000..26627ae509bb
--- /dev/null
+++ b/net-libs/miniupnpc/files/0004-Move-minixml-validation-test-to-check-target.patch
@@ -0,0 +1,31 @@
+From 5aafd1a45c10dc9c06cf3655ec488339d292e58f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
+Date: Tue, 7 Sep 2010 22:50:37 +0200
+Subject: [PATCH 4/6] Move minixml validation test to 'check' target.
+
+---
+ Makefile |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 199be58..85b9737 100644
+--- a/Makefile
++++ b/Makefile
+@@ -89,9 +89,12 @@ FILESTOINSTALL := $(FILESTOINSTALL) $(SHAREDLIBRARY)
+ endif
+ 
+ 
+-.PHONY:	install clean depend all everything installpythonmodule
++.PHONY:	install clean depend all check everything installpythonmodule \
++	validateminixml
+ 
+-all:	validateminixml $(LIBRARY) $(EXECUTABLES)
++all:	$(LIBRARY) $(EXECUTABLES)
++
++check:	validateminixml
+ 
+ everything:	all $(EXECUTABLES_ADDTESTS)
+ 
+-- 
+1.7.2.2
+
diff --git a/net-libs/miniupnpc/files/miniupnpc-Respect-LDFLAGS.patch b/net-libs/miniupnpc/files/miniupnpc-Respect-LDFLAGS.patch
new file mode 100644
index 000000000000..c62a08a699a2
--- /dev/null
+++ b/net-libs/miniupnpc/files/miniupnpc-Respect-LDFLAGS.patch
@@ -0,0 +1,36 @@
+From bbd74061406e1972820c24982a39c4f1770d0ed5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
+Date: Tue, 7 Sep 2010 22:34:20 +0200
+Subject: [PATCH 2/6] Respect LDFLAGS.
+
+---
+ Makefile |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index af257a8..427315c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -141,16 +141,16 @@ $(LIBRARY):	$(LIBOBJS)
+ 
+ $(SHAREDLIBRARY):	$(LIBOBJS)
+ ifeq ($(OS), Darwin)
+-	$(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^ 
++	$(CC) -dynamiclib $(LDFLAGS) -Wl,-install_name,$(SONAME) -o $@ $^ 
+ else
+-	$(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^
++	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) -o $@ $^
+ endif
+ 
+ upnpc-static:	upnpc.o $(LIBRARY) $(LDLIBS)
+-	$(CC) -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^
+ 
+ upnpc-shared:	upnpc.o $(SHAREDLIBRARY) $(LDLIBS)
+-	$(CC) -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^
+ 
+ testminixml:	$(TESTMINIXMLOBJS)
+ 
+-- 
+1.7.2.2
diff --git a/net-libs/miniupnpc/metadata.xml b/net-libs/miniupnpc/metadata.xml
new file mode 100644
index 000000000000..87cc39f64fd9
--- /dev/null
+++ b/net-libs/miniupnpc/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+	<email>pva@gentoo.org</email>
+	<name>Peter Volkov</name>
+</maintainer>
+<maintainer>
+  <email>nikoli@lavabit.com</email>
+  <name>Nikoli</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-libs/miniupnpc/miniupnpc-1.4.20100609.ebuild b/net-libs/miniupnpc/miniupnpc-1.4.20100609.ebuild
new file mode 100644
index 000000000000..02620098611b
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-1.4.20100609.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.4.20100609.ebuild,v 1.1 2010/09/15 08:40:36 pva Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="python? 2"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils 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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python static-libs"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-Respect-LDFLAGS.patch"
+	epatch "${FILESDIR}/0003-Move-non-used-and-non-installed-test-executables-to-.patch"
+	epatch "${FILESDIR}/0004-Move-minixml-validation-test-to-check-target.patch"
+
+	sed \
+		-e 's/^CFLAGS ?= -O -Wall /CFLAGS += /' \
+		-i Makefile
+
+	if use !static-libs; then
+		sed \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(INSTALLDIRLIB)/d' \
+			-i Makefile
+	fi
+
+	use python && distutils_src_prepare
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die
+
+	use python && distutils_src_compile
+}
+
+src_install() {
+	emake \
+		PREFIX="${D}" \
+		INSTALLDIRLIB="${D}usr/$(get_libdir)" \
+		install || die
+
+	dodoc README Changelog.txt || die
+	doman man3/* || die
+
+	use python && distutils_src_install
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}