gentoo resync : 29.08.2018

3 files changed, 11 insertions, 90 deletions

diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest
index a5577e5b2482..d64a05b731bb 100644
--- a/sci-electronics/gwave/Manifest
+++ b/sci-electronics/gwave/Manifest
@@ -6,9 +6,8 @@ AUX gwave-20120229_remove_gh.patch 3324 BLAKE2B 4473407744f9b1e7ed68f46b01d12b7f
 AUX gwave-20120229_remove_old_and_broken_compatibility_check.patch 1757 BLAKE2B 799a87b4a800d941205ee654c0ebb9eaca33316c1b0b79133401523b9a2a0d54f83d0daf0d3dae103cfba28286df2fd1915861c3caeba3d115d080f4b73c3d29 SHA512 2abbaae746743ac2f287985656778fa12b0f23f2d9e0d726925656aeab48ba07d92c13c30aea236439aa6cbac32ceb22e6dbb66c9649277ab315b4fe6ff3a7fe
 AUX gwave-20120229_stdlib.patch 396 BLAKE2B 4242963c3fc41d2ef86777f7e055448eaf9d27bf18d2d3b6071613037d048d0167d3b1570fe2fa082aa996e7497af522f64d5c20837221d5684fc648d8eb779c SHA512 5a960da39b2bc3f9d6646bbbac5f291e407578e13be7910c3f14dc3ecf5a5b6a3fe907cae8322e3888035d3d5844266d7ddb912ad567377543866671a640ae5c
 AUX gwave-20120229_unistd.patch 802 BLAKE2B 95d5b62714b25e8dfd6f7158303b92fcc2a8d3951af1201c714ff6d50691467df3b4235136d64d66c6e680131fb92f94d016c9398bed8a253e32b6c74895c206 SHA512 4b45b5606072675e3bede8852c5aaa25f25d2d9544970cf5eb81f896ed9c65fcc18e7f301254490165736b07dd9203e63bab93681366482baff8d995f0c105ea
-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
 EBUILD gwave-20090213-r1.ebuild 1218 BLAKE2B d22a108b44951bbcf8b9f306d8e97e0a7d2f440f87c10866c363008ce8edfa303f10ae81e1bcb680e423183de0d62e3433170cffca7dee9f6ae74c4326974ff0 SHA512 9a7a38cf7911322c80326cfa8336b5afc03cda2e58152edac77a259f5dde581bf5bc95f3bde2ff733b9b0c797ef74f579e04ab41928de1e1a23c7d2b4b2c7d32
-EBUILD gwave-20120229-r1.ebuild 1641 BLAKE2B 2d28ed84f9be21af1adfdabe48ba2d5f1f4224243781df4dafb71c7d09c98e30034297a1d27fe81c355cc11738bd3a0c08d69641108423cb3a94ca1df79206c4 SHA512 e544205fa04e8af28a76e4f55e91b29b601f1628d6b8b292a1d2fe040edd2f75f343407458732c31f4a9ec53071e55672a57433bc5c2b52d0263ec90d42482b1
-EBUILD gwave-20120229.ebuild 1711 BLAKE2B bd6db32ff24239b1e6321b0880a4cb9a72e6fec2a6190a148bd9786be85e65099f607a739f65614936525b485a221608555dfd233e6fc8136aed1bb9b2ff60cc SHA512 3de7b66666a79657216aaa5ff82840dae0a845c2ffa7d68425e8149a71c22cdd11453cbcc0acec6c64455a0376d20fe2124f046814162a0e8b4e76dafb7cc890
+EBUILD gwave-20120229-r1.ebuild 1627 BLAKE2B 8afb2a1f8bb7cfedb33170b237ef91f4f74a16bc8d7eedb852bb394261611b42895def16eae702068f103680f78f9ef48ff68523af1b2d417eb3d39cc9f53ff5 SHA512 cd85fbe0bf6e3746355be5db8cf1eb352ee48cecb0e839becb5fa33d275e872e5736af4be6dd43c3d0aa4106c0c93fc1350bb3543fd25b3841a4f1e272d75655
 MISC metadata.xml 729 BLAKE2B a7e62f3f754e700c62e9d43f473837302c704b9ca800ece31a152cbfcb56024db78b4ebbdd7b6d68eb31fb026962ea630661b06668d257d1e0cbfcb160c30ecd SHA512 c38f63a842618cfed2e78374219eaabb16a0cd9198ccb339701e1a4a86cf90689d12a70277b19dc781522f9b67a7ab740fdb5475c1eda0d9cdadbe4556ee2966
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
deleted file mode 100644
index 8c483369652d..000000000000
--- a/sci-electronics/gwave/gwave-20120229.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-WANT_AUTOMAKE=1.9
-
-inherit autotools fdo-mime gnome2-utils
-
-rev="r249"
-
-DESCRIPTION="Analog waveform viewer for SPICE-like simulations"
-LICENSE="GPL-2"
-HOMEPAGE="http://gwave.sourceforge.net"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gw/gwave/code/gwave-code-${rev}-trunk.zip"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot plotutils"
-SLOT="0"
-
-DEPEND=">=dev-scheme/guile-2[deprecated,networking]
-	<dev-scheme/guile-2.2
-	dev-scheme/guile-gnome-platform
-	x11-libs/guile-gtk"
-
-RDEPEND="${DEPEND}
-	sci-electronics/electronics-menu
-	gnuplot? ( sci-visualization/gnuplot )
-	plotutils? ( media-libs/plotutils )"
-
-DEPEND="${DEPEND}
-	app-text/docbook-sgml-utils"
-
-S="${WORKDIR}/gwave-code-${rev}-trunk"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_as-needed.patch
-	"${FILESDIR}"/${P}_doc.patch
-	"${FILESDIR}"/${P}_missing_externs.patch
-	"${FILESDIR}"/${P}_remove_gh.patch
-	"${FILESDIR}"/${P}_remove_old_and_broken_compatibility_check.patch
-	"${FILESDIR}"/${P}_stdlib.patch
-	"${FILESDIR}"/${P}_unistd.patch
-	)
-
-src_prepare() {
-	sed 's/AM_INIT_AUTOMAKE(gwave, [0-9]*)/AM_INIT_AUTOMAKE(gwave, ${PV})/' -i configure.ac || die
-	epatch "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README TODO
-	newicon icons/wave-drag-ok.xpm gwave.xpm
-	make_desktop_entry gwave "Gwave" gwave "Electronics"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}