Drop old, bump to EAPI=5

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 42 insertions, 81 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/Manifest b/net-p2p/opendchub/Manifest
index cb5462fa9e16..c8ae86e7908a 100644
--- a/net-p2p/opendchub/Manifest
+++ b/net-p2p/opendchub/Manifest
@@ -1,21 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX 0.7.14-overflow.patch 556 RMD160 00236867ba47443e52f23b1e8af5f4f19d53df4f SHA1 0fd5bdfd47a6b1e95ed543e60802fe172bfb6dc4 SHA256 5139d0eecade2b43edf4e06eb0e04c0bfa790203dd998ab9fc55292d071549b8
-AUX 0.7.14-telnet.patch 540 RMD160 390a099252543daa793ef7ded69b01926d9e710e SHA1 88064d175d4a1541a30097940807126679cd98a1 SHA256 3274cc06ff525057970506555bb8b705d09e37098e57633f2ea6b426ca826394
-AUX opendchub-0.8.2-telnet.patch 380 RMD160 3cf26a3d0e0d8f4f270e2e986335120c87bd9070 SHA1 9a63c69183c1d2f4f4bc8813f70fb6f0c2ac6af9 SHA256 cfbb0c34409698600df55be0de69438549cf13fe7141df9d5edc7695a1bea15f
-AUX opendchub-gentoo.patch 873 RMD160 97bdc2d80e867bf266efd6f7c7f25c18767b7d01 SHA1 3a02532ab7499ab4134a13f47014a1ac987a0a84 SHA256 9ede4a027aec4f49251ace461c27708eff05e1e9e7e8391cbb735b76f58c11f1
-AUX opendchub_setup.sh 556 RMD160 cee2626fc211fd4374ee69d540e81ef2fce64ab3 SHA1 2dcd0ee530b1b4f7e1f2fe7f511390da8ff4718e SHA256 d6c58be3ca59002265fe7489ed53ad847f26fa3a353a478b6ae9782cad7bd4c6
-DIST opendchub-0.7.15.tar.gz 193507 RMD160 200e2aae3fe522617ccff7a8d5c345f6da1d33b4 SHA1 7b72322fbbfe7b314f10bc3c6c3ae8becb4f3df7 SHA256 cae88a6d3faceb5da35e30399ba0613c85a437f3c85a5b02b954fc1161a965b1
-DIST opendchub-0.8.2.tar.gz 188551 RMD160 a52f32f544e7b2bb52824cc2da743387c68d0c6c SHA1 2236861833d24a6af1dffe6cc5571d0cf64d3dc0 SHA256 c00d5859fde939741699026da9d4d5fd0b409474608353710204c3c78a8ac5bf
-EBUILD opendchub-0.7.15.ebuild 1251 RMD160 66f0c289cf41e30bfe4c50586ed1015fa6370844 SHA1 e6fbf10f5fbf6b954a73ca8f2b4c5714ab5ec7b9 SHA256 10c61aadb76f60904057df232645635d4894bd999a7e17ad94c9bd60c4034529
-EBUILD opendchub-0.8.2.ebuild 1144 RMD160 a7744dc882685c5a7a26f9fcbe41811038920a0b SHA1 342a3e3d5dbeb51957629d033bb8963946932bbe SHA256 cfaaeec9c315fa3949d244fbdaa8ba2619997372536b2a13d136ffaeb21dba60
-MISC ChangeLog 2331 RMD160 6976aa50e95220fd7e670e03dd9940965b4d32fa SHA1 dff6efdd1be5c0cd1bcf366d75b929c6d27f4261 SHA256 58d57a87a37c3f671b151f2289992d0b00aacef329179c839108af9b36dd1e80
-MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
+AUX 0.7.14-overflow.patch 556 SHA256 5139d0eecade2b43edf4e06eb0e04c0bfa790203dd998ab9fc55292d071549b8 SHA512 c281fa2f9d52c90cf1ac5d9272fa9ab8cedd5759fd34969a6cff25a03f196514d572ca576a803f03e899be42c27923c5f6d80d06204faa472b947a7da71bfa91 WHIRLPOOL 6ffcf5877b9592cca12292ad0a42c34b4f301af8f257b5ef42bac7bb0b1c3467f413ec4665d299e39cee53d9e6a9a28c1a206ab7d075289885ce2f1b55256dc7
+AUX 0.7.14-telnet.patch 540 SHA256 3274cc06ff525057970506555bb8b705d09e37098e57633f2ea6b426ca826394 SHA512 1639270b47ea2c7b4704b83a15eb4231c2cd492d810db2c8400b52c1951c3bf50e4f3dd3888cd91d87ff6fd23ae1b92c53260057b75c4a012a4c6e07a4c882f0 WHIRLPOOL 999940c697017074360552612aaf82979e1fbb2afceded4d977ca3d05a6990353e1f3438ca94f648cb036fc78c9eec5ece1980a458978072ad41919e8ebe6cc9
+AUX opendchub-0.8.2-telnet.patch 380 SHA256 cfbb0c34409698600df55be0de69438549cf13fe7141df9d5edc7695a1bea15f SHA512 3ccbc970544c37f545dde60286ef575160d9d4bda047f5e33b57f9e332d854dab51cb34dba7f253524a1cc87086c6034940bd1250a30af26099944d99c67d271 WHIRLPOOL 5f61163958b4cf406e7a66cf157a3805740fa6e4143799f815b047d93e4414b50e9e95e6f1333bf642cbf5e302739e09cee3f6fa438a955fc6ad14d8d9972a33
+AUX opendchub-gentoo.patch 873 SHA256 9ede4a027aec4f49251ace461c27708eff05e1e9e7e8391cbb735b76f58c11f1 SHA512 f343d93ba3c8faebfd778cfb16f2853a0b323297d9387fd6982649024fe377cb854b4a0a000d11ed7ab91ed7d70b80891c2d39656ddc7d09890015590e72990c WHIRLPOOL e486083945c643f79030706682a1c269e12212240aff47b19272a9851a1c73a63684155eb73fb6b69b3fc4dc9c29111e1542efe56ddb831d1517851c60bf24a5
+AUX opendchub_setup.sh 556 SHA256 d6c58be3ca59002265fe7489ed53ad847f26fa3a353a478b6ae9782cad7bd4c6 SHA512 392b0cca686b8a8ba43eeca43b109616ef29af38ffec1ae02e0a10fb45986a3f6141485dca708abe103080b9a38c867b0120bcf9cd83deb8f6c220b919ae29eb WHIRLPOOL 5e6f181db5ccea0c21c4c9cc1d683968aeb38236d730ad110969acda838e7f3c3858fc541c9c5c49c1179f9b99801fa78145c7f93aa34b7cc32934df3792dc1e
+DIST opendchub-0.8.2.tar.gz 188551 SHA256 c00d5859fde939741699026da9d4d5fd0b409474608353710204c3c78a8ac5bf
+EBUILD opendchub-0.8.2.ebuild 1083 SHA256 6f9763820baddc1c628732c586b57d8a48c922ee00c8a7ce204eb6e5a2b13c99 SHA512 b2519ad63607a5195c322a31a001fb892a7d85fbe30a7c8f11d2a4eacda1d1a2221559c38a992953e206b3eb0d53cea7193d664248f3338386e629ffa030fa09 WHIRLPOOL e22caa7d6c3de5ee56fb4852deb09a888e3653c8b9c0c662e1445e2611b23c53728421bd7c839156cd28c467ef7b0d9d635a1544dcd8dff6003039edf514b3e1
+MISC ChangeLog 2471 SHA256 37f9cc9a0c0320f91d21e756b625efb36d3262a0ff2e1f43d16d1160185c1b65 SHA512 2dfdfc86bc52ed0de942aefa9ae45c7b70f44858f1ea27d278a7190e6efc291f24f4dc11df2042e32307112834b9e83468e3e974d808895602ca7c45c4387cf1 WHIRLPOOL db798e1c2f508483ad40791f0b8542455761c7229d3d3a8b664987a3327159ac9a7c6c644654a1319c6713628c1bb43a73961691c17cfdc589f213f41838ca9a
+MISC metadata.xml 162 SHA256 1ceb974976e8aca9645340cd42cdf3e0d734d768bf6d1b3b5f67932328144799 SHA512 c5d40be633af40377a84cdaa3a4cfb808a7436211e7a97ea7a009b9bd7e21f5157387fea82aea8d18f040ab9575b2422cef9a3f83e1270e090b7acfa10a80dc9 WHIRLPOOL c1e23ff90d6254eed5cdf0c0ec9a9475158e215f86534aa3d2a9d22096220c069b31f39bc43ea2dd4cfdb314b099258896d580684375a64fdbabf4f28253b0ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAk5ObEEACgkQodBTJSDyo64I3QD/cXfn3ktw4W5a72cqq1VbQrjz
-+Bf6gG6ZUCtoCGuLxXkA/2jnSw0nhWuQH7yTijwrbo9GuUjHdMR4T0OEC9w1WHOH
-=7p65
+iQJ8BAEBCgBmBQJVDc6YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir/5sP/01o+wa+jVFkyeEZuegKjgXZ
+qrIUI9AySmsD9lIvQuHdqxKEq0VuIIN6xKAt5iweSzphH71lTI0PIMIJIb40iOhq
+KojCKCXgHFxoeTfwPyttI5xfdujtMYCaxEuMDhAt6eXDSabLtURzDUjEBx2T5b1T
+Xwt0ce7Hwu2kX49VW0pFg57T/HZ1I2ZEU81NivSOrRGiL6RAtxwyBfcw/wXcngpQ
+Ed9O7bHcg2qQRtXVVmazwMplNvwDtrPCC5apwueeQEuz+MvXU2ADI66Sk212lTKl
+B2ZnNfhN4xj9KkH55NSLgSUtVtZdrvbsACk2dns27w+t85KynYINDQYVUZdzaI3F
+WGPC60LV2gObfz87y+q1Mo3ul4gCZnIFIs37O+PSfTpBgX8mrQQts8NoCinYOGPg
+nIkTzCEW2wMRpKJAUDdMGeVtIeT8WcFmZdcILYQBF5usSjRP0JR70cxKmtpmYyL9
+I8LvTN8RlQl05ySEahPU1PB4Bki0J1gn0Bda1beFzPyQDYAWTi3jSflmeds8Kzye
+/iR+ZHYUsS/f8fUou9ZWSTC0KC1NR+hjapvm1HCNdZLDeilr3wxdI12JEG/a8olZ
+IQpgMV/yW2sVzbCzX5Jihw+LLo/WHtMaIYmecs/5scLt0SQfWkOtVZzBoY3yZLty
+n1ML1fvDxTZszFWyNrWG
+=ZAUp
 -----END PGP SIGNATURE-----
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
 }