net-misc/stund: Version bump, move to EAPI 5, strip CFLAGS and LDFLAGS optim from Makefile, build client and server

Package-Manager: portage-2.1.12.3

6 files changed, 67 insertions, 51 deletions

diff --git a/net-misc/stund/ChangeLog b/net-misc/stund/ChangeLog
index 2a19fd60..1b369713 100644
--- a/net-misc/stund/ChangeLog
+++ b/net-misc/stund/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*stund-0.97 (08 Jun 2013)
+
+  08 Jun 2013; Bertrand Jacquin <beber@meleeweb.net>
+  +files/stund-0.97-BJA-amd64.diff, +stund-0.97.ebuild,
+  -files/stund-0.96-BJA-amd64.diff, -stund-0.96.ebuild, files/stund.initd:
+  net-misc/stund: Version bump, move to EAPI 5, strip CFLAGS and LDFLAGS optim
+  from Makefile, build client and server
+
   28 May 2013; Bertrand Jacquin <beber@meleeweb.net> +metadata.xml:
   Add missing metadata.xml
 
@@ -16,4 +24,3 @@
   +files/stund-0.96-BJA-amd64.diff, +files/stund.confd, +files/stund.initd,
   +stund-0.96.ebuild:
   stund-0.96
-
diff --git a/net-misc/stund/Manifest b/net-misc/stund/Manifest
index b5b12b23..bb9d9bf4 100644
--- a/net-misc/stund/Manifest
+++ b/net-misc/stund/Manifest
@@ -1,7 +1,7 @@
-AUX stund-0.96-BJA-amd64.diff 557 SHA256 29319b65f6591055dc7f5da2dbde2ee2f81563f8fed20ee79834ce5f8c5ff490 WHIRLPOOL 209cd36930fd9da4e141b429c3230301b1d0eaedc95fceebe1fef5ca947adf1a3b38fb60899f2f063c00924e2bf1fc9792cc97001632b4ad9102563530426f10
+AUX stund-0.97-BJA-amd64.diff 557 SHA256 29319b65f6591055dc7f5da2dbde2ee2f81563f8fed20ee79834ce5f8c5ff490 WHIRLPOOL 209cd36930fd9da4e141b429c3230301b1d0eaedc95fceebe1fef5ca947adf1a3b38fb60899f2f063c00924e2bf1fc9792cc97001632b4ad9102563530426f10
 AUX stund.confd 49 SHA256 d77624c10e2a7b1885329d211d0369049708942ef9292e84a91dd775e3e3d207 WHIRLPOOL 2233bd2ae14347e23da8576e9ce035f9ea960e6ebfd4df47b35a2d522e1c71437dd1b975313ddda4c953a4d5c39395e2e17ce0bf32bdb0938bb4f9bb15eec23f
