Version bump, drop old

(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 24 insertions, 96 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index 05f8d24ee4a0..9cbe8318a42d 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/vte
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.408 2015/04/08 17:28:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.409 2015/05/17 09:20:04 pacho Exp $
+
+*vte-0.36.4 (17 May 2015)
+
+  17 May 2015; Pacho Ramos <pacho@gentoo.org> +vte-0.36.4.ebuild,
+  -vte-0.34.9.ebuild, -vte-0.38.2.ebuild, metadata.xml:
+  Version bump, drop old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> vte-0.28.2-r206.ebuild:
   Drop old Python implementations
diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
index a9510d23b2b6..84c40c2c6ea0 100644
--- a/x11-libs/vte/metadata.xml
+++ b/x11-libs/vte/metadata.xml
@@ -4,7 +4,5 @@
 <herd>gnome</herd>
 <use>
 	<flag name='glade'>Provide integration with <pkg>dev-util/glade</pkg>.</flag>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-	introspection</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-libs/vte/vte-0.34.9.ebuild b/x11-libs/vte/vte-0.36.4.ebuild
index afd2c1b05f71..f6644a92d30f 100644
--- a/x11-libs/vte/vte-0.34.9.ebuild
+++ b/x11-libs/vte/vte-0.36.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.34.9.ebuild,v 1.12 2014/04/21 10:30:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.36.4.ebuild,v 1.1 2015/05/17 09:20:04 pacho Exp $
 
 EAPI="5"
-GCONF_DEBUG="yes"
+GCONF_DEBUG="no"
 
 inherit eutils gnome2
 
@@ -13,9 +13,9 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.90"
 IUSE="debug glade +introspection"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
-PDEPEND="=x11-libs/gnome-pty-helper-${PV}"
+PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
 RDEPEND="
 	>=dev-libs/glib-2.31.13:2
 	>=x11-libs/gtk+-3.1.9:3[introspection?]
@@ -26,31 +26,31 @@ RDEPEND="
 	x11-libs/libXft
 
 	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
 "
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
 src_prepare() {
-	if [[ ${CHOST} == *-interix* ]]; then
-		G2CONF="${G2CONF} --disable-Bsymbolic"
-
-		# interix stropts.h is empty...
-		export ac_cv_header_stropts_h=no
-	fi
-
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
 	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
 	epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
-
 	gnome2_src_prepare
 }
 
 src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
 	# Python bindings are via gobject-introspection
 	# Ex: from gi.repository import Vte
 	# Do not disable gnome-pty-helper, bug #401389
@@ -63,6 +63,7 @@ src_configure() {
 }
 
 src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	gnome2_src_install
 	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
 }
diff --git a/x11-libs/vte/vte-0.38.2.ebuild b/x11-libs/vte/vte-0.38.2.ebuild
deleted file mode 100644
index f2235d0018df..000000000000
--- a/x11-libs/vte/vte-0.38.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.38.2.ebuild,v 1.2 2014/12/15 23:30:21 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.18"
-
-inherit eutils gnome2 vala
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
-
-LICENSE="LGPL-2+"
-SLOT="2.91"
-IUSE="debug glade +introspection vala"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=x11-libs/gtk+-3.8:3[introspection?]
-	>=x11-libs/pango-1.22.0
-
-	sys-libs/ncurses
-	x11-libs/libX11
-	x11-libs/libXft
-
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${RDEPEND}
-	!x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
-
-		# interix stropts.h is empty...
-		export ac_cv_header_stropts_h=no
-	fi
-
-	# Python bindings are via gobject-introspection
-	# Ex: from gi.repository import Vte
-	# Do not disable gnome-pty-helper, bug #401389
-	gnome2_src_configure \
-		--disable-deprecation \
-		--disable-test-application \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable glade glade-catalogue) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		${myconf}
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_install
-	mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}