Revision bump: EAPI 5, base eclass, use flag-o-matic for CFLAGS handling, respect LDFLAGS, wrt bug #337879

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

4 files changed, 84 insertions, 6 deletions

diff --git a/net-misc/stone/ChangeLog b/net-misc/stone/ChangeLog
index c5d381449682..840e63447932 100644
--- a/net-misc/stone/ChangeLog
+++ b/net-misc/stone/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/stone
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stone/ChangeLog,v 1.20 2013/02/03 12:37:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stone/ChangeLog,v 1.21 2013/02/20 13:56:01 pinkbyte Exp $
+
+*stone-2.3e-r1 (20 Feb 2013)
+
+  20 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> +stone-2.3e-r1.ebuild,
+  +files/stone-2.3e-makefile.patch:
+  Revision bump: EAPI 5, base eclass, use flag-o-matic for CFLAGS handling,
+  respect LDFLAGS, wrt bug #337879
 
   03 Feb 2013; Pacho Ramos <pacho@gentoo.org> -stone-2.2c.ebuild,
   -stone-2.2e.ebuild, metadata.xml:
diff --git a/net-misc/stone/Manifest b/net-misc/stone/Manifest
index bdce0cdf94b0..dd23ed900715 100644
--- a/net-misc/stone/Manifest
+++ b/net-misc/stone/Manifest
@@ -1,14 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST stone-2.3e.tar.gz 92587 SHA256 b2b664ee6771847672e078e7870e56b886be70d9ff3d7b20d0b3d26ee950c670
+AUX stone-2.3e-makefile.patch 551 SHA256 ca9cb87e0e6411b48b84c099adc57b729ae9d778ba7506c6dee2f57aabd6a98c SHA512 ab9051fc87046484c755830f1803b1ac9ceca5c0fdc00e09f690eae538d7cd7611049fcad4100c43cf996dacea2eb57360778eb91aa40b76b697a217e105c18c WHIRLPOOL 7bea2b8781ad93689b5d0c4ad2f2497f95723f3f17d31449e04616bf45bb1dad7b710e6a0df0131c41ce4321e5fdfaed561ec1826f8845624e45eee76164c438
+DIST stone-2.3e.tar.gz 92587 SHA256 b2b664ee6771847672e078e7870e56b886be70d9ff3d7b20d0b3d26ee950c670 SHA512 a0cccc123222c4fb4c1b2f031fc4d039f39e77691adc9f1df367d99bef8524738265350d1056c926c5f216236d2db25f31d14e9bec297b1bb4ea17e217c4983b WHIRLPOOL f73f5dd7d91f0d0e68065b0dd20adf50865c5081f1628154d9bf4b5c8c11fe9aa2355e7cc4dc6409f241325f509af4e5f1dd7eaf690eecca794c191dfa72028a
+EBUILD stone-2.3e-r1.ebuild 904 SHA256 c28c981b08636c81b23ba421faa47adc1c77ba212b186cc6b4fbb69588a662f3 SHA512 cd985d0fdc79a38921d57172ab6f02948c92f150cb64990c68e7e7a613300c1ed72e8fa8c94192e9aa8111152aa26ba15e6890c5a4d7fe63199974cc5a6a9a00 WHIRLPOOL 8b99094472db4bb4cee3afa49506c72f767a857b8ed9c456c4be71f3776c047c3f8b84ae7847433ddd13b703660f28aa6dd56e377ecac98c07029547ec6ae6ce
 EBUILD stone-2.3e.ebuild 814 SHA256 571660e2071fe431de75764964d21d9ec75a5bdf3b7d8b33fb8faee27a9d78b3 SHA512 910724d402660d2d1e7603fb167dcfdb457baa84fb9a48a3bad2da76466a8d0d4c96783e52025c3b187d498b6d1b302dc2dedbce473fa8c57d81a93e1efb41cc WHIRLPOOL e72bd9a5a7b89bd3f300dc2a516ddbacc40b45a1b8d499def0df8a9aa34cc895ed4b934f8c68889f8e2029a55220c5bfb77c0adc85c70ce78fdf9fb598ed14b4
