Drop old, bump to EAPI=5

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 16 insertions, 65 deletions

diff --git a/net-p2p/opendchub/ChangeLog b/net-p2p/opendchub/ChangeLog
index b65e5c21d522..f068acfb5fe1 100644
--- a/net-p2p/opendchub/ChangeLog
+++ b/net-p2p/opendchub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/opendchub
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/opendchub/ChangeLog,v 1.17 2011/08/19 13:59:24 tomka Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/opendchub/ChangeLog,v 1.18 2015/03/21 20:03:35 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -opendchub-0.7.15.ebuild,
+  metadata.xml, opendchub-0.8.2.ebuild:
+  Drop old, bump to EAPI=5
 
   19 Aug 2011; Thomas Kahle <tomka@gentoo.org> opendchub-0.8.2.ebuild:
   x86 stable per bug 314551
diff --git a/net-p2p/opendchub/metadata.xml b/net-p2p/opendchub/metadata.xml
index aa0f3664825f..0bf38b28b505 100644
--- a/net-p2p/opendchub/metadata.xml
+++ b/net-p2p/opendchub/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
+  <herd>net-p2p</herd>
 </pkgmetadata>
diff --git a/net-p2p/opendchub/opendchub-0.7.15.ebuild b/net-p2p/opendchub/opendchub-0.7.15.ebuild
deleted file mode 100644
index 16607f5206ef..000000000000
--- a/net-p2p/opendchub/opendchub-0.7.15.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/opendchub/opendchub-0.7.15.ebuild,v 1.3 2007/01/22 15:03:05 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="hub software for Direct Connect"
-HOMEPAGE="http://opendchub.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE="perl"
-
-DEPEND="perl? ( dev-lang/perl )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/opendchub-gentoo.patch
-	epatch ${FILESDIR}/"0.7.14-telnet.patch"
-	epatch ${FILESDIR}/"0.7.14-overflow.patch"
-}
-
-src_compile() {
-	! use perl && myconf="--disable-perl --enable-switch_user"
-	econf $myconf || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	if use perl ; then
-		exeinto /usr/bin
-		doexe ${FILESDIR}/opendchub_setup.sh
-		dodir /usr/share/opendchub/scripts
-		insinto /usr/share/opendchub/scripts
-		doins Samplescripts/*
-	fi
-	dodoc Documentation/*
-}
-
-pkg_postinst() {
-	if use perl ; then
-		einfo
-		einfo "To set up perl scripts for opendchub to use, please run"
-		einfo "opendchub_setup.sh as the user you will be using opendchub as."
-		einfo
-	fi
-}
diff --git a/net-p2p/opendchub/opendchub-0.8.2.ebuild b/net-p2p/opendchub/opendchub-0.8.2.ebuild
index 02a4134cb02a..a5d63f4bcecf 100644
--- a/net-p2p/opendchub/opendchub-0.8.2.ebuild
+++ b/net-p2p/opendchub/opendchub-0.8.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/opendchub/opendchub-0.8.2.ebuild,v 1.2 2011/08/19 13:59:24 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/opendchub/opendchub-0.8.2.ebuild,v 1.3 2015/03/21 20:03:35 jlec Exp $
 
-EAPI="4"
+EAPI=5
 
-inherit eutils autotools
+inherit autotools eutils
 
 DESCRIPTION="hub software for Direct Connect"
 HOMEPAGE="http://opendchub.sf.net"
@@ -26,17 +26,15 @@ src_prepare() {
 }
 
 src_configure() {
-	! use perl && myconf="--disable-perl --enable-switch_user"
-	econf $myconf
+	use perl || myconf="--disable-perl --enable-switch_user"
+	econf ${myconf}
 }
 
 src_install() {
 	default
 
 	if use perl ; then
-		exeinto /usr/bin
-		doexe "${FILESDIR}"/opendchub_setup.sh
-		dodir /usr/share/opendchub/scripts
+		dobin "${FILESDIR}"/opendchub_setup.sh
 		insinto /usr/share/opendchub/scripts
 		doins Samplescripts/*
 	fi
@@ -44,9 +42,9 @@ src_install() {
 
 pkg_postinst() {
 	if use perl ; then
-		einfo
+		echo
 		einfo "To set up perl scripts for opendchub to use, please run"
 		einfo "opendchub_setup.sh as the user you will be using opendchub as."
-		einfo
+		echo
 	fi
 }