Install unit file, drop old

(Portage version: 2.2.4/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

7 files changed, 20 insertions, 242 deletions

diff --git a/net-misc/dibbler/ChangeLog b/net-misc/dibbler/ChangeLog
index 23d0147e8fd7..e4fbff4eddd2 100644
--- a/net-misc/dibbler/ChangeLog
+++ b/net-misc/dibbler/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/dibbler
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/ChangeLog,v 1.18 2013/09/13 22:58:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/ChangeLog,v 1.19 2013/09/14 14:20:18 pacho Exp $
+
+*dibbler-0.8.3-r1 (14 Sep 2013)
+
+  14 Sep 2013; Pacho Ramos <pacho@gentoo.org> +dibbler-0.8.3-r1.ebuild,
+  +files/dibbler-client.service, -dibbler-0.8.0.ebuild, -dibbler-0.8.2.ebuild,
+  -dibbler-0.8.3.ebuild, -files/dibbler-0.8.2-gcc47.patch,
+  -files/dibbler-gcc-4.1.patch:
+  Install unit file, drop old
 
   13 Sep 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   drop to maintainer-needed
diff --git a/net-misc/dibbler/dibbler-0.8.0.ebuild b/net-misc/dibbler/dibbler-0.8.0.ebuild
deleted file mode 100644
index f73699c0cb4d..000000000000
--- a/net-misc/dibbler/dibbler-0.8.0.ebuild
+++ /dev/null
@@ -1,69 +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/dibbler/dibbler-0.8.0.ebuild,v 1.2 2012/05/15 20:18:10 hwoarang Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
-HOMEPAGE="http://klub.com.pl/dhcpv6/"
-
-SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~x86"
-IUSE="doc"
-DEPEND="doc? (
-	dev-texlive/texlive-latex
-	dev-tex/floatflt )"
-RDEPEND=""
-
-DIBBLER_DOCDIR=${S}/doc
-
-src_prepare() {
-	# TODO: FIX ME!
-	append-ldflags $(no-as-needed)
-	sed -i \
-		-e "s#CC           ?= gcc#CC           ?= $(tc-getCC)#g" \
-		-e "s#CXX          ?= g++#CXX          ?= $(tc-getCXX)#g" \
-		Makefile.inc || die "Patching Makefile.inc failed"
-	cd "${S}"/poslib
-	eautoreconf
-}
-
-src_compile() {
-	emake -j1
-	# devel documentation is broken and users should consult the online
-	# version
-	# http://klub.com.pl/dhcpv6/doxygen/
-	use doc && emake -j1 -C doc/ user
-}
-
-src_install() {
-	dosbin dibbler-server
-	dosbin dibbler-client
-	dosbin dibbler-relay
-	doman doc/man/dibbler-server.8 doc/man/dibbler-client.8 \
-		doc/man/dibbler-relay.8
-	dodoc CHANGELOG RELNOTES
-
-	insinto /etc/dibbler
-	doins *.conf
-	dodir /var/lib/dibbler
-
-	use doc && dodoc ${DIBBLER_DOCDIR}/dibbler-user.pdf
-
-	insinto /etc/init.d
-	doins "${FILESDIR}/dibbler-server" "${FILESDIR}/dibbler-client" \
-		"${FILESDIR}/dibbler-relay"
-	fperms 755 /etc/init.d/dibbler-server
-	fperms 755 /etc/init.d/dibbler-client
-	fperms 755 /etc/init.d/dibbler-relay
-}
-
-pkg_postinst() {
-	einfo "Make sure that you modify client.conf, server.conf and/or relay.conf "
-	einfo "to suit your needs. They are stored in /etc/dibbler."
-}
diff --git a/net-misc/dibbler/dibbler-0.8.2.ebuild b/net-misc/dibbler/dibbler-0.8.2.ebuild
deleted file mode 100644
index 17a5770d179d..000000000000
--- a/net-misc/dibbler/dibbler-0.8.2.ebuild
+++ /dev/null
@@ -1,64 +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/dibbler/dibbler-0.8.2.ebuild,v 1.2 2012/07/12 18:54:58 hwoarang Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
-HOMEPAGE="http://klub.com.pl/dhcpv6/"
-
-SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~x86"
-IUSE="doc"
-DEPEND="doc? (
-	dev-texlive/texlive-latex
-	dev-tex/floatflt )
-	"
-RDEPEND=""
-
-DIBBLER_DOCDIR=${S}/doc
-
-src_prepare() {
-	# bug #426342
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-}
-
-src_compile() {
-	emake
-	# devel documentation is broken and users should consult the online
-	# version
-	# http://klub.com.pl/dhcpv6/doxygen/
-	use doc && emake -C doc/ user
-}
-
-src_install() {
-	dosbin dibbler-server
-	dosbin dibbler-client
-	dosbin dibbler-relay
-	doman doc/man/dibbler-server.8 doc/man/dibbler-client.8 \
-		doc/man/dibbler-relay.8
-	dodoc CHANGELOG RELNOTES
-
-	insinto /etc/dibbler
-	doins doc/examples/*.conf
-	dodir /var/lib/dibbler
-
-	use doc && dodoc ${DIBBLER_DOCDIR}/dibbler-user.pdf
-
-	insinto /etc/init.d
-	doins "${FILESDIR}/dibbler-server" "${FILESDIR}/dibbler-client" \
-		"${FILESDIR}/dibbler-relay"
-	fperms 755 /etc/init.d/dibbler-server
-	fperms 755 /etc/init.d/dibbler-client
-	fperms 755 /etc/init.d/dibbler-relay
-}
-
-pkg_postinst() {
-	einfo "Make sure that you modify client.conf, server.conf and/or relay.conf "
-	einfo "to suit your needs. They are stored in /etc/dibbler."
-}
diff --git a/net-misc/dibbler/dibbler-0.8.3.ebuild b/net-misc/dibbler/dibbler-0.8.3-r1.ebuild
index 6e418525b5cc..163826714c6a 100644
--- a/net-misc/dibbler/dibbler-0.8.3.ebuild
+++ b/net-misc/dibbler/dibbler-0.8.3-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/dibbler-0.8.3.ebuild,v 1.1 2013/04/05 13:59:31 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/dibbler-0.8.3-r1.ebuild,v 1.1 2013/09/14 14:20:18 pacho Exp $
 
 EAPI="5"
-
-inherit eutils readme.gentoo
+inherit eutils readme.gentoo systemd
 
 DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
 HOMEPAGE="http://klub.com.pl/dhcpv6/"
@@ -49,4 +48,5 @@ src_install() {
 	use doc && dodoc doc/dibbler-user.pdf
 
 	doinitd "${FILESDIR}"/dibbler-{client,relay,server}
+	systemd_dounit "${FILESDIR}"/dibbler-client.service
 }
diff --git a/net-misc/dibbler/files/dibbler-0.8.2-gcc47.patch b/net-misc/dibbler/files/dibbler-0.8.2-gcc47.patch
deleted file mode 100644
index be4d3c4c779f..000000000000
--- a/net-misc/dibbler/files/dibbler-0.8.2-gcc47.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6e3f338f8285583b8c0548607a8c9f6d55c50c3d Mon Sep 17 00:00:00 2001
-From: Tomek Mrugalski <thomson@klub.com.pl>
-Date: Tue, 8 May 2012 15:22:23 +0200
-Subject: [PATCH] Missing header added (debian bug #672003)
-
----
- CHANGELOG                       |    1 +
- ClntIfaceMgr/ClntIfaceIface.cpp |    1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/ClntIfaceMgr/ClntIfaceIface.cpp b/ClntIfaceMgr/ClntIfaceIface.cpp
-index fbf9834..dab0ed6 100644
---- a/ClntIfaceMgr/ClntIfaceIface.cpp
-+++ b/ClntIfaceMgr/ClntIfaceIface.cpp
-@@ -8,6 +8,7 @@
-  *
-  */
- 
-+#include <unistd.h>
- #include <iostream>
- #include "ClntIfaceIface.h"
- #include "Portable.h"
--- 
-1.7.10
-
diff --git a/net-misc/dibbler/files/dibbler-client.service b/net-misc/dibbler/files/dibbler-client.service
new file mode 100644
index 000000000000..bdac26318fc0
--- /dev/null
+++ b/net-misc/dibbler/files/dibbler-client.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Dibbler IPv6 DHCPv6 Client
+
+[Service]
+ExecStart=/usr/sbin/dibbler-client run
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/dibbler/files/dibbler-gcc-4.1.patch b/net-misc/dibbler/files/dibbler-gcc-4.1.patch
deleted file mode 100644
index e5b19d20c0c9..000000000000
--- a/net-misc/dibbler/files/dibbler-gcc-4.1.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -ruN dibbler-0.4.1.orig/CfgMgr/CfgMgr.h dibbler-0.4.1/CfgMgr/CfgMgr.h
---- dibbler-0.4.1.orig/CfgMgr/CfgMgr.h	2006-05-14 02:45:22.000000000 -0500
-+++ dibbler-0.4.1/CfgMgr/CfgMgr.h	2006-05-14 02:49:20.000000000 -0500
-@@ -40,7 +40,7 @@
- {
-  public:
-     TCfgMgr(SmartPtr<TIfaceMgr> IfaceMgr);
--    virtual TCfgMgr::~TCfgMgr();
-+    virtual ~TCfgMgr();
- 
-     bool compareConfigs(const string cfgFile, const string oldCfgFile);
-     void copyFile(const string cfgFile, const string oldCfgFile);
-diff -ruN dibbler-0.4.1.orig/ClntCfgMgr/ClntCfgMgr.h dibbler-0.4.1/ClntCfgMgr/ClntCfgMgr.h
---- dibbler-0.4.1.orig/ClntCfgMgr/ClntCfgMgr.h	2006-05-14 02:45:22.000000000 -0500
-+++ dibbler-0.4.1/ClntCfgMgr/ClntCfgMgr.h	2006-05-14 02:51:15.000000000 -0500
-@@ -66,7 +66,7 @@
-     int countAddrForIA(long IAID);
-     
-     SmartPtr<TClntCfgGroup> getGroupForIA(long IAID);
--    SmartPtr<TClntCfgIface> TClntCfgMgr::getIfaceByIAID(int iaid);
-+    SmartPtr<TClntCfgIface> getIfaceByIAID(int iaid);
-     bool isDone();
- 
- private:
-diff -ruN dibbler-0.4.1.orig/Makefile dibbler-0.4.1/Makefile
---- dibbler-0.4.1.orig/Makefile	2006-05-14 02:45:22.000000000 -0500
-+++ dibbler-0.4.1/Makefile	2006-05-14 02:53:38.000000000 -0500
-@@ -54,10 +54,10 @@
- 	-L$(SRVOPTIONS)  -lSrvOptions \
- 	-L$(SRVTRANSMGR) -lSrvTransMgr \
- 	-L$(SRVCFGMGR)   -lSrvCfgMgr \
--	-L$(CFGMGR)      -lCfgMgr\
-+	-L$(CFGMGR)      -lCfgMgr \
- 	-L$(SRVIFACEMGR) -lSrvIfaceMgr \
- 	-L$(IFACEMGR)     -lIfaceMgr \
--	-L$(MISC)        -lMisc\
-+	-L$(MISC)        -lMisc \
- 	-lSrvIfaceMgr -lSrvMsg -lSrvCfgMgr \
- 	-L$(SRVADDRMGR)  -lSrvAddrMgr \
- 	                 -lAddrMgr \
-@@ -81,10 +81,10 @@
- 	-L$(RELIFACEMGR) -lRelIfaceMgr \
- 	-L$(RELOPTIONS)  -lRelOptions \
- 	-L$(RELMESSAGES) -lRelMsg \
--	-L$(LOWLEVEL)    -lLowLevel\
--	-L$(CFGMGR)      -lCfgMgr\
-+	-L$(LOWLEVEL)    -lLowLevel \
-+	-L$(CFGMGR)      -lCfgMgr \
- 	-L$(IFACEMGR)     -lIfaceMgr \
--	-L$(MISC)        -lMisc\
-+	-L$(MISC)        -lMisc \
- 	-L$(MESSAGES)    -lMsg \
- 	-L$(MISC)        -lMisc \
- 	-L$(OPTIONS)     -lOptions \
-diff -ruN dibbler-0.4.1.orig/Misc/DUID.h dibbler-0.4.1/Misc/DUID.h
---- dibbler-0.4.1.orig/Misc/DUID.h	2006-05-14 02:45:22.000000000 -0500
-+++ dibbler-0.4.1/Misc/DUID.h	2006-05-14 02:52:47.000000000 -0500
-@@ -38,8 +38,8 @@
-     TDUID(char* Plain); // plain
-     TDUID(const TDUID &duid);
-     TDUID& operator=(const TDUID& duid);
--    bool TDUID::operator==(const TDUID &duid);
--    bool TDUID::operator<=(const TDUID &duid);
-+    bool operator==(const TDUID &duid);
-+    bool operator<=(const TDUID &duid);
-     int getLen();
-     char * storeSelf(char* buf);
-     const string getPlain();
-diff -ruN dibbler-0.4.1.orig/Options/Opt.h dibbler-0.4.1/Options/Opt.h
---- dibbler-0.4.1.orig/Options/Opt.h	2006-05-14 02:45:22.000000000 -0500
-+++ dibbler-0.4.1/Options/Opt.h	2006-05-14 02:49:49.000000000 -0500
-@@ -41,7 +41,7 @@
-     int getOptType();
-     int getSubOptSize();
-     
--    char* TOpt::storeSubOpt(char* buf);
-+    char* storeSubOpt(char* buf);
-     SmartPtr<TOpt> getOption(int optType);
- 
-     // suboptions management