Revert "bitcoincore 0.11.1 & 9999: hasufell's suggestions"

This reverts commit 5be824adbd39361d273f6d7c08a15a5574ceec24.

6 files changed, 12 insertions, 20 deletions

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 13e5eda79de..17d993f9a48 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 || die
+	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind \)bitcoind \(bitcoin-cli\)$/\1\2/' contrib/bitcoind.bash-completion
 	bitcoincore_src_prepare
 }
 
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild
index 3c7b4d5241d..4904ce462a3 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 || die
+	sed -i 's/bitcoin-tx//' src/Makefile.am
 	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 46d4f07bd28..d2618cfd98f 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
@@ -38,7 +38,7 @@ REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
 src_prepare() {
 	bitcoincore_prepare
 
-	local filt= yeslang= nolang= lan ts x
+	local filt= yeslang= nolang=
 
 	for lan in $LANGS; do
 		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
@@ -52,15 +52,15 @@ src_prepare() {
 		x="${x/.ts/}"
 		if ! use "linguas_$x"; then
 			nolang="$nolang $x"
-			rm "$ts" || die
+			rm "$ts"
 			filt="$filt\\|$x"
 		else
 			yeslang="$yeslang $x"
 		fi
 	done
 	filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
-	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' || die
-	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die
+	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc'
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
 	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
 
 	bitcoincore_autoreconf
@@ -89,10 +89,6 @@ 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 902b6ae6d4a..6f9997e672a 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
 src_prepare() {
 	bitcoincore_prepare
 
-	local filt= yeslang= nolang= lan ts x
+	local filt= yeslang= nolang=
 
 	for lan in $LANGS; do
 		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
@@ -49,15 +49,15 @@ src_prepare() {
 		x="${x/.ts/}"
 		if ! use "linguas_$x"; then
 			nolang="$nolang $x"
-			rm "$ts" || die
+			rm "$ts"
 			filt="$filt\\|$x"
 		else
 			yeslang="$yeslang $x"
 		fi
 	done
 	filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
-	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' || die
-	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die
+	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc'
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
 	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
 
 	bitcoincore_autoreconf
@@ -86,10 +86,6 @@ 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 390c9ea0056..ef75d878db1 100644
--- a/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
@@ -33,7 +33,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
+	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion
 	bitcoincore_src_prepare
 }
 
diff --git a/net-p2p/bitcoind/bitcoind-9999.ebuild b/net-p2p/bitcoind/bitcoind-9999.ebuild
index 715308d80be..5c38561fd52 100644
--- a/net-p2p/bitcoind/bitcoind-9999.ebuild
+++ b/net-p2p/bitcoind/bitcoind-9999.ebuild
@@ -28,7 +28,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
+	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion
 	bitcoincore_src_prepare
 }