gentoo resync : 10.02.2020

8 files changed, 3 insertions, 352 deletions

diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index 6b49ebd1d394..4f4ec9e4e744 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -1,11 +1,4 @@
-AUX pcb-20110918-fix-config.diff 466 BLAKE2B e9dfc32fee936846c1e91a52b4fb2ae07e16b0d592eef80756d49f72500f04e89fcc8d7b3163308c41385117f66d765fec4de2fcd13246842b11ca4909587c60 SHA512 9bfb0cd28e3c87eba91ee2a226a75128e4a0df37f79ebb10e4f34880d1f32d3cee17fc9f3ba6f553b6ed018a521efcecc583e75d82e8549d91cbab2a1280aa0c
-AUX pcb-4.0.2-doc.diff 368 BLAKE2B b45d661583ef68b3a40cc203fbfaf91f275a29a8374cce4bb7870e05addfa34bb5b5e3db9bb4b8ffaa6d1b107f9029782f3e44dbb2a9011876c49f5425ad1154 SHA512 8a6f68e8e4799244ed12a11ae4092aa3ce02786481adc02abf1622f08f5e5406cbc05a172da9ebbb646a20cf77a722536f31da7c1fe95579dc0cb0c19e7c496b
-AUX pcb-4.0.2-tests.diff 386 BLAKE2B 12f6d3e190d49549569e99f6e421c9492b0fe1a55c02f206388dd6eb4208e481a7b865fa46e67e25cecb8bcc51a2b3070e17cf28f9f0e25d2484a9c9285b0db3 SHA512 a589c1f01b55d48a1fa2af4a764103a8dbb146c4dcb409ba88298ce011ecc26160a5275fd69e58b29b3dbc2773c80ef9ed86570ac53cc649bc969cb6a0262f55
 AUX pcb-4.2.2-fix-autotools.patch 1182 BLAKE2B 627b48ae5ec4cf50a060c95ca13758000837e808aa1eb84ac9ab205d8b438cbe50f428b1c7100e6aad043eaefaa0a32e8797e08a05bfc9345d005199b05f3cf3 SHA512 9c3c1fc4d7e71920e0f06bdc4961ea3cecb7aa27f726f9851e2a69d1aea17a761eca71362a444815956df10338c7b985440d1f4c50a6531597687080ac8bd600
-DIST pcb-20140316.tar.gz 4210077 BLAKE2B a0a676bc0eaedd269644d7f7e6d6d443c4ca1a66aba4db18a0aea33edef2dbd84d7a027a25c310bce9d309c46b63ac4f1b807587f5064ce81aadaea2f675521b SHA512 5b9a2704b4d3c95f03afad0fe8fb5414b2aa9d680e40bf77ad9b46a9d4e14ba740858092794a9ff6788f31ac19063b126d8ceed6316c0d9eaaaa574e6678c071
-DIST pcb-4.0.2.tar.gz 4762521 BLAKE2B 3bae7983c84a79edc882b822b91e94adc00ec4e9b329719a0a15599bb12a6771318844ffbd6163b3c646be8410af1964d59b523fffaebd690af2cce9b4f0f98e SHA512 8bca9bdbdd640174e82e9cf1a457f9ef3f9b7c3f1d957a21c3bb07e50134b83504d85f312e429bed90bfc58f786b4319ffb69c5637ed4fd69a0312e11c6ad30b
 DIST pcb-4.2.2.tar.gz 5182807 BLAKE2B e2a9ab7fdeb402d9d07717fbc2ad4b31594aada95693c2a7046c73364a43591ee1a537f0cbda67bf46e39d53c61a454f146963fe14a4661fe2ffbc11c2eab99f SHA512 c76fc053fbb0a8a9b7aef494a37d3587efaa2023affd32c3cce895632a7e68fbb85f8862cff8349c7d281365379c07a5471c9467c5977a7aa053a83fc6499c55
