diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-07-11 08:04:01 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-07-11 08:04:01 +0000 |
| commit | e731c51ba43c34f1382ed75db9c5ae7a5fc2866d (patch) | |
| tree | b4801bf1e3ada1753288b40ec107d52ca5bba0b1 /net-libs | |
| parent | Fix python-tools installation, correct dependency (need twisted-web as well) ... (diff) | |
| download | gentoo-2-e731c51ba43c34f1382ed75db9c5ae7a5fc2866d.tar.gz gentoo-2-e731c51ba43c34f1382ed75db9c5ae7a5fc2866d.tar.bz2 gentoo-2-e731c51ba43c34f1382ed75db9c5ae7a5fc2866d.zip | |
Fix shortcomings introduced by non-maintainer commits.
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/miniupnpc/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/miniupnpc/miniupnpc-1.7.ebuild | 19 |
2 files changed, 18 insertions, 7 deletions
diff --git a/net-libs/miniupnpc/ChangeLog b/net-libs/miniupnpc/ChangeLog index 665ad930656a..a204395c8913 100644 --- a/net-libs/miniupnpc/ChangeLog +++ b/net-libs/miniupnpc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-libs/miniupnpc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.27 2012/07/03 16:20:49 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.28 2012/07/11 08:04:01 mgorny Exp $ + + 11 Jul 2012; Michał Górny <mgorny@gentoo.org> miniupnpc-1.7.ebuild: + Fix shortcomings introduced by non-maintainer commits. 03 Jul 2012; Brent Baude <ranger@gentoo.org> miniupnpc-1.6.20120509.ebuild: Marking miniupnpc-1.6.20120509 ppc for bug 421535 @@ -116,4 +119,3 @@ +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/miniupnpc-1.7.ebuild b/net-libs/miniupnpc/miniupnpc-1.7.ebuild index 449d1e758b75..6ff16bd0ea9c 100644 --- a/net-libs/miniupnpc/miniupnpc-1.7.ebuild +++ b/net-libs/miniupnpc/miniupnpc-1.7.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.7.ebuild,v 1.1 2012/06/18 12:44:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.7.ebuild,v 1.2 2012/07/11 08:04:01 mgorny Exp $ EAPI=4 -inherit multilib toolchain-funcs + +inherit eutils multilib toolchain-funcs DESCRIPTION="UPnP client library and a simple UPnP client" HOMEPAGE="http://miniupnp.free.fr/" @@ -20,8 +21,9 @@ RDEPEND="" DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )" src_prepare() { - sed -i -e '/CFLAGS.*-O/d' Makefile || die + epatch_user + sed -i -e '/CFLAGS.*-O/d' Makefile || die if ! use static-libs; then sed -i \ -e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \ @@ -30,12 +32,19 @@ src_prepare() { fi } +# Upstream cmake causes more trouble than it fixes, +# so we'll just stay with the Makefile for now. + src_compile() { tc-export CC emake upnpc-shared $(use static-libs && echo upnpc-static) } src_install() { - emake PREFIX="${D}" INSTALLDIRLIB="${D}/usr/$(get_libdir)" install - dodoc Changelog.txt + emake \ + PREFIX="${D}" \ + INSTALLDIRLIB="${D}usr/$(get_libdir)" \ + install + + dodoc README Changelog.txt } |