Version bump, drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 69 insertions, 22 deletions

diff --git a/net-dialup/pptpclient/ChangeLog b/net-dialup/pptpclient/ChangeLog
index 00297963bdf5..5d7df6f0ce56 100644
--- a/net-dialup/pptpclient/ChangeLog
+++ b/net-dialup/pptpclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/pptpclient
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.65 2013/10/25 09:27:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.66 2013/12/02 11:43:54 pinkbyte Exp $
+
+*pptpclient-1.8.0 (02 Dec 2013)
+
+  02 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> -pptpclient-1.7.2-r2.ebuild,
+  +pptpclient-1.8.0.ebuild, +files/pptpclient-1.8.0-process-name.patch:
+  Version bump, drop old
 
   25 Oct 2013; Sergey Popov <pinkbyte@gentoo.org> pptpclient-1.7.2-r3.ebuild:
   Add ~arm keyword wrt bug #488572, thanks to Michael Kurinnoy <viewizard AT
diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
index 3b805344baf9..422c593442d0 100644
--- a/net-dialup/pptpclient/Manifest
+++ b/net-dialup/pptpclient/Manifest
@@ -4,22 +4,23 @@ Hash: SHA256
 AUX pptp_fe.pl 8100 SHA256 f980fd3ff529bd4476852be39e05579bbeb9dc5c299795050a8d146ed6c4c648 SHA512 1fca3e6e5ab1438297e142745e87c96b5f6bf1dcb2ea0def466b3a54ebcb391771b1803f2c70e852b201a7eb2e50bbc4dc0f49ca648e64ac20e177027d85eee0 WHIRLPOOL 0e0a2de971c3b955d06f9679880febd110fb7676928563422ea94ad89d6116e7b987155e841fd5f04b73851b056c0e3bc3b5ca67476d78892ad3e5b4cdd74819
 AUX pptpclient-1.7.2-ip-path.patch 883 SHA256 e4b30e07b7af6f0085044a98644d7d57689a74f2302f7b5a8a9108a7613179d6 SHA512 d413f0877b062a63954daa51e49cbb430eeb0375e9257df7f94253683cb263ceeb54f5ba7f377ab6fddff6a49c90136b26065d578eb2bd8be983dc1c220976c6 WHIRLPOOL 20dc7b770c2ce60187ad256d80a574ac6f0dfd3731ab540dbbb38afb844f091f0d78cca18602d88aa48ec9a71cb902cc4dd00fd0abc2102d4be5bd0b44a4a7c8
 AUX pptpclient-1.7.2-process-name.patch 1242 SHA256 a16bc434f301af72f43cca41a17e8232006878295b0f4f2a3fc5dbe85b020b5e SHA512 f0157c828783838493ad56a0737fa696ce3422d6db50c76c9f8d6771c57a359a3ebafbd30bba09b4e440a4cad28f935f7bf8992695bccd16b16143cdadf62a25 WHIRLPOOL 5a52106ae0483d486622be6412440af7459664e32949f574cbe5061a9d827c4fce590a12f675833555dfb3e7b1484e84b0716887e5c14fff28a9104a36c1a7aa
