version bump. Improved initscript thanks to inspiration by Natanael Copa in bug #175024

Package-Manager: portage-2.1.2.2

11 files changed, 96 insertions, 211 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index b4083727ed14..cd9cb8015730 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,11 +1,19 @@
 # ChangeLog for net-misc/tinc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.12 2007/04/07 13:38:28 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.13 2007/04/19 08:45:08 dragonheart Exp $
+
+*tinc-1.0.7 (19 Apr 2007)
+
+  19 Apr 2007; Daniel Black <dragonheart@gentoo.org> files/tincd,
+  -tinc-1.0.3.ebuild, -tinc-1.0.4.ebuild, -files/tinc-1.0.4-lzo2.patch,
+  tinc-1.0.5.ebuild, +tinc-1.0.7.ebuild:
+  version bump. Improved initscript thanks to inspiration by Natanael Copa in
+  bug #175024
 
   07 Apr 2007; Christian Faulhammer <opfer@gentoo.org> tinc-1.0.5.ebuild:
   keyworded ~amd64, bug 171550
 
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
 
 *tinc-1.0.5 (16 Dec 2006)
@@ -13,7 +21,7 @@
   16 Dec 2006; Daniel Black <dragonheart@gentoo.org> +tinc-1.0.5.ebuild:
   version bump.
 
-  24 May 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  24 May 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove warpzero from metadata.xml, bug 133117.
 
 *tinc-1.0.4 (25 Apr 2006)
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index c795cf84f58e..5b438c3b40be 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -1,50 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX tinc-1.0.4-lzo2.patch 2624 RMD160 67ec64c8683d8a55c9ca25277d1f2d06d3d6ca38 SHA1 d68c14b71a9a663f7ddab94f924a2581cc61092c SHA256 ecde19af347a2308925cf66a9cca0e84eb592abf1d7caf7dee6860ce6abb7f43
-MD5 4d26ba559ee9d5f91656b3b5f9e08478 files/tinc-1.0.4-lzo2.patch 2624
-RMD160 67ec64c8683d8a55c9ca25277d1f2d06d3d6ca38 files/tinc-1.0.4-lzo2.patch 2624
-SHA256 ecde19af347a2308925cf66a9cca0e84eb592abf1d7caf7dee6860ce6abb7f43 files/tinc-1.0.4-lzo2.patch 2624
-AUX tincd 1340 RMD160 961ea88587682a32db46cb71e116f26c5b788f50 SHA1 afd5c1c7230b30bd352e2301e962c5bca5c57ed2 SHA256 694d9e3728d32b12620637f003d5d5b67698955687740bafabc77c8bc7d4fe70
-MD5 9aa869612dc4114ba8b2c8761afccdd6 files/tincd 1340
-RMD160 961ea88587682a32db46cb71e116f26c5b788f50 files/tincd 1340
-SHA256 694d9e3728d32b12620637f003d5d5b67698955687740bafabc77c8bc7d4fe70 files/tincd 1340
-DIST tinc-1.0.3.tar.gz 476701 RMD160 82168516eb1db8b42f54980c3cae79ed53f037b0 SHA1 4c8e2495d5d65fb48b3674fff8e404d6a3324241 SHA256 f3c9e51dfd9a57f5923eb9ab24fbe7dd7c97a5c9c23028a3985383a84942d15d
-DIST tinc-1.0.4.tar.gz 480305 RMD160 f4ec33a10f5039c625ec124376216cc03aa5f318 SHA1 b70c87a147e5a01edcb70593ea29155eed075785 SHA256 74373997b37a9e189e557ecf0d4e8b5aaa57f39be04ba5361448e31b73574b33
+AUX tincd 1598 RMD160 5ddecbbaccbb28cdb595db5439fb63192ee1b61e SHA1 4fa03b0898736cdadccab946cf329bc422c75e19 SHA256 520acccd0bb7ab37d966d5dc453050829dedd35ff857558814443b22527f0be8
+MD5 9d6be41a86a51d3f1c94ec258b236566 files/tincd 1598
+RMD160 5ddecbbaccbb28cdb595db5439fb63192ee1b61e files/tincd 1598
+SHA256 520acccd0bb7ab37d966d5dc453050829dedd35ff857558814443b22527f0be8 files/tincd 1598
 DIST tinc-1.0.5.tar.gz 490292 RMD160 fd5965153b1a5c9c6d200c257bc885679c36b174 SHA1 32f85bc58ce2c45351d312e7baee40f382e44edd SHA256 6069e560ea114d62b300282a21a515bccc4fb85db6e5694dabb1642067ea051e
