From: Pacho Ramos Date: Sat, 10 Sep 2011 08:54:54 +0000 (+0000) Subject: Version bump, remove old, include introspection macro for gtk3 version until a better... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=690be870318377fc5e4760e292c2301743eb0ea4;p=gentoo.git Version bump, remove old, include introspection macro for gtk3 version until a better solution is supplied. Package-Manager: portage-2.1.10.14/cvs/Linux x86_64 --- diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog index 0490e9ad51f3..5c57702a2406 100644 --- a/x11-libs/vte/ChangeLog +++ b/x11-libs/vte/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-libs/vte # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.285 2011/08/02 05:34:57 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.286 2011/09/10 08:54:54 pacho Exp $ + +*vte-0.28.2-r300 (10 Sep 2011) +*vte-0.28.2-r200 (10 Sep 2011) + + 10 Sep 2011; Pacho Ramos -vte-0.26.2.ebuild, + +vte-0.28.2-r200.ebuild, +vte-0.28.2-r300.ebuild: + Version bump, remove old, include introspection macro for gtk3 version until + a better solution is supplied. 11 Jul 2011; Matt Turner vte-0.28.1-r200.ebuild, vte-0.28.1-r300.ebuild: diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index 621224dfb8f6..b1acc9beb0a3 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -2,17 +2,19 @@ Hash: SHA1 AUX vte-0.28.0-fix-gdk-targets.patch 1302 RMD160 953e83b5f39d02278d69b95601a6d35f3b733544 SHA1 2b5fd8289ce58d9795c3627b7b289bd7f6442b62 SHA256 f3886e0e8a580010a71e0cce47c124b97ef78988ee031c1212c4707b0cd50828 -DIST vte-0.26.2.tar.bz2 1310863 RMD160 22a2217f69c2f64090a9d45105047fb1a440b07f SHA1 4c8fb07403538b7f743ec1d7af7b127683c7b9c2 SHA256 f02c350340266c9515a98b8f69c72b4bdc53b352cd053624a63a7cb97ddec9bd +DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae DIST vte-0.28.1.tar.xz 963496 RMD160 48b6423cc688a07d7864738dd864261b33313aae SHA1 528191c07aaf7f315fba7585bd427616a56dedd1 SHA256 ad1b868356e0231c42ac2493d3e2a7726014c9dc4110ec89fbb01aee8c2ed7ad -EBUILD vte-0.26.2.ebuild 1400 RMD160 4555a4c1836edbbe59293e1655038b7b13ace489 SHA1 6eec8d3088bc0ee7cd68bbd6a5f0c8f6a64183e2 SHA256 b6def081fe98a32254751c0b189fabca3206a0c2fbae79cdbc70acdb37234d2b +DIST vte-0.28.2.tar.xz 962340 RMD160 8f3396d4e98023b74898e938331917b181964158 SHA1 b0af0701ef9d6c7ede9c578366b12a70ac47ab66 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae EBUILD vte-0.28.1-r200.ebuild 1457 RMD160 2d65682be75db9599ae56deff82523e48e29b310 SHA1 be479c333d93b1d05beec343716ad744dc21ecf7 SHA256 e8864a1042a76bf1f8597ea87de4a707b073c3ac40e959033d8e934a2099c2f2 EBUILD vte-0.28.1-r300.ebuild 1458 RMD160 94d6ccea4d9be8dbdf71521e605ade040616fb65 SHA1 e9a2ae9c3527e6cb275e95ede2a7a9578c26b8d3 SHA256 0ef5199b303c8a03fcf577af4dbeb25aa3fa41bc9082b3bdb11bc53d3ee1837f -MISC ChangeLog 37425 RMD160 23c3406c14d1929a42065c7c64d16b565be7a4a1 SHA1 7c08da52f5825fc1856948bfc712feda584f954c SHA256 9157f93c0ce94bc5f1c3f0396b406bbcb768384a22279cd4ea0ccc5727d0bd7b +EBUILD vte-0.28.2-r200.ebuild 1464 RMD160 01409873aa81b8601f1434c7a39770646b21f961 SHA1 38997ef19d0fd1f204afa48248ac595b074fa6ae SHA256 e000c3b5e080791654c2e6e954c6e7d9d6c2acd22de154f1bb4398d8673b6f1f +EBUILD vte-0.28.2-r300.ebuild 1575 RMD160 a7ab4efc2203ae97b43bcd6dc70eb11377ffcc7c SHA1 4f214d6e2566af607ba89d76dbba429d89001541 SHA256 260d840d6f1da3a1895da1414512c051bddea6763c36ba6f596b58e30c4742ce +MISC ChangeLog 37716 RMD160 c626ed385baf194cb5edb9c99d54129d286a2b5b SHA1 23fd687cc262ff0c497025c65108033e3651273e SHA256 ed85acdce51c0c1781dfdc4a214b1173d9d12c35b29267e52d863cadac9be727 MISC metadata.xml 350 RMD160 c81d1e1776ed27ef7418cdc46a686e2b6a9dbdeb SHA1 8063a6278411458adbfa260f11d53687a6881f3b SHA256 16e77360aaa3f204d03bfad2997aabf51d51c3360f59f6c4d5f24076e9bae0d1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk43lOMACgkQTVUdg23rv52KagCfavT4Oeo+nVviNJrrU3V2O3Es -enUAn3UATpYjTKXH6kH26DoVwpIVEKDn -=dCcC +iEYEARECAAYFAk5rJeUACgkQCaWpQKGI+9SrhwCfQDHQE094aO/dYh90dEMShfpa +UDMAnRIPxHp9v3ekQrt2vlIvaaFGkylm +=LdJd -----END PGP SIGNATURE----- diff --git a/x11-libs/vte/vte-0.26.2.ebuild b/x11-libs/vte/vte-0.28.2-r200.ebuild similarity index 57% rename from x11-libs/vte/vte-0.26.2.ebuild rename to x11-libs/vte/vte-0.28.2-r200.ebuild index b3eecd14257a..d46eefdc6aa9 100644 --- a/x11-libs/vte/vte-0.26.2.ebuild +++ b/x11-libs/vte/vte-0.28.2-r200.ebuild @@ -1,46 +1,51 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.26.2.ebuild,v 1.10 2011/04/10 09:07:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.2-r200.ebuild,v 1.1 2011/09/10 08:54:54 pacho Exp $ EAPI="3" GCONF_DEBUG="yes" +GNOME_TARBALL_SUFFIX="xz" +GNOME2_LA_PUNT="yes" PYTHON_DEPEND="python? 2:2.4" inherit gnome2 python -DESCRIPTION="Gnome terminal widget" -HOMEPAGE="http://www.gnome.org/" +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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="debug doc glade +introspection python" -RDEPEND=">=dev-libs/glib-2.22:2 - >=x11-libs/gtk+-2.20:2 +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 - glade? ( dev-util/glade:3 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) - python? ( >=dev-python/pygtk-2.4 ) x11-libs/libX11 - x11-libs/libXft" + 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} - doc? ( >=dev-util/gtk-doc-1.13 ) >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 - sys-devel/gettext" + sys-devel/gettext + doc? ( >=dev-util/gtk-doc-1.13 )" pkg_setup() { G2CONF="${G2CONF} - --disable-maintainer-mode + --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-html-dir=/usr/share/doc/${PF}/html --with-gtk=2.0" DOCS="AUTHORS ChangeLog HACKING NEWS README" use python && python_set_active_version 2 @@ -48,6 +53,5 @@ pkg_setup() { src_install() { gnome2_src_install - find "${ED}" -name '*.la' -exec rm -f {} + use python && python_clean_installation_image } diff --git a/x11-libs/vte/vte-0.28.2-r300.ebuild b/x11-libs/vte/vte-0.28.2-r300.ebuild new file mode 100644 index 000000000000..ae3d4cbe03f1 --- /dev/null +++ b/x11-libs/vte/vte-0.28.2-r300.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2011 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-r300.ebuild,v 1.1 2011/09/10 08:54:54 pacho Exp $ + +EAPI="3" +GCONF_DEBUG="yes" +GNOME_TARBALL_SUFFIX="xz" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 + +DESCRIPTION="GNOME terminal widget" +HOMEPAGE="http://git.gnome.org/browse/vte" +SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2" + +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" + +PDEPEND="x11-libs/gnome-pty-helper" +RDEPEND=">=dev-libs/glib-2.26:2 + >=x11-libs/gtk+-3.0: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} + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.9 + sys-devel/gettext + doc? ( >=dev-util/gtk-doc-1.13 )" + +pkg_setup() { + # Python bindings are via gobject-introspection + # Ex: from gi.repository import Vte + G2CONF="${G2CONF} + --disable-gnome-pty-helper + --disable-deprecation + --disable-maintainer-mode + --disable-static + $(use_enable debug) + $(use_enable glade glade-catalogue) + $(use_enable introspection) + --with-gtk=3.0" + DOCS="AUTHORS ChangeLog HACKING NEWS README" +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.28.0-fix-gdk-targets.patch" + + mv "${WORKDIR}/introspection.m4" "${S}/" || die + AT_M4DIR="." eautoreconf + + gnome2_src_prepare +}