gentoo resync : 05.02.2020

4 files changed, 150 insertions, 1 deletions

diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index 21f8d3e41f89..6b49ebd1d394 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -1,8 +1,11 @@
 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
-MISC metadata.xml 1029 BLAKE2B 4c3792765c1ddb9daa35eea1a4e9eef977d083a360b216f0284c74148619a7b45c339ce305abbdabe4d5596ad206bb7eb7a3bb76197136170f175b7d3c09ff8e SHA512 14df20e3c253e65f444f67fd0a69facbd02027578c2ef9cbbd1ad10cef0e8c2b0eefd56889b871714410c116173fec815ec6bee1c84d541ed95970e4dabfbc3e
+EBUILD pcb-4.2.2.ebuild 2759 BLAKE2B c94577e9478005aa261d63fa44cf5e7f410d66d3216de7e061f28ce56907d70e269f6b0e64db76b858dc241b092bb3d9544c984a3a2143459fcb6c3f3ecaf21a SHA512 b7523f2fef8171c7194f827142e72edd1cba47227cd05617c71c6b534200b24eb04a1022639e88f572d8621259e3f55b77f3657f713758327796427c46a060e5
+MISC metadata.xml 1075 BLAKE2B 8ee38af92e19a45d50f13f9b4967816011fb7b97a5d1259d4f5bb0c8e6d5a7e0570e814b71802af65ecbf460de9f9ce553faa7c3cc3db9a54738f852d9032f73 SHA512 318bf4eaa10916d3a827595dd95da0abe9832f75e237e3be957a4c9019c525d7754bcc20d34f9b54c2692d53bb1cffbd02746f4d66c029cde1662181ae3d670c
diff --git a/sci-electronics/pcb/files/pcb-4.2.2-fix-autotools.patch b/sci-electronics/pcb/files/pcb-4.2.2-fix-autotools.patch
new file mode 100644
index 000000000000..22a4563d2db3
--- /dev/null
+++ b/sci-electronics/pcb/files/pcb-4.2.2-fix-autotools.patch
@@ -0,0 +1,36 @@
+1. avoid rebuilding documentation
+2. avoid non-portable syntax
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -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.
+@@ -1285,11 +1288,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)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -15,5 +15,5 @@
+ MAINTAINERCLEANFILES= $(INTLTOOL_FILES)
+ 
+ ACLOCAL_AMFLAGS = -I m4
+-DISTCHECK_CONFIGURE_FLAGS := ${DISTCHECK_CONFIGURE_FLAGS} --disable-update-mime-database --disable-update-desktop-database GTK_UPDATE_ICON_THEME_BIN=true --with-gui=batch
++DISTCHECK_CONFIGURE_FLAGS = ${DISTCHECK_CONFIGURE_FLAGS} --disable-update-mime-database --disable-update-desktop-database GTK_UPDATE_ICON_THEME_BIN=true --with-gui=batch
+ 
diff --git a/sci-electronics/pcb/metadata.xml b/sci-electronics/pcb/metadata.xml
index 358405f57a2f..2ab5e9e2afd5 100644
--- a/sci-electronics/pcb/metadata.xml
+++ b/sci-electronics/pcb/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name="nelma">NELMA file export</flag>
 		<flag name="png">PNG graphics export</flag>
 		<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>
diff --git a/sci-electronics/pcb/pcb-4.2.2.ebuild b/sci-electronics/pcb/pcb-4.2.2.ebuild
new file mode 100644
index 000000000000..d7c8ac609fe0
--- /dev/null
+++ b/sci-electronics/pcb/pcb-4.2.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs xdg
+
+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 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 )"
+
+RDEPEND="
+	dev-libs/glib:2
+	sci-electronics/electronics-menu
+	gif? ( media-libs/gd )
+	gsvit? ( media-libs/gd[png] )
+	gui? (
+		x11-libs/gtk+:2
+		x11-libs/pango
+		dbus? ( sys-apps/dbus )
+	)
+	jpeg? ( media-libs/gd[jpeg] )
+	nelma? ( media-libs/gd[png] )
+	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="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	sys-devel/gettext
+	test? (
+		sci-electronics/gerbv
+		virtual/imagemagick-tools
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.2-fix-autotools.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# tests are unconditional, even in the known presence of missing/disabled
+	# features, so we have to remove feature tests ourselves.
+	if ! use gcode; then
+		sed -i '/^hid_gcode/d' tests/tests.list || die
+	fi
+	if ! use gsvit; then
+		sed -i '/^hid_gsvit/d' tests/tests.list || die
+	fi
+	if ! use nelma; then
+		sed -i '/^hid_nelma/d' tests/tests.list || die
+	fi
+	if ! use png; then
+		sed -i '/^hid_png/d' tests/tests.list || die
+	fi
+	if ! use gif; then
+		sed -i '/^hid_png10[[:digit:]]/d' tests/tests.list || die
+	fi
+	if ! use jpeg; then
+		sed -i '/^hid_png20[[:digit:]]/d' tests/tests.list || die
+	fi
+}
+
+src_configure() {
+	local exporters=( bom gerber ps ipcd356 )
+	if use png || use jpeg || use gif; then
+		exporters+=( png )
+	fi
+	use gcode && exporters+=( gcode )
+	use gsvit && exporters+=( gsvit )
+	use nelma && exporters+=( nelma )
+	use tk || export WISH="${EPREFIX}/bin/true"
+
+	# toporouter-output USE flag removed, seems to do nothing
+	# opengl disabled unconditionally, due to requiring EOL gtkglext
+	econf \
+		--disable-gl \
+		--disable-rpath \
+		--disable-toporouter-output \
+		--disable-update-mime-database \
+		--disable-update-desktop-database \
+		--disable-xrender \
+		--enable-nls \
+		$(use_enable doc) \
+		$(use_enable gif) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable m4lib-png) \
+		$(use_enable toporouter) \
+		$(use_enable gui dbus $(usex dbus yes no)) \
+		--with-gui=$(usex gui gtk batch) \
+		--with-exporters="${exporters[*]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}