-EBUILD tinc-1.0.3.ebuild 913 RMD160 76f8cb9ed0981e44e61736c3823710cc37557d44 SHA1 40711f70846151530fe09e7d9d3699ab6ab8c488 SHA256 eedd392ba4162972603a0c893656a321ad30c7af56e130f0ceeaa7f9cf6b83a5
-MD5 ff805f24b8485558ef776d48ed8a02be tinc-1.0.3.ebuild 913
-RMD160 76f8cb9ed0981e44e61736c3823710cc37557d44 tinc-1.0.3.ebuild 913
-SHA256 eedd392ba4162972603a0c893656a321ad30c7af56e130f0ceeaa7f9cf6b83a5 tinc-1.0.3.ebuild 913
-EBUILD tinc-1.0.4.ebuild 1023 RMD160 a26bd4051be29f32f795d9364be6b802e1cd2a6b SHA1 3317807a12d0833b928b5af55e243ad3fa0e7143 SHA256 2ddf5632238beac777898796d7093b151b1bd7ce1135c1a7f17b6299fb5cc0ea
-MD5 5ec48bc03da51ef41536777ea2f66d74 tinc-1.0.4.ebuild 1023
-RMD160 a26bd4051be29f32f795d9364be6b802e1cd2a6b tinc-1.0.4.ebuild 1023
-SHA256 2ddf5632238beac777898796d7093b151b1bd7ce1135c1a7f17b6299fb5cc0ea tinc-1.0.4.ebuild 1023
-EBUILD tinc-1.0.5.ebuild 953 RMD160 52b0312b9c631c4a7e85d8eb3fc6d247534b0c5f SHA1 db3de02a5ca6f6ad03a9e1fa63e25309d29ceae0 SHA256 c6efc3ec881f10653e41c9286c8aee9de3fd1dcd953184ef24e0f8c2a29cd309
-MD5 9f400f988fc67f0d20d5e87384b1e826 tinc-1.0.5.ebuild 953
-RMD160 52b0312b9c631c4a7e85d8eb3fc6d247534b0c5f tinc-1.0.5.ebuild 953
-SHA256 c6efc3ec881f10653e41c9286c8aee9de3fd1dcd953184ef24e0f8c2a29cd309 tinc-1.0.5.ebuild 953
-MISC ChangeLog 1915 RMD160 b390496e9b06551868c2e0cb08471a193e788297 SHA1 e7b6e46104f25b60a9ef9de46ed15e3f419ea16c SHA256 bafff35365d92aba83de5df14030b7e28f5a0182f2571ecb63fd637e0d101113
-MD5 1db769285280898155f8c4976f358f47 ChangeLog 1915
-RMD160 b390496e9b06551868c2e0cb08471a193e788297 ChangeLog 1915
-SHA256 bafff35365d92aba83de5df14030b7e28f5a0182f2571ecb63fd637e0d101113 ChangeLog 1915
+DIST tinc-1.0.7.tar.gz 499135 RMD160 74ce43f65700b182dff879ac08c41859faee27c2 SHA1 79b18aa72d5c694c2a9ee7f59c8cf274407ed908 SHA256 5993b9d2c8a2836bb2527a3c07ceb0d933e55964a4790b08743f5f7aaec25952
+EBUILD tinc-1.0.5.ebuild 932 RMD160 386364538300126a28edde64902851b55fa5f7ac SHA1 8885969faab5888188f0a96ee47a7fdecb504d8e SHA256 12f74d37d2460f87b986859eb2c752ec14b5fb602287bd805b87461bb0c94b46
+MD5 1e48db84a21d24ab649b0ce9eaa1e8d2 tinc-1.0.5.ebuild 932
+RMD160 386364538300126a28edde64902851b55fa5f7ac tinc-1.0.5.ebuild 932
+SHA256 12f74d37d2460f87b986859eb2c752ec14b5fb602287bd805b87461bb0c94b46 tinc-1.0.5.ebuild 932
+EBUILD tinc-1.0.7.ebuild 928 RMD160 cd6e2967e2df08d7fd5583d98a450eb99d34c984 SHA1 6bf91b1c29c4cc1dcfa0577727a4be4d01ebf58e SHA256 74ae2c68a61e8527d210a5a9f566d2b1bd36da7fd908cfb961be2345f37f2d95
+MD5 11cb40fa1b51521857a7ce114e1acc9c tinc-1.0.7.ebuild 928
+RMD160 cd6e2967e2df08d7fd5583d98a450eb99d34c984 tinc-1.0.7.ebuild 928
+SHA256 74ae2c68a61e8527d210a5a9f566d2b1bd36da7fd908cfb961be2345f37f2d95 tinc-1.0.7.ebuild 928
+MISC ChangeLog 2224 RMD160 be45a3811861d9dd8c464a3536b09f7aa2e9afab SHA1 3c698c4392aa6294f6d2241a2968b83444aa8aeb SHA256 5331153eb18231f9957efa4ab1fd1ba1c0ca00c31da077a2bb8b8990620c5f38
+MD5 c8a766dd9df1b04f8899050e6c111f93 ChangeLog 2224
+RMD160 be45a3811861d9dd8c464a3536b09f7aa2e9afab ChangeLog 2224
+SHA256 5331153eb18231f9957efa4ab1fd1ba1c0ca00c31da077a2bb8b8990620c5f38 ChangeLog 2224
 MISC metadata.xml 348 RMD160 afd2573757a4b008cba32a623a56b57f4b0dd2e1 SHA1 d5be688b2f184743d8e63b551cc1a359ec8355be SHA256 9c51cd497b519a843d983279c7cd59bf739d1c3f4d55ae94600cfecdb2ffbb5a
 MD5 cd6151a96e4193f6dc2624b058af15d5 metadata.xml 348
 RMD160 afd2573757a4b008cba32a623a56b57f4b0dd2e1 metadata.xml 348
 SHA256 9c51cd497b519a843d983279c7cd59bf739d1c3f4d55ae94600cfecdb2ffbb5a metadata.xml 348
