Version bump and drop old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 16 insertions, 83 deletions

diff --git a/dev-libs/vala-common/ChangeLog b/dev-libs/vala-common/ChangeLog
index cd5cfb873d98..faea61797ce6 100644
--- a/dev-libs/vala-common/ChangeLog
+++ b/dev-libs/vala-common/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/vala-common
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/ChangeLog,v 1.30 2013/08/15 09:47:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/ChangeLog,v 1.31 2013/10/04 22:25:09 tetromino Exp $
+
+*vala-common-0.22.0 (04 Oct 2013)
+
+  04 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -vala-common-0.18.0.ebuild, vala-common-0.18.1.ebuild,
+  -vala-common-0.20.0.ebuild, vala-common-0.20.1.ebuild,
+  +vala-common-0.22.0.ebuild:
+  Version bump and drop old.
 
   15 Aug 2013; Fabian Groffen <grobian@gentoo.org> vala-common-0.20.1.ebuild:
   Marked ~x64-solaris
diff --git a/dev-libs/vala-common/vala-common-0.18.0.ebuild b/dev-libs/vala-common/vala-common-0.18.0.ebuild
deleted file mode 100644
index 5b9de2ca00eb..000000000000
--- a/dev-libs/vala-common/vala-common-0.18.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/vala-common-0.18.0.ebuild,v 1.11 2013/03/03 09:06:35 vapier Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="http://live.gnome.org/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x64-macos"
-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-18.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.18.1.ebuild b/dev-libs/vala-common/vala-common-0.18.1.ebuild
index 8326af07373a..f81f518daac2 100644
--- a/dev-libs/vala-common/vala-common-0.18.1.ebuild
+++ b/dev-libs/vala-common/vala-common-0.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/vala-common-0.18.1.ebuild,v 1.13 2013/04/09 16:42:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/vala-common-0.18.1.ebuild,v 1.14 2013/10/04 22:25:09 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="vala"
@@ -39,7 +39,7 @@ pkg_postinst() {
 	# 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-18.m4" &> /dev/null
+		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
diff --git a/dev-libs/vala-common/vala-common-0.20.1.ebuild b/dev-libs/vala-common/vala-common-0.20.1.ebuild
index 233332e0519a..8ea29115c7fc 100644
--- a/dev-libs/vala-common/vala-common-0.20.1.ebuild
+++ b/dev-libs/vala-common/vala-common-0.20.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/vala-common-0.20.1.ebuild,v 1.2 2013/08/15 09:47:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/vala-common-0.20.1.ebuild,v 1.3 2013/10/04 22:25:09 tetromino Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="vala"
@@ -39,7 +39,7 @@ pkg_postinst() {
 	# 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-18.m4" &> /dev/null
+		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
diff --git a/dev-libs/vala-common/vala-common-0.20.0.ebuild b/dev-libs/vala-common/vala-common-0.22.0.ebuild
index 25a395cebaf0..412aced28da4 100644
--- a/dev-libs/vala-common/vala-common-0.20.0.ebuild
+++ b/dev-libs/vala-common/vala-common-0.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/vala-common-0.20.0.ebuild,v 1.1 2013/03/28 16:53:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/vala-common-0.22.0.ebuild,v 1.1 2013/10/04 22:25:09 tetromino Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="vala"
@@ -12,7 +12,7 @@ HOMEPAGE="http://live.gnome.org/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
@@ -39,7 +39,7 @@ pkg_postinst() {
 	# 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-18.m4" &> /dev/null
+		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