-MISC ChangeLog 2477 SHA256 5a567a036ec7b99eb6f9e0738e2c4071041703a9bc497aa2cd609938ba9b58a7 SHA512 9b30c4e319e51d952b322306168ec838c96dfb4ff864a2fadc2739277f92262a42b400d3db9b72e3d72ab8f30b7c44394d0b22a82a09d49385372f0816e24fec WHIRLPOOL 2c827f69064f09a2063266b4747951a198c9c409963a6b046ce902b70f63687e8d6d0b1c3fcad50bc01fee43c50ea368353ccebec4c46467b672168a70d57d7e
+MISC ChangeLog 2731 SHA256 5ccaf73e468c6bad83a36d4f4686a79ad6af3d2fed9adc4804a5882333a2ea61 SHA512 b596cb845d36d75c59bb85ff80cb4e3c09e51340143a15d38ca7ec8108f55fed2b8022f68e92a9a3b4da8f545e3d4898fe7a7e86d8997fcc6502dd28fd593644 WHIRLPOOL ac64976515b34d81768a5ec36dbaa3588cc15977db5fbc793418ee802189b8c9dde3f9441358196b5a7ce7b2db075dd5a93a830de1b95ef74dbff1758a902101
 MISC metadata.xml 402 SHA256 68dd2c530f60976b0fa372e6150d108a82416096c59c96da9c5d252d18385c7b SHA512 0130e5b04515f2e51d93182f402edceb8d5528ebbff7c9a609607dbd8b459ffe4a726075a882ca1058cecebf7dbd6e9d6f84b12a038963f6d371453416936353 WHIRLPOOL 39c27bdeddb4e36067bcf6926ba95330d6c78c69c55dc7e57f9ee164abb93f741b6b43a3aaf1e446c89d620e1ed066804d74ff2f300aa487d1d325ad6d9283f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEUEAREIAAYFAlEOWg8ACgkQCaWpQKGI+9TNgQCcDR8j9hZAlw/QFT1CqCki5ArH
-Bg4AmJZuDUVmxaaT0sar4aTHKxvPTOM=
-=2Mxx
+iQEcBAEBCAAGBQJRJNXyAAoJECo/aRed9267JgIH/0xI2ykWelomatE+SwY3Z5Pt
+ho2sYZCV1HYTxOJcp6r4KRCAzYO7yTpYRzHI/O+0GnkGrquUB6k4NHGBkVildAGr
+V0NuPaeUZsqCjo1g/GTbmPApv3Xqgtol5TyeamuPm/8+IzluvAUiSwrZYkjvtUNa
+26gUOD+LJuUhnkJqKkMwAl++qgsoj1FIMYsqVc05A17XUSdbKyuz4NhafdsKthVL
+dv3O/NGTezAjkL/P3yx/Q11FDns2QoM9/nzVlkK2Hw4ym/zUUnpAkvtwRRLtRTIl
+ZiEmno3KlqQK4h5TONhpuAHzvrVpfjXS88rx9hxNRhfbul9xacD/teVspfeW3QI=
+=8l4o
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stone/files/stone-2.3e-makefile.patch b/net-misc/stone/files/stone-2.3e-makefile.patch
new file mode 100644
index 000000000000..5df2b6868a24
--- /dev/null
+++ b/net-misc/stone/files/stone-2.3e-makefile.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig	2013-02-20 17:45:36.000000000 +0400
++++ Makefile	2013-02-20 17:47:19.323650328 +0400
+@@ -19,8 +19,6 @@
+ # -DWINDOWS	Windows95/98/NT
+ # -DNT_SERVICE	WindowsNT/2000 native service
+ 
+-CFLAGS=		# -g
+-
+ SSL=		/usr/local/ssl
+ SSL_FLAGS=	-DUSE_SSL
+ SSL_LIBS=	-lssl -lcrypto
+@@ -60,7 +58,7 @@
+ 	@echo "*** md5c.c is contained in RFC1321"
+ 
+ stone: stone.c
+-	$(CC) $(CFLAGS) $(FLAGS) -o $@ $? $(LIBS)
++	$(CC) $(CFLAGS) $(FLAGS) ${LDFLAGS} -o $@ $? $(LIBS)
+ 
+ pop_stone: $(POP_LIBS)
+ 	$(MAKE) FLAGS="$(POP_FLAGS)" LIBS="$(POP_LIBS)" $(TARGET)
diff --git a/net-misc/stone/stone-2.3e-r1.ebuild b/net-misc/stone/stone-2.3e-r1.ebuild
new file mode 100644
index 000000000000..704b86e198d2
--- /dev/null
+++ b/net-misc/stone/stone-2.3e-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stone/stone-2.3e-r1.ebuild,v 1.1 2013/02/20 13:56:01 pinkbyte Exp $
+
+EAPI=5
+
+inherit base eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A simple TCP/IP packet repeater"
+HOMEPAGE="http://www.gcd.org/sengoku/stone/"
+SRC_URI="http://www.gcd.org/sengoku/stone/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ssl"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-2.3d-2.3.2.7"
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) # bug #337879
+
+src_prepare() {
+	tc-export CC
+	append-cflags "-D_GNU_SOURCE"
+
+	base_src_prepare
+}
+
+src_compile() {
+	local myargs
+	if use ssl ; then
+		myargs="SSL=/usr linux-ssl"
+	else
+		myargs="linux"
+	fi
+	emake ${myargs}
+}
+
+src_install() {
+	dobin stone
+	dodoc README*
+}