Add systemd support (thanks Łukasz Stelmach, bug 444692)

Package-Manager: portage-2.2.0_alpha175/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 119 insertions, 58 deletions

diff --git a/net-misc/aiccu/ChangeLog b/net-misc/aiccu/ChangeLog
index 1c7376764ec3..21f179f50cdb 100644
--- a/net-misc/aiccu/ChangeLog
+++ b/net-misc/aiccu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/aiccu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.41 2013/02/28 14:34:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.42 2013/05/24 07:09:06 xmw Exp $
+
+*aiccu-2007.01.15-r3 (24 May 2013)
+
+  24 May 2013; Michael Weber <xmw@gentoo.org> +aiccu-2007.01.15-r3.ebuild,
+  +files/aiccu-2007.01.15-systemd.patch, -aiccu-2007.01.15-r1.ebuild:
+  Add systemd support (thanks Łukasz Stelmach, bug 444692)
 
   28 Feb 2013; Jeroen Roovers <jer@gentoo.org> aiccu-2007.01.15-r2.ebuild:
   Stable for HPPA (bug #457440).
diff --git a/net-misc/aiccu/Manifest b/net-misc/aiccu/Manifest
index daec1a65a2be..2b691f5c33b4 100644
--- a/net-misc/aiccu/Manifest
+++ b/net-misc/aiccu/Manifest
@@ -4,17 +4,18 @@ Hash: SHA256
 AUX aiccu-2007.01.15-Makefile.patch 2128 SHA256 8e282eb8004da15927cb4811e3a3c007cbfb39fab15483b5b918f78e0cfbfcd6 SHA512 bafc7d397edcfc24138fc32137dc0ee6eb2afedd5e14656e3b769ff50790619a421b5dc3860c316e4c2150890154ded1149eaa5e23734dd0e2471464ff032544 WHIRLPOOL ec96c82ef7b2058a82fe4ec2c2a0217a5bd9447eb6b392b9b77db6d9527b393cff2b6892f34d6645728d181cc754dfb66ba27ab687843c82d9cca315e0acfa48
 AUX aiccu-2007.01.15-r2-init.gentoo.patch 677 SHA256 80f1503eb963484ffc8c7dd5a4ef132721439695f5fef77eed0220edc1927a47 SHA512 06ca8ca7d860fddf3c1f30eecbfcb7fb8b2e62b66ea3fbdba25af16b03fd91d47c26c54f9b5589c1e91b3a2dc7efeeb457b98db7dde85484402f6c24db0e2570 WHIRLPOOL 1a039cfdc006023ff48f6d37833c37a73bee1ca86fbbdabe079454b1c205064e3c9bd8dfccae246e7db5b161dbf93a5a1810f42b6caa889f4668f9321bd9447c
 AUX aiccu-2007.01.15-setupscript.patch 414 SHA256 f1bcc87aac41d1c9bbb667c3a26097bf8939279f983245a76c1f7224a1f5c675 SHA512 6170c9c52516d58ea68f2acd61c78379f21a1810a9c19867c57249547aa07ca35b1281ae4dea905ac4600d2b2643b3a1c7050e3adbad963efb3554688dc4ac0a WHIRLPOOL f6257d70de47c9003da2fc9afa7367d770f9b1a9793aca6c847b238acf6f353d6f18a35ec9611dd0db9fbc4eae59c340ad0d1aecd95a45bdff278e61d3eac55b
+AUX aiccu-2007.01.15-systemd.patch 1290 SHA256 aa3f1552bd1c1919a36cf3c376d93f46a8929de1712fdb451550b41d65095d51 SHA512 6479891df3f167cf6d70223bbd71d19a4141593772ee17eda4fee84228fa8cb69aef01ffd9afd68c3a54f498ff99c3eb5d2fba777f61244f3b884dcd1521300f WHIRLPOOL 268b02aedfdfcb58e5e07c1f6ac3cd560ec2742886aa4ab66ac1b2d9fe6a6c71d649a60ae622fa4b25915cd89e54362197bf34da90a01f909693337786e696f3
 AUX aiccu-2007.01.15-uclibc.patch 790 SHA256 221f6ca988595ab183eeb09cd50ae2cec2f7c5eaf6aad9a8b1a781aabfdb092b SHA512 fe2382db103f1cda397dfdd02b97e44e1b54b256d87a81fc04e46b999ed5692a077f15a974414f7cbddf6e22c5ba975da0d0fa96e5de516c3741d9121deafca6 WHIRLPOOL cd6fb97e889cc02940146aaf55d7235b916ea63e38ed73a0fc8a1812bd46682078dac64f52452e7d95a47565736fcc6af0e4ff7b500f3fc9d3bd9da26554b27b
 AUX aiccu.init.gentoo.patch 651 SHA256 bcb1e6f002b83c519fed4dd54012a20828e86e82e54d1f0142fe1b50c1a59011 SHA512 bfc40346453cb1aad7ae326e3b4ebf66f540817c3a3666ba3b2485af727e2f7f998a306030b3811dd4aa4af1589cf0c940cd72e47e258986946a22bf338a69c2 WHIRLPOOL 9df742b071d25060a7a433e4276673ba463bdf7f4d6c4aca0a6842b37b6d9671c37559608467ae14024e625fa146c822e89be898d48d193326e8c480d3aa7742
 DIST aiccu_20070115.tar.gz 70056 SHA256 2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760 SHA512 15b2f0dab51843e58abbd8a0cc13139e492057ee348e368e1b65476bb2760119e88982cd03ffc6ec2cb563a1b7a061e1f66a98861eaad15972d486ac17b7bc78 WHIRLPOOL a5743e9c28ec3b9f6bc43f1b715553842a13872f18281239ed76d3b322e3a4c3c3e0f0c5d80b47694bbedaf831d1b3feed285af9f37174cac323b2c1814813d7
-EBUILD aiccu-2007.01.15-r1.ebuild 1303 SHA256 bf9f24609d68678a9c6aecf0c37326d38cb8d0e06356d60af4829ab4fea60050 SHA512 0df7ba7db6d161ee0722d94ca3174fffd0ab5147efbd3d69e3dedf993742fe84c333155ecb385e6e014a7812717bfa32098cb05e00ec78e25a89ba5bc828a89c WHIRLPOOL a96f43eb049063b44b299d4a6352c9455cb7dfce397c1d603ade4f8bf908233cecb4d2d69695326232cbea5d2bd8a0f11d4e4cd61a829e8a1000bdb36a980da1
 EBUILD aiccu-2007.01.15-r2.ebuild 1169 SHA256 ead9317fab139d8a0af90b647375b2cbe8cb0d05ec1852a53a955ca9d542f1ab SHA512 63df984775adf1872cae1f626e859b2dea198b4414b74ba142978bc50915bfeeb49787bff28b14caef56abe91573dce45bcc5b67cfae0495f78bc7cbbab1b170 WHIRLPOOL 67639e07482d37562460b1752e96bcd16c610a77bf3f81adf3d3689154b41ca378f123a1270abce272885c5f2b30e74ed6e56170a9457d346e3b2b54cfea5d26
-MISC ChangeLog 5992 SHA256 3c50190af202cf29428d68ec85ab1f38eede628e4619b13c955b502cf6e806d0 SHA512 b18a0edb9e069c6f79f9435a5c07ffd1352955a7b4d4fe1ba82446be19581334d6cb176f6de54761ad835e49c406af8c1eff760e7db086150229bee4603e24f2 WHIRLPOOL fd0e4ab5a90ed4c0989272683eba5104df13e2ff22784e42692de0a826a598411c792afc63de8bba09bc063e71e200ba15fcd874869484a6f083476693c1b531
+EBUILD aiccu-2007.01.15-r3.ebuild 1339 SHA256 88a34341c4894fa8146caa2105e7fadc189b0a42dd9e117b27e4d94a924baafa SHA512 27c5d824a42322fd328bd95093b340bb5c099fc8a8837f9adf49e3294dbaa99bc77cdfa6c9c598402fb0d3a4f2417887ff7a4546cb8e6aa73ad4cf148fef964e WHIRLPOOL fc500231fd3f905019fba592e5925a0c02b90f76d9c8051e64f42f2d3b832fcfc33330c86188c630098b40dde43ce64b7c125a6b444f1786178e24bc8588ad32
+MISC ChangeLog 6234 SHA256 79feadf151468098b0147d09096b088594e6236bdfa0d7fe207365a367b81cdc SHA512 5c157c37eb3f98c3dfe876707291795a6cd9919dc1899d440a6a6e510109f4dac92186c4ddd51fd6599ff41fd3fcb30aa6a472f73d3524543acd72299f102fc3 WHIRLPOOL 76a58cfc03817b5faf2d20203ab46003b297782979448be3abf38d841d91bf9420ba7be88cc1ced06d9cd38f03675c43033e7ba9f7d1d8ea65b24a9ba2453ee8
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEvaxMACgkQVWmRsqeSphPoJgCfeRwRdYnVokzPReRQ6MQaNEEt
-ts8AnRkLW6jUFwDlBV0anh9CtJDBtPpm
-=BaqO
+iF4EAREIAAYFAlGfEg4ACgkQknrdDGLu8JB17wD/eVl1mI6umuAXZr4yoDRBr3rg
+9tM+wF8jyVg/DIodmuAA/RqvlPhgWknBDSJe6DyvGOSdoVWgiKkCFr5aZgYx3abc
+=oAeo
 -----END PGP SIGNATURE-----
diff --git a/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild b/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild
deleted file mode 100644
index 61ca1f27b938..000000000000
--- a/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.7 2012/08/01 06:39:07 xmw Exp $
-
-EAPI=3
-
-inherit toolchain-funcs 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/aiccu/unix/${PN}_${PV//\./}.tar.gz"
-
-LICENSE="SixXS"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc sparc x86"
-IUSE=""
-
-DEPEND="net-libs/gnutls
-	sys-apps/iproute2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/aiccu
-
-src_prepare() {
-	epatch "${FILESDIR}/aiccu.init.gentoo.patch" \
-		"${FILESDIR}/${P}-Makefile.patch"
-}
-
-src_compile() {
-	# 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 || die
-
-	insopts -m 600
-	insinto /etc
-	doins doc/aiccu.conf || die
-
-	dodoc doc/{HOWTO,README,changelog}
-
-	newinitd doc/aiccu.init.gentoo aiccu || die
-}
-
-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.15-r3.ebuild b/net-misc/aiccu/aiccu-2007.01.15-r3.ebuild
new file mode 100644
index 000000000000..ea9b9cb66115
--- /dev/null
+++ b/net-misc/aiccu/aiccu-2007.01.15-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/05/24 07:09:06 xmw Exp $
+
+EAPI=5
+
+inherit eutils linux-info systemd toolchain-funcs
+
+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/aiccu/unix/${PN}_${PV//\./}.tar.gz"
+
+LICENSE="SixXS"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="systemd"
+
+RDEPEND="net-libs/gnutls
+	sys-apps/iproute2
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+CONFIG_CHECK="~TUN"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-r2-init.gentoo.patch \
+		"${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-setupscript.patch \
+		"${FILESDIR}"/${P}-uclibc.patch \
+		"${FILESDIR}"/${P}-systemd.patch
+}
+
+src_compile() {
+	# Don't use main Makefile since it requires additional
+	# dependencies which are useless for us.
+	emake CC=$(tc-getCC) STRIP= -C unix-console \
+		HAVE_SYSTEMD=$(usex systemd 1 0)
+}
+
+src_install() {
+	dosbin unix-console/${PN}
+
+	insopts -m 600
+	insinto /etc
+	doins doc/${PN}.conf
+	newinitd doc/${PN}.init.gentoo ${PN}
+
+	use systemd && systemd_dounit doc/${PN}.service
+
+	dodoc doc/{HOWTO,README,changelog}
+}
diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-systemd.patch b/net-misc/aiccu/files/aiccu-2007.01.15-systemd.patch
new file mode 100644
index 000000000000..a7ead9831438
--- /dev/null
+++ b/net-misc/aiccu/files/aiccu-2007.01.15-systemd.patch
@@ -0,0 +1,52 @@
+--- /dev/null
++++ aiccu-2007.01.15/doc/aiccu.service
+@@ -0,0 +1,13 @@
++[Unit]
++Description=Automatic IPv6 Connectivity Client Utility
++After=time-sync.target network.target
++ConditionPathExists=/etc/aiccu.conf
++
++
++[Service]
++Type=notify
++ExecStart=/usr/sbin/aiccu start
++ExecStop=/usr/sbin/aiccu stop
++
++[Install]
++WantedBy=multi-user.target
+--- aiccu-2007.01.15/unix-console/Makefile
++++ aiccu-2007.01.15/unix-console/Makefile
+@@ -48,6 +48,10 @@ ifeq ($(shell uname | grep -c "Linux"),1)
+ SRCS	+= ../common/aiccu_linux.c
+ OBJS	+= ../common/aiccu_linux.o
+ LIBS	+= -lpthread -lresolv
++ifeq (1,HAVE_SYSTEMD)
++LIBS	+= -lsystemd-daemon
++CFLAGS += -DHAVE_SYSTEMD
++endif
+ endif
+ 
+ # FreeBSD
+--- aiccu-2007.01.15/unix-console/main.c
++++ aiccu-2007.01.15/unix-console/main.c
+@@ -12,6 +12,9 @@
+ 
+ #include "../common/aiccu.h"
+ #include "../common/tun.h"
++#ifdef HAVE_SYSTEMD
++#include <systemd/sd-daemon.h>
++#endif
+ 
+ #ifndef _WIN32
+ /* Enable/Disable heartbeating */
+@@ -478,6 +481,10 @@ int main(int argc, char *argv[])
+ 			aiccu_exec("%s", g_aiccu->setupscript);
+ 		}
+ 
++#ifdef HAVE_SYSTEMD
++		/* Tell systemd we are operational. */
++		sd_notify(0, "READY=1");
++#endif
+ 
+ 		/* We need to stay running when doing Heartbeat or AYIYA */
+ 		if (	strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 ||