version bump bug #112375. added me to maintainer too. removed old version

(Portage version: 2.1_pre9-r4)

6 files changed, 130 insertions, 1 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 5e3c48ec4ec6..ba20ebdf1f82 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/tinc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.6 2006/01/03 10:52:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.7 2006/04/25 14:03:29 dragonheart Exp $
+
+*tinc-1.0.4 (25 Apr 2006)
+
+  25 Apr 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/tinc-1.0.4-lzo2.patch, metadata.xml, -tinc-1.0.2.ebuild,
+  +tinc-1.0.4.ebuild:
+  version bump bug #112375. added me to maintainer too. removed old version
 
   03 Jan 2006; Daniel Black <dragonheart@gentoo.org> tinc-1.0.2.ebuild,
   tinc-1.0.3.ebuild:
diff --git a/net-misc/tinc/files/digest-tinc-1.0.3 b/net-misc/tinc/files/digest-tinc-1.0.3
index b60ba137b5a6..c12347f68df8 100644
--- a/net-misc/tinc/files/digest-tinc-1.0.3
+++ b/net-misc/tinc/files/digest-tinc-1.0.3
@@ -1 +1,3 @@
 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
new file mode 100644
index 000000000000..e57405c59373
--- /dev/null
+++ b/net-misc/tinc/files/digest-tinc-1.0.4
@@ -0,0 +1,3 @@
+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/tinc-1.0.4-lzo2.patch b/net-misc/tinc/files/tinc-1.0.4-lzo2.patch
new file mode 100644
index 000000000000..a08374aa1808
--- /dev/null
+++ b/net-misc/tinc/files/tinc-1.0.4-lzo2.patch
@@ -0,0 +1,73 @@
+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/metadata.xml b/net-misc/tinc/metadata.xml
index 1dd324cfbfc6..e7c4069eb5df 100644
--- a/net-misc/tinc/metadata.xml
+++ b/net-misc/tinc/metadata.xml
@@ -6,5 +6,9 @@
   <email>warpzero@gentoo.org</email>
   <name>Joshua Charles Campbell</name>
 </maintainer>
+<maintainer>
+  <email>dragonheart@gentoo.org</email>
+  <name>Daniel Black</name>
+</maintainer>
 <longdescription>tinc is an easy to configure VPN implementation.</longdescription>
 </pkgmetadata>
diff --git a/net-misc/tinc/tinc-1.0.4.ebuild b/net-misc/tinc/tinc-1.0.4.ebuild
new file mode 100644
index 000000000000..b37767650afd
--- /dev/null
+++ b/net-misc/tinc/tinc-1.0.4.ebuild
@@ -0,0 +1,40 @@
+# 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"
+}