Remove USE=bash-completion and fix primecoind.bash-completion, bug #521352

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 24 insertions, 136 deletions

diff --git a/net-p2p/primecoind/ChangeLog b/net-p2p/primecoind/ChangeLog
index 94e9182c530a..29f53d3a9216 100644
--- a/net-p2p/primecoind/ChangeLog
+++ b/net-p2p/primecoind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/primecoind
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/primecoind/ChangeLog,v 1.4 2014/08/10 20:38:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/primecoind/ChangeLog,v 1.5 2014/08/28 22:42:59 blueness Exp $
+
+  28 Aug 2014; Anthony G. Basile <blueness@gentoo.org> -primecoind-0.1.2.ebuild,
+  primecoind-0.1.2-r1.ebuild:
+  Remove USE=bash-completion and fix primecoind.bash-completion, bug #521352
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   primecoind-0.1.2-r1.ebuild, primecoind-0.1.2.ebuild:
diff --git a/net-p2p/primecoind/Manifest b/net-p2p/primecoind/Manifest
index 10e41732cfb1..1b38560e3545 100644
--- a/net-p2p/primecoind/Manifest
+++ b/net-p2p/primecoind/Manifest
@@ -9,14 +9,23 @@ AUX primecoin.initd-r1 956 SHA256 eee9eff97ffe848461df0b6dd5242869234cca7de1829a
 AUX primecoin.service 889 SHA256 f38b0b67a950b1b43dce4906aeece22bd186ddc198bce0b9136edc5bf4149fd3 SHA512 5b37b776f419bf9da51952e9a4b3bc7f8879297d1e6d8d551ea4658a8daf7f2f5138bd018443a514ee7787b8c6265fadc409bbc9bdb1d58a8df34ae312dbfd0f WHIRLPOOL 503a5e730cd9cee91308d8d79a0ed59f3ef0fe7dbd1c673c82deb5f12cf3c7c07de498d31b996c9fe0523ebba50752c792f8b636896b01b04718de2e929512d9
 AUX primecoind.logrotate 116 SHA256 fb78530aad1491be7c75dede40e82809020b438f272a6a8506ba74eb9af0691b SHA512 ad6873f47e73a305e3b44fc0a6e9ef430a2e82392ff6c5230f365aaa1b1d64afc8d97094006dc2b57b8b9245288f3e144ecdccb5913d98d7171fcd6a216022e9 WHIRLPOOL 0d6c4b3fcbe60de559febe9d8029de177821c0aceec31fdae3b9b907aebc24ffc4f1b7ecc2102a8ae486f25ac00fd479a1b349ce2ed39a1e6fb85a620b30a97e
 DIST primecoin-0.1.2.tar.gz 16521236 SHA256 d0f3c6a91b4d505f25e9284bcca85e420cf09d0e6cf71e5a001b7e1367ef46d0 SHA512 cff71b0e6459c4e534e78acef9491090d05c0cb864a068c0a3cb289310a1ee13fd69c7b61a7d6cb9732af54fbcf1fa4e77db8c8528a09bbdafd36421fdf7aff1 WHIRLPOOL 5031efa135dcf08975a06a037179863ad180920e0c55e0ec5d1863b4b24d005ce829fa0e0f081120d3610bc0abd1d3919db477a33e32ec6d0d353b7177480eb1
