Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gwave/
Date: Sat, 25 Aug 2018 22:54:08
Message-Id: 1535237580.12d8000851fe56574097946cc503d7efae20ca62.asturm@gentoo
1 commit: 12d8000851fe56574097946cc503d7efae20ca62
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 25 22:43:02 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 25 22:53:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d80008
7
8 sci-electronics/gwave: Revert back to old tarball
9
10 This reverts 5dfa4f57d8fa86f4eb7ccea80088a025c72f177f and faulty
11 SRC_URI to use the existing tarball from GENTOO_MIRRORS.
12
13 Bug: https://bugs.gentoo.org/664230
14 Package-Manager: Portage-2.3.48, Repoman-2.3.10
15
16 sci-electronics/gwave/Manifest | 2 +-
17 sci-electronics/gwave/gwave-20120229-r1.ebuild | 22 +++++++++-------------
18 sci-electronics/gwave/gwave-20120229.ebuild | 2 +-
19 3 files changed, 11 insertions(+), 15 deletions(-)
20
21 diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest
22 index 2c6abbd525e..d49f652ce60 100644
23 --- a/sci-electronics/gwave/Manifest
24 +++ b/sci-electronics/gwave/Manifest
25 @@ -1,2 +1,2 @@
26 -DIST gwave-code-r249-trunk.zip 418899 BLAKE2B 314c426914e9049cf5390f31204f9a84b1216577f1e6a33bc6588a58afdfc392ef54d69e7cc840ac2bfff5ce232f8ec791bc657f7640add23e58b0ec57cbfa34 SHA512 7a073b9eae2f72f17c3b552b671f3c7e72dc265d62c33a746fdd24a54cfb53100fd9ae53e80a512fd8b029f7e8fac2eb5e9456787ef708d18a3ab2417a31a5ac
27 +DIST gwave-code-249-trunk.zip 415799 BLAKE2B d128d9497f05f61e334886f0884a745c2cab624131ff2811162dc4ad0d39a244c4f08783dc7ddb12edde3287466744d8f6f8db6a61f77a493811d887ca611a5d SHA512 351e5db7c65a0ff3ff68785986c3c4f16e2fbf2386c944c8ed63ced4b4714e9e00c2d30a12f7180477bb8f1ac56a09208cf6379b0e0074dc92de71ff483d5d87
28 DIST gwave2-20090213.tar.gz 403957 BLAKE2B aeb1db92bfc5977d1a11e0baad89919f4eafd8c9c8ceaf94e29e8a8a6aed29f38f27bec6a340c8610b0acde83c0f8fa3944313417ae3db7d91e155db920fa358 SHA512 9b39ed2923901af18253abe8e3ae1a6f71a660e31181dce31b0d784eb1dd0800a31ff48158b2c68555fcd268029e20295e87626e8e1d4cebc236b3863fe25e8c
29
30 diff --git a/sci-electronics/gwave/gwave-20120229-r1.ebuild b/sci-electronics/gwave/gwave-20120229-r1.ebuild
31 index 79db65e55b8..a5697a7a0ed 100644
32 --- a/sci-electronics/gwave/gwave-20120229-r1.ebuild
33 +++ b/sci-electronics/gwave/gwave-20120229-r1.ebuild
34 @@ -3,36 +3,35 @@
35
36 EAPI=6
37
38 +REV="249"
39 WANT_AUTOMAKE=1.9
40 -
41 inherit autotools desktop gnome2-utils xdg-utils
42
43 -rev="r249"
44 -
45 DESCRIPTION="Analog waveform viewer for SPICE-like simulations"
46 HOMEPAGE="http://gwave.sourceforge.net"
47 -SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gw/gwave/code/gwave-code-${rev}-trunk.zip"
48 +SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gw/gwave/code/gwave-code-${REV}-trunk.zip"
49
50 LICENSE="GPL-2"
51 KEYWORDS="~amd64 ~x86"
52 IUSE="gnuplot plotutils"
53 SLOT="0"
54
55 -DEPEND="app-arch/unzip
56 +COMMON_DEPEND="
57 >=dev-scheme/guile-2[deprecated,networking]
58 <dev-scheme/guile-2.2
59 dev-scheme/guile-gnome-platform
60 x11-libs/guile-gtk"
61
62 -RDEPEND="${DEPEND}
63 +RDEPEND="${COMMON_DEPEND}
64 sci-electronics/electronics-menu
65 gnuplot? ( sci-visualization/gnuplot )
66 plotutils? ( media-libs/plotutils )"
67
68 -DEPEND="${DEPEND}
69 +DEPEND="${COMMON_DEPEND}
70 + app-arch/unzip
71 app-text/docbook-sgml-utils"
72
73 -S="${WORKDIR}/gwave-code-${rev}-trunk"
74 +S="${WORKDIR}/gwave-code-${REV}-trunk"
75
76 PATCHES=(
77 "${FILESDIR}"/${P}_as-needed.patch
78 @@ -45,8 +44,9 @@ PATCHES=(
79 )
80
81 src_prepare() {
82 - sed 's/AM_INIT_AUTOMAKE(gwave, [0-9]*)/AM_INIT_AUTOMAKE(gwave, ${PV})/' -i configure.ac || die
83 default
84 + sed -e 's/AM_INIT_AUTOMAKE(gwave, [0-9]*)/AM_INIT_AUTOMAKE(gwave, ${PV})/' \
85 + -i configure.ac || die
86 eautoreconf
87 }
88
89 @@ -56,10 +56,6 @@ src_install() {
90 make_desktop_entry gwave "Gwave" gwave "Electronics"
91 }
92
93 -pkg_preinst() {
94 - gnome2_icon_savelist
95 -}
96 -
97 pkg_postinst() {
98 xdg_desktop_database_update
99 xdg_mimeinfo_database_update
100
101 diff --git a/sci-electronics/gwave/gwave-20120229.ebuild b/sci-electronics/gwave/gwave-20120229.ebuild
102 index 8c483369652..acd8cfe9181 100644
103 --- a/sci-electronics/gwave/gwave-20120229.ebuild
104 +++ b/sci-electronics/gwave/gwave-20120229.ebuild
105 @@ -7,7 +7,7 @@ WANT_AUTOMAKE=1.9
106
107 inherit autotools fdo-mime gnome2-utils
108
109 -rev="r249"
110 +rev=249
111
112 DESCRIPTION="Analog waveform viewer for SPICE-like simulations"
113 LICENSE="GPL-2"