Revbump. Fix bug 248669 and 318033. Some QA fixes. Add a Makefile patch to use LDFLAGS properly, make stripping optional and respect CFLAGS properly. Remove old ebuilds.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

10 files changed, 141 insertions, 222 deletions

diff --git a/net-misc/aiccu/ChangeLog b/net-misc/aiccu/ChangeLog
index 2e6960bbfaf7..c7cbc4516d2a 100644
--- a/net-misc/aiccu/ChangeLog
+++ b/net-misc/aiccu/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/aiccu
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.21 2008/08/12 20:27:50 bluebird Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.22 2010/06/28 20:36:34 idl0r Exp $
+
+*aiccu-2007.01.15-r1 (28 Jun 2010)
+
+  28 Jun 2010; Christian Ruppert <idl0r@gentoo.org>
+  -aiccu-2005.01.31.ebuild, -aiccu-2005.01.31-r1.ebuild,
+  -aiccu-2006.07.25.ebuild, -aiccu-2007.01.07.ebuild,
+  aiccu-2007.01.15.ebuild, +aiccu-2007.01.15-r1.ebuild,
+  +files/aiccu-2007.01.15-Makefile.patch, +files/aiccu.init.gentoo.patch,
+  -files/init-after-ntp-client.patch,
+  -files/patch_aiccu_ticservpar_2005.01.31:
+  Revbump. Fix bug 248669 and 318033. Some QA fixes. Add a Makefile patch to
+  use LDFLAGS properly, make stripping optional and respect CFLAGS properly.
+  Remove old ebuilds.
 
   12 Aug 2008; Friedrich Oslage <bluebird@gentoo.org>
   aiccu-2007.01.15.ebuild:
diff --git a/net-misc/aiccu/aiccu-2005.01.31-r1.ebuild b/net-misc/aiccu/aiccu-2005.01.31-r1.ebuild
deleted file mode 100644
index ce7367bcd580..000000000000
--- a/net-misc/aiccu/aiccu-2005.01.31-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2005.01.31-r1.ebuild,v 1.7 2007/08/25 14:37:19 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="AICCU Client to configure an IPv6 tunnel to SixXS."
-HOMEPAGE="http://www.sixxs.net/tools/aiccu"
-SRC_URI="http://www.sixxs.net/archive/sixxs/${PN}/unix/${PN}_${PV}.tar.gz"
-
-LICENSE="AICCU"
-SLOT="0"
-KEYWORDS="~amd64 arm ~hppa ~ppc x86"
-IUSE=""
-DEPEND="sys-apps/iproute2"
-S=${WORKDIR}/${PN}
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/patch_aiccu_ticservpar_${PV}
-	epatch ${FILESDIR}/init-after-ntp-client.patch
-	sed -e 's/ip -6 ro /ip -6 route /' -i common/aiccu_linux.c
-
-}
-
-src_compile() {
-	emake RPM_OPT_FLAGS="${CFLAGS}" || die "Build Failed"
-}
-
-src_install() {
-	dosbin unix-console/aiccu
-	insopts -m 600
-	insinto /etc
-	doins doc/aiccu.conf
-	dodoc doc/{HOWTO,LICENSE,README,changelog}
-	newinitd doc/aiccu.init.gentoo aiccu
-}
-
-pkg_postinst() {
-	einfo "The aiccu ebuild installs an init script named 'aiccu'"
-	einfo "To add support for a SixXS connection at startup, do"
-	einfo "edit your /etc/aiccu.conf and do"
-	einfo "# rc-update add aiccu default"
-}
diff --git a/net-misc/aiccu/aiccu-2005.01.31.ebuild b/net-misc/aiccu/aiccu-2005.01.31.ebuild
deleted file mode 100644
index 1c35a58c35d2..000000000000
--- a/net-misc/aiccu/aiccu-2005.01.31.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/aiccu/aiccu-2005.01.31.ebuild,v 1.4 2006/03/02 19:17:18 jokey Exp $
-
-DESCRIPTION="AICCU Client to configure an IPv6 tunnel to SixXS."
-HOMEPAGE="http://www.sixxs.net/"
-SRC_URI="http://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_${PV}.tar.gz"
-
-LICENSE="AICCU"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~arm"
-IUSE=""
-DEPEND=""
-S=${WORKDIR}/aiccu
-
-src_compile() {
-	emake  RPM_OPT_FLAGS="${CFLAGS}" || die "Build Failed"
-}
-
-src_install() {
-	dosbin unix-console/aiccu
-	insopts -m 600
-	insinto /etc
-	doins doc/aiccu.conf
-	dodoc doc/{HOWTO,LICENSE,README,changelog}
-	newinitd doc/aiccu.init.gentoo aiccu
-}
-
-pkg_postinst() {
-	einfo "The aiccu ebuild installs an init script named 'aiccu'"
-	einfo "To add support for a SixXS connection at startup, do"
-	einfo "edit your /etc/aiccu.conf and do"
-	einfo "# rc-update add aiccu default"
-}
diff --git a/net-misc/aiccu/aiccu-2006.07.25.ebuild b/net-misc/aiccu/aiccu-2006.07.25.ebuild
deleted file mode 100644
index 357f1ee0ef47..000000000000
--- a/net-misc/aiccu/aiccu-2006.07.25.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2006.07.25.ebuild,v 1.4 2007/07/12 02:52:15 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="AICCU Client to configure an IPv6 tunnel to SixXS"
-HOMEPAGE="http://www.sixxs.net/"
-SRC_URI="http://www.sixxs.net/archive/sixxs/aiccu/unix/${PN}_${PV}.tar.gz"
-
-LICENSE="SixXS"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
-IUSE=""
-DEPEND="net-libs/gnutls
-		sys-apps/iproute2"
-S=${WORKDIR}/aiccu
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/init-after-ntp-client.patch
-}
-
-src_compile() {
-	cd ${S}
-	export RPM_OPT_FLAGS=${CFLAGS}
-	make  || die "Build Failed"
-}
-
-src_install() {
-	dosbin unix-console/aiccu
-	insopts -m 600
-	insinto /etc
-	doins doc/aiccu.conf
-	dodoc doc/{HOWTO,LICENSE,README,changelog}
-	newinitd doc/aiccu.init.gentoo aiccu
-}
-
-pkg_postinst() {
-	einfo "The aiccu ebuild installs an init script named 'aiccu'"
-	einfo "To add support for a SixXS connection at startup, do"
-	einfo "edit your /etc/aiccu.conf and do"
-	einfo "# rc-update add aiccu default"
-}
diff --git a/net-misc/aiccu/aiccu-2007.01.07.ebuild b/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild
index 6d0be86550de..60169676d122 100644
--- a/net-misc/aiccu/aiccu-2007.01.07.ebuild
+++ b/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild
@@ -1,40 +1,44 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2007.01.07.ebuild,v 1.6 2007/08/25 14:37:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild,v 1.1 2010/06/28 20:36:34 idl0r Exp $
 
