Revision bump: EAPI 5, epatch_user, replace einstall with default src_install phase function call, wrt bug #521580, respect compiler, replace /var/run with /run

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

4 files changed, 72 insertions, 23 deletions

diff --git a/net-dialup/dwun/ChangeLog b/net-dialup/dwun/ChangeLog
index 8c56e1cc9b47..807987eda600 100644
--- a/net-dialup/dwun/ChangeLog
+++ b/net-dialup/dwun/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/dwun
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/dwun/ChangeLog,v 1.10 2013/02/02 18:57:47 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/dwun/ChangeLog,v 1.11 2014/12/04 08:27:53 pinkbyte Exp $
+
+*dwun-0.96e-r3 (04 Dec 2014)
+
+  04 Dec 2014; Sergey Popov <pinkbyte@gentoo.org> +dwun-0.96e-r3.ebuild,
+  files/dwun:
+  Revision bump: EAPI 5, epatch_user, replace einstall with default src_install
+  phase function call, wrt bug #521580, respect compiler, replace /var/run with
+  /run
 
   02 Feb 2013; Ulrich Müller <ulm@gentoo.org> dwun-0.96e-r2.ebuild:
   Fix LICENSE, MIT (Expat) according to COPYING file, bug 453214. Add GPL-2 for
diff --git a/net-dialup/dwun/Manifest b/net-dialup/dwun/Manifest
index 6d5b0e9b1d6d..3a32e40db024 100644
--- a/net-dialup/dwun/Manifest
+++ b/net-dialup/dwun/Manifest
@@ -1,25 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX dwun 518 SHA256 7d9dbc5dded15345a9cd77d9dd7bb0cc6eb1e312b51b83b0d13d5a1fd102eee9 SHA512 58aa31ff6e16b664e725d9d51ce778db004e3035abafb3ad0d268e2715b555edbfd1257b4d8b8fcd2a30db7ef56c33b952797dbbbdbffda242c6d60c7276d676 WHIRLPOOL 48cb08596d6640ee1e0510881b563fab3acb2a5fed4552c4c40283092cea3b918ecc09874cef2e84c9538d801a24dd67430a811531eac8621dc381657ae68d45
+AUX dwun 534 SHA256 80351d4c3f73b9b6654c6d03d241afc74daabaaabec2eff199d199c564fda92e SHA512 82c0478cfb05dca23db89e97e8ee74238c081e16476d5de985a2edcd05acc327b0f4935ade4bc78a9a830b18ae3da68b22dd6812f8139c05e165e29367f14261 WHIRLPOOL 9e5b6e62ceaf40aac41b2fd9fd83c08bfb0e9c46f61bd9ed3d1d8a6fbc576e47a738c3daa88fbe8fd7e673962768609ceca8c3aec3c15f3d90dde58d42853370
 DIST dwun-0.96e.tar.gz 147960 SHA256 43aafb4e3dcb9f0aebe54661e880e04f8764da23539621beead29bcaf618d887 SHA512 6763acd60192f18ffd81edd4f4e18ccfb8c5ac3882db96f9b7d2d032e9a0c61cb843094222744525a9927981c8cc7a603fd0aa1e1d4309d3f7fab21fec028115 WHIRLPOOL 81a102494a9a2279bfae3e7ef8609869dbe9076fef5be60ca90f8bd0dce32f4a424ea4e779560fcb7f1d88722272e44fa112fb641e1b367de8883c59197814db
 EBUILD dwun-0.96e-r2.ebuild 1134 SHA256 1def29838a49678cb7f1140f9ba0e617805f43912015cc4c33a686648d8c813d SHA512 3d269ef1b9e51679303493f571b92d72a264bd8fb4369f8668a8c629a3c30b7669b0be407814d5db4d43aab023d30438b5149eb6b935164fae1de877c0410364 WHIRLPOOL 351e2105a7bd51ed202bd6f507403de9d60889344fed9a660a384edc40722bf14ebe39458595e4d1a083e58a3bb95784092e2641710c07aeac34243f5c558704
-MISC ChangeLog 1448 SHA256 f76626c2c73945d8b7556207d3e469f6fb45a1b6dbe51de8ca4122d19ed7f69c SHA512 8f2ae291363e293f5e7d18429161501e454fc9a107a6a70ad263b76c22ff1f051165129dd0739ca87af718fb36bd4e1645cd92a2f2bfa097082494f8c7a3725b WHIRLPOOL 224e15fd4fe303390b86a17fea7746ec7e0c17f662d610d0e809f7594970743eed98e7dde1b610f474124931d82142c02996bc03dbbdb537979fca81eb41a530
+EBUILD dwun-0.96e-r3.ebuild 1145 SHA256 93a6f6d1303bb458fbf0b31c139b72a67e2ae444c603b1aac55d1b7ea67868e9 SHA512 cca68b8091a846c0cb9eb87c81303147c09b32450e8b1adc6acf82f6ccf9be5e68cec91c91c021a9a40f165532147d2bb65b2a92dd3578f72d60f6d0746cbf1d WHIRLPOOL 4bfb09b7723bbbc6e6037e7c102f07be3a549fa68b6d8eda2cc5da1f7b4e3a775ad80dccd81e77c2bb0d7dfa0bc731990f8252cd023ad8b8ae590508ab42155e
+MISC ChangeLog 1738 SHA256 a44ff69f3b3a32068719c39d0c39e7a8346917093cf1882e26266237c4daeb0e SHA512 4ea039a4c3f4235611fa6b2786d79a48edf46651759dbe693fbf32b86760c589e65930e6b7c0e6e7cf54e79416be2d456f2f413e6f843b87f17f66103e3806ed WHIRLPOOL a78337718a1be91a6797b2394a9e59ed4b9fbdd6e3251acebedb435b0351025d77cc5eb6e3c1d78883f13cb4e976eaaed7f080c8480c6470038e7f104f64a111
 MISC metadata.xml 163 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 SHA512 275566c067e365604d523694db8e2417e0ccf91227d1204a104912d46841d193d1cb0a39e31663f30bfb92bda09523277b61661093bfb80ca9a9e70b20ea91f0 WHIRLPOOL f02b3040d2c474daa9d38e7d17ee7d138245e06be8c26403efd656d03f54495e344157c23245bc925a0f5319f507d30a68924997ac9880e32593855d0ac0fad7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJRDWJ0AAoJEDxpGckxwJCBsIMP+gNodCAd+vqFkpAC70nhudlh
