gentoo resync : 23.12.2017

7 files changed, 173 insertions, 10 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 677fd624ea3e..bdb72cdbd7a2 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest
index 80795d75a851..9d75a06d5387 100644
--- a/sci-electronics/gwave/Manifest
+++ b/sci-electronics/gwave/Manifest
@@ -9,5 +9,5 @@ AUX gwave-20120229_unistd.patch 802 BLAKE2B 95d5b62714b25e8dfd6f7158303b92fcc2a8
 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 1222 BLAKE2B 7a47107b3011033742fa460e174f05524da9bd4d73551edcd3c50c8cd10bae8d4c0268129f12904a15ee56eb421dab313e2c3098cdd41da73187a24278be852c SHA512 29fb7ac7333112d58ae9d38d35271d58f6a93d4f2803459e8ce600ff1be252a7413735e23119d0ae36a2d9fc64d65f5fef0743b4c46d9e5be1a19624f08b5d9f
-EBUILD gwave-20120229.ebuild 1690 BLAKE2B c384dd02c1ef84254488373af31d59cf74b20e19095f876295e49010baedb7ae50b4eb042750180627050e3d559b6ed3cd9a2174301242ea94734d02eb0d246d SHA512 0cfa4d5cf7549565a21cb6b304412a8c7d3632a841375ff563be9a913f65ead73625f620941a82c7d1639b66098be2b50f51de378c81f876faa585025d19e34d
+EBUILD gwave-20120229.ebuild 1713 BLAKE2B d3779b9a1340fa3b715122b34801cd3e66b8e31bfffd9ce0061392b031660ffbd7dbfb9cc917a808a7523e93accbeaf0e27c11f5da4a85694c460e5bf85b4fa8 SHA512 d48dba89d368b3908bde8cf5935363d6d2526065b0d40bb77a14fbd13a35ce46f6d231bb3528694183403fb5fce3680f3a9951c4e208d7a091a33f384ab7c3a4
 MISC metadata.xml 729 BLAKE2B a7e62f3f754e700c62e9d43f473837302c704b9ca800ece31a152cbfcb56024db78b4ebbdd7b6d68eb31fb026962ea630661b06668d257d1e0cbfcb160c30ecd SHA512 c38f63a842618cfed2e78374219eaabb16a0cd9198ccb339701e1a4a86cf90689d12a70277b19dc781522f9b67a7ab740fdb5475c1eda0d9cdadbe4556ee2966
diff --git a/sci-electronics/gwave/gwave-20120229.ebuild b/sci-electronics/gwave/gwave-20120229.ebuild
index 8d3fc5038203..9b452ec42612 100644
--- a/sci-electronics/gwave/gwave-20120229.ebuild
+++ b/sci-electronics/gwave/gwave-20120229.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,6 +19,7 @@ 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"
 
diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index d63331b7b123..0475ad5b6f16 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -1,4 +1,7 @@
 AUX pcb-20110918-fix-config.diff 466 BLAKE2B e9dfc32fee936846c1e91a52b4fb2ae07e16b0d592eef80756d49f72500f04e89fcc8d7b3163308c41385117f66d765fec4de2fcd13246842b11ca4909587c60 SHA512 9bfb0cd28e3c87eba91ee2a226a75128e4a0df37f79ebb10e4f34880d1f32d3cee17fc9f3ba6f553b6ed018a521efcecc583e75d82e8549d91cbab2a1280aa0c
+AUX pcb-4.0.2-doc.diff 368 BLAKE2B b45d661583ef68b3a40cc203fbfaf91f275a29a8374cce4bb7870e05addfa34bb5b5e3db9bb4b8ffaa6d1b107f9029782f3e44dbb2a9011876c49f5425ad1154 SHA512 8a6f68e8e4799244ed12a11ae4092aa3ce02786481adc02abf1622f08f5e5406cbc05a172da9ebbb646a20cf77a722536f31da7c1fe95579dc0cb0c19e7c496b
 DIST pcb-20140316.tar.gz 4210077 BLAKE2B a0a676bc0eaedd269644d7f7e6d6d443c4ca1a66aba4db18a0aea33edef2dbd84d7a027a25c310bce9d309c46b63ac4f1b807587f5064ce81aadaea2f675521b SHA512 5b9a2704b4d3c95f03afad0fe8fb5414b2aa9d680e40bf77ad9b46a9d4e14ba740858092794a9ff6788f31ac19063b126d8ceed6316c0d9eaaaa574e6678c071