+AUX pptpclient-1.8.0-process-name.patch 1134 SHA256 ce8d2abc8b47ac20ee574e1278a948fcb5746345f686f390676a795379c27b53 SHA512 4615438cb457c3fe0e2e7342f0aa234f3b63fccb069d217c9b7340e1b6a73ca7879e85b21742f155bb5a16db5a1bd55da14f9867486760a49479f96bdddbc451 WHIRLPOOL 9978c48a9034446aaa89ff6e35df7b90b19d2d80f49010a9714e4b923f3c2dbf34c3f8c31b5c50ea14e07d53c2708726b8c9311be684a923caf9cd414ecaa1d1
 AUX xpptp_fe.pl 5620 SHA256 18c6098a66721a4f5c5b387c2ea312c21224c11ad6b2ddaec83f63049b1ab053 SHA512 110502f17b6d5dc9920c249ae593f5e4a178fed71be15764935ecdd39e30b55ac8ba448ff018af9bd8f3080d7b01b5829c64b5cd5c784d6ad440c1a2a97e4245 WHIRLPOOL 0ac3e98a9fdec1a00c9e3e0d1ae45b4e698c8f69bcc7595f2cf92d4d77e4951cb32ce5387a772cd4aa152987ea0b09f8d6f87b9cace4c593b7877e8c5471ede1
 DIST pptp-1.7.2.tar.gz 81113 SHA256 e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc SHA512 8c070bd0e2fac68e54eefcc21a31b567f74080764130cf94bf1e29138c3a43b8f56721836d826343528062fc6afcffee03ad93631678cc9b946bc6a8f4ce3dec WHIRLPOOL 4a1a38e3e50fe77e553933532147a202858ba54f009fb8b98c33539122014a61fae6df69d985d118329a5b62f86bdfe4ca4bcb62b1586c4dbd76f4a9750f1280
-DIST pptp-command-20050401.gz 7662 SHA256 49cfb115491b476a364ddc03f8c1b27f7ba19b6a231eabc11e823e3f32c5987d SHA512 81e1d1f5828b9d9e202bd8d4b502fd1df74f6dfa21f0712a3116b11b2690ef8c6f955c15e44d859d73116679ed740444276354952a4d670d17655c4afd422f26 WHIRLPOOL a4fef3fd6d41e65fb07e91299a66d9d1055253d0016cc3ea51b992cf5a41a1b9e0e9f5d617597c7ae0fda3ec5703935058924e47174afcba1026d82c9a7d3a41
+DIST pptp-1.8.0.tar.gz 86778 SHA256 e39c42d933242a8a6dd8600a0fa7f0a5ec8f066d10c4149d8e81a5c68fe4bbda SHA512 cabcc2ef29d20859af923c6d96c524e83a80549839d1ad6fccaf9ec0ed5e7a5de7120e0694e6160b374952ea3ecb7b69d9809641000d6bf2585eeedb2d29c073 WHIRLPOOL da21a83f78c2973d90679d2ae76b47bd32ad0327d55ff943c5f663513fe2ce6736ca0910f55cb9929667e935975c1ac523641e12eaa3c42ba60e30d017d5942c
 DIST pptp-command-20130515.bz2 7269 SHA256 c94f6ccb4370adb4c8f857ed260326583484d461df54dc06a966b1387c68cd6a SHA512 3b0ad28c5f7bf4f674ba8742e8a3be50cb62521f767142a1a1e74263707bc860126b7238a4aea307366a71100a193d18f3ec7599f4c0c52cd259f8b1d6b429bf WHIRLPOOL 2f1c9c1e6c4fb75bc4932c8536d0b10aa89c7fc53ba0887875b7920c8fc2bc894e7863ae4830dd907e9a4459c16f747b3454fda542664f61ac80353164121773
-EBUILD pptpclient-1.7.2-r2.ebuild 1399 SHA256 3aa783c9c39040d100ab5aace1ab3a379d1bc28622ed86a801115b47e5af1f02 SHA512 b4b6907cecdd546080613b9563d42a7c464a962a333b6e3c8704bf2d62e28cb15640a4993b5fcd07d3017c97659f6179d9b219ef84cbfc959aee11f661a22edc WHIRLPOOL f6032d08912489915ef45cad1da901db3aca86bc77711a98cb7954ebfb86db7495552a7597c6658fe5f532c07159b6a44a111fb2ab476dceb77a0633c4449e60
 EBUILD pptpclient-1.7.2-r3.ebuild 1349 SHA256 96a30b37133025cb6667b74e4c1cfd6992af13abf7475cb7dfdf5145427a8154 SHA512 dc0bce1e73283a66bdc6961e21d3e37cf8cc1fa4b14be2a025bafd5bfd1633a6558ed2480232de8183b2ac90b72f5ec0489e323928b51dbdddff913b62cd91db WHIRLPOOL 1349c467ec3cc9809240e52ec06d9f26e06d535898b426557a44f4fc57401d94193062a5de8dc21f528fa53361e025ffbc0d7d187f567800ed99154f7621f4ce
