Version bump, remove older broken 1.9.x

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

5 files changed, 72 insertions, 114 deletions

diff --git a/net-misc/electrum/ChangeLog b/net-misc/electrum/ChangeLog
index 0cebe517f023..2c63f7650840 100644
--- a/net-misc/electrum/ChangeLog
+++ b/net-misc/electrum/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/electrum
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.17 2013/11/13 12:54:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.18 2013/12/17 12:50:09 blueness Exp $
+
+*electrum-1.9.6 (17 Dec 2013)
+
+  17 Dec 2013; Anthony G. Basile <blueness@gentoo.org> +electrum-1.9.6.ebuild,
+  +files/electrum.desktop-1.9.6.patch, +files/setup.py-1.9.6.patch,
+  -electrum-1.9.3.ebuild, -electrum-1.9.4.ebuild:
+  Version bump, remove older broken 1.9.x
 
 *electrum-1.9.4 (13 Nov 2013)
 
diff --git a/net-misc/electrum/electrum-1.9.4.ebuild b/net-misc/electrum/electrum-1.9.4.ebuild
deleted file mode 100644
index b98bf07541a6..000000000000
--- a/net-misc/electrum/electrum-1.9.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.4.ebuild,v 1.1 2013/11/13 12:54:16 blueness Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils distutils-r1 gnome2-utils
-
-MY_P=Electrum-${PV}
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="http://electrum.org/"
-SRC_URI="http://download.electrum.org/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk qt4"
-REQUIRED_USE="|| ( gtk qt4 )"
-
-LANGS="br cs de eo es fr it lv nl ru sl vi zh"
-
-for X in ${LANGS}; do
-	IUSE+=" linguas_${X}"
-done
-unset X
-
-RDEPEND="
-	dev-python/setuptools
-	dev-python/ecdsa
-	dev-python/slowaes
-	gtk? ( dev-python/pygtk:2 )
-	qt4? ( dev-python/PyQt4 )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	# Prevent icon from being installed in the wrong location:
-	sed -i '/electrum\.png/ d' setup.py || die
-	sed -i "s:^Icon=.*:Icon=${PN}:" "${PN}.desktop" || die
-
-	# Fix .desktop to pass validation
-	sed -i 's:bitcoin$:bitcoin;:' electrum.desktop || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${LANGS#en}; do
-		if use linguas_$lang; then
-			test -f "locale/$lang/LC_MESSAGES/${PN}.mo" || die
-		else
-			rm -r "locale/$lang" || die
-		fi
-	done
-
-	# Remove unrequested GUI implementations:
-	if use !gtk; then
-		rm gui/gtk.py || die
-		sed -i "/electrum_gui.gtk/d" setup.py
-	fi
-	if use !qt4; then
-		rm -rf gui/qt || die
-		sed -i "/electrum_gui.qt/d" setup.py
-		sed -i "/config.get('gui','classic')/s/classic/gtk/" electrum \
-			|| die
-	fi
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 64 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/electrum/electrum-1.9.3.ebuild b/net-misc/electrum/electrum-1.9.6.ebuild
index aa3f55ab160e..1bafdb8d19df 100644
--- a/net-misc/electrum/electrum-1.9.3.ebuild
+++ b/net-misc/electrum/electrum-1.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.3.ebuild,v 1.1 2013/11/12 14:59:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.6.ebuild,v 1.1 2013/12/17 12:50:09 blueness Exp $
 
 EAPI="5"
 
@@ -16,19 +16,17 @@ SRC_URI="http://download.electrum.org/download/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+LINGUAS="ar_SA de_DE es_ES hu_HU it_IT ky_KG nl_NL pt_BR ru_RU ta_IN zh_CN
+		 cs_CZ eo_UY fr_FR id_ID ja_JP lv_LV pl_PL pt_PT sl_SI vi_VN"
 IUSE="gtk qt4"
-REQUIRED_USE="|| ( gtk qt4 )"
 
-LANGS="br cs de eo es fr it lv nl ru sl vi zh"
-
-for X in ${LANGS}; do
-	IUSE+=" linguas_${X}"
+for lingua in ${LINGUAS}; do
+		IUSE+=" linguas_${lingua}"
 done
-unset X
 
 RDEPEND="
 	dev-python/setuptools
-	dev-python/ecdsa
+	>=dev-python/ecdsa-0.9
 	dev-python/slowaes
 	gtk? ( dev-python/pygtk:2 )
 	qt4? ( dev-python/PyQt4 )"
@@ -38,40 +36,42 @@ S=${WORKDIR}/${MY_P}
 DOCS="RELEASE-NOTES"
 
 src_prepare() {
-	# Prevent icon from being installed in the wrong location:
-	sed -i '/electrum\.png/ d' setup.py || die
-	sed -i "s:^Icon=.*:Icon=${PN}:" "${PN}.desktop" || die
+	# Prevent .desktop, icon, and translations from being installed in the wrong locations
+	epatch "${FILESDIR}"/setup.py-${PV}.patch
 
-	# Fix .desktop to pass validation
-	sed -i 's:bitcoin$:bitcoin;:' electrum.desktop || die
+	epatch "${FILESDIR}"/electrum.desktop-${PV}.patch
+	validate_desktop_entries
 
 	# Remove unrequested localization files:
-	local lang
-	for lang in ${LANGS#en}; do
-		if use linguas_$lang; then
-			test -f "locale/$lang/LC_MESSAGES/${PN}.mo" || die
+	for lang in ${LINGUAS}; do
+		if use linguas_${lang}; then
+			test -f "locale/${lang}/LC_MESSAGES/${PN}.mo" || die
 		else
-			rm -r "locale/$lang" || die
+			rm -r "locale/${lang}" || die
 		fi
 	done
 
 	# Remove unrequested GUI implementations:
 	if use !gtk; then
-		rm gui/gtk.py || die
-		sed -i "/electrum_gui.gtk/d" setup.py
+		sed -i "/'electrum_gui.gtk/d" setup.py || die
+	fi
+	if use !qt4; then
+		sed -i "/'electrum_gui.qt/d" setup.py  || die
 	fi
+
 	if use !qt4; then
-		rm -rf gui/qt || die
-		sed -i "/electrum_gui.qt/d" setup.py
-		sed -i "/config.get('gui','classic')/s/classic/gtk/" electrum \
-			|| die
+		if use gtk; then
+			sed -i "s/config.get('gui','classic')/ config.get('gui','gtk')/" electrum || die
+		else
+			sed -i "s/config.get('gui','classic')/ config.get('gui','text')/" electrum || die
+		fi
 	fi
 
 	distutils-r1_src_prepare
 }
 
 src_install() {
-	doicon -s 64 icons/${PN}.png
+	doicon -s 128 icons/${PN}.png
 	distutils-r1_src_install
 }
 
diff --git a/net-misc/electrum/files/electrum.desktop-1.9.6.patch b/net-misc/electrum/files/electrum.desktop-1.9.6.patch
new file mode 100644
index 000000000000..89f576c3f39c
--- /dev/null
+++ b/net-misc/electrum/files/electrum.desktop-1.9.6.patch
@@ -0,0 +1,11 @@
+diff --git a/electrum.desktop b/electrum.desktop
+index 1b0c5ab..20a0b1e 100644
+--- a/electrum.desktop
++++ b/electrum.desktop
+@@ -13,5 +13,5 @@ Categories=Network;
+ StartupNotify=false
+ Terminal=false
+ Type=Application
+-MimeType=x-scheme-handler/bitcoin
++MimeType=x-scheme-handler/bitcoin;
+ 
diff --git a/net-misc/electrum/files/setup.py-1.9.6.patch b/net-misc/electrum/files/setup.py-1.9.6.patch
new file mode 100644
index 000000000000..ee89641775d6
--- /dev/null
+++ b/net-misc/electrum/files/setup.py-1.9.6.patch
@@ -0,0 +1,28 @@
+diff --git a/setup.py b/setup.py
+index c2eba94..1e032d7 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,15 +16,12 @@ if sys.version_info[:3] < (2, 6, 0):
+     sys.exit("Error: Electrum requires Python version >= 2.6.0...")
+ 
+ usr_share = '/usr/share'
+-if not os.access(usr_share, os.W_OK):
+-    usr_share = os.getenv("XDG_DATA_HOME", os.path.join(os.getenv("HOME"), ".local", "share"))
+ 
+ data_files = []
+ if (len(sys.argv) > 1 and (sys.argv[1] == "sdist")) or (platform.system() != 'Windows' and platform.system() != 'Darwin'):
+     print "Including all files"
+     data_files += [
+         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
+-        (os.path.join(usr_share, 'app-install', 'icons/'), ['icons/electrum.png'])
+     ]
+     if not os.path.exists('locale'):
+         os.mkdir('locale')
+@@ -37,7 +34,6 @@ if not os.access(appdata_dir, os.W_OK):
+     appdata_dir = os.path.join(usr_share, "electrum")
+ 
+ data_files += [
+-    (appdata_dir, ["data/README"]),
+     (os.path.join(appdata_dir, "cleanlook"), [
+         "data/cleanlook/name.cfg",
+         "data/cleanlook/style.css"