Drop older versions.

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

6 files changed, 7 insertions, 336 deletions

diff --git a/net-misc/electrum/ChangeLog b/net-misc/electrum/ChangeLog
index 58e446fa17ca..100d4c39c2d6 100644
--- a/net-misc/electrum/ChangeLog
+++ b/net-misc/electrum/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/electrum
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.33 2015/05/04 12:53:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.34 2015/05/04 13:11:53 blueness Exp $
+
+  04 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  -electrum-1.9.8-r1.ebuild, -electrum-2.0.0.ebuild,
+  -files/1.9.8-gtk3-fix.patch, -files/electrum.desktop-1.9.7.patch,
+  -files/setup.py-1.9.7.patch:
+  Drop older versions.
 
 *electrum-2.1.1 (04 May 2015)
 
diff --git a/net-misc/electrum/electrum-1.9.8-r1.ebuild b/net-misc/electrum/electrum-1.9.8-r1.ebuild
deleted file mode 100644
index e23b51d6e33a..000000000000
--- a/net-misc/electrum/electrum-1.9.8-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.8-r1.ebuild,v 1.3 2015/04/08 18:04:50 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?"
-
-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"
-LINGUAS="ar_SA cs_CZ de_DE eo_UY es_ES fr_FR hu_HU
-		 id_ID it_IT ja_JP ky_KG lv_LV nl_NL
-		 pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI
-		 ta_IN th_TH vi_VN zh_CN"
-
-IUSE="aliases cli coinbase_com +fiat gtk3 ncurses pos qrcode +qt4 sync vkb"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-REQUIRED_USE="
-	|| ( cli gtk3 ncurses qt4 )
-	aliases? ( qt4 )
-	coinbase_com? ( qt4 )
-	fiat? ( qt4 )
-	pos? ( qt4 )
-	qrcode? ( qt4 )
-	sync? ( qt4 )
-	vkb? ( qt4 )
-"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.9[${PYTHON_USEDEP}]
-	dev-python/slowaes[${PYTHON_USEDEP}]
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
-	qt4? (
-		coinbase_com? ( dev-python/PyQt4[${PYTHON_USEDEP},webkit] )
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	# Prevent .desktop, icon, and translations from being installed in the wrong locations
-	epatch "${FILESDIR}"/setup.py-1.9.7.patch
-
-	epatch "${FILESDIR}"/electrum.desktop-1.9.7.patch
-	validate_desktop_entries
-
-	# Bugfix
-	epatch "${FILESDIR}/${PV}-gtk3-fix.patch"
-
-	# Remove unrequested localization files:
-	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
-		fi
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		$(usex gtk3     '' gtk  )  \
-		$(usex qt4      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		sed -i "/'electrum_gui\.${gui}/d" setup.py || die
-	done
-
-	if ! use qt4; then
-		local bestgui=$(usex gtk3 gtk $(usex ncurses text stdio))
-		sed -i "s/\(config.get('gui', \?\)'classic'/\1'${bestgui}'/" electrum || die
-	fi
-
-	local plugin
-	for plugin in  \
-		$(usex aliases       '' aliases         )  \
-		$(usex coinbase_com  '' coinbase_buyback)  \
-		$(usex fiat          '' exchange_rate   )  \
-		$(usex sync          '' labels          )  \
-		$(usex pos           '' pointofsale     )  \
-		$(usex qrcode        '' qrscanner       )  \
-		$(usex vkb           '' virtualkeyboard )  \
-	; do
-		sed -i "/'electrum_plugins\.${plugin}/d" setup.py || die
-	done
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 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-2.0.0.ebuild b/net-misc/electrum/electrum-2.0.0.ebuild
deleted file mode 100644
index acbe4ccb849a..000000000000
--- a/net-misc/electrum/electrum-2.0.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-2.0.0.ebuild,v 1.2 2015/03/14 19:53:20 blueness Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit eutils distutils-r1 gnome2-utils
-
-MY_P=Electrum-2.0
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://electrum.org/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LINGUAS="ar_SA cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ky_KG lv_LV nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH vi_VN zh_CN"
-
-IUSE="aliases amodem cli coinbase_com cosign +fiat graph greenaddress_it gtk3 ncurses qrcode +qt4 sync trustedcoin_com vkb"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-REQUIRED_USE="
-	|| ( cli gtk3 ncurses qt4 )
-	aliases? ( qt4 )
-	amodem? ( qt4 )
-	coinbase_com? ( qt4 )
-	cosign? ( qt4 )
-	fiat? ( qt4 )
-	graph? ( qt4 )
-	greenaddress_it? ( qt4 )
-	qrcode? ( qt4 )
-	sync? ( qt4 )
-	trustedcoin_com? ( qt4 )
-	vkb? ( qt4 )
-"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.9[${PYTHON_USEDEP}]
-	dev-python/slowaes[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/socksipy[${PYTHON_USEDEP}]
-	dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
-	qt4? (
-		coinbase_com? ( dev-python/PyQt4[${PYTHON_USEDEP},webkit] )
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-	aliases? ( dev-python/dnspython[${PYTHON_USEDEP}] )
-	amodem? ( dev-python/amodem[${PYTHON_USEDEP}] )
-	graph? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	# Don't advise using PIP
-	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	validate_desktop_entries
-
-	# Remove unrequested localization files:
-	for lang in ${LINGUAS}; do
-		use "linguas_${lang}" && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	# french is unfinished
-	for wordlist in  \
-		$(usex linguas_es_ES '' spanish)  \
-		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese))  \
-		french  \
-		$(usex linguas_ja_JP '' japanese)  \
-	; do
-		rm "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		$(usex gtk3     '' gtk  )  \
-		$(usex qt4      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	if ! use qt4; then
-		sed -i "s/'electrum_gui\\.qt',//;/\"qt\\/themes/d" setup.py || die
-		local bestgui=$(usex gtk3 gtk $(usex ncurses text stdio))
-		sed -i "s/\(config.get('gui', \?\)'classic'/\1'${bestgui}'/" electrum || die
-	fi
-
-	local plugin
-	# btchipwallet requires python btchip module (and dev-python/pyusb)
-	# trezor requires python trezorlib module
-	for plugin in  \
-		$(usex aliases       '' openalias       )  \
-		$(usex amodem        '' audio           )  \
-		btchipwallet  \
-		$(usex coinbase_com  '' coinbase_buyback)  \
-		$(usex cosign        '' cosigner_pool   )  \
-		$(usex fiat          '' exchange_rate   )  \
-		$(usex graph         '' plot            )  \
-		$(usex greenaddress_it '' greenaddress_instant)  \
-		$(usex sync          '' labels          )  \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin   )  \
-		$(usex vkb           '' virtualkeyboard )  \
-	; do
-		rm plugins/"${plugin}"* || die
-	done
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 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/files/1.9.8-gtk3-fix.patch b/net-misc/electrum/files/1.9.8-gtk3-fix.patch
deleted file mode 100644
index c101d2f61c25..000000000000
--- a/net-misc/electrum/files/1.9.8-gtk3-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Electrum-1.9.8/gui/gtk.py	2014-03-11 14:12:31.000000000 +0000
-+++ Electrum-1.9.8/gui/gtk.py	2015-03-01 08:01:02.851740805 +0000
-@@ -87,7 +87,7 @@
-     # ask if the user wants to create a new wallet, or recover from a seed. 
-     # if he wants to recover, and nothing is found, do not create wallet
-     dialog = Gtk.Dialog("electrum", parent=None, 
--                        flags=Gtk.DialogFlags.MODAL|Gtk.DialogFlags.NO_SEPARATOR, 
-+                        flags=Gtk.DialogFlags.MODAL | getattr(Gtk.DialogFlags, 'NO_SEPARATOR', 0), 
-                         buttons= ("create", 0, "restore",1, "cancel",2)  )
- 
-     label = Gtk.Label("Wallet file not found.\nDo you want to create a new wallet,\n or to restore an existing one?"  )
diff --git a/net-misc/electrum/files/electrum.desktop-1.9.7.patch b/net-misc/electrum/files/electrum.desktop-1.9.7.patch
deleted file mode 100644
index 89f576c3f39c..000000000000
--- a/net-misc/electrum/files/electrum.desktop-1.9.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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.7.patch b/net-misc/electrum/files/setup.py-1.9.7.patch
deleted file mode 100644
index ee89641775d6..000000000000
--- a/net-misc/electrum/files/setup.py-1.9.7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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"