-MD5 953fcbfe7ccf194385591d0edb8bed03 files/digest-tinc-1.0.3 232
-RMD160 662cfa779d587be33bae1e6791f7c5a1b098e3bc files/digest-tinc-1.0.3 232
-SHA256 c4ee0e13c8f75ecb6e9e00815928106e4f0523ec53bb13b310c85e70d6f4eea3 files/digest-tinc-1.0.3 232
-MD5 297f0832fbd859b79f8e2cd522baf728 files/digest-tinc-1.0.4 232
-RMD160 8c12103347020c8865ae27ab047a5b1e0e89625f files/digest-tinc-1.0.4 232
-SHA256 0b1d8bb9fc6a5c0e51b91acf092b8fc95ae700e0685f43c780a47d6134d88e91 files/digest-tinc-1.0.4 232
 MD5 7e74a36b6019d95acbe9956bc1ac07ba files/digest-tinc-1.0.5 232
 RMD160 50288e9dde818507cb5529977d18ed77406fca61 files/digest-tinc-1.0.5 232
 SHA256 22843b93329ecc96059f510f94b490e1f93a474e9332b99798b4d9a5ab2ebc51 files/digest-tinc-1.0.5 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGF57bNQqtfCuFneMRApLMAJ4u3LCM4DG7eaetfq0he/HXM215wACglPSJ
