bitcoincore 0.11.1 & 9999: hasufell's suggestions

7 files changed, 31 insertions, 40 deletions

diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass
index 0cebdb5a92b6..0362c8cdcf26 100644
--- a/eclass/bitcoincore.eclass
+++ b/eclass/bitcoincore.eclass
@@ -213,6 +213,7 @@ bitcoincore_pkg_pretend() {
 }
 
 bitcoincore_prepare() {
+	local mypolicy
 	if [ -n "${BITCOINCORE_NO_SYSLIBS}" ]; then
 		true
 	elif [ "${PV}" = "9999" ]; then
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild
index 17d993f9a48b..13e5eda79de2 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 src_prepare() {
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind \)bitcoind \(bitcoin-cli\)$/\1\2/' contrib/bitcoind.bash-completion
+	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind \)bitcoind \(bitcoin-cli\)$/\1\2/' contrib/bitcoind.bash-completion || die
 	bitcoincore_src_prepare
 }
 
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild
index 4904ce462a32..3c7b4d5241da 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 
 src_prepare() {
 	bitcoincore_prepare
-	sed -i 's/bitcoin-tx//' src/Makefile.am
+	sed -i 's/bitcoin-tx//' src/Makefile.am || die
 	bitcoincore_autoreconf
 }
 
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
index d2618cfd98f1..28a0513b031f 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
@@ -33,12 +33,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	qt5? ( dev-qt/linguist-tools:5 )
 "
-REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
+REQUIRED_USE="^^ ( qt4 qt5 )"
 
 src_prepare() {
 	bitcoincore_prepare
 
-	local filt= yeslang= nolang=
+	local filt= yeslang= nolang= lan ts x
 
 	for lan in $LANGS; do
 		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
@@ -46,21 +46,21 @@ src_prepare() {
 		fi
 	done
 
-	for ts in $(ls src/qt/locale/*.ts)
+	for ts in src/qt/locale/*.ts
 	do
 		x="${ts/*bitcoin_/}"
 		x="${x/.ts/}"
 		if ! use "linguas_$x"; then
 			nolang="$nolang $x"
-			rm "$ts"
+			rm "$ts" || die
 			filt="$filt\\|$x"
 		else
 			yeslang="$yeslang $x"
 		fi
 	done
 	filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
-	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc'
-	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
+	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' || die
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die
 	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
 
 	bitcoincore_autoreconf
@@ -89,6 +89,10 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 update_caches() {
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
index 6f9997e672af..202dbe527921 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
@@ -30,12 +30,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	qt5? ( dev-qt/linguist-tools:5 )
 "
-REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
+REQUIRED_USE="^^ ( qt4 qt5 )"
 
 src_prepare() {
 	bitcoincore_prepare
 
-	local filt= yeslang= nolang=
+	local filt= yeslang= nolang= lan ts x
 
 	for lan in $LANGS; do
 		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
@@ -43,21 +43,21 @@ src_prepare() {
 		fi
 	done
 
-	for ts in $(ls src/qt/locale/*.ts)
+	for ts in src/qt/locale/*.ts
 	do
 		x="${ts/*bitcoin_/}"
 		x="${x/.ts/}"
 		if ! use "linguas_$x"; then
 			nolang="$nolang $x"
-			rm "$ts"
+			rm "$ts" || die
 			filt="$filt\\|$x"
 		else
 			yeslang="$yeslang $x"
 		fi
 	done
 	filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
-	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc'
-	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
+	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' || die
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die
 	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
 
 	bitcoincore_autoreconf
@@ -86,6 +86,10 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 update_caches() {
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
diff --git a/net-p2p/bitcoind/bitcoind-0.11.1.ebuild b/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
index ef75d878db18..0b60d2efc63e 100644
--- a/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
 BITCOINCORE_LJR_DATE="20150921"
-BITCOINCORE_IUSE="addrindex examples ljr logrotate test upnp +wallet zeromq"
+BITCOINCORE_IUSE="addrindex examples ljr test upnp +wallet zeromq"
 BITCOINCORE_ADDRINDEX_DIFF="8a915e56f4be5d090d79f01cbd4a23ce1b7e9168...4a6331c5068d8f2c95731518445a57267d506bb5"
 BITCOINCORE_ADDRINDEX_PATCHFILE="bitcoin-addrindex-v0.11.0.patch"
 BITCOINCORE_POLICY_PATCHES="cltv cpfp dcmp rbf spamfilter"
@@ -19,13 +19,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="
-	logrotate? (
-		app-admin/logrotate
-	)
-"
-DEPEND="${RDEPEND}"
-
 pkg_setup() {
 	local UG='bitcoin'
 	enewgroup "${UG}"
@@ -33,7 +26,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion
+	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
 	bitcoincore_src_prepare
 }
 
@@ -70,8 +63,6 @@ src_install() {
 		dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh}
 	fi
 
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-	fi
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
 }
diff --git a/net-p2p/bitcoind/bitcoind-9999.ebuild b/net-p2p/bitcoind/bitcoind-9999.ebuild
index 5c38561fd52b..71304c3496ab 100644
--- a/net-p2p/bitcoind/bitcoind-9999.ebuild
+++ b/net-p2p/bitcoind/bitcoind-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-BITCOINCORE_IUSE="examples logrotate test upnp +wallet"
+BITCOINCORE_IUSE="examples test upnp +wallet"
 BITCOINCORE_NEED_LEVELDB=1
 BITCOINCORE_NEED_LIBSECP256K1=1
 inherit bash-completion-r1 bitcoincore user systemd
@@ -14,13 +14,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 
-RDEPEND="
-	logrotate? (
-		app-admin/logrotate
-	)
-"
-DEPEND="${RDEPEND}"
-
 pkg_setup() {
 	local UG='bitcoin'
 	enewgroup "${UG}"
@@ -28,7 +21,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion
+	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
 	bitcoincore_src_prepare
 }
 
@@ -65,8 +58,6 @@ src_install() {
 		dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh}
 	fi
 
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-	fi
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
 }