-MISC ChangeLog 9506 SHA256 a563c88e08045a078c32875134cf24fac7156ee308ec298776a756ba4681b48c SHA512 a01d2e87ce0f212409f964f8a9a04a83f1621d3943ef0cb67454031d08ddf9b2ef73b6b612a3984f311ef8fb874fc64a31b7fff0ca404d6992014573a76e9e17 WHIRLPOOL 294cfee34507748e91cc1770508fb995b01ab1bcd8f535159cfa16ed645c57655251d11b156ee02b77e118650fadd41672c15a91087d1c874f561dcf26c7d786
+EBUILD pptpclient-1.8.0.ebuild 1351 SHA256 72d61b1c6cd0ecaa5b9159a42b6ef64d3012eb50775dd86f70d1b99074e5056c SHA512 4f4af10dc2681aa3c90b7f15b87568c85dcfaf74e5ec24c21ea43f1ea1d7ed15165089702ce295d03c9716fa2ac8d2e932617d3b1a5fb047da55dba85b5a50f4 WHIRLPOOL ca463b8a7bfb8ed4284d6918316d0eb1eb3b41c7d55c0f2fee3d7d0e1a9e4194b4a7e521f291130f8f922703f0d6e37dfec85861aef8cc10bb6956c4872b0d58
+MISC ChangeLog 9716 SHA256 544785861ed073c602026151b8fb3121ae3a21d84f24b98623b343a85536f699 SHA512 68428e23e25835c2bc015810c2cdbe232918f5dc82f01548556737b0a1588c3b241caec181f5768bcfc762fb59d18083951103453127bfed1e617d1d9b6270e9 WHIRLPOOL 24884eea1201180fb992203f90285a4c046d5ac0f4078447238dfb4f335824cfc2ff7653fbf234cfbad3d5d41e29650051bc766ce23fb4afb3c024c5ff1f071b
 MISC metadata.xml 295 SHA256 86aeda200c41eff29b264a66ce96f3a68f1e1e5a142ffdccf2bb1cd46ac5f5be SHA512 ac183907c181bf47fb046ad6b82e312bada51e5ce0b23b89ad49c637fc3f7a099e2b491895c72b1c88028d826845ada259cdf0cfc8c0e816c89899bcb52626c7 WHIRLPOOL 21df9c7af5c5cc6e203a5d3383c309d20e1e5f0f0ce5f7f44c9f4cf35451ad4f13f390e5c4fd0e66ffc2f2b4e9b4e6fc9c1b360a6bb9ec07dd8b179b413e693f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSajlAAAoJECo/aRed9267bBgIALNmYRjUEX2kwdy5u2633fyu
