fixed automagic deps and updated to eapi 5

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x3A051746

4 files changed, 100 insertions, 32 deletions

diff --git a/net-proxy/pingtunnel/ChangeLog b/net-proxy/pingtunnel/ChangeLog
index 8f5b21c6f485..24aa12587512 100644
--- a/net-proxy/pingtunnel/ChangeLog
+++ b/net-proxy/pingtunnel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/pingtunnel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/pingtunnel/ChangeLog,v 1.6 2012/03/06 12:39:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/pingtunnel/ChangeLog,v 1.7 2012/12/10 21:52:31 dastergon Exp $
+
+  10 Dec 2012; Pavlos Ratis <dastergon@gentoo.org>
+  +files/pingtunnel-0.72_makefile.patch, pingtunnel-0.72.ebuild:
+  fixed automagic deps and updated to eapi 5
 
   06 Mar 2012; Tim Harder <radhermit@gentoo.org> -pingtunnel-0.61.ebuild,
   -pingtunnel-0.71.ebuild:
@@ -28,4 +32,3 @@
   16 Jul 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml,
   +pingtunnel-0.61.ebuild:
   Initial import from bug #98294.
-
diff --git a/net-proxy/pingtunnel/Manifest b/net-proxy/pingtunnel/Manifest
index c6039285b095..9064b9654b1b 100644
--- a/net-proxy/pingtunnel/Manifest
+++ b/net-proxy/pingtunnel/Manifest
@@ -1,18 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST PingTunnel-0.72.tar.gz 64188 RMD160 8c0f8b34ac928f3960518ed028b711d92fa90477 SHA1 d5d874ec7b4f68d2307cacc83a1c408aeb4206a5 SHA256 b318f7aa7d88918b6269d054a7e26f04f97d8870f47bd49a76cb2c99c73407a4
-EBUILD pingtunnel-0.72.ebuild 862 RMD160 8aa19555ec0c4b1e0c58550e5e9506674a066528 SHA1 bea6e203a7a505e7940187c4e6d4a4845bbdecb0 SHA256 270fbe1924d3aed11010a33fa18e629ad8bad5645e1470f4c21fa7cf63684591
-MISC ChangeLog 1092 RMD160 0cdee43361a7ade97b2cdfbf9bfa1f6ae3e33341 SHA1 360c536c8c44ebfc5a962af2345aaee88d467485 SHA256 1ea65d1d4810c266e8af92a8147090b2b224f84383435e3858209b0063bb6018
-MISC metadata.xml 380 RMD160 22751d363511cb511077b6fe8a4948836685f28b SHA1 6aceda20fc76978109e2173485d835a1e019cc7a SHA256 954355bd18e541874ccdd46e6d126a9631898996c31b0b7a81a7c648d1cc7baf
+AUX pingtunnel-0.72_makefile.patch 1587 SHA256 797b84b27508f5233c9781056c611d8b3834ed788c457234fa52dc24e7533388 SHA512 901258ec0f299441ab65bc38240f735fd46a5faf6c33d8011bc3dd88c40bf85ec267cdf6a7e90bdb8abc7f688fb6332d9571c4949321fa8dfa4403d175f3eb32 WHIRLPOOL 967dfa0634ab2bc4105e1fb86af5a9b987d47adb0d40f049e72ad47c718395c630c8316d09e40e4e4b8706e872932a3fbfa54a8409f819553280d9c24443b81a
+DIST PingTunnel-0.72.tar.gz 64188 SHA256 b318f7aa7d88918b6269d054a7e26f04f97d8870f47bd49a76cb2c99c73407a4 SHA512 943fc571ca95bb6af59f2a74458470865a89a502145bb1e5cf9b86159d61d897418d10d100691337f299892af7aba65964624462068a77ef1645890a4abf5d17 WHIRLPOOL a39fe5cc57d87b5977fcec53083a405c5310d74ea857af3a3837c0347d78c217a3e8fc911130a93e2ec1ab43f793104185cfeb7277caf6dc7b70b2c0209d0b74
+EBUILD pingtunnel-0.72.ebuild 815 SHA256 d37adb32d2ade3cde77e105cb9ecd80194d7d89ba01a55cbc8611e30fb0dd36f SHA512 9653cd5a5e2ba2fc1aa199b03f61084551b939a23a75fbc2fb3f9bec27e4fd658e0b1f2bc64b0c03dcbd2ad72d8b4d1c71de435cacce6e6064e8531ce2674c2f WHIRLPOOL e04168f40f278fa94a573ed8d2da999d5228ebc5b6e7d54e73d19656e51bdca1402f65a3dad8c8afeb9087c2aaca713b59ddd9da3ae7a4ea35868d7119663bd8
+MISC ChangeLog 1253 SHA256 e6a87a0c14520ae01f59b75fd878b0cb60b36715c5376074939cd1f7546353c8 SHA512 aa09e4b73f0ac7681443ce85c05eabfc5aa68593e12ef0ca350790d9d3939b6502dc93c199c2103f426b46afb49afbd867aa3b03a1cf30d85e66db337e48dc83 WHIRLPOOL 2e0a6d36d92a6c88e84a024cbf19e7cada7a0589d144afd82b854e71ca00643ecd991130335bc733ac010186ed7d426a84394fbd978c9d750f1ab9cab5c6f0a3
+MISC metadata.xml 380 SHA256 954355bd18e541874ccdd46e6d126a9631898996c31b0b7a81a7c648d1cc7baf SHA512 0a3cf17e9b1a49617efb9eedc9e99a5b3b2e4bb38ec5e2d36cdccc5854f42b40b1aba4bd0e031e713dbcd5b016feefd864c58a812b8ea060a1551246d449d7d5 WHIRLPOOL 5b05a38045e0efffd43d6d8978c4cc2011c70e41cde19c7bbb062bf0d1d0b2d57a7260730777a0364852b7d7f1deca4aefd063376b6d58fcb7c88ab9fef11482
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPVgWiAAoJEEqz6FtPBkyjj7YH/jo28bHnYW/njkXJhbZyvuwh
-j74eAGZIyO4PVY9/5orjWmYdwgptxliiyZLzOJriwrZMZEB+e17Z8vfOXHTwwB7e
-Q7BknI6AhZkJylLYLi1vc6r87LVhb73c8n5jc65R+N3nu7nc+kCpix8A5bI3Mobx
-cZ+S0x+u4phmPwwbKlpuaXlcMJUvSYR4U4i2k7qrvqZMBp3oYBS6afIjBwGnG+ve
-Ua1sCp/OEvdR3Iqx3Bhh6vSDtLJGSlKtPbgUoZVY1TLUrLGWgFfzErXwPoGnen2m
-HqpEOQGLtaCRa6s91HdwK1275OMRgpD39en17o4KnjLM4cD8u+BvmOYO56iSqCg=
-=cXQf
+iQIcBAEBCAAGBQJQxlmpAAoJEKMbvrI6BRdG6JkP/176wJU7bQkx578j34hlHB9n
+Zr1za5gaXz68sqSTmbSd5Y9f6Zfku0KjVnV/fwj9wJqyBPuEhG7+ddnjKDzDI/cX
+8Miezzo0hbCNlmp/7po1Z1Un4CftL8I7PxMxzrjt3ZOKgKAi6IKf7m4OL71O9CLp
+VULt26RK+d6fpGgTY7ViApErE7xna/MiF0kBsKVKkbbKtZxLcBKBcM66ZaMWnmZR
+YWzxPZwT1r3M9sfK9OjPOB6Z8S6wnVmBoe4B0776a+MfmHUbxMjrdrMJvy3A3HQf
+EGzwu7WVke4EvEonlictXHwd3w9nyBhYnskdk6uTUBETgoyHWB0613GCz42YTKoE
+OTl6ZIyHHLaHwXTYMO0Lbb362R4p3aLeiktcIq8msvPKCyXcAUiRieG7eMOXsG3Y
+tkW/GpnYouhPU/YIcfO0XAz7dP8i9N6OL1brZjb5w3j6fFKXADJuj7MYRHVsDzKX
+FdXmA1LLWOfFHYfoacHhxYmr6inHLmkd/vLR/fsP4tjtSUdWYSFvOxoPrGxZBYRZ
+iliThKi70+8/QRDh+tfRJVncgv0Xdp1RZz3mBlnsucGctU3nZa29ILwM7DlhMR1Q
+avmcitv9zplnD0pFb198fsCRzm0cxZ4maj7X14yQXeJbJbjO3o8lSnw6PnG5MFSQ
+5WvEVxTEddMhz+5xPZRb
+=9fQ9
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch b/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch
new file mode 100644
index 000000000000..9dce0992cbda
--- /dev/null
+++ b/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch
@@ -0,0 +1,60 @@
+--- Makefile

++++ Makefile

+@@ -2,11 +2,26 @@

+ # (c) 2004-2009 Daniel Stoedle, daniels@cs.uit.no

+ # ptunnel.exe target added by Mike Miller, mike@mikeage.net

+ 

+-CC	 		= gcc

+-CFLAGS		= -Wall -g

+-LDOPTS		= -lpthread -lpcap

++# set to 1 to enable debug symbols

++DEBUG=0

++

++# set to 1 to enable selinux support

++SELINUX=0

++

++CC         ?= gcc

++CFLAGS		+= -Wall

++LIBS		+= -lpthread -lpcap

+ PT_OBJS		= ptunnel.o md5.o

+ 

++ifeq ($(DEBUG),1)

++CFLAGS += -g

++endif

++

++ifeq ($(SELINUX),1)

++CPPFLAGS += -DHAVE_SELINUX

++LIBS += -lselinux

++endif

++

+ WIN32_CC    = mingw32-gcc

+ WIN32_CFLAGS = -g -Wall -DWIN32 -I"c:\Program Files\WpdPack\Include"

+ WIN32_LDOPTS = -lwpcap -lwsock32 -L"c:\Program Files\WpdPack\Lib"

+@@ -26,13 +41,13 @@

+ 	

+ 

+ install: ptunnel

+-	install -d $(bindir)/

+-	install -d $(mandir)/

+-	install ./ptunnel $(bindir)/ptunnel

+-	install ./ptunnel.8 $(mandir)/ptunnel.8

++	install -d "$(DESTDIR)/$(bindir)/"

++	install -d "$(DESTDIR)/$(mandir)/"

++	install -m755 ./ptunnel "$(DESTDIR)/$(bindir)/ptunnel"

++	install -m644 ./ptunnel.8 "$(DESTDIR)/$(mandir)/ptunnel.8"

+ 

+ ptunnel: $(PT_OBJS)

+-	$(CC) -o $@ $^ $(LDOPTS) `[ -e /usr/include/selinux/selinux.h ] && echo -lselinux`

++	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)

+ 

+ ptunnel.exe: $(WIN32_PT_OBJS)

+ 	$(CC) -o $@ $^ $(WIN32_LDOPTS)

+@@ -47,7 +62,7 @@

+ 	$(CC) $(CFLAGS) -MM *.c > $@

+ 

+ %.o:%.c

+-	$(CC) $(CFLAGS) `[ -e /usr/include/selinux/selinux.h ] && echo -DHAVE_SELINUX` -c -o $@ $<

++	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<

+ 

+ %.obj:%.c

+ 	$(WIN32_CC) $(WIN32_CFLAGS) -c -o $@ $<

diff --git a/net-proxy/pingtunnel/pingtunnel-0.72.ebuild b/net-proxy/pingtunnel/pingtunnel-0.72.ebuild
index e3dd1a994c86..aa460eb59346 100644
--- a/net-proxy/pingtunnel/pingtunnel-0.72.ebuild
+++ b/net-proxy/pingtunnel/pingtunnel-0.72.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/pingtunnel/pingtunnel-0.72.ebuild,v 1.1 2011/09/05 20:08:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/pingtunnel/pingtunnel-0.72.ebuild,v 1.2 2012/12/10 21:52:31 dastergon Exp $
 
-EAPI="4"
+EAPI=5
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Tunnel TCP over ICMP"
 HOMEPAGE="http://www.cs.uit.no/~daniels/PingTunnel"
@@ -13,28 +13,26 @@ SRC_URI="http://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
-IUSE="doc"
+IUSE="doc selinux"
 
-DEPEND="net-libs/libpcap"
+DEPEND="
+	net-libs/libpcap
+	selinux? ( sys-libs/libselinux )
+"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/PingTunnel
 
-src_prepare() {
-	sed -r -i \
-		-e '/^CFLAGS/s:=.*:+= -Wall -fno-strict-aliasing:' \
-		-e '/^LDOPTS/s:$: $(LDFLAGS):' \
-		Makefile
+src_prepare(){
+	epatch "${FILESDIR}"/${P}_makefile.patch
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	tc-export CC
+	emake $(usex selinux "SELINUX=1" "SELINUX=0")
 }
 
 src_install() {
-	emake prefix="${D}/usr" install
-	dodoc CHANGELOG README
-	if use doc ; then
-		dohtml web/*
-	fi
+	default
+	use doc && dohtml web/*
 }