Version bump with box drawing character improvements. Drop old. Make license more precise and update homepage.

(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)

6 files changed, 32 insertions, 82 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index 7638ba0ed69e..2234abf94171 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/vte
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.330 2012/08/10 00:37:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.331 2012/09/25 13:46:11 tetromino Exp $
+
+*vte-0.34.0 (25 Sep 2012)
+
+  25 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -vte-0.28.2-r202.ebuild, vte-0.28.2-r203.ebuild, vte-0.30.1-r3.ebuild,
+  -vte-0.32.1.ebuild, vte-0.32.2.ebuild, +vte-0.34.0.ebuild:
+  Version bump with box drawing character improvements. Drop old. Make license
+  more precise and update homepage.
 
   10 Aug 2012; Jeroen Roovers <jer@gentoo.org> vte-0.28.2-r203.ebuild:
   Remove duplicate keyword by zvasylvv (bug #430658).
diff --git a/x11-libs/vte/vte-0.28.2-r202.ebuild b/x11-libs/vte/vte-0.28.2-r202.ebuild
deleted file mode 100644
index b1fd4d20b3af..000000000000
--- a/x11-libs/vte/vte-0.28.2-r202.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.2-r202.ebuild,v 1.11 2012/05/05 03:52:26 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="GNOME terminal widget"
-HOMEPAGE="http://git.gnome.org/browse/vte"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-linux"
-IUSE="debug doc glade +introspection python"
-
-PDEPEND="x11-libs/gnome-pty-helper"
-RDEPEND=">=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-2.20:2[introspection?]
-	>=x11-libs/pango-1.22.0
-
-	sys-libs/ncurses
-	x11-libs/libX11
-	x11-libs/libXft
-
-	glade? ( dev-util/glade:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-	python? ( >=dev-python/pygtk-2.4:2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1.13 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-gnome-pty-helper
-		--disable-deprecation
-		--disable-maintainer-mode
-		--disable-static
-		$(use_enable debug)
-		$(use_enable glade glade-catalogue)
-		$(use_enable introspection)
-		$(use_enable python)
-		--with-gtk=2.0"
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
-	epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	use python && python_clean_installation_image
-}
diff --git a/x11-libs/vte/vte-0.28.2-r203.ebuild b/x11-libs/vte/vte-0.28.2-r203.ebuild
index 2d3f496bc85d..e6c89b6e0542 100644
--- a/x11-libs/vte/vte-0.28.2-r203.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r203.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.2-r203.ebuild,v 1.12 2012/08/10 00:37:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.2-r203.ebuild,v 1.13 2012/09/25 13:46:11 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -10,9 +10,9 @@ PYTHON_DEPEND="python? 2:2.5"
 inherit eutils gnome2 python
 
 DESCRIPTION="GNOME terminal widget"
-HOMEPAGE="http://git.gnome.org/browse/vte"
+HOMEPAGE="https://live.gnome.org/VTE"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug doc glade +introspection python"
diff --git a/x11-libs/vte/vte-0.30.1-r3.ebuild b/x11-libs/vte/vte-0.30.1-r3.ebuild
index 66cec9115998..c01072d86086 100644
--- a/x11-libs/vte/vte-0.30.1-r3.ebuild
+++ b/x11-libs/vte/vte-0.30.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.30.1-r3.ebuild,v 1.9 2012/05/20 19:33:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.30.1-r3.ebuild,v 1.10 2012/09/25 13:46:11 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -9,9 +9,9 @@ GNOME2_LA_PUNT="yes"
 inherit eutils gnome2
 
 DESCRIPTION="GNOME terminal widget"
-HOMEPAGE="http://git.gnome.org/browse/vte"
+HOMEPAGE="https://live.gnome.org/VTE"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.90"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="debug doc glade +introspection"
diff --git a/x11-libs/vte/vte-0.32.2.ebuild b/x11-libs/vte/vte-0.32.2.ebuild
index 98bbbee45974..24ea7d49005e 100644
--- a/x11-libs/vte/vte-0.32.2.ebuild
+++ b/x11-libs/vte/vte-0.32.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.32.2.ebuild,v 1.2 2012/07/30 13:51:56 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.32.2.ebuild,v 1.3 2012/09/25 13:46:11 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -9,11 +9,11 @@ GNOME2_LA_PUNT="yes"
 inherit eutils gnome2
 
 DESCRIPTION="GNOME terminal widget"
-HOMEPAGE="http://git.gnome.org/browse/vte"
+HOMEPAGE="https://live.gnome.org/VTE"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.90"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~alpha"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug doc glade +introspection"
 
 PDEPEND="x11-libs/gnome-pty-helper"
diff --git a/x11-libs/vte/vte-0.32.1.ebuild b/x11-libs/vte/vte-0.34.0.ebuild
index a97d1e0483bf..d21b30fe6b70 100644
--- a/x11-libs/vte/vte-0.32.1.ebuild
+++ b/x11-libs/vte/vte-0.34.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.32.1.ebuild,v 1.2 2012/05/05 03:52:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.34.0.ebuild,v 1.1 2012/09/25 13:46:11 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -9,12 +9,12 @@ GNOME2_LA_PUNT="yes"
 inherit eutils gnome2
 
 DESCRIPTION="GNOME terminal widget"
-HOMEPAGE="http://git.gnome.org/browse/vte"
+HOMEPAGE="https://live.gnome.org/VTE"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc glade +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 PDEPEND="x11-libs/gnome-pty-helper"
 RDEPEND=">=dev-libs/glib-2.31.13:2
@@ -29,8 +29,8 @@ RDEPEND=">=dev-libs/glib-2.31.13:2
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig
 	sys-devel/gettext
+	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.13 )"
 
 pkg_setup() {
@@ -43,6 +43,14 @@ pkg_setup() {
 		$(use_enable debug)
 		$(use_enable glade glade-catalogue)
 		$(use_enable introspection)"
+
+	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"
 }