-EBUILD pcb-20140316-r1.ebuild 4085 BLAKE2B 04174ed8625d2d9fb58fe47d540e9d2cf3e1c3092c4b2643afaee513fda37e86891bc78a58dda7aace7965bb4d79c747e5d7b81b5f51e63e9af1439d8943aeff SHA512 2ef23a04f1c53e31708b9e2901e3d56c7b00699d7d44d7e23d7d9209fb69dc4ff0530276c7101d40ff1b7bcd9dd8fd54510849d66f0b8357abf6b8d636e6c5cf
+DIST pcb-4.0.2.tar.gz 4762521 BLAKE2B 3bae7983c84a79edc882b822b91e94adc00ec4e9b329719a0a15599bb12a6771318844ffbd6163b3c646be8410af1964d59b523fffaebd690af2cce9b4f0f98e SHA512 8bca9bdbdd640174e82e9cf1a457f9ef3f9b7c3f1d957a21c3bb07e50134b83504d85f312e429bed90bfc58f786b4319ffb69c5637ed4fd69a0312e11c6ad30b
+EBUILD pcb-20140316-r1.ebuild 4084 BLAKE2B 9e747275cc76b01be8cd240b9bcd978a26a88875e6f257fb213f78669f1645d0128c4f88a9b4e4bbe39269153e9a909ea5fadf2e5b3ee927bb690eea799d132e SHA512 05907a633968a3f4bca538bf099e15f9c2e79c6a2720aa1e5543e3a77f342398d8d72615c2fd7cdf67dfc5429436a8c2461ca1eaac6d23f2eed57c65a5752e5e
+EBUILD pcb-4.0.2.ebuild 3851 BLAKE2B e27f719a5907edb50ac94467638946f5b72277e0477218f6e59a61f7ce96edd75c45f9e3260d8fa87eb9af046a8d6e8dad3de4ee1b9abd7ae3a88ca6f669abe3 SHA512 b4604472fb0baa51fea8af58ad07d43e1572556e32277659babf24170af46b1e5c5796cc846ca3a389033ba97d7179204ea0d91698b10bbd6320365eaa3f813b
 MISC metadata.xml 1029 BLAKE2B 4c3792765c1ddb9daa35eea1a4e9eef977d083a360b216f0284c74148619a7b45c339ce305abbdabe4d5596ad206bb7eb7a3bb76197136170f175b7d3c09ff8e SHA512 14df20e3c253e65f444f67fd0a69facbd02027578c2ef9cbbd1ad10cef0e8c2b0eefd56889b871714410c116173fec815ec6bee1c84d541ed95970e4dabfbc3e
diff --git a/sci-electronics/pcb/files/pcb-4.0.2-doc.diff b/sci-electronics/pcb/files/pcb-4.0.2-doc.diff
new file mode 100644
index 000000000000..78f0a05e35ed
--- /dev/null
+++ b/sci-electronics/pcb/files/pcb-4.0.2-doc.diff
@@ -0,0 +1,12 @@
+--- 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/pcb-20140316-r1.ebuild b/sci-electronics/pcb/pcb-20140316-r1.ebuild
index 1a30b76bb34a..5acd185dfdef 100644
--- a/sci-electronics/pcb/pcb-20140316-r1.ebuild
+++ b/sci-electronics/pcb/pcb-20140316-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs
+inherit autotools eutils xdg-utils gnome2-utils toolchain-funcs
 
 DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor"
 HOMEPAGE="http://www.gpleda.org/"
@@ -26,9 +26,9 @@ CDEPEND="dev-libs/glib:2
 		>=x11-libs/motif-2.3:0
 		dbus? ( sys-apps/dbus )
 		xrender? ( >=x11-libs/libXrender-0.9 ) ) )
-	nelma? ( >=media-libs/gd-2.0.23 )
+	nelma? ( >=media-libs/gd-2.0.23[png] )
 	opengl? ( virtual/opengl )
-	gcode? ( >=media-libs/gd-2.0.23 )
+	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] )
@@ -136,13 +136,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	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
new file mode 100644
index 000000000000..752d71d5b4ce
--- /dev/null
+++ b/sci-electronics/pcb/pcb-4.0.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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://www.gpleda.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
+
+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
+	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"
+	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
+}