* [gentoo-commits] dev/blueness:master commit in: dev-python/libnatpmp/, dev-python/libnatpmp/files/
@ 2011-08-03 11:20 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2011-08-03 11:20 UTC (permalink / raw
To: gentoo-commits
commit: d26c6f43ce44592702e93e9cbb0bb1900ec8c32d
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 3 11:20:05 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 11:20:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=d26c6f43
dev-python/libnatpmp: Fix build against system library
(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
dev-python/libnatpmp/ChangeLog | 4 +++
dev-python/libnatpmp/Manifest | 11 ++++----
.../libnatpmp/files/link-against-system-lib.patch | 12 +++++++++
dev-python/libnatpmp/libnatpmp-20110715.ebuild | 25 +++++++------------
4 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/dev-python/libnatpmp/ChangeLog b/dev-python/libnatpmp/ChangeLog
index d185eb2..e2fdc67 100644
--- a/dev-python/libnatpmp/ChangeLog
+++ b/dev-python/libnatpmp/ChangeLog
@@ -1,5 +1,9 @@
+ 03 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+ libnatpmp-20110715.ebuild, +files/link-against-system-lib.patch:
+ Fix build against system library
+
*libnatpmp-20110715 (03 Aug 2011)
03 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
diff --git a/dev-python/libnatpmp/Manifest b/dev-python/libnatpmp/Manifest
index a484454..e365bba 100644
--- a/dev-python/libnatpmp/Manifest
+++ b/dev-python/libnatpmp/Manifest
@@ -1,14 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX link-against-system-lib.patch 536 RMD160 34cec3a3eb972468c2329d40b4e421cfc60f4a30 SHA1 ebade41308e57bfa0690d854045287ea12d7687c SHA256 47809598d8d7c3b407785de3a27b99d4a3463be52706da7df55ce51a980b9658
DIST libnatpmp-20110715.tar.gz 17943 RMD160 df9c656fdaa2782863670c334c840ff2ceab3e6b SHA1 87338bbbe07c627d33c5935b92b9f2c7622fe885 SHA256 853364242b2ad21ada841de484ad702f609d822690816a0c04a324f5963bed58
-EBUILD libnatpmp-20110715.ebuild 874 RMD160 f8568dd685788354cafd8e3c45da3f4224ffa37d SHA1 931b00f43ba25af4ff186af770ab980c0af93852 SHA256 c7aa43cde3b78ea31a903639cdea02bc49b32cf63313f118eb318e6fcc70be63
-MISC ChangeLog 155 RMD160 1159c37412f1db55405fd34a4e960f696a81f4e6 SHA1 fdafaf7ef0ef1d6d408e8be71ee99fda3e6df21e SHA256 1e9430f6e7abe9bc32b4278f3ffeec1df44595a7eefbcbd55c2553f079c4e7d8
+EBUILD libnatpmp-20110715.ebuild 692 RMD160 df2b364d62c8ff675d5273b52972c1ffaca32629 SHA1 29ad12d60b0e4f9036605eb11205f6864343d08c SHA256 17ebcb8e1d78dde6a0d4819b50f18d64f0906e0a4995a3cf7c252ce80e6d84b9
+MISC ChangeLog 313 RMD160 bb52015339f6360dc0b80b5dc02f87df577b5f8d SHA1 3dd4d85d8ce17cf270f16841db89c1ca8132526d SHA256 3ba17c6337a2c01a64c79f77d9b2603ff7b3f3101a2ec1158283c763e3bfee46
MISC metadata.xml 260 RMD160 fbefa5d68419d2a2c7f16e2be1b7d32bdf550da6 SHA1 2ae3d90be714fe96cb79937e2e9ecc1a7b4bf7a1 SHA256 7b301cfccb3820f218f51a1a3acafb5a640a92dff1155c2ad4cc955b6c3351fb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEAREIAAYFAk45EIcACgkQl5yvQNBFVTXh5wCglzxqsrIQzE/xPb37JNM9WwTI
-4+8AnjOjsi73U8PiQXqxxCU55cEQXNDh
-=B/3l
+iEYEAREIAAYFAk45LuUACgkQl5yvQNBFVTWVeACfdewuV6H466DrOo/C/nQDeHMF
+uNwAoIs5771BmMWp5PNEGZnZACyhJLn3
+=QbXr
-----END PGP SIGNATURE-----
diff --git a/dev-python/libnatpmp/files/link-against-system-lib.patch b/dev-python/libnatpmp/files/link-against-system-lib.patch
new file mode 100644
index 0000000..cdb64a9
--- /dev/null
+++ b/dev-python/libnatpmp/files/link-against-system-lib.patch
@@ -0,0 +1,12 @@
+diff -Naur libnatpmp-20110715.orig//setup.py libnatpmp-20110715/setup.py
+--- libnatpmp-20110715.orig//setup.py 2009-06-04 17:37:06.000000000 -0400
++++ libnatpmp-20110715/setup.py 2011-08-03 06:55:11.000000000 -0400
+@@ -8,7 +8,7 @@
+ setup(name="libnatpmp", version="1.0",
+ ext_modules=[
+ Extension(name="libnatpmp", sources=["libnatpmpmodule.c"],
+- extra_objects=["libnatpmp.a"],
++ libraries=["natpmp"],
+ define_macros=[('ENABLE_STRNATPMPERR', None)]
+ )]
+ )
diff --git a/dev-python/libnatpmp/libnatpmp-20110715.ebuild b/dev-python/libnatpmp/libnatpmp-20110715.ebuild
index c6c4e70..50339c5 100644
--- a/dev-python/libnatpmp/libnatpmp-20110715.ebuild
+++ b/dev-python/libnatpmp/libnatpmp-20110715.ebuild
@@ -3,14 +3,12 @@
# $Header: $
EAPI=3
-SUPPORT_PYTHON_ABIS=1
PYTHON_DEPEND=2
RESTRICT_PYTHON_ABIS="3.*"
-inherit distutils
-#inherit base distutils
+inherit eutils distutils
-DESCRIPTION="Python client for libnatpmp, An alternative protocol to UPnP IGD."
+DESCRIPTION="Python module for libnatpmp, An alternative protocol to UPnP IGD."
HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
@@ -22,15 +20,10 @@ IUSE=""
DEPEND="net-libs/libnatpmp"
RDEPEND="${DEPEND}"
-#src_prepare() {
-# local PATCHES=(
-# "${FILESDIR}"/0001-Link-Python-module-against-the-shared-library.patch
-# )
-#
-# base_src_prepare
-# distutils_src_prepare
-#
-# # these will conflict with base miniupnpc ebuild
-# # and distutils.eclass is stupid enough to force installing them
-# rm -f Changelog.txt README || die
-#}
+src_prepare() {
+ epatch "${FILESDIR}"/link-against-system-lib.patch
+ distutils_src_prepare
+
+ #These were installed by net-libs/libnatpmp
+ rm -f Changelog.txt README || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: dev-python/libnatpmp/, dev-python/libnatpmp/files/
@ 2011-08-07 2:57 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2011-08-07 2:57 UTC (permalink / raw
To: gentoo-commits
commit: 54159eb8ec956de26aa0b15bdb1e0cc346464326
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 7 02:57:26 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug 7 02:57:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=54159eb8
dev-python/libnatpmp: initial commit to tree
---
dev-python/libnatpmp/ChangeLog | 12 --------
dev-python/libnatpmp/Manifest | 15 ----------
.../libnatpmp/files/link-against-system-lib.patch | 12 --------
dev-python/libnatpmp/libnatpmp-20110715.ebuild | 29 --------------------
dev-python/libnatpmp/metadata.xml | 9 ------
5 files changed, 0 insertions(+), 77 deletions(-)
diff --git a/dev-python/libnatpmp/ChangeLog b/dev-python/libnatpmp/ChangeLog
deleted file mode 100644
index e2fdc67..0000000
--- a/dev-python/libnatpmp/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 03 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
- libnatpmp-20110715.ebuild, +files/link-against-system-lib.patch:
- Fix build against system library
-
-*libnatpmp-20110715 (03 Aug 2011)
-
- 03 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
- +libnatpmp-20110715.ebuild, +metadata.xml:
- Initial commit
-
diff --git a/dev-python/libnatpmp/Manifest b/dev-python/libnatpmp/Manifest
deleted file mode 100644
index e365bba..0000000
--- a/dev-python/libnatpmp/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX link-against-system-lib.patch 536 RMD160 34cec3a3eb972468c2329d40b4e421cfc60f4a30 SHA1 ebade41308e57bfa0690d854045287ea12d7687c SHA256 47809598d8d7c3b407785de3a27b99d4a3463be52706da7df55ce51a980b9658
-DIST libnatpmp-20110715.tar.gz 17943 RMD160 df9c656fdaa2782863670c334c840ff2ceab3e6b SHA1 87338bbbe07c627d33c5935b92b9f2c7622fe885 SHA256 853364242b2ad21ada841de484ad702f609d822690816a0c04a324f5963bed58
-EBUILD libnatpmp-20110715.ebuild 692 RMD160 df2b364d62c8ff675d5273b52972c1ffaca32629 SHA1 29ad12d60b0e4f9036605eb11205f6864343d08c SHA256 17ebcb8e1d78dde6a0d4819b50f18d64f0906e0a4995a3cf7c252ce80e6d84b9
-MISC ChangeLog 313 RMD160 bb52015339f6360dc0b80b5dc02f87df577b5f8d SHA1 3dd4d85d8ce17cf270f16841db89c1ca8132526d SHA256 3ba17c6337a2c01a64c79f77d9b2603ff7b3f3101a2ec1158283c763e3bfee46
-MISC metadata.xml 260 RMD160 fbefa5d68419d2a2c7f16e2be1b7d32bdf550da6 SHA1 2ae3d90be714fe96cb79937e2e9ecc1a7b4bf7a1 SHA256 7b301cfccb3820f218f51a1a3acafb5a640a92dff1155c2ad4cc955b6c3351fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk45LuUACgkQl5yvQNBFVTWVeACfdewuV6H466DrOo/C/nQDeHMF
-uNwAoIs5771BmMWp5PNEGZnZACyhJLn3
-=QbXr
------END PGP SIGNATURE-----
diff --git a/dev-python/libnatpmp/files/link-against-system-lib.patch b/dev-python/libnatpmp/files/link-against-system-lib.patch
deleted file mode 100644
index cdb64a9..0000000
--- a/dev-python/libnatpmp/files/link-against-system-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libnatpmp-20110715.orig//setup.py libnatpmp-20110715/setup.py
---- libnatpmp-20110715.orig//setup.py 2009-06-04 17:37:06.000000000 -0400
-+++ libnatpmp-20110715/setup.py 2011-08-03 06:55:11.000000000 -0400
-@@ -8,7 +8,7 @@
- setup(name="libnatpmp", version="1.0",
- ext_modules=[
- Extension(name="libnatpmp", sources=["libnatpmpmodule.c"],
-- extra_objects=["libnatpmp.a"],
-+ libraries=["natpmp"],
- define_macros=[('ENABLE_STRNATPMPERR', None)]
- )]
- )
diff --git a/dev-python/libnatpmp/libnatpmp-20110715.ebuild b/dev-python/libnatpmp/libnatpmp-20110715.ebuild
deleted file mode 100644
index 50339c5..0000000
--- a/dev-python/libnatpmp/libnatpmp-20110715.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-PYTHON_DEPEND=2
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils distutils
-
-DESCRIPTION="Python module for libnatpmp, An alternative protocol to UPnP IGD."
-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=""
-
-DEPEND="net-libs/libnatpmp"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/link-against-system-lib.patch
- distutils_src_prepare
-
- #These were installed by net-libs/libnatpmp
- rm -f Changelog.txt README || die
-}
diff --git a/dev-python/libnatpmp/metadata.xml b/dev-python/libnatpmp/metadata.xml
deleted file mode 100644
index 52e5c58..0000000
--- a/dev-python/libnatpmp/metadata.xml
+++ /dev/null
@@ -1,9 +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>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-07 2:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-07 2:57 [gentoo-commits] dev/blueness:master commit in: dev-python/libnatpmp/, dev-python/libnatpmp/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2011-08-03 11:20 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox