[gentoo-commits] dev/blueness:master commit in: net-libs/libnatpmp/, net-libs/libnatpmp/files/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     0e05b24607d8bc2113d7277b371cb5e54bdec125
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 14:12:17 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 14:12:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=0e05b246

net-libs/libnatpmp: moved to tree

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 net-libs/libnatpmp/ChangeLog                     |   35 ----------
 net-libs/libnatpmp/Manifest                      |   17 -----
 net-libs/libnatpmp/files/remove-static-lib.patch |   73 ----------------------
 net-libs/libnatpmp/files/respect-FLAGS.patch     |   24 -------
 net-libs/libnatpmp/files/respect-libdir.patch    |   20 ------
 net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild  |   36 -----------
 net-libs/libnatpmp/metadata.xml                  |    8 ---
 7 files changed, 0 insertions(+), 213 deletions(-)

diff --git a/net-libs/libnatpmp/ChangeLog b/net-libs/libnatpmp/ChangeLog
deleted file mode 100644
index 37d2868..0000000
--- a/net-libs/libnatpmp/ChangeLog
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-*libnatpmp-20110808-r1 (17 Dec 2011)
-
-  17 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
-  +libnatpmp-20110808-r1.ebuild, +files/remove-static-lib.patch,
-  +files/respect-FLAGS.patch, +files/respect-libdir.patch, +metadata.xml:
-  Addressing bugs 395039, 395041, 395043
-
-*libnatpmp-20110808 (09 Aug 2011)
-
-  09 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
-  +libnatpmp-20110808.ebuild:
-  Version bump
-
-  03 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
-  libnatpmp-20110715-r1.ebuild:
-  Fix HOMEPAGE
-
-  23 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
-  -libnatpmp-20110715.ebuild, libnatpmp-20110715-r1.ebuild:
-  Removed old version and added docs
-
-*libnatpmp-20110715-r1 (23 Jul 2011)
-
-  23 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
-  +libnatpmp-20110715-r1.ebuild, +files/remove-static-lib.patch:
-  Added USE="static-libs"
-
-*libnatpmp-20110715 (22 Jul 2011)
-
-  22 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
-  +libnatpmp-20110715.ebuild, +files/respect-FLAGS.patch, +metadata.xml:
-  Initial commit to satisfy tor's net-pmp USE flag
-

diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
deleted file mode 100644
index 42c1915..0000000
--- a/net-libs/libnatpmp/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX remove-static-lib.patch 2174 RMD160 11dffa0ac65728c4cb25d91d10fa274ccf95de0e SHA1 5bc4d77a7adc6506478e708d850f891359faa471 SHA256 8cf17c151af16d23dd3c85d39456c0029d4a6ce206b247cd237d24577632fc3b
-AUX respect-FLAGS.patch 685 RMD160 5359179f77266a167d13e0b00d8c1afa589760f4 SHA1 d17f5565525ad28576d91d8effd3bb8193c0dac3 SHA256 6a55e769a9a25b52f97a3d1489d4bc35d14a02d2d7126f6ac313a39f5fb4f516
-AUX respect-libdir.patch 642 RMD160 218635eec2c26316410998f46a3aa21e9e39ca32 SHA1 1302cda153daa4d0c589832e64eb51711cf57f5e SHA256 9472836febef37193f38e4fef879cbccb4185b7e037b2c89f930a68e5c1c9432
-DIST libnatpmp-20110808.tar.gz 17762 RMD160 265e04f2282bfc4a48c1e797591478338a33d14f SHA1 3763ab0e612710ce7348e7e37bb7c1b5ac7932e3 SHA256 2c306719c8f77027c51161e90fb7fa72e1eb22475288ea6867a133316e944a69
-EBUILD libnatpmp-20110808-r1.ebuild 912 RMD160 c9f181ec90517be53ed9932d563a25ebab185d91 SHA1 d5cfeb199fbae0b3dc4ed43cafad3ab9a72de334 SHA256 f7a6f7311b194feeb9b1212b0e5f89f1aff0d8d8fefe16e5c8a68b35d34de135
-MISC ChangeLog 1068 RMD160 56013b598ea3ed87ea73cb20b1bcc1d6093dffeb SHA1 3e9962a165b05ff2e3b055eb392ced77ffddaabf SHA256 43470fe4ae62241a8771b139ac1b2926db52ffd86da559a989a2387a349811f1
-MISC metadata.xml 238 RMD160 6401efde1642c40e91d5a41a966b9dbff0512eab SHA1 9751c07b46aec3d4f96133758cdd23a3e2ca2835 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk7shg4ACgkQl5yvQNBFVTVMvwCcCvUCzWvJ+h7P4qP6GWYw/CTC
-KhIAmgOyF+7h0F4+cIAgDhksVk1h7PdS
-=hxJj
------END PGP SIGNATURE-----

