gentoo resync : 21.05.2019

4 files changed, 15 insertions, 86 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 2b7810029ef0..649322dc516e 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index f29a82d49fb5..de17dd52f308 100644
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -1,6 +1,4 @@
 AUX geda-1.9.2-guile-2.2.patch 655 BLAKE2B 503f041c3217dc6eaccba95fe5044a88ef08d9e625c50cfbfdeba29e3bef68e341b8920d15aebf9e921dfe875d45bd9bc0d57f1683fa8a46b519a0affb9c97d6 SHA512 f6dd973626fc2717c4262d715dcb3fcaafacd5773cfadaeade292b4f637ae19f30e4a0338e41037ba403b9133e9670d434d6ac7d67dd4eace69bca98a9d0ed1c
-DIST geda-gaf-1.8.2.tar.gz 11282353 BLAKE2B c3c8912d2c89d81533367e35c7c7fd3ebdac7d6641295af34e8bc81165ee473989036ce968af84b04499b8c9430e7716bbcb2bc6a28f976ded380731895b77b2 SHA512 3a6fad455c3fd2b62e9788ff04ca33242f2e4701ec24089d8c4304ad5ca44af4901fc1c396b3f840e14a0be0729ff08561a82c6911e1d23ac4b8636534b4e764
 DIST geda-gaf-1.9.2.tar.gz 10612225 BLAKE2B d09accde32f672b984bc2541404efccc886edb15e985bab287b4a619f11fc10cfd2b3ce3074d82c1a61811c4df9e515ecfbc61bd537c6943188b130062bda97f SHA512 5e26ea2cffffe50bd4f0bdb4594af9cc4510386d29c715c2b4ea99c6522838a08cc2045bf65e8b1da01ab33a266fc9f03da42e28b8cc4d5c030001777ab077e3
-EBUILD geda-1.8.2.ebuild 1738 BLAKE2B 8c6ba251628715598d00c6dbc88037f9d593a3e1acd7efe064d12ab8b9f9aa82ebee8b3b9361800f83b9d206526483ba35d719885a09586f6bb26bdbcabf6940 SHA512 923a49da2a8c57a1e6b22dc89f3a2dea532be9e988dd2f646225300db3da23925ef03a2bd6846e935e34be078439c7a2c07e8c06a3f8560e5ca8c3ac8ae57756
-EBUILD geda-1.9.2-r1.ebuild 1790 BLAKE2B 98f8321f581eddf12e223e1829e7e8f12c89b796ed15301babc0236187e442a83736ee2eb290016436cb6c5a40c91bf339d23daeb52caa5336ee699fbf6c4799 SHA512 faf4582cf991b3af3fb86f2306590f9cde3a12ea5d0e15393395845c19c3158f8f79baeb30ae6a14116634b01d824f8ecc0cafdc03c217490196669aacb5add2
+EBUILD geda-1.9.2-r1.ebuild 2255 BLAKE2B 6190fbb7b623a3ad21e4f7771360c10287d8027623f476ec4d9a85c164b758600f8cafe934ce3956428bc90cc48d01e9347bc87ee3c9a5ebc01697da9301f36e SHA512 a9623ebdf787f3cd951c8062deea07854c71432f22339a3762b18bfb4ddc5cdcaa812bcd027fef8c9932b3d09d23c6672ae3fe4a5d25dd9e1bdd5dd6c340566e
 MISC metadata.xml 1107 BLAKE2B 480a8a14257044a580f952f3e1efd26a02133e0b1ac98cc35c2d11ff08e3515ec38593d773ea2a881e1e3301ea5e1e1785909cc3017e56adec34ee09e11689d6 SHA512 7c64ce6548bc555ace1023c79ae7f74ac90b285f1bcdc65302d6908079a3358b010100ee50d607fdd65321d297d28410041010ca9b1db6599e20dccf0470c2c6
diff --git a/sci-electronics/geda/geda-1.8.2.ebuild b/sci-electronics/geda/geda-1.8.2.ebuild
deleted file mode 100644
index 45fc9cf9942c..000000000000
--- a/sci-electronics/geda/geda-1.8.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils xdg-utils flag-o-matic gnome2-utils versionator
-
-MY_PN=${PN}-gaf
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package"
-HOMEPAGE="http://wiki.geda-project.org/geda:gaf"
-SRC_URI="http://ftp.geda-project.org/${MY_PN}/stable/v$(get_version_component_range 1-2)/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc examples nls stroke threads"
-
-CDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	>=x11-libs/cairo-1.2.0
-	>=dev-scheme/guile-1.8[deprecated]
-	<dev-scheme/guile-2.2
-	nls? ( virtual/libintl )
-	stroke? ( >=dev-libs/libstroke-0.5.1 )"
-
-DEPEND="${CDEPEND}
-	sys-apps/groff
-	dev-util/desktop-file-utils
-	x11-misc/shared-mime-info
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16 )"
-
-RDEPEND="${CDEPEND}
-	sci-electronics/electronics-menu"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README"
-
-src_prepare() {
-	append-libs -lgio-2.0
-	if ! use doc ; then
-		sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die
-	fi
-	if ! use examples ; then
-		sed -i -e 's/\texamples$//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable threads threads posix) \
-		$(use_with stroke libstroke) \
-		$(use_enable nls) \
-		$(use_enable debug assert) \
-		--disable-doxygen \
-		--disable-rpath \
-		--disable-update-xdg-database
-}
-
-src_test() {
-	emake -j1 check
-}
-
-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/geda/geda-1.9.2-r1.ebuild b/sci-electronics/geda/geda-1.9.2-r1.ebuild
index 2a44a907ab44..08129958fc60 100644
--- a/sci-electronics/geda/geda-1.9.2-r1.ebuild
+++ b/sci-electronics/geda/geda-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,6 +52,19 @@ src_prepare() {
 		sed -i -e 's/\texamples$//' Makefile.in || die
 	fi
 
+	# add missing GIO_LIB Bug #684870
+	sed -i -e 's/gsymcheck_LDFLAGS =/gsymcheck_LDFLAGS = $(GIO_LIBS)/' \
+		gsymcheck/src/Makefile.am || die
+
+	sed -i -e 's/gnetlist_LDFLAGS =/gnetlist_LDFLAGS = $(GIO_LIBS)/' \
+		gnetlist/src/Makefile.am || die
+
+	sed -i -e 's/gschlas_LDFLAGS =/gschlas_LDFLAGS = $(GIO_LIBS)/' \
+		utils/gschlas/Makefile.am || die
+
+	sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \
+		contrib/sarlacc_schem/Makefile.am || die
+
 	eautoreconf
 }