-AUX stund.initd 645 SHA256 8d00f31468edb648573f0240b44c9e91fcdfef4ba19ab80b00c66cd25e47282f WHIRLPOOL 589d954f38ba6a2b86e523601a600473fb096c4c976588f0fd364ee75b2f0d74306a07b01bc4145cb94908c706e4c4c911716ffa801376e59a2a1678121f6b3a
-DIST stund_0.96_Aug13.tgz 84730 SHA256 a34b83eea2669ac681c07f2ffd404eaefa3e280b650b97e7152dd8fccc077fcc WHIRLPOOL 45dd3696de9d2c1b73c399ff322971621ca243fdd9a0dc9c83e9411a4f51995e57fd598a36cf901ed0dbca1b9568db5658cf363196466d3574e257c4c70426f5
-EBUILD stund-0.96.ebuild 725 SHA256 c7553134ed956e46fc569061a767d42d0bfd3bed1dc3724c552e4d541b1e695e WHIRLPOOL bc6b5fa1a9c6a3f4209edde01a4e1a2a3bcb7bd5d4802ac9d2ea50729051083688cc4e886c2d57aad4d36f999135924db9de49db48bc59bde381d5fbcbf19e24
-MISC ChangeLog 535 SHA256 b2d089aa99661d43194ad56e9291367805c7acebe2364787f75f7a07878bdc04 WHIRLPOOL a1b0f732cbd61916c67cdf6ba16c5aca70730218a2c576bdaa74e5c6b70ec5b47d96515ef1aec5bfe4127a82f6627a300cfcaf85ec91a90afecb29bcb661dffb
+AUX stund.initd 647 SHA256 8bee184f2fc0176702af4656f88623136556cba9f5e710a0145786d85b594926 WHIRLPOOL b77796abc3ca9b3c693b879bba72b1adb165c3a3036b51a929e5eb62362947f55dd23f1ab326a9f7d37042c1cf615df54658559373cba11460e62abd9cb93ad7
+DIST stund-0.97.tgz 169558 SHA256 83e1bf9c21399244c5e8ad19789121a3537399d6523a887a5abc6187adcdb1d7 WHIRLPOOL f177e881c90998793e0f4f49f4935f01b5569f86f4d29314a6c67d3c0a8021a6de62f55f9c37b2457b81658c761f08270a89cb307885161e2ed54c879198c0e4
+EBUILD stund-0.97.ebuild 850 SHA256 872db9e1a4a49146a2ab955c04a9a9bcffbf9ae10f3f258fcc5833c041c5ba77 WHIRLPOOL d8f45bfb7a1a76dccc833974eff21cf52a54951355261b7413955f1deb722e46641c4ae3b27ec50941dac324d09ea460906fcc2a9d8b4ce87ea0179f4b51a26d
+MISC ChangeLog 866 SHA256 5d903bc382c2b8f396b62ab91017732e1f6662cd15ca3a6986ef857faeba7377 WHIRLPOOL 1e042b6bb3469710ce9bc992c297ce1ffb7dc369a84df23455f233ba2bcda6751ca33c22227dc2026778c2093439171aefd1535e9c360e144805e68ed1e4056b
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/net-misc/stund/files/stund-0.96-BJA-amd64.diff b/net-misc/stund/files/stund-0.97-BJA-amd64.diff
index 6aafcce5..6aafcce5 100644
--- a/net-misc/stund/files/stund-0.96-BJA-amd64.diff
+++ b/net-misc/stund/files/stund-0.97-BJA-amd64.diff
diff --git a/net-misc/stund/files/stund.initd b/net-misc/stund/files/stund.initd
index 35073eb0..811a4d80 100644
--- a/net-misc/stund/files/stund.initd
+++ b/net-misc/stund/files/stund.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-PIDFILE=/var/run/${SVCNAME}.pid
+PIDFILE="/var/run/${SVCNAME}.pid"
 
 depend() {
 	need net
diff --git a/net-misc/stund/stund-0.96.ebuild b/net-misc/stund/stund-0.96.ebuild
deleted file mode 100644
index eb482202..00000000
--- a/net-misc/stund/stund-0.96.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit eutils
-
-DESCRIPTION="STUN server"
-HOMEPAGE="http://sourceforge.net/projects/stun/"
-SRC_URI="mirror://sourceforge/stun/${PN}_${PV}_Aug13.tgz"
-
-LICENSE="VSL-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-src_prepare ()
-{
-	epatch "${FILESDIR}"/${P}-BJA-amd64.diff
-}
-
-src_compile ()
-{
-	emake server || die "emake server failed"
-}
-
-src_install ()
-{
-	cp "${S}"/server "${S}"/stund || die
-	insinto /usr
-	dobin stund
-
-	newinitd "${FILESDIR}/"${PN}.initd ${PN}
-	newconfd "${FILESDIR}/"${PN}.confd ${PN}
-
-	dodoc nattestwarning.txt
-	dodoc rfc3489.txt
-}
diff --git a/net-misc/stund/stund-0.97.ebuild b/net-misc/stund/stund-0.97.ebuild
new file mode 100644
index 00000000..8b2078d7
--- /dev/null
+++ b/net-misc/stund/stund-0.97.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="STUN server"
+HOMEPAGE="http://sourceforge.net/projects/stun/"
+SRC_URI="mirror://sourceforge/stun/${P}.tgz"
+
+LICENSE="VSL-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare ()
+{
+	epatch "${FILESDIR}"/${P}-BJA-amd64.diff
+
+	sed -i \
+		-e "/^CXXFLAGS/ s:-g -O ::" \
+		-e "/^LDFLAGS+/ s:-g -O ::" \
+		Makefile
+
+	tc-export CXX
+}
+
+src_compile ()
+{
+	emake all
+}
+
+src_install ()
+{
+	mv client "${PN}-client" || die
+	mv server "${PN}-server" || die
+
+	insinto /usr
+	dobin "${PN}-client" "${PN}-server"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	dodoc readme.txt
+	dodoc nattestwarning.txt rfc3489.txt
+}