-EBUILD pcb-0_p20140316.ebuild 4150 BLAKE2B 9bb721a281078b53a31ba4ac460092031f2aff7f010f62f02a2452ffb459ea6a83a0d3651dce7501a857c7be7fea55a68a55e3bd1d2a62eac703ab2915d8d755 SHA512 9f1fa2992155c46591f4ce31cff51ac1452c9420128fee0e3eaa0cae4dc48e5f03750b0a3388047cf595ed623d5925bb63983bf1d6d09b47e31fbfe28c762040
-EBUILD pcb-4.0.2.ebuild 3981 BLAKE2B 904c79d5cccec4d4e717ba1599d83750e3ec804e88472f4ceb67439ea5f95be8806539c2e0f5638b16338b11bf0c51e475ae9e2731e5d316ba3bb238aaef2b23 SHA512 8f4dca30a2931fcb080abb540c1da36c3f5e610f42730280eed6c5d02f2240ee9122b5a4663dfeaa0491bc33383b9a27a61f4f5db704b39fa53f05a0ed843a81
-EBUILD pcb-4.2.2.ebuild 2759 BLAKE2B c94577e9478005aa261d63fa44cf5e7f410d66d3216de7e061f28ce56907d70e269f6b0e64db76b858dc241b092bb3d9544c984a3a2143459fcb6c3f3ecaf21a SHA512 b7523f2fef8171c7194f827142e72edd1cba47227cd05617c71c6b534200b24eb04a1022639e88f572d8621259e3f55b77f3657f713758327796427c46a060e5
-MISC metadata.xml 1075 BLAKE2B 8ee38af92e19a45d50f13f9b4967816011fb7b97a5d1259d4f5bb0c8e6d5a7e0570e814b71802af65ecbf460de9f9ce553faa7c3cc3db9a54738f852d9032f73 SHA512 318bf4eaa10916d3a827595dd95da0abe9832f75e237e3be957a4c9019c525d7754bcc20d34f9b54c2692d53bb1cffbd02746f4d66c029cde1662181ae3d670c
+EBUILD pcb-4.2.2.ebuild 2757 BLAKE2B 80e1258671b8449ce32bb8cd58c08655eb35987783f677438f1da4a74881300383294f74e20e708aebc0756d59fe543c6e994e38afc196af60037145e9e489a1 SHA512 5bfeceda8a1306e64dccffc4a4ece48c297eb85c36b80311088e8007b24e18d26af7d6c1c015658ceea6f0d3d33b3dcca9e6448d1d42f3b8b8c329d6a7e623ba
+MISC metadata.xml 999 BLAKE2B 8bb8c575d1dabb137081bc12dff4e91c5bef1ff1e83e9aa11f241fc1ed7a1c44fdfcc7812f5476c8774ed5604033cddf05b948fa489384f483c80a84f134caca SHA512 162270942f0fd924729909a2e1f5e24d0433fbebfa1f9e08deff2b14a802e92a4fd839e3cc5bfb8c3175c23e874c43253166213b5397bf6e49f862aa481e83f4
diff --git a/sci-electronics/pcb/files/pcb-20110918-fix-config.diff b/sci-electronics/pcb/files/pcb-20110918-fix-config.diff
deleted file mode 100644
index 86ac7c3aad40..000000000000
--- a/sci-electronics/pcb/files/pcb-20110918-fix-config.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac.old	2012-03-11 17:02:27.000000000 +0100
-+++ configure.ac	2012-03-11 17:02:37.000000000 +0100
-@@ -1252,11 +1252,6 @@
- if test -d $srcdir/doc; then
-    AC_CONFIG_FILES(doc/Makefile)
- fi
--if test -d $srcdir/doc/gs; then
--   AC_CONFIG_FILES(doc/gs/Makefile)
--   AC_CONFIG_FILES(doc/gs/gafrc)
--   AC_CONFIG_FILES(doc/gs/gschemrc)
--fi
- if test -d $srcdir/example; then
-    AC_CONFIG_FILES(example/Makefile)
-    AC_CONFIG_FILES(example/libraries/Makefile)
diff --git a/sci-electronics/pcb/files/pcb-4.0.2-doc.diff b/sci-electronics/pcb/files/pcb-4.0.2-doc.diff
deleted file mode 100644
index 78f0a05e35ed..000000000000
--- a/sci-electronics/pcb/files/pcb-4.0.2-doc.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.ac.orig	2017-12-23 08:35:07.079096342 +0000
-+++ configure.ac	2017-12-23 08:35:36.903643912 +0000
-@@ -7,6 +7,9 @@
- AC_GNU_SOURCE
- AC_CONFIG_HEADERS([config.h])
- 
-+# avoid rebuilding documentation
-+AM_MAINTAINER_MODE
-+
- ##########################################################################
- #
- # Try to figure out if we are building from git sources.
diff --git a/sci-electronics/pcb/files/pcb-4.0.2-tests.diff b/sci-electronics/pcb/files/pcb-4.0.2-tests.diff
deleted file mode 100644
index 9c6052ee7d73..000000000000
--- a/sci-electronics/pcb/files/pcb-4.0.2-tests.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# Do not count skipped tests as failed (bug #642366)
---- tests/run_tests.sh.orig	2017-12-28 16:40:57.657366187 +0100
-+++ tests/run_tests.sh	2017-12-28 16:42:57.183392063 +0100
-@@ -842,8 +842,9 @@
- show_sep
- echo "Passed $pass, failed $fail, skipped $skip out of $tot tests."
- 
-+sum=`expr $skip + $pass`
- rc=0
--if test $pass -ne $tot ; then
-+if test $sum -ne $tot ; then
-     rc=1
- fi
- 
diff --git a/sci-electronics/pcb/metadata.xml b/sci-electronics/pcb/metadata.xml
index 2ab5e9e2afd5..edc93e050afe 100644
--- a/sci-electronics/pcb/metadata.xml
+++ b/sci-electronics/pcb/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="gcode">gcode file export</flag>
 		<flag name="gsvit">GSvit file export</flag>
 		<flag name="tk">Build tcl/tk graphical QFP footprint generator</flag>
-		<flag name="xrender">Translucent PCB display for Motif/Lesstif GUI</flag>
 		<flag name="m4lib-png">Enable creating png previews for the m4 library</flag>
 		<flag name="toporouter">Build toporouter</flag>
 	</use>
diff --git a/sci-electronics/pcb/pcb-0_p20140316.ebuild b/sci-electronics/pcb/pcb-0_p20140316.ebuild
deleted file mode 100644
index 24b400cffc4b..000000000000
--- a/sci-electronics/pcb/pcb-0_p20140316.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils xdg-utils gnome2-utils toolchain-funcs
-
-DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor"
-HOMEPAGE="http://pcb.geda-project.org/"
-SRC_URI="mirror://sourceforge/pcb/pcb/${P/0_p/}/${P/0_p/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-macos"
-IUSE="dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png
-test tk toporouter xrender"
-# toporouter-output USE flag removed, there seems to be no result
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/glib:2
-	gif? ( >=media-libs/gd-2.0.23 )
-	gtk? ( x11-libs/gtk+:2 x11-libs/pango
-		x11-libs/gtkglext
-		dbus? ( sys-apps/dbus ) )
-	jpeg? ( >=media-libs/gd-2.0.23[jpeg] )
-	motif? ( !gtk? (
-		>=x11-libs/motif-2.3:0
-		dbus? ( sys-apps/dbus )
-		xrender? ( >=x11-libs/libXrender-0.9 ) ) )
-	nelma? ( >=media-libs/gd-2.0.23[png] )
-	opengl? ( virtual/opengl )
-	gcode? ( >=media-libs/gd-2.0.23[png] )
-	virtual/libintl
-	png? ( >=media-libs/gd-2.0.23[png] )
-	m4lib-png? ( >=media-libs/gd-2.0.23[png] )
-	tk? ( >=dev-lang/tk-8:0 )"
-#toporouter-output? ( x11-libs/cairo )
-
-DEPEND="${CDEPEND}
-	test? (
-		sci-electronics/gerbv
-		virtual/imagemagick-tools
-	)
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-RDEPEND="${CDEPEND}
-	sci-electronics/electronics-menu"
-
-DOCS="AUTHORS README NEWS ChangeLog"
-
-S="${WORKDIR}/${P/0_p/}"
-
-pkg_setup() {
-	if use gtk && use motif; then
-		elog "Can only build for GTK+ or Motif/Lesstif GUI. GTK+ has priority."
-	fi
-	if !(use gtk || use motif); then
-		elog "Building without GUI, make sure you know what you are doing."
-	fi
-	if use dbus && !(use gtk || use motif); then
-		elog "dbus needs GTK or Motif/Lesstif GUI. Try USE=-dbus or USE=gtk or USE=motif."
-	fi
-	if use opengl && !(use gtk); then
-		elog "GL drawing needs GTK"
-	fi
-	if (use gtk || (! use gtk && ! use motif)) &&  (use xrender); then
-		elog "The XRender extension is only usable with the Motif/Lesstif GUI."
-	fi
-}
-
-src_prepare() {
-	if use test; then
-		# adapt the list of tests to run according to USE flag settings
-		if ! use png; then
-			sed -i '/^hid_png/d' tests/tests.list || die
-		fi
-		if ! use gcode; then
-			sed -i '/^hid_gcode/d' tests/tests.list || die
-		fi
-	fi
-	# Backport from upstream
-	# http://git.geda-project.org/pcb/commit/?id=a34b40add60310a51780f359cc90d9c5ee75752c
-	# (do not install static GTS library)
-	sed -i -e 's/lib_LIBRARIES/noinst_LIBRARIES/' -e 's/include_HEADERS/noinst_HEADERS/' gts/Makefile.am || die
-
-	# fix bad syntax in Makefile.am and configure.ac before running eautoreconf
-	sed -i -e 's/:=/=/' Makefile.am || die
-	epatch "${FILESDIR}"/${PN}-20110918-fix-config.diff
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use gtk ; then
-		myconf="--with-gui=gtk $(use_enable dbus) $(use_enable opengl gl) --disable-xrender"
-	elif use motif ; then
-		myconf="--with-gui=lesstif $(use_enable dbus) $(use_enable xrender)"
-	else
-		myconf="--with-gui=batch --disable-xrender --disable-dbus"
-	fi
-
-	local exporters="bom gerber ps"
-	if (use png || use jpeg || use gif) ; then
-		exporters="${exporters} png"
-	fi
-	use nelma && exporters="${exporters} nelma"
-	use gcode && exporters="${exporters} gcode"
-	use tk || export WISH="${EPREFIX}/bin/true"
-
-	econf \
-		${myconf} \
-		$(use_enable doc) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable m4lib-png) \
-		$(use_enable toporouter) \
-		$(use_enable debug) \
-		--enable-nls \
-		--disable-toporouter-output \
-		--with-exporters="${exporters}" \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--disable-update-mime-database \
-		--disable-update-desktop-database \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-# toporouter-output USE flag removed, there seems to be no result
-#		$(use_enable toporouter-output) \
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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/pcb/pcb-4.0.2.ebuild b/sci-electronics/pcb/pcb-4.0.2.ebuild
deleted file mode 100644
index fbed2457df40..000000000000
--- a/sci-electronics/pcb/pcb-4.0.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils xdg-utils gnome2-utils toolchain-funcs
-
-DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor"
-HOMEPAGE="http://pcb.geda-project.org/"
-SRC_URI="mirror://sourceforge/pcb/pcb/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
-IUSE="dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png
-test tk toporouter xrender"
-# toporouter-output USE flag removed, there seems to be no result
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/glib:2
-	gif? ( media-libs/gd )
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/pango
-		x11-libs/gtkglext
-		dbus? ( sys-apps/dbus ) )
-	jpeg? ( media-libs/gd[jpeg] )
-	motif? ( !gtk? (
-		>=x11-libs/motif-2.3:0
-		dbus? ( sys-apps/dbus )
-		xrender? ( >=x11-libs/libXrender-0.9 ) ) )
-	nelma? ( media-libs/gd[png] )
-	opengl? ( virtual/opengl )
-	gcode? ( media-libs/gd[png] )
-	virtual/libintl
-	png? ( media-libs/gd[png] )
-	m4lib-png? ( media-libs/gd[png] )
-	tk? ( >=dev-lang/tk-8:0 )"
-#toporouter-output? ( x11-libs/cairo )
-
-DEPEND="${CDEPEND}
-	test? (
-		sci-electronics/gerbv
-		virtual/imagemagick-tools
-	)
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-RDEPEND="${CDEPEND}
-	sci-electronics/electronics-menu"
-
-DOCS="AUTHORS README NEWS ChangeLog"
-
-pkg_setup() {
-	if use gtk && use motif; then
-		elog "Can only build for GTK+ or Motif/Lesstif GUI. GTK+ has priority."
-	fi
-	if !(use gtk || use motif); then
-		elog "Building without GUI, make sure you know what you are doing."
-	fi
-	if use dbus && !(use gtk || use motif); then
-		elog "dbus needs GTK or Motif/Lesstif GUI. Try USE=-dbus or USE=gtk or USE=motif."
-	fi
-	if use opengl && !(use gtk); then
-		elog "GL drawing needs GTK"
-	fi
-	if (use gtk || (! use gtk && ! use motif)) &&  (use xrender); then
-		elog "The XRender extension is only usable with the Motif/Lesstif GUI."
-	fi
-}
-
-src_prepare() {
-	if use test; then
-		# adapt the list of tests to run according to USE flag settings
-		if ! use png; then
-			sed -i '/^hid_png/d' tests/tests.list || die
-		fi
-		if ! use gcode; then
-			sed -i '/^hid_gcode/d' tests/tests.list || die
-		fi
-		# fix wrong accounting of skipped and passed tests
-		epatch "${FILESDIR}"/${P}-tests.diff
-	fi
-
-	# fix bad syntax in Makefile.am and configure.ac before running eautoreconf
-	sed -i -e 's/:=/=/' Makefile.am || die
-	epatch "${FILESDIR}"/${PN}-20110918-fix-config.diff
-	# avoid rebuilding documentation
-	epatch "${FILESDIR}"/${PN}-4.0.2-doc.diff
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use gtk ; then
-		myconf="--with-gui=gtk $(use_enable dbus) $(use_enable opengl gl) --disable-xrender"
-	elif use motif ; then
-		myconf="--with-gui=lesstif $(use_enable dbus) $(use_enable xrender)"
-	else
-		myconf="--with-gui=batch --disable-xrender --disable-dbus"
-	fi
-
-	local exporters="bom gerber ps ipcd356"
-	if (use png || use jpeg || use gif) ; then
-		exporters="${exporters} png"
-	fi
-	use nelma && exporters="${exporters} nelma"
-	use gcode && exporters="${exporters} gcode"
-	use tk || export WISH="${EPREFIX}/bin/true"
-
-	econf \
-		${myconf} \
-		$(use_enable doc) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable m4lib-png) \
-		$(use_enable toporouter) \
-		$(use_enable debug) \
-		--enable-nls \
-		--disable-toporouter-output \
-		--with-exporters="${exporters}" \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--disable-update-mime-database \
-		--disable-update-desktop-database \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-# toporouter-output USE flag removed, there seems to be no result
-#		$(use_enable toporouter-output) \
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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/pcb/pcb-4.2.2.ebuild b/sci-electronics/pcb/pcb-4.2.2.ebuild
index d7c8ac609fe0..4e23178926a3 100644
--- a/sci-electronics/pcb/pcb-4.2.2.ebuild
+++ b/sci-electronics/pcb/pcb-4.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcb/pcb/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-macos"
 IUSE="dbus doc gcode gif gsvit gui jpeg m4lib-png nelma png test tk toporouter"
 # toporouter-output USE flag removed, there seems to be no result
 RESTRICT="!test? ( test )"