Version bump for Gnome 3.12.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 106 insertions, 5 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index a1fa31d147c3..3d707ec1ed1b 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/glade
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.212 2014/04/26 07:24:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.213 2014/04/27 18:30:49 eva Exp $
+
+*glade-3.18.2 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +glade-3.18.2.ebuild:
+  Version bump for Gnome 3.12.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -glade-3.12.2.ebuild,
   -glade-3.14.2.ebuild, -glade-3.8.3.ebuild:
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 5d9e0fbdec1b..a0ee5b725edd 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -5,15 +5,17 @@ AUX glade-3.12.1-doc-version.patch 1416 SHA256 224a3aca9c9bcd190798a702f603a1861
 AUX glade-3.14.1-doc-version.patch 853 SHA256 6fb39133bf00abd38f56b3a79cbd8b714a922cca231db59cd8dcb00693604fdf SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf WHIRLPOOL 2f5315144afc183db4599134a23ebab098df1708474180c27aaf4143cf5db5a70260bbfed756d00f54a35f37b6379134cb24f6567edaaff0a9bae72b19433f99
 AUX glade-3.16.1-underlinking.patch 2545 SHA256 eb0fb4b5566c903cf63b0c6cd22755115ecd83e83a7a4f1e93e53be5942694a0 SHA512 c099df4f717dec37f81bcc8d01b3c948e44fe9372c2828400df1d9f77527fbf78b93b487cf13efacba9f927b06ef235dc86ea7ba21a6be39cb7ac2ddb0180e9f WHIRLPOOL 149bf8226263e9d2a66f28f80f9a53c1d2d71da46a72fd0f38f1889eabb6825b64c616228d9b1d645c16af0d1525c559280344a6cf1aa214b5a7fe2d1f212d88
 DIST glade-3.16.1.tar.xz 3080072 SHA256 994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f SHA512 daa67dd44a6e0ab1e2ed2fd8e389de40c0d6f516765b564563422e0210fe50185e485d2ed7d3e79b96589dccdfc089c8ee058cfc52a79ba1d478e61098af334e WHIRLPOOL 47d15ac37a15d3d37591aaee0eb62320ae7c78bffae20f6aaf37aa7a09f3adf01e86c6d1ad97ca546db48af3e6d0eac8866941cd7ccf37461b85ac672aea9fca
+DIST glade-3.18.2.tar.xz 3256200 SHA256 a2fd77e64e8d6c4d6cbd7f365b5b3a4a06b04f749c90acbdf7a09538b2a021fc SHA512 5bf3ec211ccf84802307ccb8615df6c622a8c3132f247ec3b93c379608ae1c778ac7ca515a51b30769b7d7fe29525c11f0b513665cb4dea9b5b33ccf834b9b57 WHIRLPOOL 878171679c14354c4252f648ca074a4d1ab4dbdcacb2f374b457e531e03ad8abf05f24b1f251f26ccdb047727738d6ab16c7d028283d5f40884f0ac3a4b562d6
 DIST glade3-3.8.4.tar.xz 2305876 SHA256 c7ae0775b96a400cf43be738b2f836663a505b1458255df9ce83a340057e3d08 SHA512 dead9b9788002eecca6f8413c999471b957a8c482d770a0a2288c207c86a69e0a011164114ea9d2da60641be9cb205e3f1be7838998566a585aa3b121d316ef5 WHIRLPOOL 0fc377d71367c084a32b5b77fdbdfb82a8c8192faa94a65660c461900fedb01fd68751cb4511af926f6dc18d3e4c0f4743e68207c725b133d61a6f066a30ffd9
 EBUILD glade-3.16.1.ebuild 2527 SHA256 c5ae6f0632592d32f7d3206ea4cf731c5a280e4ef4e0d002c8fb3dfe99260f20 SHA512 6979a4374f414811e9abd1991a7db9961d4f72440d596a505ba0e4c34847ea46def6ebfa84551864fac8668301a19cbf18875d989f0a8824581c1af500998410 WHIRLPOOL 120b5b990f56317e9c7d3c60abaa562fa442aa1e520a7372429b37629671134acbc5f8efc9a712e2806f3fd8eed03d48047fe3312c3a8d4e4e929ed836f66c49