-8URE0mez3KJaWJb16g4lKac=
-=HPWN
------END PGP SIGNATURE-----
+MD5 9d35c02042a57e39457322aac03a0ab0 files/digest-tinc-1.0.7 232
+RMD160 66e327f8e338aab304a66b16d05babc9c7627a25 files/digest-tinc-1.0.7 232
+SHA256 738d018f61c7aad912008d2eaa5a0c06d63a8f85598eacb77cc721a3335a088b files/digest-tinc-1.0.7 232
diff --git a/net-misc/tinc/files/digest-tinc-1.0.3 b/net-misc/tinc/files/digest-tinc-1.0.3
deleted file mode 100644
index c12347f68df8..000000000000
--- a/net-misc/tinc/files/digest-tinc-1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5dd1acf7d784e29aae78c31a2630fccd tinc-1.0.3.tar.gz 476701
-RMD160 82168516eb1db8b42f54980c3cae79ed53f037b0 tinc-1.0.3.tar.gz 476701
-SHA256 f3c9e51dfd9a57f5923eb9ab24fbe7dd7c97a5c9c23028a3985383a84942d15d tinc-1.0.3.tar.gz 476701
diff --git a/net-misc/tinc/files/digest-tinc-1.0.4 b/net-misc/tinc/files/digest-tinc-1.0.4
deleted file mode 100644
index e57405c59373..000000000000
--- a/net-misc/tinc/files/digest-tinc-1.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63887373dd763f8d90cecc5a3616c363 tinc-1.0.4.tar.gz 480305
-RMD160 f4ec33a10f5039c625ec124376216cc03aa5f318 tinc-1.0.4.tar.gz 480305
-SHA256 74373997b37a9e189e557ecf0d4e8b5aaa57f39be04ba5361448e31b73574b33 tinc-1.0.4.tar.gz 480305
diff --git a/net-misc/tinc/files/digest-tinc-1.0.7 b/net-misc/tinc/files/digest-tinc-1.0.7
new file mode 100644
index 000000000000..07a647a56335
--- /dev/null
+++ b/net-misc/tinc/files/digest-tinc-1.0.7
@@ -0,0 +1,3 @@
+MD5 572255e6cbb9efffd9e40adb73ab7861 tinc-1.0.7.tar.gz 499135
+RMD160 74ce43f65700b182dff879ac08c41859faee27c2 tinc-1.0.7.tar.gz 499135
+SHA256 5993b9d2c8a2836bb2527a3c07ceb0d933e55964a4790b08743f5f7aaec25952 tinc-1.0.7.tar.gz 499135
diff --git a/net-misc/tinc/files/tinc-1.0.4-lzo2.patch b/net-misc/tinc/files/tinc-1.0.4-lzo2.patch
deleted file mode 100644
index a08374aa1808..000000000000
--- a/net-misc/tinc/files/tinc-1.0.4-lzo2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ru tinc-1.0.4.orig/configure tinc-1.0.4/configure
---- tinc-1.0.4.orig/configure	2005-05-05 04:24:06.000000000 +1000
-+++ tinc-1.0.4/configure	2005-11-13 18:34:21.000000000 +1100
-@@ -11074,13 +11144,13 @@
- done
- 
- 
--  echo "$as_me:$LINENO: checking for lzo1x_1_compress in -llzo" >&5
--echo $ECHO_N "checking for lzo1x_1_compress in -llzo... $ECHO_C" >&6
--if test "${ac_cv_lib_lzo_lzo1x_1_compress+set}" = set; then
-+  echo "$as_me:$LINENO: checking for lzo1x_1_compress in -llzo2" >&5
-+echo $ECHO_N "checking for lzo1x_1_compress in -llzo2... $ECHO_C" >&6
-+if test "${ac_cv_lib_lzo2_lzo1x_1_compress+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-llzo  $LIBS"
-+LIBS="-llzo2  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11112,7 +11182,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -11124,21 +11195,21 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_lzo_lzo1x_1_compress=yes
-+  ac_cv_lib_lzo2_lzo1x_1_compress=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_lzo_lzo1x_1_compress=no
-+ac_cv_lib_lzo2_lzo1x_1_compress=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_lzo_lzo1x_1_compress" >&5
--echo "${ECHO_T}$ac_cv_lib_lzo_lzo1x_1_compress" >&6
--if test $ac_cv_lib_lzo_lzo1x_1_compress = yes; then
--  LIBS="$LIBS -llzo"
-+echo "$as_me:$LINENO: result: $ac_cv_lib_lzo2_lzo1x_1_compress" >&5
-+echo "${ECHO_T}$ac_cv_lib_lzo2_lzo1x_1_compress" >&6
-+if test $ac_cv_lib_lzo2_lzo1x_1_compress = yes; then
-+  LIBS="$LIBS -llzo2"
- else
-   { { echo "$as_me:$LINENO: error: \"lzo libraries not found.\"" >&5
- echo "$as_me: error: \"lzo libraries not found.\"" >&2;}
-diff -ru tinc-1.0.4.orig/m4/lzo.m4 tinc-1.0.4/m4/lzo.m4
---- tinc-1.0.4.orig/m4/lzo.m4	2004-03-25 08:04:27.000000000 +1100
-+++ tinc-1.0.4/m4/lzo.m4	2005-11-13 18:38:39.000000000 +1100
-@@ -26,8 +26,8 @@
-     [AC_MSG_ERROR("lzo header files not found."); break]
-   )
- 
--  AC_CHECK_LIB(lzo, lzo1x_1_compress,
--    [LIBS="$LIBS -llzo"],
-+  AC_CHECK_LIB(lzo2, lzo1x_1_compress,
-+    [LIBS="$LIBS -llzo2"],
-     [AC_MSG_ERROR("lzo libraries not found.")]
-   )
- ])
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
index e5265632ec66..32c0cff904a2 100644
--- a/net-misc/tinc/files/tincd
+++ b/net-misc/tinc/files/tincd
@@ -1,7 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.3 2004/07/15 00:13:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.4 2007/04/19 08:45:08 dragonheart Exp $
+
+opts="reload"
 
 depend() {
 	use logger dns
@@ -9,7 +11,7 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! `grep -c '^ *NETWORK:' /etc/conf.d/tinc.networks` > 0 ]
+	if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks 
 	then
 		eerror "No VPN networks configured in /etc/conf.d/tinc.networks"
 		return 1
