x11-libs/vte: 0.29.0 → 0.29.1

Version bump. Patches were applied upstream.

5 files changed, 5 insertions, 104 deletions

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index e1f46c93..dac677a3 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,5 +1,3 @@
-AUX vte-0.29.0-api-version.patch 892 RMD160 d93e038b8080a225284016fd65ae18606514d335 SHA1 a55e1c368a130ef557db107ea1f0be8ee4df23ce SHA256 37712e34d50ba360cd418436c61d870a4df5947674b15497a2f0f1b072ec74c7
-AUX vte-0.29.0-fix-gdk-targets.patch 1496 RMD160 d51643e05f29b8fcae928de315de1efab433ae44 SHA1 6d640085f885ffbc2255546f7a0dbac78bbbc381 SHA256 481762b1ff9697d23af813393eb790c9ce52e63b1909a67391e38c32c5deb4df
-DIST vte-0.29.0.tar.xz 951712 RMD160 60464aaae30ce292619ed0ec0883aa77b142b1d3 SHA1 216fd419e9b178925e3e3d0800efe19faad666f6 SHA256 fa25a5433039ff5f7eafa5cc2204355d562bda9ce4f46bdbff8e5981e1821b77
-EBUILD vte-0.29.0.ebuild 1727 RMD160 2379c4666f43421759f098273e008e028028b492 SHA1 ef17c122b82717a866b28ff27f60c47893bf6de6 SHA256 102cc9716786d99eea231cb2cd2137a0fde4e0adc7f47d2b9b73e3b0d265a4e6
-EBUILD vte-9999.ebuild 1727 RMD160 2379c4666f43421759f098273e008e028028b492 SHA1 ef17c122b82717a866b28ff27f60c47893bf6de6 SHA256 102cc9716786d99eea231cb2cd2137a0fde4e0adc7f47d2b9b73e3b0d265a4e6
+DIST vte-0.29.1.tar.xz 952404 RMD160 ba169b0422225be68c3f8abf1959a463d5224184 SHA1 28a0f0ce7b66f35ab9981fc975926c24c18133e6 SHA256 5f846c2763eaac95bb15b99dd212d76ec7d723c1c6f81a8b562143f6eaf2ba9e
+EBUILD vte-0.29.1.ebuild 1417 RMD160 f3f59c6844676ce0ac2bea72d291aa7de82533d8 SHA1 8ad18beb8bb0fc3a36fcf71ef63dd03c85c4a2dd SHA256 8b9bfb176381002b1fb11aa2a960acbeb8fd9456f798517d9b9c0970c5201438
+EBUILD vte-9999.ebuild 1417 RMD160 f3f59c6844676ce0ac2bea72d291aa7de82533d8 SHA1 8ad18beb8bb0fc3a36fcf71ef63dd03c85c4a2dd SHA256 8b9bfb176381002b1fb11aa2a960acbeb8fd9456f798517d9b9c0970c5201438
diff --git a/x11-libs/vte/files/vte-0.29.0-api-version.patch b/x11-libs/vte/files/vte-0.29.0-api-version.patch
deleted file mode 100644
index 6c1fd9fe..00000000
--- a/x11-libs/vte/files/vte-0.29.0-api-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b11cd319e0dbf9ed56be11f8bdb20f1be477a509 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sun, 28 Aug 2011 21:59:00 -0400
-Subject: [PATCH] Need to set VTE_API_VERSION
-
-Configure needs to properly set VTE_API_VERSION to use the same library
-names as previous gtk3-based vte releases, and to prevent file collisions
-with gtk2-based vte.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=657584
----
- configure.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index a4ef0b7..0193fe6 100644
---- a/configure.in
-+++ b/configure.in
-@@ -40,6 +40,7 @@ AC_SUBST([LT_VERSION_INFO])
- 
- VTE_API_MAJOR_VERSION=2
- VTE_API_MINOR_VERSION=90
-+VTE_API_VERSION=$VTE_API_MAJOR_VERSION.$VTE_API_MINOR_VERSION
- VTE_PC_VERSION=-$VTE_API_VERSION
- VTE_LIBRARY_SUFFIX=$VTE_API_VERSION
- VTE_SEAL_CFLAGS="-DVTE_SEAL_ENABLE"
--- 
-1.7.6.1
-
diff --git a/x11-libs/vte/files/vte-0.29.0-fix-gdk-targets.patch b/x11-libs/vte/files/vte-0.29.0-fix-gdk-targets.patch
deleted file mode 100644
index f79dd5b8..00000000
--- a/x11-libs/vte/files/vte-0.29.0-fix-gdk-targets.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 733b995f1eb0bd19cb16cbce7164730645505297 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sun, 28 Aug 2011 21:26:06 -0400
-Subject: [PATCH] Gdk-3.0 supports multiple targets
-
-Gdk-3.0 supports multiple targets now, and the "target" variable no
-longer works.
-
-[ This is an 0.29.0 port of a patch created by Nirbheek Chauhan
-<nirbheek@gentoo.org> for 0.28.0. ]
-
-https://bugzilla.gnome.org/show_bug.cgi?id=657581
----
- configure.in |   16 +++++++++-------
- 1 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index e89106d..a4ef0b7 100644
---- a/configure.in
-+++ b/configure.in
-@@ -378,13 +378,15 @@ esac
- # Search for the required modules.
- 
- # We have a direct dependency on X11 on gdk-x11, see bug #613525
--AC_MSG_CHECKING([for GDK target])
--GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)"
--AC_MSG_RESULT([$GDK_TARGET])
--case "$GDK_TARGET" in
--  x11) PLATFORM_PKGS="x11 cairo-xlib" ;;
--  *) PLATFORM_PKGS="" ;;
--esac
-+AC_MSG_CHECKING([for GDK targets])
-+GDK_TARGETS="$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)"
-+AC_MSG_RESULT([$GDK_TARGETS])
-+PLATFORM_PKGS=
-+for i in $GDK_TARGETS; do
-+  if test "$i" = "x11"; then
-+    PLATFORM_PKGS="$PLATFORM_PKGS x11 cairo-xlib"
-+  fi
-+done
- 
- VTE_PKGS="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 pango >= $PANGO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gobject-2.0 gio-2.0 gio-unix-2.0 $PLATFORM_PKGS"
- PKG_CHECK_MODULES([VTE],[$VTE_PKGS])
--- 
-1.7.6.1
-
diff --git a/x11-libs/vte/vte-0.29.0.ebuild b/x11-libs/vte/vte-0.29.1.ebuild
index 1b57fa03..ba93f8f3 100644
--- a/x11-libs/vte/vte-0.29.0.ebuild
+++ b/x11-libs/vte/vte-0.29.1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	EGIT_BRANCH=${EGIT_BRANCH:-"vte-0-30"}
 	inherit gnome2-live
@@ -54,14 +54,3 @@ pkg_setup() {
 		$(use_enable introspection)"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=657581
-	epatch "${FILESDIR}/${PN}-0.29.0-fix-gdk-targets.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=657584
-	epatch "${FILESDIR}/${PN}-0.29.0-api-version.patch"
-
-	[[ ${PV} != 9999 ]] && eautoreconf
-
-	gnome2_src_prepare
-}
diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-9999.ebuild
index 1b57fa03..ba93f8f3 100644
--- a/x11-libs/vte/vte-9999.ebuild
+++ b/x11-libs/vte/vte-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	EGIT_BRANCH=${EGIT_BRANCH:-"vte-0-30"}
 	inherit gnome2-live
@@ -54,14 +54,3 @@ pkg_setup() {
 		$(use_enable introspection)"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=657581
-	epatch "${FILESDIR}/${PN}-0.29.0-fix-gdk-targets.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=657584
-	epatch "${FILESDIR}/${PN}-0.29.0-api-version.patch"
-
-	[[ ${PV} != 9999 ]] && eautoreconf
-
-	gnome2_src_prepare
-}