-EBUILD primecoind-0.1.2-r1.ebuild 3138 SHA256 a830634a7fba74ed322bd5597a12ca7880d1120ffba035e2bcd73bf376abc6cd SHA512 900e2582c294817e3a3cc9c94d05ff6fdffd29c5c16e17966faec705a33a93d78bbfb5d3f583e6db80e5ad43ef0822a4ffcf1c511096c687f5e7da679174d097 WHIRLPOOL cb7a13472f9833854935f8382d4f87e009cdd6086e9c33416f6f1cc1381c2498a1f95b050d2b3cd0c01b9bc77b257dec8f4dd5a193f8cc75835d997574bc5f35
-EBUILD primecoind-0.1.2.ebuild 3132 SHA256 d57309d362adaa10cce8b6b52faabd06f2bca6cb2248e55387dcaa08ace09eca SHA512 16f2b4656b00e59e26f0224a8e429c4168323561e585fb5c474f5df15cfebb4d70b3e665c5bd3867bd01aaef845f4e06690258d398dd54dc055f1fe04fde3806 WHIRLPOOL fa428bb30db3b51f1a69593cb3337df856ee4b5298c2a0bf5136567366a1b954a465bbef1687ec96425d25d97f93443d2f3e22d918917ce0330f6812e7d3eee7
-MISC ChangeLog 982 SHA256 91ae99e2845abf9318429a1e4ca6ff1c86c03b32ed7e693f6bf3f1b05875d2c9 SHA512 60a062d9f8348a6123674634401b400451e594fc6be2d874af3efc06c95a1cec26b04469d737f2fbb66723e9fe2dda7bb5b919a6f0967c345243c4077bcd5707 WHIRLPOOL 11cb7e7192362e2ab772c7993cbb5b358389663d561667f1482e2386fc72cd729c999087037fa1bfe926ba367271b7215fbfb2db632b22e1b2229a9ecd0d4505
+EBUILD primecoind-0.1.2-r1.ebuild 3157 SHA256 c25155469ec503befc1ed0ffff16cfcb3234d635dffcf4f9713efb842897258f SHA512 88c3b5691b4a5ca7fab8289cf543240f78c111ac9e021c727d8636e46b7eba278c7490e6970bb0d9684a7963fbcda1b879e4c02dfadb9e89c786d1cc48487d36 WHIRLPOOL d370422239c3f20f4b5cecc25f829abfa8ab9928cdffdf8cd623a8c9a84567faf92b4e0c9ef4006bb074e5e05c0565293a84334906a58bdd13de73f021e1862b
+MISC ChangeLog 1173 SHA256 8ff6f15ec68fe6b1eb7fc7745679b17185441359b96b381bdf810e1bf8386682 SHA512 62397e08e30bd3c1db6e24626a1197be0c47b467ebe549ea81a68fb6c1a7b8e0080005cfdfac88f1b1dc56a862099a95525082acb58a2889ab9e03ee9ea3dac9 WHIRLPOOL 76fd1d80f06cd8272c10e903823b3919ed5dd8ede2c7b863ba04b6d7d68663fc8fbedab8b9f81036f7a80c0e51d585589d4ab5f5c43d42341f3ba167c48faa2b
 MISC metadata.xml 327 SHA256 2009a65ac31a6a928926715ab212766020927524623581b18ee1f5026a6a689c SHA512 4d68f30b7c29aa5b6c3f7fd5c657ffbbe12706ce5d8d332cd8848906a27ae852e39d48219f6137a65c31db9c7693c2218edf8b6b1511cb1098d86bdb394cd0f9 WHIRLPOOL f7ad1bdb29423c9a88a721e77168aa35372a3411f77c775e2ac518eefc7ee39def4a307a66b4da02f80a6e9d8cdcff8fafa20da1792b7909e84bcad67598c4d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn2DwACgkQcaHudmEf86oxtgCff62PS2C2yPaQemRtR7vcfwtM
-BC8An0OcTPWFzuLKcmW3lsLBq8W0drfM
-=l3t6
+iQIcBAEBCAAGBQJT/7EcAAoJEJOE+m71LUu6WGMP/AsCOsHyd+3wZdQltxVzp/aL
+BB5KYXIV8psFi0BFtdCuN+GJUjEQVrxtpxPK4iLZrTQLQu5hu4YzKTWt6JbKBnQS
+/5PGS7c8XwZagbsH54s20fGucFpnu+eEIT0tfh/N+h5s3QRgmeo9uDxp8ydW5ZMh
+ATFbTT/+KsQFuKFUa5kjGIlr/7FycG/8ptSxzr+Yc5M2t9Cy2GmXUsMfC9/Nl78Q
+RKSIXkU+h42p3E/L1bN4v485C88YMDs0t3jymzr5r718ghvgJaX5IMYQGg9hMimZ
+6zygNuWoLS8H6JpZvenuy5VkiItJvJdnD0FWuSStC3acGO/f8EWMqlfRF4o/SOlS
+wXlpziObjJo/bc/v1NLdQxcWgE/OGkPQss5oLQd/midsIERSTqY2cBj0HhlcBbjb
+AzOYu0uj15WnqO7hqovZBeQYbvNPaxyk9BJ+51QHZBqvY4Gl7CWeHI7MK7LpNaVL
+7G2oAbO93fXll7lBwYBQVPV768dEcBH3W/mG9uKDwcTWHCl9e9Qrb982Cbe1XpNV
+l3MQOQ5PUdFf76eIYU/CEXkX4oNsKz8hTl6nnh4PKofpoLLjlOGbdDpzs3Fc6Vom
+yerU/7Mhj6NNl7QxQiogmKlez5POB2PbJaFCTsBd/mD1ios4EAF3hwzHvSkQFs5z
+5g1jAl1j5QoD/Bonfv7B
+=zOGM
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/primecoind/primecoind-0.1.2-r1.ebuild b/net-p2p/primecoind/primecoind-0.1.2-r1.ebuild
index 72fcc228e79f..45a2e2744220 100644
--- a/net-p2p/primecoind/primecoind-0.1.2-r1.ebuild
+++ b/net-p2p/primecoind/primecoind-0.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/primecoind/primecoind-0.1.2-r1.ebuild,v 1.2 2014/08/10 20:38:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/primecoind/primecoind-0.1.2-r1.ebuild,v 1.3 2014/08/28 22:42:59 blueness Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${MyPN}/${MyP}-linux.tar.gz -> ${MyP}.tar.gz"
 LICENSE="MIT ISC GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion examples ipv6 logrotate upnp"
