gentoo resync : 28.12.2017

3 files changed, 2 insertions, 80 deletions

diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 04daa1d03977..ba4eecfb65c5 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,7 +1,5 @@
-DIST vala-0.34.8.tar.xz 2778228 BLAKE2B ce48baeaa2ba88e09234c8a6e14c6aed60771476f4f2d25d1654ed07e0de78bb98f506fbf9f3990f13e2946ed541a0da2364a6fd1834c36e58c99e905afdf15b SHA512 03739173aa2b4e5d476037c77ac86543b97bd6eeb94f40dcce952da127e32baefa0dfa83f9d6e8ea254d4aee5ecd557964520926239bd119da72c771e30ece14
 DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5138bfea1ed058f41bf07968e55e032469cc068cefdb6a4d53f1c029ca7e728c57b00f6b9845e32c4410e8258 SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f
 DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b
-EBUILD vala-common-0.34.8.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de
-EBUILD vala-common-0.34.9.ebuild 2534 BLAKE2B 2f8318c02c59b3ecd29e69280fec0aecead781eab9eaa6620c04757dcfd3175d235816292503dc984bdc3f28cff5daa2887e3492cdcf30d8da26107a67e959ff SHA512 876ba791e3c801c0b7b2b358257dcce45d229e95f119584b64cc229af9c469b859ab090888e5f06e1071b61f5d4d7f02c76c4958e2adcf5809c1ef45a113b60b
+EBUILD vala-common-0.34.9.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de
 EBUILD vala-common-0.36.7.ebuild 2542 BLAKE2B 115fde004f43b28050b2ba90f834b3c06c953bc29b8c7581920cce6d876ea5f80ff96bc57b0b7a05e953a773631ee15419d97359e80a4ec80000943f3eebab2b SHA512 dc92e98e84d726421ff40e073ca8218257d2edfedb3d1e45fefdbf1c8a030e27dd4b85bebf5a472e74a93a4bd0e03d5ce5d1e07151965101401590cb2f6306d0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.34.8.ebuild b/dev-libs/vala-common/vala-common-0.34.8.ebuild
deleted file mode 100644
index 743737dd7b56..000000000000
--- a/dev-libs/vala-common/vala-common-0.34.8.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-# Previously ${PN} was part of dev-lang/vala
-RDEPEND="
-	!<dev-lang/vala-0.10.4-r2
-	!<dev-lang/vala-0.12.1-r1:0.12
-	!<dev-lang/vala-0.14.2-r2:0.14
-	!<dev-lang/vala-0.16.1-r2:0.16
-	!<dev-lang/vala-0.17.5:0.18
-"
-DEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
-
-pkg_postinst() {
-	# Hack to prevent alternatives_auto_makesym in previously installed
-	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
-	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
-		ebegin "Removing old vala-0.10 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
-		ebegin "Removing old vala-0.12 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
-		ebegin "Removing old vala-0.14 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
-		ebegin "Removing old vala-0.16 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.16 makefile template"
-			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
-		ebegin "Removing old vala-0.18 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.18 makefile template"
-			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-}
diff --git a/dev-libs/vala-common/vala-common-0.34.9.ebuild b/dev-libs/vala-common/vala-common-0.34.9.ebuild
index b038cb76143b..743737dd7b56 100644
--- a/dev-libs/vala-common/vala-common-0.34.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.34.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala