gentoo resync : 25.11.2020

5 files changed, 24 insertions, 268 deletions

diff --git a/sci-electronics/gtkwave/Manifest b/sci-electronics/gtkwave/Manifest
index 8facbb067f95..f17403795cd0 100644
--- a/sci-electronics/gtkwave/Manifest
+++ b/sci-electronics/gtkwave/Manifest
@@ -1,9 +1,3 @@
-DIST gtkwave-3.3.68.tar.gz 4097204 BLAKE2B acaad5e161c7aeaf84eccb81fd2bad75e2a067224ac436df34b4b4cb9c73bb8b9da019e1adb0e3016d247828d451004eb38f10c101d96e34b3277426e4000393 SHA512 bcdd6f7de6454aefec65a0056a4a6a9994566b19ba0dc13f49f38d7d2bc601421d68aa04ebcd285fcb446f6d4a0a55a169db366c0d9387a809a59d61c8c76cac
-DIST gtkwave-3.3.73.tar.gz 4122802 BLAKE2B 32fcf6e03e0a2d55c952df5d6188bc48c52789fbc605388c63932b5ee507470d7d8ed5f2a0f572b793fa8d3807160aa6c383142e66cbde67b04ffb5c9de6d6ea SHA512 a8a3bf3ba8964c0a42f01f38235762da51d62f5fd602e0a81a2d7c36f9562409e0ccaf9aeaf73c6eb853d979ca2c93008837c395f2312d6e7996135518938eff
-DIST gtkwave-3.3.87.tar.gz 4176746 BLAKE2B 96b43f40e965d54f973dd38a89caf84671fdb5ba03f72e6b3b6d4829926f29789b63069ab537f1627acea8602e716bbfc66585d5f4beb4da53f85c1ef7892a37 SHA512 eed3c93e0f8acb9b075c90ab59e5f2dff3c29d9602a4bac7b6c0adca1bf4778468964532606227719bde1c498fc1f5655553ea9fccbf7d37fbec1671c371b7dd
-DIST gtkwave-3.3.99.tar.gz 3505354 BLAKE2B 1a768aca209ccd3049f40accec3c2dc0f5c1e7b05abb3300dd249345a70da4a72a20e9b5e1e22fdddc1e7e9b7586473aa590ccfa01947494b9040abe228d9e66 SHA512 b4525200a201b409fa8a4758f775671b458e8caf5b9c86b6052158ff24aa1e6620b74b663f755dcec71fd28612949a3a0e9ab700cd4559b962580bc130b8fa3c
-EBUILD gtkwave-3.3.68.ebuild 1555 BLAKE2B 00f56f3f72f125ca6476479e250d9620bcc8a7f2c3a773c8bbce015012ded5b337e254b52d3d96299846a0fbf8a8d365ddd1d0d98304ab16f4d428ee50255cf1 SHA512 4e42dc545a5aa5927b376291472ccd081ac6f62d6d862a97d42bc45064ae9c5e5713c7d74010612e4342a8f56e086fa8e95d4bc5f8d5d7b17f349c1644abb90b
-EBUILD gtkwave-3.3.73.ebuild 1558 BLAKE2B d335c475afee2e538eac2acb90bd8a1a1448a486fcc17f22bbaa620e2160f5291801d6794c58410153f4c152a85ac7f9bea38714ef090e8a9b590c51df8c0df4 SHA512 753da8ef404f389d68195a71498a6d18b25b1a3283a70a4677054394e0572b2cc0bf5b961037e8d02ca7bf4f68e5ffa8089574a12caba3982c46f1537d3c5b93
-EBUILD gtkwave-3.3.87.ebuild 1615 BLAKE2B ac2660fdf5748403ffbf609dc77320d759e371a31354584902ae46d11736051fbeccb3d4a973c58c3447ce70cf4e600883ac8aa97ab335e5eaf575698bc3ca25 SHA512 e5333b70ab78c144fc28908a09e89540aca9e5e0294a1e7d9ffd8eeb62e029c9ee1496d150791dc86165becfe313558c36ebee7db33813997db88e8fa600055d
-EBUILD gtkwave-3.3.99.ebuild 1594 BLAKE2B da99069bbec1a692fce57cc422424fcb70da04989c7a183b280718b78756a6cd1173bd8ecfa8b1cf6cbbbef5b782b15ea48499b9c1a91835aa40be7a88c59ffe SHA512 15fdd9483d7eb86ca462836dd44148acbbcecc11487015e1d5c69378920aea829049e51254c3b4edd952730f091cf82d93bfac3d8b9985deed43451f7d125547
+DIST gtkwave-3.3.106.tar.gz 3507185 BLAKE2B 89389c6eef2fb80b82b048fc94248cf6b30ec0d8fea1260189f2ea1f143123e0294d00f93a0c25f777b6e2c188041af16f4e26e5206e0c65fe23c1f058b19186 SHA512 4deec8dc88210ae542b8066763265450530756d34babf10c7820fe27b23d01e6d2f084ec74b7b0730a645fcb667ba3c0d2dcfb4111e702a523805041dc96768a
+EBUILD gtkwave-3.3.106.ebuild 1342 BLAKE2B 4d618ec344538c9c23425d4ff7c40143253c8707d036ca57450b9ca88f842e8494e5a63e184803e830d89d906d9cd6222f37002c82616576cf1c6adebd453efd SHA512 088a8d99da9cbc18226adccdc1eb1a1e43c32cf7cd00652dd4e416150f3970bdbcdab4b1df8169746189f753b884d062da97a895f5776df7a3404597e9c84953
 MISC metadata.xml 912 BLAKE2B 54c24ca793a80275df4c91427ebb587e721d43ffe983403e8f3d5a0601b293e7f862fe7b6102a27b0a8e40ab916b8b268aa6759e82ef3efa8e058bad1371cca1 SHA512 4b988f4fc2491aa8273a50844dc8bb292521b2a3eaf7ef6b917e21f453761369eb78d57363fdd04aea0cea63af8774bb6b572d145a21292956ca9f43eca6a6b9
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.73.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild
index 2f498f210aa4..0b3043548834 100644
--- a/sci-electronics/gtkwave/gtkwave-3.3.73.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild
@@ -1,40 +1,42 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils fdo-mime toolchain-funcs
+inherit toolchain-funcs xdg
 
 DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
 HOMEPAGE="http://gtkwave.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-IUSE="doc examples fasttree fatlines judy lzma packed tcl"
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fasttree fatlines judy lzma packed tcl"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/zlib
 	x11-libs/gtk+:2
 	x11-libs/pango
-	sys-libs/zlib
 	judy? ( dev-libs/judy )
 	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
 	lzma? ( app-arch/xz-utils )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gperf"
-
-AT_M4DIR="${S}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gperf
+	virtual/pkgconfig"
 
 src_prepare() {
+	default
+
 	# do not install doc and examples by default
 	sed -i -e 's/doc examples//' Makefile.in || die
 }
 
 src_configure() {
-	econf --disable-local-libz \
+	econf \
+		--disable-local-libz \
 		--disable-local-libbz2 \
 		--disable-mime-update \
 		--enable-largefile \
@@ -47,28 +49,16 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
+	default
 
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	use doc && dodoc doc/${PN}.odt
+	if use examples; then
+		rm examples/Makefile* || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 }
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild
deleted file mode 100644
index ee4ce58a03b6..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils fdo-mime toolchain-funcs
-
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://gtkwave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fasttree fatlines judy lzma packed tcl"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	sys-libs/zlib
-	judy? ( dev-libs/judy )
-	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
-	lzma? ( app-arch/xz-utils )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gperf"
-
-AT_M4DIR="${S}"
-
-src_prepare() {
-	# do not install doc and examples by default
-	sed -i -e 's/doc examples//' Makefile.in || die
-}
-
-src_configure() {
-	econf --disable-local-libz \
-		--disable-local-libbz2 \
-		--disable-mime-update \
-		--enable-largefile \
-		$(use_enable packed struct-pack) \
-		$(use_enable fatlines) \
-		$(use_enable tcl) \
-		$(use_enable lzma xz) \
-		$(use_enable fasttree) \
-		$(use_enable judy)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.87.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.87.ebuild
deleted file mode 100644
index 80fab4ec0adf..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.3.87.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit xdg-utils gnome2-utils toolchain-funcs
-
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://gtkwave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fasttree fatlines judy lzma packed tcl"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	sys-libs/zlib
-	judy? ( dev-libs/judy )
-	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
-	lzma? ( app-arch/xz-utils )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gperf"
-
-AT_M4DIR="${S}"
-
-src_prepare() {
-	# do not install doc and examples by default
-	sed -i -e 's/doc examples//' Makefile.in || die
-	default
-}
-
-src_configure() {
-	econf --disable-local-libz \
-		--disable-local-libbz2 \
-		--disable-mime-update \
-		--enable-largefile \
-		$(use_enable packed struct-pack) \
-		$(use_enable fatlines) \
-		$(use_enable tcl) \
-		$(use_enable lzma xz) \
-		$(use_enable fasttree) \
-		$(use_enable judy)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	dodoc ChangeLog README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.99.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.99.ebuild
deleted file mode 100644
index 257b3daf3419..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.3.99.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils toolchain-funcs
-
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://gtkwave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fasttree fatlines judy lzma packed tcl"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	sys-libs/zlib
-	judy? ( dev-libs/judy )
-	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
-	lzma? ( app-arch/xz-utils )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gperf"
-
-AT_M4DIR="${S}"
-
-src_prepare() {
-	# do not install doc and examples by default
-	sed -i -e 's/doc examples//' Makefile.in || die
-	default
-}
-
-src_configure() {
-	econf --disable-local-libz \
-		--disable-local-libbz2 \
-		--disable-mime-update \
-		--enable-largefile \
-		$(use_enable packed struct-pack) \
-		$(use_enable fatlines) \
-		$(use_enable tcl) \
-		$(use_enable lzma xz) \
-		$(use_enable fasttree) \
-		$(use_enable judy)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	dodoc ChangeLog README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}