Clean out old versions. Resolve bug #163983 with using emake instead of make.

(Portage version: 2.1.2-r12)

7 files changed, 12 insertions, 309 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index 690447d3c039..a9368e063022 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,11 @@
 # 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.51 2007/02/10 13:36:20 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.52 2007/02/28 16:11:34 pylon Exp $
+
+  28 Feb 2007; Lars Weiler <pylon@gentoo.org> -strongswan-2.5.7.ebuild,
+  -strongswan-2.6.2.ebuild, strongswan-2.8.0.ebuild,
+  strongswan-2.8.1.ebuild:
+  Clean out old versions.  Resolve bug #163983 with using emake instead of make.
 
   10 Feb 2007; Steve Dibb <beandog@gentoo.org> strongswan-2.8.0.ebuild:
   amd64 stable, bug 162649
diff --git a/net-misc/strongswan/files/digest-strongswan-2.5.7 b/net-misc/strongswan/files/digest-strongswan-2.5.7
deleted file mode 100644
index 2dde14e364bc..000000000000
--- a/net-misc/strongswan/files/digest-strongswan-2.5.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0453f13b0a0620bc291a679bffa0d08d strongswan-2.5.7.tar.bz2 2458893
-RMD160 e2c8f799c1ef68cdd0327c415efb6ced0bc48d0e strongswan-2.5.7.tar.bz2 2458893
-SHA256 8195ce5c5576ba63fec4e12f23fa4f91cc90e4ca35b004b1a59bc272949b64bb strongswan-2.5.7.tar.bz2 2458893
diff --git a/net-misc/strongswan/files/digest-strongswan-2.6.2 b/net-misc/strongswan/files/digest-strongswan-2.6.2
deleted file mode 100644
index c3abc83847b6..000000000000
--- a/net-misc/strongswan/files/digest-strongswan-2.6.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 67590df6197dafee11e52b5a2516b7f7 strongswan-2.6.2.tar.bz2 2634571
-RMD160 600aa3c523f9db432441f7c9c4c4898a6b89edb4 strongswan-2.6.2.tar.bz2 2634571
-SHA256 713fbd4bebecf9e4293251aa8b1b2f0bd308f698633b0fc727b7570135434385 strongswan-2.6.2.tar.bz2 2634571
diff --git a/net-misc/strongswan/strongswan-2.5.7.ebuild b/net-misc/strongswan/strongswan-2.5.7.ebuild
deleted file mode 100644
index 994bccdd5441..000000000000
--- a/net-misc/strongswan/strongswan-2.5.7.ebuild
+++ /dev/null
@@ -1,149 +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/strongswan/strongswan-2.5.7.ebuild,v 1.5 2006/05/01 23:02:52 weeve Exp $
-
-inherit eutils
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system."
-HOMEPAGE="http://www.strongswan.org/"
-SRC_URI="http://download.strongswan.org/${P}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ppc sparc x86"
-IUSE="curl ldap smartcard"
-
-DEPEND="!net-misc/openswan
-	virtual/libc
-	virtual/linux-sources
-	curl? ( net-misc/curl )
-	ldap? ( =net-nds/openldap-2* )
-	smartcard? ( dev-libs/opensc )
-	>=dev-libs/gmp-3.1.1
-	net-dns/host
-	sys-apps/iproute2"
-RDEPEND=""
-
-check_version_h() {
-	if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ]
-	then
-		eerror "Please verify that your /usr/src/linux symlink is pointing"
-		eerror "to your current kernel sources, and that you have a running kernel"
-		die "/usr/src/linux symlink not setup!"
-	fi
-}
-
-get_KV_info() {
-	check_version_h
-
-	# Get the kernel version of sources in /usr/src/linux ...
-	export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \
-		"${ROOT}/usr/src/linux/include/linux/version.h")"
-	export KV_major="$(echo "${KV_full}" | cut -d. -f1)"
-	export KV_minor="$(echo "${KV_full}" | cut -d. -f2)"
-	export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')"
-}
-
-is_kernel() {
-	[ -z "$1" -o -z "$2" ] && return 1
-
-	get_KV_info
-
-	if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-pkg_setup() {
-	get_KV_info
-
-	einfo "Linux kernel is version ${KV_major}.${KV_minor}.${KV_micro}"
-
-	if is_kernel 2 5
-	then
-	eerror "Kernel version ${KV_major}.${KV_minor}.${KV_micro} will not work with this ebuild."
-	die "Please install a 2.6.x version of the Linux kernel."
-	fi
-
-	if is_kernel 2 6
-	then
-	einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-	einfo "KLIPS will not be compiled/installed."
-	export MYMAKE="programs"
-
-	elif is_kernel 2 4
-	then
-		[ -d /usr/src/linux/net/ipsec ] || {
-		eerror "You need to have an IPsec enabled 2.4.x kernel."
-		eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
-		}
-	einfo "Using patched-in IPsec code for kernel 2.4"
-	einfo "Your kernel only supports KLIPS for kernel level IPsec."
-	export MYMAKE="confcheck programs"
-
-	else
-	eerror "Sorry, no support for your kernel version ${KV_major}.${KV_minor}.${KV_micro}."
-	die "Install an IPsec enabled 2.4 or 2.6 kernel."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	cd programs/pluto
-
-	if use curl ; then
-		ebegin "Curl support requested. Enabling curl support"
-		sed -i -e 's:#LIBCURL=1:LIBCURL=1:g' Makefile || die
-		eend $?
-	fi
-
-	if use ldap ; then
-		ebegin "LDAP support requested. Enabling LDAPv3 support"
-		sed -i -e 's:#LDAP_VERSION=3:LDAP_VERSION=3:g' Makefile || die
-		eend $?
-	fi
-
-	if  use smartcard ; then
-		ebegin "Smartcard support requested. Enabling opensc support"
-		sed -i -e 's:#SMARTCARD=1:SMARTCARD=1:g' Makefile || die
-		eend $?
-	fi
-}
-
-src_compile() {
-	make \
-		DESTDIR=${D} \
-		USERCOMPILE="${CFLAGS}" \
-		FINALCONFDIR=/etc/ipsec \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		${MYMAKE} || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		USERCOMPILE="${CFLAGS}" \
-		FINALCONFDIR=/etc/ipsec \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		install || die
-
-	dohtml doc/*.html
-	rm -f ${S}/doc/*.html
-	dodoc CHANGES* CREDITS INSTALL LICENSE README* doc/*
-	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
-
-	exeinto /etc/init.d/
-	doexe ${FILESDIR}/ipsec
-}
diff --git a/net-misc/strongswan/strongswan-2.6.2.ebuild b/net-misc/strongswan/strongswan-2.6.2.ebuild
deleted file mode 100644
index 3f7a5b0b489c..000000000000
--- a/net-misc/strongswan/strongswan-2.6.2.ebuild
+++ /dev/null
@@ -1,147 +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/strongswan/strongswan-2.6.2.ebuild,v 1.2 2006/02/16 17:07:06 pfeifer Exp $
-
-inherit eutils
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system."
-HOMEPAGE="http://www.strongswan.org/"
-SRC_URI="http://download.strongswan.org/${P}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~sparc ~x86"
-IUSE="curl ldap smartcard"
-
-DEPEND="!net-misc/openswan
-	virtual/libc
-	virtual/linux-sources
-	curl? ( net-misc/curl )
-	ldap? ( =net-nds/openldap-2* )
-	smartcard? ( dev-libs/opensc )
-	>=dev-libs/gmp-3.1.1
-	net-dns/host
-	sys-apps/iproute2"
-RDEPEND=""
-
-check_version_h() {
-	if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ]
-	then
-		eerror "Please verify that your /usr/src/linux symlink is pointing"
-		eerror "to your current kernel sources, and that you have a running kernel"
-		die "/usr/src/linux symlink not setup or kernel tree has not been configured!"
-	fi
-}
-
-get_KV_info() {
-	check_version_h
-
-	# Get the kernel version of sources in /usr/src/linux ...
-	export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \
-		"${ROOT}/usr/src/linux/include/linux/version.h")"
-	export KV_major="$(echo "${KV_full}" | cut -d. -f1)"
-	export KV_minor="$(echo "${KV_full}" | cut -d. -f2)"
-	export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')"
-}
-
-is_kernel() {
-	[ -z "$1" -o -z "$2" ] && return 1
-
-	get_KV_info
-
-	if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-pkg_setup() {
-	get_KV_info
-
-	einfo "Linux kernel is version ${KV_major}.${KV_minor}.${KV_micro}"
-
-	if is_kernel 2 5
-	then
-	eerror "Kernel version ${KV_major}.${KV_minor}.${KV_micro} will not work with this ebuild."
-	die "Please install a 2.6.x version of the Linux kernel."
-	fi
-
-	if is_kernel 2 6
-	then
-	einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-	einfo "KLIPS will not be compiled/installed."
-	export MYMAKE="programs"
-
-	elif is_kernel 2 4
-	then
-		[ -d /usr/src/linux/net/ipsec ] || {
-		eerror "You need to have an IPsec enabled 2.4.x kernel."
-		eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
-		}
-	einfo "Using patched-in IPsec code for kernel 2.4"
-	einfo "Your kernel only supports KLIPS for kernel level IPsec."
-	export MYMAKE="confcheck programs"
-
-	else
-	eerror "Sorry, no support for your kernel version ${KV_major}.${KV_minor}.${KV_micro}."
-	die "Install an IPsec enabled 2.4 or 2.6 kernel."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	if use curl ; then
-		ebegin "Curl support requested. Enabling curl support"
-		sed -i -e 's:USE_LIBCURL?=false:USE_LIBCURL?=true:g' Makefile.inc || die
-		eend $?
-	fi
-
-	if use ldap ; then
-		ebegin "LDAP support requested. Enabling LDAPv3 support"
-		sed -i -e 's:USE_LDAP?=false:USE_LDAP?=true:g' Makefile.inc || die
-		eend $?
-	fi
-
-	if  use smartcard ; then
-		ebegin "Smartcard support requested. Enabling opensc support"
-		sed -i -e 's:USE_SMARTCARD?=false:USE_SMARTCARD?=true:g' Makefile.inc || die
-		eend $?
-	fi
-}
-
-src_compile() {
-	make \
-		DESTDIR=${D} \
-		USERCOMPILE="${CFLAGS}" \
-		FINALCONFDIR=/etc/ipsec \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		${MYMAKE} || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		USERCOMPILE="${CFLAGS}" \
-		FINALCONFDIR=/etc/ipsec \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		install || die
-
-	dohtml doc/*.html
-	rm -f ${S}/doc/*.html
-	dodoc CHANGES* CREDITS INSTALL LICENSE README* doc/*
-	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
-
-	exeinto /etc/init.d/
-	doexe ${FILESDIR}/ipsec
-}
diff --git a/net-misc/strongswan/strongswan-2.8.0.ebuild b/net-misc/strongswan/strongswan-2.8.0.ebuild
index c27633590254..0e2de17f6a4f 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.9 2007/02/10 13:36:20 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.0.ebuild,v 1.10 2007/02/28 16:11:34 pylon Exp $
 
 inherit eutils linux-info
 
@@ -88,7 +88,7 @@ src_unpack() {
 }
 
 src_compile() {
-	make \
+	emake \
 		DESTDIR="${D}" \
 		USERCOMPILE="${CFLAGS}" \
 		FINALCONFDIR=/etc/ipsec \
@@ -104,7 +104,7 @@ src_install() {
 	# make install wants this directory
 	dodir /etc/init.d
 
-	make \
+	emake \
 		DESTDIR="${D}" \
 		USERCOMPILE="${CFLAGS}" \
 		FINALCONFDIR=/etc/ipsec \
diff --git a/net-misc/strongswan/strongswan-2.8.1.ebuild b/net-misc/strongswan/strongswan-2.8.1.ebuild
index 214b2303f0fc..89f53d9024e9 100644
--- a/net-misc/strongswan/strongswan-2.8.1.ebuild
+++ b/net-misc/strongswan/strongswan-2.8.1.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.1 2007/01/20 00:20:38 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.1.ebuild,v 1.2 2007/02/28 16:11:34 pylon Exp $
 
 inherit eutils linux-info
 
@@ -95,7 +95,7 @@ src_unpack() {
 }
 
 src_compile() {
-	make \
+	emake \
 		DESTDIR="${D}" \
 		USERCOMPILE="${CFLAGS}" \
 		FINALCONFDIR=/etc/ipsec \
@@ -111,7 +111,7 @@ src_install() {
 	# make install wants this directory
 	dodir /etc/init.d
 
-	make \
+	emake \
 		DESTDIR="${D}" \
 		USERCOMPILE="${CFLAGS}" \
 		FINALCONFDIR=/etc/ipsec \