]> Pileus Git - ~andy/sunrise/commitdiff
net-misc/miniupnpc: Moved to gx86 as net-libs/miniupnpc.
authorMichał Górny <mgorny@gentoo.org>
Wed, 15 Sep 2010 17:16:27 +0000 (17:16 +0000)
committerMichał Górny <mgorny@gentoo.org>
Wed, 15 Sep 2010 17:16:27 +0000 (17:16 +0000)
svn path=/sunrise/; revision=11315

net-misc/miniupnpc/ChangeLog [deleted file]
net-misc/miniupnpc/Manifest [deleted file]
net-misc/miniupnpc/files/0001-Append-miniupnpc-specific-flags-to-CFLAGS.patch [deleted file]
net-misc/miniupnpc/files/0002-Respect-LDFLAGS.patch [deleted file]
net-misc/miniupnpc/files/0003-Move-non-used-and-non-installed-test-executables-to-.patch [deleted file]
net-misc/miniupnpc/files/0004-Move-minixml-validation-test-to-check-target.patch [deleted file]
net-misc/miniupnpc/files/0005-Build-upnpc-static-only-on-AmigaOS-or-everything-tar.patch [deleted file]
net-misc/miniupnpc/files/0006-Support-disabling-static-library-install-through-LIB.patch [deleted file]
net-misc/miniupnpc/metadata.xml [deleted file]
net-misc/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild [deleted file]
profiles/updates/3Q-2010

