gentoo resync : 16.06.2018

3 files changed, 71 insertions, 0 deletions

diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index ef653f170ebc..51d6cc86eb75 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,7 +1,10 @@
 AUX gdbus-codegen-2.40.0-sitedir.patch 1086 BLAKE2B 7c3a460c3ceb90e35ce160eed36229e99459062e2b9166003408aa8a1b10b529aa419f18943c6d225a89c2378f9405f8f54b40fe460428a81544359562a2b8db SHA512 e860da78f31cb61896c450b4728cfc1d8eb57f0c06c9440fa4c3d4344429e41b12531b59e6ad6c8cb4ff146f9f63ddd9ed0e6b7f493a11adba46ea628bcc3499
+AUX gdbus-codegen-2.54.3-sitedir.patch 885 BLAKE2B e63cdb128735fa8fbdf2ae1e324f9ba602149c6a36e69752e948a2be0c559625154a6d6036478d9f30da9d628ada9d62930142fc351686aca0e7f55ec7cc4386 SHA512 122583e4d4f84144c822a37ee9b259e9f3be0dddecaee1d19575e53836122b3c5a283d201e1864c15d1f9b3f7f9827f8e6040a7f856ea1d471842acc28f0dd1a
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
+DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
 EBUILD gdbus-codegen-2.50.3.ebuild 1305 BLAKE2B 5aecff45e4829b32d3404c81f664620a54a2127bf066ef3af51e9be9ec3b70d4f5b18c674bec23d1b061f32af4d4346bef508ec0cf9111c94ebb7f2c7b01cd0d SHA512 cb018c694e4639888ff696c72b9df895de46946a0849668b3ccce9d6dcdae8193bc84cbf7ff2a0ccdd75108c8b4358d76cfe547dc8849cfa22c69ee42f8d3223
 EBUILD gdbus-codegen-2.52.3.ebuild 1313 BLAKE2B feea720780058dd1f086d7142cbcbf8ffbbd40ede7667a8f1e95f9a17ffdc4ce75acd524d269d9dfa4b6649d9f49d48e21501107745a227eea1311041fd68e12 SHA512 6a135d73e6a2d02ae545f617b3d227c6e86737374b4611034c4d9868c3cd266038c413a1281ff6fcb3dfa65813a389ee0428f740741c8d77e970f414f535fdc3
+EBUILD gdbus-codegen-2.54.3.ebuild 1303 BLAKE2B b0e9e2582ee7f4d9fca636bf37a87a48bb596c9c3c196c0d2233c03e1c989d455524a99a516190b06dadedd72223f44b16db4c024853b4b3c0a0f58e2732aec1 SHA512 f7bd9a848fb0b32153545083876663d1f8d11a85bedebcae7bad7dede1b0f47e6455beb30dffb2cf5404563c24b585958e03d5fe71f006625a7ce3858346f36c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
new file mode 100644
index 000000000000..d3bbba4cb034
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
@@ -0,0 +1,22 @@
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 8050981..932410a 100644
+--- a/gdbus-codegen.in
++++ b/gdbus-codegen.in
+@@ -28,16 +28,7 @@ filedir = os.path.dirname(__file__)
+ 
+ if srcdir is not None:
+     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
+-elif os.path.basename(filedir) == 'bin':
+-    # Make the prefix containing gdbus-codegen 'relocatable' at runtime by
+-    # adding /some/prefix/bin/../share/glib-2.0 to the python path
+-    path = os.path.join(filedir, '..', 'share', 'glib-2.0')
+ else:
+-    # Assume that the modules we need are in the current directory and add the
+-    # parent directory to the python path.
+-    path = os.path.join(filedir, '..')
+-
+-sys.path.insert(0, os.path.abspath(path))
+-from codegen import codegen_main
++    from gdbus_codegen import codegen_main
+ 
+ sys.exit(codegen_main.codegen_main())
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
new file mode 100644
index 000000000000..1ac95b47d966
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.54.3-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}