diff --git a/net-libs/libnatpmp/files/remove-static-lib.patch b/net-libs/libnatpmp/files/remove-static-lib.patch
deleted file mode 100644
index b24aae4..0000000
--- a/net-libs/libnatpmp/files/remove-static-lib.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur libnatpmp-20110715.orig//Makefile libnatpmp-20110715/Makefile
---- libnatpmp-20110715.orig//Makefile	2011-07-22 14:57:49.000000000 -0400
-+++ libnatpmp-20110715/Makefile	2011-07-22 14:59:41.000000000 -0400
-@@ -21,7 +21,6 @@
- 
- OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o
- 
--STATICLIB = libnatpmp.a
- ifeq ($(OS), Darwin)
-   SHAREDLIB = libnatpmp.dylib
-   SONAME = $(basename $(SHAREDLIB)).$(APIVERSION).dylib
-@@ -33,7 +32,7 @@
- 
- HEADERS = natpmp.h
- 
--EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
-+EXECUTABLES = testgetgateway natpmpc-shared
- 
- INSTALLPREFIX ?= $(PREFIX)/usr
- INSTALLDIRINC = $(INSTALLPREFIX)/include
-@@ -45,9 +44,9 @@
- 
- .PHONY:	all clean depend install cleaninstall installpythonmodule
- 
--all: $(STATICLIB) $(SHAREDLIB) $(EXECUTABLES)
-+all: $(SHAREDLIB) $(EXECUTABLES)
- 
--pythonmodule: $(STATICLIB) libnatpmpmodule.c setup.py
-+pythonmodule: libnatpmpmodule.c setup.py
- 	python setup.py build
- 	touch $@
- 
-@@ -55,18 +54,17 @@
- 	python setup.py install
- 
- clean:
--	$(RM) $(OBJS) $(EXECUTABLES) $(STATICLIB) $(SHAREDLIB)
-+	$(RM) $(OBJS) $(EXECUTABLES) $(SHAREDLIB)
- 	$(RM) pythonmodule
- 	$(RM) -r build/ dist/
- 
- depend:
- 	makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null
- 
--install:	$(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared
-+install:	$(HEADERS) $(SHAREDLIB) natpmpc-shared
- 	$(INSTALL) -d $(INSTALLDIRINC)
- 	$(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC)
- 	$(INSTALL) -d $(INSTALLDIRLIB)
--	$(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB)
- 	$(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
- 	$(INSTALL) -d $(INSTALLDIRBIN)
- 	$(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc
-@@ -76,19 +74,12 @@
- 	$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
- 	$(RM) $(INSTALLDIRLIB)/$(SONAME)
- 	$(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
--	$(RM) $(INSTALLDIRLIB)/$(STATICLIB)
- 
- testgetgateway:	testgetgateway.o getgateway.o
- 
--natpmpc-static:	natpmpc.o $(STATICLIB)
--	$(CC) $(LDFLAGS) -o $@ $^
--
- natpmpc-shared:	natpmpc.o $(SHAREDLIB)
- 	$(CC) $(LDFLAGS) -o $@ $^
- 
--$(STATICLIB):	$(LIBOBJS)
--	$(AR) crs $@ $?
--
- $(SHAREDLIB):	$(LIBOBJS)
- ifeq ($(OS), Darwin)
- 	$(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^

diff --git a/net-libs/libnatpmp/files/respect-FLAGS.patch b/net-libs/libnatpmp/files/respect-FLAGS.patch
deleted file mode 100644
index 6de270a..0000000
--- a/net-libs/libnatpmp/files/respect-FLAGS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur libnatpmp-20110808.1//Makefile libnatpmp-20110808/Makefile
---- libnatpmp-20110808.1//Makefile	2011-06-22 18:28:00.000000000 -0400
-+++ libnatpmp-20110808/Makefile	2011-12-17 06:41:21.000000000 -0500
-@@ -4,14 +4,17 @@
- # (c) 2007-2011 Thomas Bernard
- # http://miniupnp.free.fr/libnatpmp.html
- 
-+GENTOO_CFLAGS := $(CFLAGS)
-+GENTOO_LDFLAGS := $(LDFLAGS)
-+
- OS = $(shell uname -s)
--CC = gcc
-+CC ?= gcc
- INSTALL = install
- 
- # APIVERSION is used in soname
- APIVERSION = 1
--#LDFLAGS = -Wl,--no-undefined
--CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR
-+LDFLAGS = $(GENTOO_LDFLAGS)
-+CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR $(GENTOO_CFLAGS)
- 
- LIBOBJS = natpmp.o getgateway.o
- 

diff --git a/net-libs/libnatpmp/files/respect-libdir.patch b/net-libs/libnatpmp/files/respect-libdir.patch
deleted file mode 100644
index f56155a..0000000
--- a/net-libs/libnatpmp/files/respect-libdir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur libnatpmp-20110808.orig//Makefile libnatpmp-20110808/Makefile
---- libnatpmp-20110808.orig//Makefile	2011-12-17 06:58:13.000000000 -0500
-+++ libnatpmp-20110808/Makefile	2011-12-17 06:58:54.000000000 -0500
-@@ -6,6 +6,7 @@
- 
- GENTOO_CFLAGS := $(CFLAGS)
- GENTOO_LDFLAGS := $(LDFLAGS)
-+GENTOO_LIBDIR ?= "lib"
- 
- OS = $(shell uname -s)
- CC ?= gcc
-@@ -36,7 +37,7 @@
- 
- INSTALLPREFIX ?= $(PREFIX)/usr
- INSTALLDIRINC = $(INSTALLPREFIX)/include
--INSTALLDIRLIB = $(INSTALLPREFIX)/lib
-+INSTALLDIRLIB = $(INSTALLPREFIX)/$(GENTOO_LIBDIR)
- INSTALLDIRBIN = $(INSTALLPREFIX)/bin
- 
- .PHONY:	all clean depend install cleaninstall installpythonmodule

diff --git a/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
deleted file mode 100644
index 77025a2..0000000
--- a/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnatpmp/libnatpmp-20110808.ebuild,v 1.1 2011/08/09 11:52:18 blueness Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="An alternative protocol to UPnP IGD specification."
-HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
-SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS.patch
-	epatch "${FILESDIR}"/respect-libdir.patch
-	use !static-libs && epatch "${FILESDIR}"/remove-static-lib.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
-
-	dodoc Changelog.txt README
-	doman natpmpc.1
-}

diff --git a/net-libs/libnatpmp/metadata.xml b/net-libs/libnatpmp/metadata.xml
deleted file mode 100644
index 1e75873..0000000
--- a/net-libs/libnatpmp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-</pkgmetadata>