From 12d8000851fe56574097946cc503d7efae20ca62 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 26 Aug 2018 00:43:02 +0200
Subject: [PATCH] sci-electronics/gwave: Revert back to old tarball

This reverts 5dfa4f57d8fa86f4eb7ccea80088a025c72f177f and faulty
SRC_URI to use the existing tarball from GENTOO_MIRRORS.

Bug: https://bugs.gentoo.org/664230
Package-Manager: Portage-2.3.48, Repoman-2.3.10
---
 sci-electronics/gwave/Manifest                |  2 +-
 .../gwave/gwave-20120229-r1.ebuild            | 22 ++++++++-----------
 sci-electronics/gwave/gwave-20120229.ebuild   |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest
index 2c6abbd525ec..d49f652ce604 100644
--- a/sci-electronics/gwave/Manifest
+++ b/sci-electronics/gwave/Manifest
@@ -1,2 +1,2 @@
-DIST gwave-code-r249-trunk.zip 418899 BLAKE2B 314c426914e9049cf5390f31204f9a84b1216577f1e6a33bc6588a58afdfc392ef54d69e7cc840ac2bfff5ce232f8ec791bc657f7640add23e58b0ec57cbfa34 SHA512 7a073b9eae2f72f17c3b552b671f3c7e72dc265d62c33a746fdd24a54cfb53100fd9ae53e80a512fd8b029f7e8fac2eb5e9456787ef708d18a3ab2417a31a5ac
+DIST gwave-code-249-trunk.zip 415799 BLAKE2B d128d9497f05f61e334886f0884a745c2cab624131ff2811162dc4ad0d39a244c4f08783dc7ddb12edde3287466744d8f6f8db6a61f77a493811d887ca611a5d SHA512 351e5db7c65a0ff3ff68785986c3c4f16e2fbf2386c944c8ed63ced4b4714e9e00c2d30a12f7180477bb8f1ac56a09208cf6379b0e0074dc92de71ff483d5d87
 DIST gwave2-20090213.tar.gz 403957 BLAKE2B aeb1db92bfc5977d1a11e0baad89919f4eafd8c9c8ceaf94e29e8a8a6aed29f38f27bec6a340c8610b0acde83c0f8fa3944313417ae3db7d91e155db920fa358 SHA512 9b39ed2923901af18253abe8e3ae1a6f71a660e31181dce31b0d784eb1dd0800a31ff48158b2c68555fcd268029e20295e87626e8e1d4cebc236b3863fe25e8c
diff --git a/sci-electronics/gwave/gwave-20120229-r1.ebuild b/sci-electronics/gwave/gwave-20120229-r1.ebuild
index 79db65e55b85..a5697a7a0ed3 100644
--- a/sci-electronics/gwave/gwave-20120229-r1.ebuild
+++ b/sci-electronics/gwave/gwave-20120229-r1.ebuild
@@ -3,36 +3,35 @@
 
 EAPI=6
 
+REV="249"
 WANT_AUTOMAKE=1.9
-
 inherit autotools desktop gnome2-utils xdg-utils
 
-rev="r249"
-
 DESCRIPTION="Analog waveform viewer for SPICE-like simulations"
 HOMEPAGE="http://gwave.sourceforge.net"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gw/gwave/code/gwave-code-${rev}-trunk.zip"
+SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gw/gwave/code/gwave-code-${REV}-trunk.zip"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnuplot plotutils"
 SLOT="0"
 
-DEPEND="app-arch/unzip
+COMMON_DEPEND="
 	>=dev-scheme/guile-2[deprecated,networking]
 	<dev-scheme/guile-2.2
 	dev-scheme/guile-gnome-platform
 	x11-libs/guile-gtk"
 
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	sci-electronics/electronics-menu
 	gnuplot? ( sci-visualization/gnuplot )
 	plotutils? ( media-libs/plotutils )"
 
-DEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
 	app-text/docbook-sgml-utils"
 
-S="${WORKDIR}/gwave-code-${rev}-trunk"
+S="${WORKDIR}/gwave-code-${REV}-trunk"
 
 PATCHES=(
 	"${FILESDIR}"/${P}_as-needed.patch
@@ -45,8 +44,9 @@ PATCHES=(
 	)
 
 src_prepare() {
-	sed 's/AM_INIT_AUTOMAKE(gwave, [0-9]*)/AM_INIT_AUTOMAKE(gwave, ${PV})/' -i configure.ac || die
 	default
+	sed -e 's/AM_INIT_AUTOMAKE(gwave, [0-9]*)/AM_INIT_AUTOMAKE(gwave, ${PV})/' \
+		-i configure.ac || die
 	eautoreconf
 }
 
@@ -56,10 +56,6 @@ src_install() {
 	make_desktop_entry gwave "Gwave" gwave "Electronics"
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
diff --git a/sci-electronics/gwave/gwave-20120229.ebuild b/sci-electronics/gwave/gwave-20120229.ebuild
index 8c483369652d..acd8cfe91817 100644
--- a/sci-electronics/gwave/gwave-20120229.ebuild
+++ b/sci-electronics/gwave/gwave-20120229.ebuild
@@ -7,7 +7,7 @@ WANT_AUTOMAKE=1.9
 
 inherit autotools fdo-mime gnome2-utils
 
-rev="r249"
+rev=249
 
 DESCRIPTION="Analog waveform viewer for SPICE-like simulations"
 LICENSE="GPL-2"
-- 
2.26.2