From 31e1fdfe3ce1c88183190fd834b24b7abf5e971f Mon Sep 17 00:00:00 2001
From: Alin Năstac <mrness@gentoo.org>
Date: Sat, 5 Dec 2009 08:51:41 +0000
Subject: Use selected CC and LDFLAGS (#293577). Install pptpsetup and man
pages (#293885). Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
RepoMan-Options: --force
---
net-dialup/pptpclient/ChangeLog | 9 +++-
net-dialup/pptpclient/Manifest | 10 ++---
net-dialup/pptpclient/pptpclient-1.7.2-r1.ebuild | 54 ------------------------
net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild | 52 +++++++++++++++++++++++
4 files changed, 65 insertions(+), 60 deletions(-)
delete mode 100644 net-dialup/pptpclient/pptpclient-1.7.2-r1.ebuild
create mode 100644 net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild
(limited to 'net-dialup/pptpclient')
diff --git a/net-dialup/pptpclient/ChangeLog b/net-dialup/pptpclient/ChangeLog
index e34096d539c4..65918be1d54e 100644
--- a/net-dialup/pptpclient/ChangeLog
+++ b/net-dialup/pptpclient/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-dialup/pptpclient
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.54 2009/09/30 22:15:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.55 2009/12/05 08:51:41 mrness Exp $
+
+*pptpclient-1.7.2-r2 (05 Dec 2009)
+
+ 05 Dec 2009; Alin Năstac <mrness@gentoo.org> -pptpclient-1.7.2-r1.ebuild,
+ +pptpclient-1.7.2-r2.ebuild:
+ Use selected CC and LDFLAGS (#293577). Install pptpsetup and man pages
+ (#293885).
30 Sep 2009; Alin Năstac <mrness@gentoo.org> pptpclient-1.7.2-r1.ebuild:
Add sys-apps/iproute2 to RDEPEND (#284460).
diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
index 4602bc98c4d6..7428f3da8cf3 100644
--- a/net-dialup/pptpclient/Manifest
+++ b/net-dialup/pptpclient/Manifest
@@ -10,13 +10,13 @@ DIST pptp-1.7.1.tar.gz 229024 RMD160 f510262e8c06058d754d6d73d1b289fcdbc54dc7 SH
DIST pptp-1.7.2.tar.gz 81113 RMD160 fff47ef2c3546b06c69c27db01beebed7e6cda4b SHA1 1007eb1d4d21629fab390903e8b394d6157b4983 SHA256 e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc
DIST pptp-command-20050401.gz 7662 RMD160 1c02ad63aa90419bbe2151476d1463d7a26d6215 SHA1 546c437896ba00fe2b66b924671de884986de5d8 SHA256 49cfb115491b476a364ddc03f8c1b27f7ba19b6a231eabc11e823e3f32c5987d
EBUILD pptpclient-1.7.1-r1.ebuild 1284 RMD160 006e1c5f30af48342b6831c7b9967c23e350de7e SHA1 29115bcbdbee75c07979c1e3332ad0017bab7232 SHA256 26e15729bc05a898855ad3fb841883d93e0ec1815cc31df2e75761e7d43b0005
-EBUILD pptpclient-1.7.2-r1.ebuild 1335 RMD160 f41d3add0fd6e850cf81b712daa526e6eea5c8ca SHA1 a10feddce93f0722e122ad750dffc0b89d8e6765 SHA256 112a904032a47d9a951c16ddbf8afc1eb8cae6809f63876c3bb21c552b8f392d
-MISC ChangeLog 7869 RMD160 659683b26d1ff78166b30aa314c6a2bce3100072 SHA1 0eb0763aa01be28aa1efe6b931de11387a758773 SHA256 7b55f9a1acbdc8336f1507c8bc18b3c535cb720fcb35d1c2d4abaeae55a36a75
+EBUILD pptpclient-1.7.2-r2.ebuild 1395 RMD160 8dd6d6c22a5ccfa24d2fc6471b28755b5c0bd5fb SHA1 7a6e833349f3237eb0ccd34441a5725845177836 SHA256 655c1cd5aa6e798c1295cfb2cdceda35cc85b47c4ff88dcfc7c477a03ccfea7a
+MISC ChangeLog 8100 RMD160 8a2503442c72ebdce8add3ea71418dc98ce95baa SHA1 e916d9cb1ed234866c08c7af6a3812ad7cd12c02 SHA256 5a60cf23bf2259f509d2aad9f96fac2f62b952e57aef926ee2bb8cc3198d0d96
MISC metadata.xml 295 RMD160 db055ffb19549883c4f07256f391e498f0ed504d SHA1 c1601c40929a9fd88e233a2773f0efa7b672114e SHA256 86aeda200c41eff29b264a66ce96f3a68f1e1e5a142ffdccf2bb1cd46ac5f5be
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkrD2JoACgkQ9A5kJBGSrssyogCfRm3Hhu0eoBf1ovE3Bj85rYXM
-iCsAn2mZpGelmhp9WU9LjaOW3Y2wiz8D
-=kxnR
+iEYEARECAAYFAksaHywACgkQ9A5kJBGSrsujbgCeK2psw2huLGDJ73j8u0O1sbrT
+ix8AmwU2hzhuAHcFW7PwAss00ayM+qWG
+=/DLs
-----END PGP SIGNATURE-----
diff --git a/net-dialup/pptpclient/pptpclient-1.7.2-r1.ebuild b/net-dialup/pptpclient/pptpclient-1.7.2-r1.ebuild
deleted file mode 100644
index b2a3093f384d..000000000000
--- a/net-dialup/pptpclient/pptpclient-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.7.2-r1.ebuild,v 1.5 2009/09/30 22:15:33 mrness Exp $
-
-EAPI="2"
-
-inherit eutils
-
-MY_P=${P/client}
-MY_CMD=pptp-command-20050401
-
-DESCRIPTION="Linux client for PPTP"
-HOMEPAGE="http://pptpclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz
- mirror://gentoo/${MY_CMD}.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ~ppc64 x86"
-IUSE="tk"
-
-DEPEND="net-dialup/ppp
- dev-lang/perl
- tk? ( dev-perl/perl-tk )"
-RDEPEND="${DEPEND}
- sys-apps/iproute2"
-
-RESTRICT="test" #make test is useless and vector_test.c is broken
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-process-name.patch
- epatch "${FILESDIR}"/${P}-ip-path.patch
-}
-
-src_compile() {
- emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" || die "make failed"
-}
-
-src_install() {
- dosbin pptp
- dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING
- dodoc Documentation/*
- dodir /etc/pptp.d
-
- # The current version of pptp-linux doesn't include the
- # RH-specific portions, so include them ourselves.
- insinto /etc/ppp
- doins options.pptp
- newsbin "${WORKDIR}/${MY_CMD}" pptp-command
- dosbin "${FILESDIR}/pptp_fe.pl"
- use tk && dosbin "${FILESDIR}/xpptp_fe.pl"
-}
diff --git a/net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild b/net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild
new file mode 100644
index 000000000000..34b799e0571c
--- /dev/null
+++ b/net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild,v 1.1 2009/12/05 08:51:41 mrness Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_P=${P/client}
+MY_CMD=pptp-command-20050401
+
+DESCRIPTION="Linux client for PPTP"
+HOMEPAGE="http://pptpclient.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz
+ mirror://gentoo/${MY_CMD}.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ppc ~ppc64 x86"
+IUSE="tk"
+
+DEPEND="net-dialup/ppp
+ dev-lang/perl
+ tk? ( dev-perl/perl-tk )"
+RDEPEND="${DEPEND}
+ sys-apps/iproute2"
+
+RESTRICT="test" #make test is useless and vector_test.c is broken
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-process-name.patch
+ epatch "${FILESDIR}"/${P}-ip-path.patch
+}
+
+src_compile() {
+ emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" LDFLAGS=${LDFLAGS} CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING
+ dodoc Documentation/*
+ dodir /etc/pptp.d
+
+ # The current version of pptp-linux doesn't include the
+ # RH-specific portions, so include them ourselves.
+ newsbin "${WORKDIR}/${MY_CMD}" pptp-command
+ dosbin "${FILESDIR}/pptp_fe.pl"
+ use tk && dosbin "${FILESDIR}/xpptp_fe.pl"
+}
--
cgit v1.2.3-65-gdbad