Version bump. Added dependency to linux-headers as new versions (>=2.6.18)

removed some needed functions.
(Portage version: 2.1.2-r12)

7 files changed, 18 insertions, 28 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index a9368e063022..bee15607d417 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/strongswan
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.52 2007/02/28 16:11:34 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.53 2007/02/28 16:47:04 pylon Exp $
+
+*strongswan-2.8.3 (28 Feb 2007)
+
+  28 Feb 2007; Lars Weiler <pylon@gentoo.org>
+  -files/linux-headers-2.6.18.patch, +files/ipsec-path-2.8.3.patch.bz2,
+  strongswan-2.8.0.ebuild, -strongswan-2.8.1.ebuild,
+  +strongswan-2.8.3.ebuild:
+  Version bump. Added dependency to linux-headers as new versions (>=2.6.18)
+  removed some needed functions.
 
   28 Feb 2007; Lars Weiler <pylon@gentoo.org> -strongswan-2.5.7.ebuild,
   -strongswan-2.6.2.ebuild, strongswan-2.8.0.ebuild,
diff --git a/net-misc/strongswan/files/digest-strongswan-2.8.1 b/net-misc/strongswan/files/digest-strongswan-2.8.1
deleted file mode 100644
index e7f86b493b7b..000000000000
--- a/net-misc/strongswan/files/digest-strongswan-2.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a87edfa33d207ef03ccb844087e26cf strongswan-2.8.1.tar.bz2 2531451
-RMD160 d7026b78498b4febd6ad06e26c7e5521a3fcef17 strongswan-2.8.1.tar.bz2 2531451
-SHA256 e8e5c1a42f50d0f03956b41bf1c59ba561b1b34b46407fe8f71b1df6c0b23d6b strongswan-2.8.1.tar.bz2 2531451
diff --git a/net-misc/strongswan/files/digest-strongswan-2.8.3 b/net-misc/strongswan/files/digest-strongswan-2.8.3
new file mode 100644
index 000000000000..fe88f92163e4
--- /dev/null
+++ b/net-misc/strongswan/files/digest-strongswan-2.8.3
@@ -0,0 +1,3 @@
+MD5 720bfbbb3a0deb6964119228ed4226b4 strongswan-2.8.3.tar.bz2 1710171
+RMD160 6bf267e500bb60d39fff5cef7872c3ad31750d9d strongswan-2.8.3.tar.bz2 1710171
+SHA256 01441bdf2e172074179d3c70a73a2a86754895e7fd60ff8b5f215fce70351bdf strongswan-2.8.3.tar.bz2 1710171
diff --git a/net-misc/strongswan/files/ipsec-path-2.8.3.patch.bz2 b/net-misc/strongswan/files/ipsec-path-2.8.3.patch.bz2
new file mode 100644
index 000000000000..e8f97f927357
--- /dev/null
+++ b/net-misc/strongswan/files/ipsec-path-2.8.3.patch.bz2
diff --git a/net-misc/strongswan/files/linux-headers-2.6.18.patch b/net-misc/strongswan/files/linux-headers-2.6.18.patch
deleted file mode 100644
index 2676160449d2..000000000000
--- a/net-misc/strongswan/files/linux-headers-2.6.18.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur strongswan-2.8.1-vanilla/programs/starter/starterwhack.c strongswan-2.8.1-incfix/programs/starter/starterwhack.c
---- strongswan-2.8.1-vanilla/programs/starter/starterwhack.c    2006-10-19 18:02:46.000000000 +0300
-+++ strongswan-2.8.1-incfix/programs/starter/starterwhack.c     2007-01-18 09:57:07.000000000 +0200
-@@ -17,7 +17,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--#include <linux/stddef.h>
-+#include <stddef.h>
- #include <unistd.h>
- #include <errno.h>
diff --git a/net-misc/strongswan/strongswan-2.8.0.ebuild b/net-misc/strongswan/strongswan-2.8.0.ebuild
index 0e2de17f6a4f..c1afd4f71b04 100644
--- a/net-misc/strongswan/strongswan-2.8.0.ebuild
+++ b/net-misc/strongswan/strongswan-2.8.0.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/strongswan/strongswan-2.8.0.ebuild,v 1.10 2007/02/28 16:11:34 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.0.ebuild,v 1.11 2007/02/28 16:47:04 pylon Exp $
 
 inherit eutils linux-info
 
@@ -17,6 +17,7 @@ COMMON_DEPEND="!net-misc/openswan
 	dev-libs/gmp"
 DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
+	<sys-kernel/linux-headers-2.6.18
 	curl? ( net-misc/curl )
 	ldap? ( net-nds/openldap )
 	smartcard? ( dev-libs/opensc )"
@@ -55,11 +56,6 @@ src_unpack() {
 
 	epatch ${FILESDIR}/ipsec-path.patch.bz2
 
-	# Fix for newer sys-kernel/linux-headers; bug #162811
-	if has_version ">=sys-kernel/linux-headers-2.6.18" ; then
-		epatch ${FILESDIR}/linux-headers-2.6.18.patch
-	fi
-
 	if use curl ; then
 		ebegin "Curl support requested. Enabling curl support"
 		sed -i -e 's:\(USE_LIBCURL?=\)false:\1true:g' Makefile.inc || die
diff --git a/net-misc/strongswan/strongswan-2.8.1.ebuild b/net-misc/strongswan/strongswan-2.8.3.ebuild
index 89f53d9024e9..81caafa17457 100644
--- a/net-misc/strongswan/strongswan-2.8.1.ebuild
+++ b/net-misc/strongswan/strongswan-2.8.3.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/strongswan/strongswan-2.8.1.ebuild,v 1.2 2007/02/28 16:11:34 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.3.ebuild,v 1.1 2007/02/28 16:47:04 pylon Exp $
 
 inherit eutils linux-info
 
@@ -17,6 +17,7 @@ COMMON_DEPEND="!net-misc/openswan
 	dev-libs/gmp"
 DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
+	<sys-kernel/linux-headers-2.6.18
 	curl? ( net-misc/curl )
 	ldap? ( net-nds/openldap )
 	smartcard? ( dev-libs/opensc )"
@@ -53,12 +54,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/ipsec-path.patch.bz2
-
-	# Fix for newer sys-kernel/linux-headers; bug #162811
-	if has_version ">=sys-kernel/linux-headers-2.6.18" ; then
-		epatch ${FILESDIR}/linux-headers-2.6.18.patch
-	fi
+	epatch ${FILESDIR}/ipsec-path-${PV}.patch.bz2
 
 	if use curl ; then
 		ebegin "Curl support requested. Enabling curl support"