diff --git a/net-misc/miniupnpc/ChangeLog b/net-misc/miniupnpc/ChangeLog
deleted file mode 100644 (file)
index db5b8e0..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# ChangeLog for net-misc/miniupnpc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*miniupnpc-1.4.20100609-r1 (07 Sep 2010)
-
-  07 Sep 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
-  +files/0001-Append-miniupnpc-specific-flags-to-CFLAGS.patch,
-  -miniupnpc-1.4.20100609.ebuild, +files/0002-Respect-LDFLAGS.patch,
-  +miniupnpc-1.4.20100609-r1.ebuild,
-  +files/0003-Move-non-used-and-non-installed-test-executables-to-.patch,
-  -files/miniupnpc-1.4.20100609-cflags.diff,
-  +files/0004-Move-minixml-validation-test-to-check-target.patch,
-  +files/0005-Build-upnpc-static-only-on-AmigaOS-or-everything-tar.patch,
-  +files/0006-Support-disabling-static-library-install-through-LIB.patch:
-  Introduce USE=static-libs, use clean libdir. Thanks to Nikoli for the
-  initial patch. Additionally, respect LDFLAGS and do not build the static
-  executables.
-
-*miniupnpc-1.4.20100609 (20 Aug 2010)
-
-  20 Aug 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
-  -miniupnpc-1.4.ebuild, +miniupnpc-1.4.20100609.ebuild,
-  +files/miniupnpc-1.4.20100609-cflags.diff,
-  -files/miniupnpc-1.4-cflags.diff:
-  Version bump.
-
-  30 May 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
-  miniupnpc-1.4.ebuild:
-  Export CC for make, support building Python module.
-
-  10 Dec 2009; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
-  -miniupnpc-1.2.ebuild, +miniupnpc-1.4.ebuild,
-  +files/miniupnpc-1.4-cflags.diff:
-  Version bump.
-
-  04 Aug 2009; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
-  miniupnpc-1.2.ebuild:
-  Adding ~amd64 to KEYWORDS.
-
-  12 Nov 2008; Alexander Krastelev (wirefa11) <alex@netrc.net>
-  +miniupnpc-1.2.ebuild, +metadata.xml:
-  New Ebuild for bug 241120 thanks to Tommy[D]
-
diff --git a/net-misc/miniupnpc/Manifest b/net-misc/miniupnpc/Manifest
deleted file mode 100644 (file)
index 3bc760b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 0001-Append-miniupnpc-specific-flags-to-CFLAGS.patch 677 RMD160 f4995183ac7ec7be7943bf6dac32c0a11873d618 SHA1 687a20f03ea5f8bc0e20aca2022a4fb30dcf5e88 SHA256 3ca5b84504241ab3375cdf694e0445b80be44bfdfbf775d30ad4e1864401d3a1
-AUX 0002-Respect-LDFLAGS.patch 969 RMD160 15d62d7d57c968bf73deb2e521fcc4e7833b616f SHA1 df8894c8ea3b850849a9048ccd4ba3387f11b34a SHA256 96f5d54945565fd5da17534d34a6389ffb5372fa77399255e8415901fc254600
-AUX 0003-Move-non-used-and-non-installed-test-executables-to-.patch 1202 RMD160 845f3c63a0a59ac80025c19f0fe5ffdc9f1791e0 SHA1 d9be9dff0b1796b08c2441cf1eae011cad4cb473 SHA256 a89e30f8f422f924c627403eb7fc0511ad7e637d4efe56116f39ecfb8eeb5893
-AUX 0004-Move-minixml-validation-test-to-check-target.patch 822 RMD160 633cd250dce2ff1c08290ecbd737ff77eacf9a4f SHA1 0f31ad648274a6c8d8fb928d8a72e86562e1e828 SHA256 e884a6c3a7d855be57d4774277a437c50efa5817e4a84142606ed332a0f0a5e6
-AUX 0005-Build-upnpc-static-only-on-AmigaOS-or-everything-tar.patch 1361 RMD160 5751733f191857d85e75a7e32ca991a5baf89376 SHA1 bb13bc8cad524534502d43a93590bd0ed6555bb0 SHA256 154970fb2dfec2bd354d532b4eb44779ed6ac623b4cc68237431048d7351ea76
-AUX 0006-Support-disabling-static-library-install-through-LIB.patch 857 RMD160 a994e2f70004672fb2afac3208213d84f7306b0d SHA1 e166395d97f39818400e3df89665bc849ee9834a SHA256 cb620b983113e8fd4fca1c7b602b8fa17e411eda8c762b7c8dcb3cfda33f5154
-DIST miniupnpc-1.4.20100609.tar.gz 50390 RMD160 75b9b147a6595da1f0336a946ece56412ca5ea38 SHA1 470c7ecd2b2c5c4c79fae4e632e52c02e0bd35f0 SHA256 f2708b8a98bb996ce0bb6dbc91b9f13c7796290f3996093ebdcc82e173c33f0e
-EBUILD miniupnpc-1.4.20100609-r1.ebuild 1420 RMD160 e3fd7ba0fdf13da15d4cbb6281b87a39ce5d7afa SHA1 2d7d6d7a3b3383261c09111b694c2929536877fd SHA256 1e5d8ade4a1e8130d1104f3faa1ca9ddd19e0edd368c888e37e5ed88424ef8b5
-MISC ChangeLog 1725 RMD160 67c60b1433ec894713e02809fe20e0cda140f8da SHA1 a3a6aca96cc94ea94bc141d68599522237f6579e SHA256 94d6a93b1a07117d4d6621d30d6e5fd18480a03fa5d66a897a2dccaab92ad7dc
-MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyGrKgACgkQnGSe5QXeB7s4WQCeLju8CmLeU9slQ9l6lqf2xFEc
-/mcAn3z+YWu/l4+GmzS7TVYG/9XIbP4a
-=P89q
------END PGP SIGNATURE-----
diff --git a/net-misc/miniupnpc/files/0001-Append-miniupnpc-specific-flags-to-CFLAGS.patch b/net-misc/miniupnpc/files/0001-Append-miniupnpc-specific-flags-to-CFLAGS.patch
deleted file mode 100644 (file)
index 0364f99..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From 80ca7351a20286aff2006300a837933633a87447 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:33:11 +0200
-Subject: [PATCH 1/6] Append miniupnpc-specific flags to CFLAGS.
-
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ca59031..af257a8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@ OS = $(shell uname -s)
- CC ?= gcc
- #AR = gar
- #CFLAGS = -O -Wall -g -DDEBUG
--CFLAGS ?= -O -Wall -DNDEBUG -DMINIUPNPC_SET_SOCKET_TIMEOUT
-+CFLAGS += -Wall -DNDEBUG -DMINIUPNPC_SET_SOCKET_TIMEOUT
- INSTALL = install
- SH = /bin/sh
- JAVA = java
--- 
-1.7.2.2
-
diff --git a/net-misc/miniupnpc/files/0002-Respect-LDFLAGS.patch b/net-misc/miniupnpc/files/0002-Respect-LDFLAGS.patch
deleted file mode 100644 (file)
index cdff672..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-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-misc/miniupnpc/files/0003-Move-non-used-and-non-installed-test-executables-to-.patch b/net-misc/miniupnpc/files/0003-Move-non-used-and-non-installed-test-executables-to-.patch
deleted file mode 100644 (file)
index dd73b13..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-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-misc/miniupnpc/files/0004-Move-minixml-validation-test-to-check-target.patch b/net-misc/miniupnpc/files/0004-Move-minixml-validation-test-to-check-target.patch
deleted file mode 100644 (file)
index 26627ae..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-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-misc/miniupnpc/files/0005-Build-upnpc-static-only-on-AmigaOS-or-everything-tar.patch b/net-misc/miniupnpc/files/0005-Build-upnpc-static-only-on-AmigaOS-or-everything-tar.patch
deleted file mode 100644 (file)
index 79947ba..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From a3bd74fbc4fa8c5b45db1d0cf6afb08f812509c3 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 23:03:20 +0200
-Subject: [PATCH 5/6] Build upnpc-static only on AmigaOS or everything target.
-
----
- Makefile |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 85b9737..a201c9b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,7 @@ else
-   SONAME = $(SHAREDLIBRARY).$(APIVERSION)
- endif
--EXECUTABLES = upnpc-static
-+EXECUTABLES_STATIC = upnpc-static
- EXECUTABLES_ADDTESTS = testminixml minixmlvalid testupnpreplyparse \
-                         testigddescparse testminiwget
-@@ -72,9 +72,11 @@ TESTIGDDESCPARSE = testigddescparse.o igd_desc_parse.o minixml.o \
-                    minisoap.o connecthostport.o
- ifneq ($(OS), AmigaOS)
--EXECUTABLES := $(EXECUTABLES) upnpc-shared
-+EXECUTABLES = upnpc-shared
- TESTMINIWGETOBJS := $(TESTMINIWGETOBJS) minissdpc.o
- TESTIGDDESCPARSE := $(TESTIGDDESCPARSE) minissdpc.o
-+else
-+EXECUTABLES := $(EXECUTABLES_STATIC)
- endif
- # install directories
-@@ -96,7 +98,7 @@ all: $(LIBRARY) $(EXECUTABLES)
- check:        validateminixml
--everything:   all $(EXECUTABLES_ADDTESTS)
-+everything:   all $(EXECUTABLES_ADDTESTS) $(EXECUTABLES_STATIC)
- pythonmodule: $(LIBRARY) miniupnpcmodule.c setup.py
-       python setup.py build
--- 
-1.7.2.2
-
diff --git a/net-misc/miniupnpc/files/0006-Support-disabling-static-library-install-through-LIB.patch b/net-misc/miniupnpc/files/0006-Support-disabling-static-library-install-through-LIB.patch
deleted file mode 100644 (file)
index bc13bef..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From 332ad8565374f67e380f19168f8586bf57e01ff7 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 23:05:49 +0200
-Subject: [PATCH 6/6] Support disabling static library install through LIBRARY=.
-
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a201c9b..b3007e5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -123,7 +123,7 @@ install:   $(FILESTOINSTALL)
-       $(INSTALL) -d $(INSTALLDIRINC)
-       $(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC)
-       $(INSTALL) -d $(INSTALLDIRLIB)
--      $(INSTALL) -m 644 $(LIBRARY) $(INSTALLDIRLIB)
-+      [ -z "$(LIBRARY)" ] || $(INSTALL) -m 644 $(LIBRARY) $(INSTALLDIRLIB)
- ifneq ($(OS), AmigaOS)
-       $(INSTALL) -m 644 $(SHAREDLIBRARY) $(INSTALLDIRLIB)/$(SONAME)
-       ln -fs $(SONAME) $(INSTALLDIRLIB)/$(SHAREDLIBRARY)
--- 
-1.7.2.2
-
diff --git a/net-misc/miniupnpc/metadata.xml b/net-misc/miniupnpc/metadata.xml
deleted file mode 100644 (file)
index e6233b5..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/net-misc/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild b/net-misc/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild
deleted file mode 100644 (file)
index c3d2318..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="python? 2"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils multilib python toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="python static-libs"
-
-src_prepare() {
-       use python && distutils_src_prepare
-
-       epatch \
-               "${FILESDIR}"/0001-Append-miniupnpc-specific-flags-to-CFLAGS.patch \
-               "${FILESDIR}"/0002-Respect-LDFLAGS.patch \
-               "${FILESDIR}"/0003-Move-non-used-and-non-installed-test-executables-to-.patch \
-               "${FILESDIR}"/0004-Move-minixml-validation-test-to-check-target.patch \
-               "${FILESDIR}"/0005-Build-upnpc-static-only-on-AmigaOS-or-everything-tar.patch \
-               "${FILESDIR}"/0006-Support-disabling-static-library-install-through-LIB.patch
-}
-
-src_compile() {
-       tc-export CC
-       # We need the static library for the Python module.
-       emake \
-               $(use static-libs || use python || printf 'LIBRARY=') || die
-       use python && distutils_src_compile
-}
-
-src_install() {
-       emake \
-               $(use static-libs || printf 'LIBRARY=') \
-               PREFIX="${D}" \
-               INSTALLDIRLIB="${D}"usr/$(get_libdir) \
-               install || die
-       dodoc README Changelog.txt || die
-       doman man3/* || die
-       use python && distutils_src_install
-}
index 507b835dec77796284f51e170efbe6578e563937..9a4b6b484da798294982ceba6e775c050d65d06c 100644 (file)
@@ -1 +1,2 @@
 move sys-apps/pe-format2 dev-dotnet/pe-format
+move net-misc/miniupnpc net-libs/miniupnpc