@@ -20,14 +22,14 @@ start() {
 	checkconfig || return 1
 	ebegin "Starting tinc VPN networks"
 	eend 0
-	cat /etc/conf.d/tinc.networks | grep '^ *NETWORK:' | awk '{ print $2 }' | while read TINCNET
+	awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
 	do
-		if [ ! -f /etc/tinc/$TINCNET/tinc.conf ] 
+		if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ] 
 		then
 			eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
 		else
 			ebegin "Starting tinc network $TINCNET"
-			/usr/sbin/tincd --net=$TINCNET --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
+			/usr/sbin/tincd --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
 			eend $?
 		fi
 	done
@@ -36,14 +38,27 @@ start() {
 stop() {
 	ebegin "Stopping tinc VPN networks"
 	eend 0
-	cat /etc/conf.d/tinc.networks | grep '^ *NETWORK:' | awk '{ print $2 }' | while read TINCNET
+	awk '^ *NETWORK:/{print $2}' /etc/conf.d/tinc.networks | while read TINCNET
 	do
-		if [ -f /var/run/tinc.$TINCNET.pid ]
+		if [ -f /var/run/tinc."$TINCNET".pid ]
 		then
 			ebegin "Stopping tinc network $TINCNET"
-			/usr/sbin/tincd --kill=9 `cat /var/run/tinc.$TINCNET.pid` --pidfile=/var/run/tinc.$TINCNET.pid
+			/usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
+			eend $?
+		fi
+	done
+}
+
+reload() {
+	ebegin "Reloading configuration for tinc VPN networks"
+	eend 0
+	awk '^ *NETWORK:/{print $2}' /etc/conf.d/tinc.networks | while read TINCNET
+	do
+		if [ -f /var/run/tinc."$TINCNET".pid ]
+		then
+			ebegin "Reloading tinc network $TINCNET"
+			/usr/sbin/tincd --kill HUP  --pidfile=/var/run/tinc."$TINCNET".pid
 			eend $?
-			#rm -f /var/run/tinc.$TINCNET.pid
 		fi
 	done
 }
diff --git a/net-misc/tinc/tinc-1.0.3.ebuild b/net-misc/tinc/tinc-1.0.3.ebuild
deleted file mode 100644
index d0e177e0b011..000000000000
--- a/net-misc/tinc/tinc-1.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.3.ebuild,v 1.2 2006/01/03 10:52:00 dragonheart Exp $
-
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://tinc.nl.linux.org/"
-SRC_URI="http://tinc.nl.linux.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~sparc ~x86 ~ppc"
-IUSE=""
-
-DEPEND=">=dev-libs/openssl-0.9.7c
-	virtual/linux-sources
-	=dev-libs/lzo-1*
-	>=sys-libs/zlib-1.1.4-r2"
-
-src_compile() {
-	econf --enable-jumbograms || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS INSTALL NEWS README THANKS TODO
-	exeinto /etc/init.d ; newexe ${FILESDIR}/tincd tincd
-}
-
-pkg_postinst() {
-	einfo "This package requires the tun/tap kernel device."
-	einfo "Look at http://tinc.nl.linux.org/ for how to configure tinc"
-}
diff --git a/net-misc/tinc/tinc-1.0.4.ebuild b/net-misc/tinc/tinc-1.0.4.ebuild
deleted file mode 100644
index b37767650afd..000000000000
--- a/net-misc/tinc/tinc-1.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.4.ebuild,v 1.1 2006/04/25 14:03:29 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://tinc.nl.linux.org/"
-SRC_URI="http://tinc.nl.linux.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~sparc ~x86 ~ppc"
-IUSE=""
-
-DEPEND=">=dev-libs/openssl-0.9.7c
-	virtual/linux-sources
-	>=dev-libs/lzo-2
-	>=sys-libs/zlib-1.1.4-r2"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-lzo2.patch
-}
-
-src_compile() {
-	econf --enable-jumbograms --with-lzo-include=/usr/include/lzo || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS NEWS README THANKS TODO
-	exeinto /etc/init.d ; newexe ${FILESDIR}/tincd tincd
-}
-
-pkg_postinst() {
-	einfo "This package requires the tun/tap kernel device."
-	einfo "Look at http://tinc.nl.linux.org/ for how to configure tinc"
-}
diff --git a/net-misc/tinc/tinc-1.0.5.ebuild b/net-misc/tinc/tinc-1.0.5.ebuild
index d91a8c474fe9..880bd650f8b9 100644
--- a/net-misc/tinc/tinc-1.0.5.ebuild
+++ b/net-misc/tinc/tinc-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.5.ebuild,v 1.2 2007/04/07 13:38:28 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.5.ebuild,v 1.3 2007/04/19 08:45:08 dragonheart Exp $
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/"
@@ -25,10 +25,10 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc AUTHORS NEWS README THANKS TODO
-	exeinto /etc/init.d ; newexe ${FILESDIR}/tincd tincd
+	doinitd "${FILESDIR}"/tincd
 }
 
 pkg_postinst() {
-	einfo "This package requires the tun/tap kernel device."
-	einfo "Look at http://www.tinc-vpn.org/ for how to configure tinc"
+	elog "This package requires the tun/tap kernel device."
+	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
 }
diff --git a/net-misc/tinc/tinc-1.0.7.ebuild b/net-misc/tinc/tinc-1.0.7.ebuild
new file mode 100644
index 000000000000..3cc1f009aa1c
--- /dev/null
+++ b/net-misc/tinc/tinc-1.0.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.7.ebuild,v 1.1 2007/04/19 08:45:08 dragonheart Exp $
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/"
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE="nls"
+
+DEPEND=">=dev-libs/openssl-0.9.7c
+	virtual/linux-sources
+	>=dev-libs/lzo-2
+	>=sys-libs/zlib-1.1.4-r2
+	nls? ( sys-devel/gettext )"
+
+src_compile() {
+	econf --enable-jumbograms $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README THANKS
+	doinitd "${FILESDIR}"/tincd
+}
+
+pkg_postinst() {
+	elog "This package requires the tun/tap kernel device."
+	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
+}