+IUSE="examples ipv6 logrotate upnp"
 
 RDEPEND="
 	dev-libs/boost[threads(+)]
@@ -108,9 +108,8 @@ src_install() {
 	newman contrib/debian/manpages/bitcoind.1 primecoind.1
 	newman contrib/debian/manpages/bitcoin.conf.5 primecoin.conf.5
 
-	if use bash-completion; then
-		newbashcomp contrib/bitcoind.bash-completion ${PN}.bash-completion
-	fi
+	sed -i -e 's/bitcoin/primecoin/g' contrib/bitcoind.bash-completion
+	newbashcomp contrib/bitcoind.bash-completion ${PN}.bash-completion
 
 	if use examples; then
 		docinto examples
diff --git a/net-p2p/primecoind/primecoind-0.1.2.ebuild b/net-p2p/primecoind/primecoind-0.1.2.ebuild
deleted file mode 100644
index fa781a90cecd..000000000000
--- a/net-p2p/primecoind/primecoind-0.1.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/primecoind/primecoind-0.1.2.ebuild,v 1.3 2014/08/10 20:38:19 slyfox Exp $
-
-EAPI=5
-
-DB_VER="4.8"
-
-inherit bash-completion-r1 db-use eutils systemd user
-
-MyPV="${PV/_/-}"
-MyPN="primecoin"
-MyP="${MyPN}-${MyPV}"
-
-DESCRIPTION="P2P Internet currency based on Bitcoin but easier to mine"
-HOMEPAGE="http://primecoin.org/"
-SRC_URI="mirror://sourceforge/${MyPN}/${MyP}-linux.tar.gz -> ${MyP}.tar.gz"
-
-LICENSE="MIT ISC GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion examples ipv6 logrotate upnp"
-
-RDEPEND="
-	dev-libs/boost[threads(+)]
-	dev-libs/openssl:0[-bindist]
-	logrotate? (
-		app-admin/logrotate
-	)
-	upnp? (
-		net-libs/miniupnpc
-	)
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	<=dev-libs/leveldb-1.12.0[-snappy]
-"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-	sys-apps/sed
-"
-
-S="${WORKDIR}/${MyP}-linux/src"
-
-pkg_setup() {
-	local UG='primecoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/primecoin "${UG}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MyPN}-sys_leveldb.patch
-	rm -r src/leveldb
-
-	if has_version '>=dev-libs/boost-1.52'; then
-		sed -i 's/\(-l db_cxx\)/-l boost_chrono$(BOOST_LIB_SUFFIX) \1/' src/makefile.unix
-	fi
-}
-
-src_configure() {
-	OPTS=()
-
-	OPTS+=("DEBUGFLAGS=")
-	OPTS+=("CXXFLAGS=${CXXFLAGS}")
-	OPTS+=("LDFLAGS=${LDFLAGS}")
-
-	if use upnp; then
-		OPTS+=("USE_UPNP=1")
-	else
-		OPTS+=("USE_UPNP=-")
-	fi
-
-	use ipv6 || OPTS+=("USE_IPV6=-")
-
-	OPTS+=("USE_SYSTEM_LEVELDB=1")
-	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
-	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
-	cd src || die
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" ${PN}
-}
-
-#Tests are broken with and without our primecoin-sys_leveldb.patch.
-#When tests work, make sure to inherit toolchain-funcs
-#src_test() {
-#	cd src || die
-#	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" test_primecoin
-#	./test_primecoin || die 'Tests failed'
-#}
-
-src_install() {
-	dobin src/${PN}
-
-	insinto /etc/primecoin
-	doins "${FILESDIR}/primecoin.conf"
-	fowners primecoin:primecoin /etc/primecoin/primecoin.conf
-	fperms 600 /etc/primecoin/primecoin.conf
-
-	newconfd "${FILESDIR}/primecoin.confd" ${PN}
-	newinitd "${FILESDIR}/primecoin.initd" ${PN}
-	systemd_dounit "${FILESDIR}/primecoin.service"
-
-	keepdir /var/lib/primecoin/.primecoin
-	fperms 700 /var/lib/primecoin
-	fowners primecoin:primecoin /var/lib/primecoin/
-	fowners primecoin:primecoin /var/lib/primecoin/.primecoin
-	dosym /etc/primecoin/primecoin.conf /var/lib/primecoin/.primecoin/primecoin.conf
-
-	dodoc doc/README.md doc/release-notes.md
-	newman contrib/debian/manpages/bitcoind.1 primecoind.1
-	newman contrib/debian/manpages/bitcoin.conf.5 primecoin.conf.5
-
-	if use bash-completion; then
-		newbashcomp contrib/bitcoind.bash-completion ${PN}.bash-completion
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{bitrpc,pyminer,spendfrom,tidy_datadir.sh,wallettools}
-	fi
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/primecoind.logrotate" primecoind
-	fi
-}