-inherit eutils
+EAPI=3
+
+inherit toolchain-funcs eutils
 
 DESCRIPTION="AICCU Client to configure an IPv6 tunnel to SixXS"
-HOMEPAGE="http://www.sixxs.net/"
+HOMEPAGE="http://www.sixxs.net/tools/aiccu"
 SRC_URI="http://www.sixxs.net/archive/sixxs/aiccu/unix/${PN}_${PV//\./}.tar.gz"
 
 LICENSE="SixXS"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ~ppc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 DEPEND="net-libs/gnutls
-		sys-apps/iproute2"
+	sys-apps/iproute2"
 S=${WORKDIR}/aiccu
 
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/init-after-ntp-client.patch
+src_prepare() {
+	epatch "${FILESDIR}/aiccu.init.gentoo.patch" \
+		"${FILESDIR}/${P}-Makefile.patch"
 }
 
 src_compile() {
-	cd ${S}
-	export RPM_OPT_FLAGS=${CFLAGS}
-	make  || die "Build Failed"
+	# Don't use main Makefile since it requires additional dependencies which
+	# are useless for us.
+	emake CC=$(tc-getCC) STRIP= -C unix-console || die
 }
 
 src_install() {
-	dosbin unix-console/aiccu
+	dosbin unix-console/aiccu || die
+
 	insopts -m 600
 	insinto /etc
-	doins doc/aiccu.conf
-	dodoc doc/{HOWTO,LICENSE,README,changelog}
-	newinitd doc/aiccu.init.gentoo aiccu
+	doins doc/aiccu.conf || die
+
+	dodoc doc/{HOWTO,README,changelog}
+
+	newinitd doc/aiccu.init.gentoo aiccu || die
 }
 
 pkg_postinst() {
diff --git a/net-misc/aiccu/aiccu-2007.01.15.ebuild b/net-misc/aiccu/aiccu-2007.01.15.ebuild
index 1cf2a844aec9..ed175dab4208 100644
--- a/net-misc/aiccu/aiccu-2007.01.15.ebuild
+++ b/net-misc/aiccu/aiccu-2007.01.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2007.01.15.ebuild,v 1.10 2008/08/12 20:27:50 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2007.01.15.ebuild,v 1.11 2010/06/28 20:36:34 idl0r Exp $
 
 inherit eutils
 
@@ -24,7 +24,6 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}
 	export RPM_OPT_FLAGS=${CFLAGS}
 	make  || die "Build Failed"
 }
diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch b/net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch
new file mode 100644
index 000000000000..c0eabbefd906
--- /dev/null
+++ b/net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch
@@ -0,0 +1,79 @@
+--- unix-console/Makefile.old	2010-06-28 21:56:32.287782600 +0200
++++ unix-console/Makefile	2010-06-28 22:15:56.232637681 +0200
+@@ -25,14 +25,11 @@ CWARNS += -W -Wall -Wshadow -Wpointer-ar
+ # CWARNS += -Wpacked
+ 
+ #CFLAGS	+= $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0
+-CFLAGS	+= $(CWARNS) -D_GNU_SOURCE
++CFLAGS ?= $(CWARNS) -O3
++CFLAGS	+= -D_GNU_SOURCE
+ CC      = @gcc
+ RM      = rm
+-
+-# Add -O3 when nothing is specified yet
+-ifeq ($(shell echo $(CFLAGS) | grep -c "\-O"),0)
+-CFLAGS	+= -O3
+-endif
++STRIP   = strip
+ 
+ # This is a console client
+ CFLAGS	+= -D AICCU_CONSOLE
+@@ -42,7 +39,7 @@ CFLAGS	+= -D AICCU_CONSOLE
+ # Currently defaultly builds only on Linux, but other platforms might easily also support it
+ ifeq ($(shell uname | grep -c "Linux"),1)
+ CFLAGS	+= -D AICCU_GNUTLS
+-LDFLAGS += -lgnutls
++LIBS += -lgnutls
+ endif
+ 
+ # Linux
+@@ -50,7 +47,7 @@ ifeq ($(shell uname | grep -c "Linux"),1
+ CFLAGS  += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\""
+ SRCS	+= ../common/aiccu_linux.c
+ OBJS	+= ../common/aiccu_linux.o
+-LDFLAGS	+= -lpthread -lresolv
++LIBS	+= -lpthread -lresolv
+ endif
+ 
+ # FreeBSD
+@@ -118,7 +115,7 @@ ifeq ($(shell uname | grep -c "Darwin"),
+ CFLAGS	+= -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\""
+ SRCS	+= ../common/aiccu_darwin.c
+ OBJS	+= ../common/aiccu_darwin.o
+-LDFLAGS	+= -lresolv
++LIBS	+= -lresolv
+ endif
+ 
+ # SunOS / Solaris
+@@ -126,7 +123,7 @@ ifeq ($(shell uname | grep -c "SunOS"),1
+ CFLAGS	+= -D_SUNOS -D AICCU_TYPE="\"sunos\""
+ SRCS	+= ../common/aiccu_sunos.c
+ OBJS	+= ../common/aiccu_sunos.o
+-LDFLAGS	+= -lsocket -lnsl -lresolv
++LIBS	+= -lsocket -lnsl -lresolv
+ endif
+ 
+ # AIX
+@@ -137,17 +134,19 @@ CFLAGS	+= -D AICCU_CONSOLE
+ CFLAGS	+= -D_AIX -D AICCU_TYPE="\"aix\""
+ SRCS	+= ../common/aiccu_aix.c
+ OBJS	+= ../common/aiccu_aix.o
+-LDFLAGS	+= -lpthread
++LIBS	+= -lpthread
+ endif
+ 
+ 
+ all: aiccu
+ 
+ aiccu:	$(OBJS) ${SRCS} ${INCS}
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
+ ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
+-	strip $@
++ifdef STRIP
++	$(STRIP) $@
++endif
+ endif
+ endif
+ 
diff --git a/net-misc/aiccu/files/aiccu.init.gentoo.patch b/net-misc/aiccu/files/aiccu.init.gentoo.patch
new file mode 100644
index 000000000000..5b20524c80d3
--- /dev/null
+++ b/net-misc/aiccu/files/aiccu.init.gentoo.patch
@@ -0,0 +1,24 @@
+--- doc/aiccu.init.gentoo.old	2010-06-28 21:28:21.527614775 +0200
++++ doc/aiccu.init.gentoo	2010-06-28 21:36:49.651781540 +0200
+@@ -23,14 +23,19 @@ checkconfig() {
+ start() {
+ 	checkconfig || return 1
+ 	ebegin "Starting aiccu"
+-	start-stop-daemon --start --oknodo --quiet --exec /usr/sbin/aiccu -- start
++	start-stop-daemon --start --quiet --exec /usr/sbin/aiccu -- start
+ 	eend $?
+ }
+ 
+ 
+ stop() {
+ 	ebegin "Stopping aiccu"
+-	start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/aiccu -- stop
++	start-stop-daemon --stop --pidfile /var/run/aiccu.pid --quiet --exec /usr/sbin/aiccu -- stop
+ 	eend $?
+ }
+ 
++restart() {
++	stop
++	sleep 3
++	start
++}
diff --git a/net-misc/aiccu/files/init-after-ntp-client.patch b/net-misc/aiccu/files/init-after-ntp-client.patch
deleted file mode 100644
index 3a061eba5acc..000000000000
--- a/net-misc/aiccu/files/init-after-ntp-client.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr aiccu.orig/doc/aiccu.init.gentoo aiccu/doc/aiccu.init.gentoo
---- aiccu.orig/doc/aiccu.init.gentoo	2006-05-17 15:42:49.000000000 +0200
-+++ aiccu/doc/aiccu.init.gentoo	2006-05-17 15:43:04.000000000 +0200
-@@ -2,6 +2,7 @@
- 
- depend() {
- 	need net
-+	after ntp-client
- }
- 
- checkconfig() {
diff --git a/net-misc/aiccu/files/patch_aiccu_ticservpar_2005.01.31 b/net-misc/aiccu/files/patch_aiccu_ticservpar_2005.01.31
deleted file mode 100644
index bc29e3eee919..000000000000
--- a/net-misc/aiccu/files/patch_aiccu_ticservpar_2005.01.31
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -urN aiccu_2005.01.31/common/aiccu.c aiccu-work/common/aiccu.c
---- aiccu_2005.01.31/common/aiccu.c	2005-01-11 13:16:09.000000000 +0100
-+++ aiccu-work/common/aiccu.c	2005-07-20 14:25:46.000000000 +0200
-@@ -18,6 +18,7 @@
- struct pl_rule aiccu_conf_rules[] =
- {
- 	/* Configuration */
-+	{"tic_server",		PLRT_STRING,	offsetof(struct AICCU_conf, tic_server)},
- 	{"username",		PLRT_STRING,	offsetof(struct AICCU_conf, username)},
- 	{"password",		PLRT_STRING,	offsetof(struct AICCU_conf, password)},
- 	{"ipv4_interface",	PLRT_STRING,	offsetof(struct AICCU_conf, ipv4_interface)},
-@@ -87,6 +88,12 @@
- 
- 	fprintf(f, "# AICCU Configuration (Automatically stored by aiccu %s)\n", AICCU_VER);
- 	fprintf(f, "\n");
-+	if(g_aiccu->tic_server)
-+	{
-+		fprintf(f, "# TIC server\n");
-+		fprintf(f, "tic_server %s\n", g_aiccu->tic_server);
-+		fprintf(f, "\n");
-+	}
- 	fprintf(f, "# Login information\n");
- 	fprintf(f, "username %s\n", g_aiccu->username);
- 	fprintf(f, "password %s\n", g_aiccu->password);
-@@ -116,6 +123,8 @@
- void aiccu_FreeConfig()
- {
- 	if (!g_aiccu) return;
-+	if (g_aiccu->tic_server)	free(g_aiccu->tic_server);
-+	g_aiccu->tic_server = NULL;
- 	if (g_aiccu->username)		free(g_aiccu->username);
- 	g_aiccu->username = NULL;
- 	if (g_aiccu->password)		free(g_aiccu->password);
-diff -urN aiccu_2005.01.31/common/aiccu.h aiccu-work/common/aiccu.h
---- aiccu_2005.01.31/common/aiccu.h	2005-01-31 20:05:52.000000000 +0100
-+++ aiccu-work/common/aiccu.h	2005-07-20 14:24:44.000000000 +0200
-@@ -73,6 +73,7 @@
- 	bool		verbose;
- 
- 	/* Only for AICCU */
-+	char		*tic_server;
- 	char		*username;
- 	char		*password;
- 	char		*ipv4_interface;
-diff -urN aiccu_2005.01.31/common/tic.c aiccu-work/common/tic.c
---- aiccu_2005.01.31/common/tic.c	2005-02-02 19:52:29.000000000 +0100
-+++ aiccu-work/common/tic.c	2005-07-20 14:26:08.000000000 +0200
-@@ -63,6 +63,7 @@
- bool tic_Login(struct TIC_conf *tic, char *username, char *password)
- {
- 	char		buf[1024], sSignature[33], sChallenge[1024];
-+	char		*server = g_aiccu->tic_server;
- 	int		i;
- #ifndef _WIN32
- 	struct utsname	utsname;
-@@ -74,7 +75,7 @@
- #endif
- 
- /* Connect to the TIC server */
--	tic->sock = connect_client(TIC_SERVER, TIC_PORT, AF_INET, SOCK_STREAM);
-+	tic->sock = connect_client((server?server:TIC_SERVER), TIC_PORT, AF_INET, SOCK_STREAM);
- 	if (tic->sock == -1)
- 	{
- 		dolog(LOG_ERR, "Couldn't connect to the TIC server\n");
-