-Wsv1aYTxUgpQQXCbaLtWnqlDOW30yTMkCgNTQ5DbNaPO95tIWMgjap685FYCLz5+
-gz22+wRZFlnV15hhFbTrjmJP1U0TUXgQ1/jTtXahkU8T9Z4NLkvXn8w1/Q0pkbOd
-NZo5p1LLGhyugHbMjYktcco1xjb0itKk5AbiSqnY6WZVBh4/VPjdK6HrkBYWUjbp
-Cuni5b9s0LgaOB7N3vJ3qEmXjiM1S5JyIgKt1yavM7xgKlq91xDmtiK8P5O542Z3
-YOYXZHB/YkLbyvSGJ0s9YyO0QQtgZ8xfeqSpzrxdjU81qagsoUmbrtmDmh4jnn4=
-=+0rF
+iQEcBAEBCAAGBQJSnHJ2AAoJECo/aRed9267T58H/2tIU4od3oI/khfigQzZckKG
+/84b8BYhMgBf81xj2xRtvsSsy14xETIojPqKoMNK6XrdFTgCAici51wRDSU58iQJ
+vzgcyTqtkJA4ENherJ/qXkccHZdgKThPhM+mSMGwbqq2zZOrW10pDqRt0MHIKFlA
+eBp6O9oEwonSWPSmGL0lgph83cYdKbSGoBckoYPSrv50fwi3T4ha/006lg15Fa2P
+oAoP8UKBEWFuJ6KFHf5+9we9jeHBWPadDL2twGbEcABXkA2poiUI3tr0BSKA2Xoc
+RBrsN/ZTtA2pmdChEgtq8/Sut1nl0x7ZHLlkCIHysQQDhU+lq/OxmeMRIv2ftVI=
+=Y9HZ
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/pptpclient/files/pptpclient-1.8.0-process-name.patch b/net-dialup/pptpclient/files/pptpclient-1.8.0-process-name.patch
new file mode 100644
index 000000000000..926574762499
--- /dev/null
+++ b/net-dialup/pptpclient/files/pptpclient-1.8.0-process-name.patch
@@ -0,0 +1,39 @@
+--- pptp.c.orig	2013-10-23 12:10:46.000000000 +0400
++++ pptp.c	2013-11-26 13:05:43.259867888 +0400
+@@ -60,9 +60,6 @@
+ #include "pptp_callmgr.h"
+ #include "pptp_gre.h"
+ #include "version.h"
+-#if defined(__linux__)
+-#include <sys/prctl.h>
+-#endif
+ #include "inststr.h"
+ #include "util.h"
+ #include "pptp_quirks.h"
+@@ -413,12 +410,7 @@
+     tty_name = ttyname(tty_fd);
+     snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s",
+               tty_name ? tty_name : "(null)");
+-#ifdef PR_SET_NAME
+-    rc = prctl(PR_SET_NAME, "pptpgw", 0, 0, 0);
+-    if (rc != 0) perror("prctl");
+-#else
+     inststr(argc, argv, envp, buf);
+-#endif
+     if (sigsetjmp(env, 1)!= 0) goto shutdown;
+ 
+     signal(SIGINT,  sighandler);
+@@ -517,13 +509,7 @@
+       char *my_argv[3] = { argv[0], inet_ntoa(inetaddr), phonenr };
+       char buf[128];
+       snprintf(buf, sizeof(buf), "pptp: call manager for %s", my_argv[1]);
+-#ifdef PR_SET_NAME
+-      int rc;
+-      rc = prctl(PR_SET_NAME, "pptpcm", 0, 0, 0);
+-      if (rc != 0) perror("prctl");
+-#else
+       inststr(argc, argv, envp, buf);
+-#endif
+       exit(callmgr_main(3, my_argv, envp));
+ }
+ 
diff --git a/net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild b/net-dialup/pptpclient/pptpclient-1.8.0.ebuild
index b5486e21e402..cd281263caaf 100644
--- a/net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.8.0.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 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.3 2010/04/29 19:46:17 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.8.0.ebuild,v 1.1 2013/12/02 11:43:54 pinkbyte Exp $
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils toolchain-funcs
 
-MY_P=${P/client}
-MY_CMD=pptp-command-20050401
+MY_P="${P/client}"
+MY_CMD="pptp-command-20130515"
 
 DESCRIPTION="Linux client for PPTP"
 HOMEPAGE="http://pptpclient.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz
-	mirror://gentoo/${MY_CMD}.gz"
+	http://dev.gentoo.org/~pinkbyte/distfiles/pptpclient/${MY_CMD}.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="tk"
 
 DEPEND="net-dialup/ppp
@@ -29,18 +29,19 @@ RESTRICT="test" #make test is useless and vector_test.c is broken
 
 S="${WORKDIR}/${MY_P}"
 
+DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-process-name.patch
-	epatch "${FILESDIR}"/${P}-ip-path.patch
+	epatch_user
 }
 
 src_compile() {
-	emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "emake failed"
+	emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING
+	default
 	dodoc Documentation/*
 	dodir /etc/pptp.d