summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-01-23 10:21:54 +0000
committerPeter Volkov <pva@gentoo.org>2009-01-23 10:21:54 +0000
commit94d013dc4d400f4e5c2389a55886c017fa11b327 (patch)
treec68c00a1fed98f360431793eca90ec1ee5e95558 /net-dialup
parentVersion bump (diff)
downloadgentoo-2-94d013dc4d400f4e5c2389a55886c017fa11b327.tar.gz
gentoo-2-94d013dc4d400f4e5c2389a55886c017fa11b327.tar.bz2
gentoo-2-94d013dc4d400f4e5c2389a55886c017fa11b327.zip
Do not run maintainer mode, bug #255906, thank Diego E. 'Flameeyes' Pettenò for report. Respect LDFLAGS.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/pptpd/ChangeLog8
-rw-r--r--net-dialup/pptpd/pptpd-1.3.4.ebuild8
2 files changed, 11 insertions, 5 deletions
diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog
index 275a2066e0b0..833c3f412073 100644
--- a/net-dialup/pptpd/ChangeLog
+++ b/net-dialup/pptpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dialup/pptpd
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.31 2008/08/23 03:10:54 cardoe Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.32 2009/01/23 10:21:54 pva Exp $
+
+ 23 Jan 2009; Peter Volkov <pva@gentoo.org> pptpd-1.3.4.ebuild:
+ Do not run maintainer mode, bug #255906, thank Diego E. 'Flameeyes'
+ Pettenò for report. Respect LDFLAGS.
23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
add GLEP 56 USE flag desc from use.local.desc
diff --git a/net-dialup/pptpd/pptpd-1.3.4.ebuild b/net-dialup/pptpd/pptpd-1.3.4.ebuild
index 057e19605e0c..706cc0c5ce50 100644
--- a/net-dialup/pptpd/pptpd-1.3.4.ebuild
+++ b/net-dialup/pptpd/pptpd-1.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4.ebuild,v 1.3 2007/06/10 21:16:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4.ebuild,v 1.4 2009/01/23 10:21:54 pva Exp $
inherit eutils autotools flag-o-matic
@@ -18,6 +18,7 @@ DEPEND="net-dialup/ppp
src_unpack() {
unpack ${A}
+ cd "${S}"
epatch "${FILESDIR}/${P}-gentoo.patch"
epatch "${FILESDIR}/${P}-more-reodering-fixes.patch"
@@ -26,7 +27,8 @@ src_unpack() {
local PPPD_VER=`best_version net-dialup/ppp`
PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" "${S}/plugins/patchlevel.h"
+ sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" "plugins/patchlevel.h"
+ sed -e "/^LDFLAGS/{s:=:+=:}" -i plugins/Makefile
eautomake
}