-rckr0xRd/geaRbabpq5YrewFT/RlxjQ1MrwoCGC46987w32SRLgoBSAZ2keol0LK
-Z+JbWeJK2cB0E5XRQ5uWxy1Qdx4QDrnCqP4ZXlaM4f5ecCnlbNt6AP668GtbeNcj
-jdeB7ni+jIlnlukLpkdZyvPy4GnY+Ziu8uTCkgD5SYi9bwEvcU9WLI/a2qqgW2iV
-smY2Tztd66NanNK5IgwSqPQMBj59Dth3ql2xSn82rDHHyycAKCEOHMtJD5fpFztO
-wnL8nH2XHOCVxLE+hLH2SXafj09CtCvwzdJ4OBx9YjmLyobx+K7UxIIq1QbdKaFD
-LsAbHAv//zmB13kiA9g5WC63rQPrpas92dSqL4LMmNw4N1Hy77+BaehMa1hch7yc
-504zAjExOHKEHOjnoAqKRYN7fHcBZRv41EsZpfVrMQnEEpZEbvZ2aX0U0xjgATOZ
-lkcYlu+thL716YndfhpN3BODRBhjPOL4g2EE/SJF/RxegYsuPOQy/WrpBa3LCYaL
-lIlFR+TelvB103dyjQjOZzWqRYhGAdR60AZR60Sh7FXK9sL2DmZupzVtl2O2agZg
-FNossvQGb1/lvknO3hOvvtFuBjOl+KiZsHEArh4auxLvoaqNyjsXg/i/t4lx3Ok/
-ZatL4AVuNeJoT/or4flX
-=8rRb
+iQEcBAEBCAAGBQJUgBsJAAoJECo/aRed9267bRYH/1gN3xH3TnzCZwggZ2KFiXg/
+HX8JriXKYMcSXGMc66LE1ci1Sx4r5e7yIPT1Jn3kp96dJJ5g9zshSc7IMylHtRQe
+b6yxqIPB8N1KSXzDzaxlAaNVdKRrZHZH7VpG88gRBjtMF38Gf0NZzJ5ywrUuXcvm
+A4AGbd2+BDxbfFIcLFWhb/Ej8qrKVTXSTYq5/qfZSDqKjUV9K9wRAgTBO8U3sISh
+hb8Tc6QZEfU5RoY22fhIwBXxqObQcnCmAEp7vYAPnkPSlfXgUbhM8n73svMA8+lf
+6T2b6BNEeJkdE41McRdgIRsuWml79JcIUgu86+UHsUvfQoHXuYt0fX/5OXKg/Q0=
+=jqCX
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/dwun/dwun-0.96e-r3.ebuild b/net-dialup/dwun/dwun-0.96e-r3.ebuild
new file mode 100644
index 000000000000..5cc4f81d8053
--- /dev/null
+++ b/net-dialup/dwun/dwun-0.96e-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/dwun/dwun-0.96e-r3.ebuild,v 1.1 2014/12/04 08:27:53 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Dialer Without a Useful Name (DWUN)"
+HOMEPAGE="http://dwun.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( AUTHORS ChangeLog QUICKSTART README TODO UPGRADING )
+
+src_prepare() {
+	sed -i -e "s:TODO QUICKSTART README UPGRADING ChangeLog COPYING AUTHORS::" Makefile.in || die
+	tc-export CC
+
+	epatch_user
+}
+
+src_configure() {
+	econf --with-docdir="share/doc/${PF}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins doc/examples/complete-rcfile dwunrc
+	newins debian/dwunauth dwunauth
+	newinitd "${FILESDIR}/dwun" dwun
+}
+
+pkg_postinst() {
+	elog
+	elog 'Make sure you have "net-dialup/ppp" merged if you intend to use dwun'
+	elog "to control a standard PPP network link."
+	elog "See /usr/share/doc/${P}/QUICKSTART for instructions on"
+	elog "configuring dwun."
+	elog
+}
diff --git a/net-dialup/dwun/files/dwun b/net-dialup/dwun/files/dwun
index f64db89ce3bc..2f4c4390d6f9 100644
--- a/net-dialup/dwun/files/dwun
+++ b/net-dialup/dwun/files/dwun
@@ -1,23 +1,23 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/dwun/files/dwun,v 1.3 2004/07/14 23:15:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/dwun/files/dwun,v 1.4 2014/12/04 08:27:53 pinkbyte Exp $
 
 depend() {
 	need net
 }
 
 DAEMON=/usr/sbin/dwun
-PIDFILE=/var/run/dwun.pid
+PIDFILE="/run/${SVCNAME}.pid"
 
 start() {
-	ebegin "Starting dwun"
+	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start --pidfile ${PIDFILE} --startas ${DAEMON}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping dwun"
+	ebegin "Stopping ${SVCNAME}"
 	start-stop-daemon --stop --signal 1 --pidfile ${PIDFILE}
 	eend $?
 }