+EBUILD glade-3.18.2.ebuild 2542 SHA256 8920498b5ae4b473336dd9ebad935768d0d46f77528bd4bf2961a576bd86a538 SHA512 a170ee37bcdf62a64a369ad2a746c9629c3c68b126ee192239bd2af8424396a44fbd48d10eea1ef818d3ebf9b2de271229bc3a19cfd7966e764d561b0e242a67 WHIRLPOOL 04569461ccba283f3f8050afc6d86a6cceed6ae1c8f216161955a10fdc4437f0a7d7abf78157ee9090272617e11f869206c45a21d928e30158feece086b43bac
 EBUILD glade-3.8.4.ebuild 1213 SHA256 1f03b18ee48ae63a8996a7c7286169396c16eaf45ea72c08542ecb1824ba3f66 SHA512 3867a6ce932f7f2e5637aa8bc36455d135acb2dd0ed31b40f62f27eb5d43bc5e63e9f7e08185f432831e70bc693ea7e62388a834ef9ce9bb2885b9067c46057d WHIRLPOOL 95d5420624144b07a2191b59bf7361c68fcbfe3bd53127bad7839b4833e8d0fd0f320b82706d82077ad3c53279be0a8b2463a7112ec00e96d9b94e172fc7ec08
-MISC ChangeLog 27099 SHA256 96ddb9545c1dab5ed593ce8ff1cfe7c81d76287e9e763be90cc976a57c225996 SHA512 8bd352b3439f7043f9387bb80386295c7d87a17436df2df900019bbdf7f805360bdf0fab86ea2acf8f4bc4e4be5c5abbf10dac186bf98187072f34b45bc128ea WHIRLPOOL 0488e1fef887150be823b4f23b70d897446f99e600051131b2dec17b15ba8410eeddfcc0fdb2cfeb5e1be1dcbe01bd8ac6c8d33a55dddded54b82dd80daf54bb
+MISC ChangeLog 27234 SHA256 a4a24f192349411f85c64e4ed6a12e2918fa0c256bff96cb917bde51860fef68 SHA512 a965507c4308892b19a41190ddf1154c18f143eb70f825d4e201995333a30f8e5e4882baf1958e6c144ab124a09e00bd65ac48ce09ee7165b83f52211f23501d WHIRLPOOL 7a2b207f59435c1026401121d12e78071e6be9bc40c54c0714bd5eb3fe6a18d98ee8f4bec79b75a51301dc946e1ca36ab6272fb73da0ede2dff76d5eccb4c6db
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNbXzMACgkQCaWpQKGI+9QWcgCdFRA7eqCMoQ+6koSgS7YiXmEs
-92MAn3h/wRh1SBOk1eUhxN8RXvOn4DmN
-=KOrJ
+iEYEAREIAAYFAlNdTNoACgkQ1fmVwcYIWAaViQCgmCZelk0vE2JPBM7wCs9M5Jw/
+uWcAoIWMpWHUKfbk9tIHQcD8ELyfI/n8
+=l2ai
 -----END PGP SIGNATURE-----
diff --git a/dev-util/glade/glade-3.18.2.ebuild b/dev-util/glade/glade-3.18.2.ebuild
new file mode 100644
index 000000000000..c5d615c302bc
--- /dev/null
+++ b/dev-util/glade/glade-3.18.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.18.2.ebuild,v 1.1 2014/04/27 18:30:49 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1 versionator virtualx
+
+DESCRIPTION="A user interface designer for GTK+ and GNOME"
+HOMEPAGE="http://glade.gnome.org/"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+introspection python"
+
+RDEPEND="
+	dev-libs/atk[introspection?]
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2.4.0:2
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.12:3[introspection?]
+	x11-libs/pango[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.41.0
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf requires:
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# To avoid file collison with other slots, rename help module.
+	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
+	epatch \
+		"${FILESDIR}"/${PN}-3.14.1-doc-version.patch \
+		"${FILESDIR}"/${PN}-3.16.1-underlinking.patch
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gladeui \
+		--enable-libtool-lock \
+		$(use_enable introspection) \
+		$(use_enable python) \
+		ITSTOOL=$(type -P true)
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	# modify Name in .desktop file to avoid confusion with other slots
+	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
+		-i data/glade.desktop || die "sed of data/glade.desktop failed"
+	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
+	sed -e 's:name="gladeui":name="gladeui-2":' \
+		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! has_version dev-util/devhelp ; then
+		elog "You may want to install dev-util/devhelp for integration API"
+		elog "documentation support."
+	fi
+}