gentoo resync : 15.12.2017

4 files changed, 40 insertions, 16 deletions

diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index a405805e8287..4819935b5fcc 100644
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -1,5 +1,6 @@
-DIST geda-gaf-1.8.2.tar.gz 11282353 SHA256 bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721 SHA512 3a6fad455c3fd2b62e9788ff04ca33242f2e4701ec24089d8c4304ad5ca44af4901fc1c396b3f840e14a0be0729ff08561a82c6911e1d23ac4b8636534b4e764 WHIRLPOOL e4e6db1b7f6d2f37d99027f9a55797f7ac5a304bb4be474d6d57091121672a86e8dfa5131e830f9bc6335f57cb3864716ef17793b550b0df064e9d2c2b158038
-DIST geda-gaf-1.9.2.tar.gz 10612225 SHA256 3f3ba90a0f1db1e71caaadcabdb52e375864a8e04e3d6330293b84ef6e21b392 SHA512 5e26ea2cffffe50bd4f0bdb4594af9cc4510386d29c715c2b4ea99c6522838a08cc2045bf65e8b1da01ab33a266fc9f03da42e28b8cc4d5c030001777ab077e3 WHIRLPOOL 314403d63b722d0ead4f223cb8f36131b6a46f4be6946848a6d0b6e18ed4cfa47b1840144dbf0d49df5e0151749407a419eb91a85d11f5fc6190562da9cdfb5c
-EBUILD geda-1.8.2.ebuild 1711 BLAKE2B 119a03b19b9d56e91275519d1901b706467e1487aa6182af8900f28f8ce27f7094341dea84767cde37796db1f6ef2e8c91a061ed11addf8b1e7fae70e6b5b28e SHA512 cb3fb9d4fbfe4567ceb1000b9733955fd6a417b54b9e2084401f1a76255b9109c9a2f9758098b63c2ab7e94e4ac62723533b87edaff16e708f9c6d8857876321
-EBUILD geda-1.9.2.ebuild 1707 BLAKE2B 9c9bc25ef2e38a9d5f0f6a271d3302397c026a5c3bd35ffcb8980787bb6738476cda6f352cdc7d39321c7e0b19ecc0acb09201053dd1b7bb58970da7ca12f936 SHA512 6feb007d3b6c57c5493d68a0c49a51728ea2b24a2cca76f8e07d8d39379e8ab8ef51f5ba8fed234d2c6f21f99bf8bd1f0a9f28c33ab1bc8f6c266ec46b99b996
+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 1723 BLAKE2B d531baf4571822f8cd7065dd03c7794652fc138dd01267f757bbe92873d9f45964ef6ac3c28347ca939c1039d22f34a181a793580915087604c487962086f311 SHA512 36caaaba3a4a0682a603c8c0f4b2eacce997e80d2dfd6be14582419825a256d2a9fa0c55fa3a508bdba75fec5695cb57a2cf991493ad8b900d214e2af602fa32
+EBUILD geda-1.9.2-r1.ebuild 1778 BLAKE2B 79c0a9b09cfbc9c0cb1d3f747bd8380ec3addd7fc73d58e2b38ebba31afde8b43d8c52ff8784c49e32134de2386a6d201c777ab3785bc844591590ab4b79ecf8 SHA512 cef4ff2ea63ed352eb7d025c8869ae698c6a546e87f871fdd97e6329c51ac31bc70440f0451a900eaabec88133aec2a3db312dd5f8263578f66bfeab0ec3af3d
 MISC metadata.xml 1107 BLAKE2B 480a8a14257044a580f952f3e1efd26a02133e0b1ac98cc35c2d11ff08e3515ec38593d773ea2a881e1e3301ea5e1e1785909cc3017e56adec34ee09e11689d6 SHA512 7c64ce6548bc555ace1023c79ae7f74ac90b285f1bcdc65302d6908079a3358b010100ee50d607fdd65321d297d28410041010ca9b1db6599e20dccf0470c2c6
diff --git a/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch b/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch
new file mode 100644
index 000000000000..631673367801
--- /dev/null
+++ b/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch
@@ -0,0 +1,16 @@
+--- geda-gaf-1.9.2/m4/geda-guile.m4
++++ geda-gaf-1.9.2/m4/geda-guile.m4
+@@ -35,8 +35,13 @@
+   GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'`
+ 
+   _found_pkg_config_guile=yes
++  PKG_CHECK_MODULES(GUILE, [guile-2.2 >= $GUILE_MIN_VER],
++                           [GUILE_PKG_NAME=guile-2.2], [_found_pkg_config_guile=no])
++
++  if test "${_found_pkg_config_guile}" = "no" ; then
+   PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER],
+                            [GUILE_PKG_NAME=guile-2.0], [_found_pkg_config_guile=no])
++  fi
+ 
+   if test "${_found_pkg_config_guile}" = "no" ; then
+    PKG_CHECK_MODULES(GUILE, [guile-1.8 >= $GUILE_MIN_VER],
diff --git a/sci-electronics/geda/geda-1.8.2.ebuild b/sci-electronics/geda/geda-1.8.2.ebuild
index 4fa4b255d039..62f0f84095c3 100644
--- a/sci-electronics/geda/geda-1.8.2.ebuild
+++ b/sci-electronics/geda/geda-1.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-inherit eutils fdo-mime flag-o-matic gnome2-utils versionator
+inherit eutils xdg-utils flag-o-matic gnome2-utils versionator
 
 MY_PN=${PN}-gaf
 MY_P=${MY_PN}-${PV}
@@ -21,6 +21,7 @@ CDEPEND="
 	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 )"
 
@@ -69,13 +70,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/geda/geda-1.9.2.ebuild b/sci-electronics/geda/geda-1.9.2-r1.ebuild
index c51bd3844de8..4408d1012751 100644
--- a/sci-electronics/geda/geda-1.9.2.ebuild
+++ b/sci-electronics/geda/geda-1.9.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils fdo-mime gnome2-utils versionator
+EAPI=6
+inherit autotools eutils xdg-utils gnome2-utils versionator
 
 MY_PN=${PN}-gaf
 MY_P=${MY_PN}-${PV}
@@ -40,13 +40,19 @@ S=${WORKDIR}/${MY_P}
 
 DOCS="AUTHORS NEWS README"
 
+PATCHES=( "${FILESDIR}"/${P}-guile-2.2.patch )
+
 src_prepare() {
+	default
+
 	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
+
+	eautoreconf
 }
 
 src_configure() {
@@ -70,13 +76,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
 }