summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2015-10-23 13:33:31 +0200
committerJulian Ospald <hasufell@gentoo.org>2015-10-23 13:33:31 +0200
commit0ccb863ab3587ccdf2a645443ec44e33c306b011 (patch)
treeaa41bcddb1908c18a4ca5601a59c4a28861e7094 /net-p2p/bitcoin-qt
parentRevert "bitcoincore: DEPEND on net-libs/miniupnpc without known security vulns" (diff)
downloadgentoo-0ccb863ab3587ccdf2a645443ec44e33c306b011.tar.gz
gentoo-0ccb863ab3587ccdf2a645443ec44e33c306b011.tar.bz2
gentoo-0ccb863ab3587ccdf2a645443ec44e33c306b011.zip
Revert "bitcoincore 0.11.1 & 9999: hasufell's suggestions"
This reverts commit 5be824adbd39361d273f6d7c08a15a5574ceec24.
Diffstat (limited to 'net-p2p/bitcoin-qt')
-rw-r--r--net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild12
-rw-r--r--net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild12
2 files changed, 8 insertions, 16 deletions
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