Version bump, plus Bug #396539: Adding gtk3 USE flag

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 88 insertions, 11 deletions

diff --git a/x11-terms/roxterm/ChangeLog b/x11-terms/roxterm/ChangeLog
index 62c64d8acab7..ef699bd6058a 100644
--- a/x11-terms/roxterm/ChangeLog
+++ b/x11-terms/roxterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/roxterm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/ChangeLog,v 1.55 2011/12/30 13:57:20 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/ChangeLog,v 1.56 2012/02/28 20:40:35 lack Exp $
+
+*roxterm-2.5.2 (28 Feb 2012)
+
+  28 Feb 2012; Jim Ramsay <jim_ramsay@gentoo.org> +roxterm-2.5.2.ebuild,
+  metadata.xml:
+  Version bump, plus Bug #396539: Adding gtk3 USE flag
 
 *roxterm-2.3.4 (30 Dec 2011)
 
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index e84f516c2217..a86aef7daf95 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -4,19 +4,27 @@ Hash: SHA1
 DIST roxterm-2.2.2.tar.gz 931976 RMD160 32ac587952bb111db2524e1c5dc5849c54c0af22 SHA1 e51f24e045fb7ecc38ea0f17b06ed2de3aec92cf SHA256 3c01daa2ee3c0e652653804ca6466a9d18cabe481660b759148e7d7ffadb4a94
 DIST roxterm-2.3.1.tar.bz2 782113 RMD160 167ca134f3413a235f57b0e16ed71b7a0c7a7618 SHA1 bde6b15b8dd322c41dc0370d55e2a9c67d991742 SHA256 6b8b76d6b9bb3beb2364157376e6145efd8892cd81df6a12b727e189e94ce12b
 DIST roxterm-2.3.4.tar.bz2 770810 RMD160 92026e380a9100c73c920673e31b5411efb995f2 SHA1 0a1df0d6a9ef85622bf550cfeccfdb72af4feaad SHA256 3b062021705badf7efd584a6ad13d88bf6cf19e4f41ae98f63422cb35f6d4bc3
+DIST roxterm-2.5.2.tar.bz2 297266 RMD160 93e4ead757ef92ffa97b6e8047c91f7f01db8f86 SHA1 32d18b8a12f1711dc7bb5ae52300dc9eb6869e09 SHA256 a9905bd31b7a854668f9998ef1c7e817cc1a30dd307afc2158557d46159462e6
 EBUILD roxterm-2.2.2.ebuild 1020 RMD160 1c84149ce42d95e20426bb40e95718bf4ebb3d2d SHA1 a2395be3e638762bdfc80330149232f4800de943 SHA256 535c0ec95b0fef4eb4f91435d642ef52a311fee8b5aa0bd1937dfe192b121c3b
 EBUILD roxterm-2.3.1.ebuild 1712 RMD160 2527f287ca52b01b32afe7d3d4d5c1ac81a7618d SHA1 66723f3f4cc718adb19e09ea60c5b10bbb295e87 SHA256 2d1e9bc7afd741d7eda94ba21bbce65dc1790f4b7ca1bf2a080931c713826451
 EBUILD roxterm-2.3.4.ebuild 1712 RMD160 7fdbbccd29e8cc44783f72f444b6c9b7ce5b218d SHA1 59085147a35ceea2c7dbe2a2bee6170304ffa401 SHA256 32b08d8ab9adc974e18be5c8b07b07a18f6e2159ea04b01f922e1e3026566c7a
-MISC ChangeLog 7377 RMD160 5a65ea4558412446c1d2bbdfecc666006421e1ab SHA1 0f7807b8852af47805190bf45a0aa0593113fe10 SHA256 31e0b1df79417ef28a94b13cdeb0d63ad9c66a74a197e2cbcc584af297e47a28
-MISC metadata.xml 207 RMD160 9d07918bde86d48642c53a8e824b0e1d19d0303a SHA1 bfbfe1798d78712b826184a982cfefc17d818d81 SHA256 22c35cff14b8982afbd1fe472a8d5e662b417ffc18e7e4fb52387dd99f877786
+EBUILD roxterm-2.5.2.ebuild 1809 RMD160 545324c691efadb52c0362f2d4ce312e8e6bbcc6 SHA1 de64cc99ee38fce1a9eea4431ef79d32c5ca2c3c SHA256 8e06792902dd6de91cf4bb8f23f19302143f30a9fe52844cb7c9bb9f3745bb55
+MISC ChangeLog 7547 RMD160 ff78987908ea73ae616019260dedc944bd8b16e2 SHA1 8669eb48c6ecef8897ae9b74d800b1a329832ab2 SHA256 202f36420b89c913bd6c14f54d156b2a9ad714f5561f9a43e087636e5800fe13
+MISC metadata.xml 315 RMD160 9024ae37ef30123600f96e64530ddea114b44834 SHA1 e1680e8c9315a79ff777404ab7703949996c5f86 SHA256 df60f74c42a96269d4ef7e0b9253d1bbe97c7951a5583a732fabe06e37f40aae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO/cLjAAoJEEdUh39IaPFNawQH/1CpctC1hyLFB8rnN890XV0a
-PDE4QZ0BI//bpjTcbsv0NnSxU6qVa7xZ71oWtrYChY855nVuMMht1yJS8r3XFYem
-2froxqxay2z5HPqBQODWxyKc+wrn7Gz9ihh7IF3IXPFyyqQcK1N4UxuWy3ZoYZWn
-SDcz4lw6lJr5mkB8gucPnbCplW12sfWI5LY836ftO7bESvuIjAxvArLjsqBndASO
-anWb9dTvOiTfuVi4VF5etJTcm3OE2gtxayBQKHSTHj08jTGBNApHXLQ51TDOfts5
-OzTt9UXqXdL1YTbvx3lQ0llu0d7Zl5AD41hvFWRBqouhNlwb/WY2kp60EPYx2jM=
-=qWGj
+iQIcBAEBAgAGBQJPTTvNAAoJEA8o5SF9Rr6qM68P/12yGJIzChwXZGMQ64Qs657e
+XJ9CuBlcaA+IgoBXFgKwr/KtF/8SUbLnbPh32oywiBAc5nxWeDs1gThq4wky0acr
+MXxb0/v6dVtgvEGcBRi+SNSM1XQ6S/lOhmlIecnfZJ3bcUOaWnFjrYOlblU9D6SH
+nGebyTbdMvphVYvEaT+P+pP12/FpQkf2JGP6wdYxf/HSkQthb7sV/AWjPUsAWiul
+5/8BmCu6nubQd46uCluSFIV8BnSyTxfjG89ocjchiEifTqh0aM2qK6wFe2y0SoNE
+ow6MAj1B57C6Z03e82dOwndDGvkIdxXJ+QhcUxk9/5oyXtuwf2DufUCq0AeQk2UG
+PtZuS01O0AXfPVJNN0ksgNuUHLh5jS9+0A8KkQYnxEzcgLC8cVQ56hV3SozZxyAf
+Lz9q8y6vBbkfTf8lpNN4rNc+RuboJGVKz8meCSy7kjA8EtvPDCFTxNrte5BYbrVk
+ECHnNN0wybzyqKxorGuRPI8bRol/tfjc5HwdydDyD6BW4w0pE34ufZoiMSTd191T
+y3FUeqwBUXsetqjQ5T5K9VumblrB61hh+TV6GalDrMC/15vcIAnZ0KDY9UiMd8zO
+A9DyK07wZWvBJlhkuJYssPUJx79lElPYQkfl6wvuLwQMo/8+uXShnrgi3tNNTPWs
+YtF0ZobC8gvsnMllUlTG
+=RNEZ
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/roxterm/metadata.xml b/x11-terms/roxterm/metadata.xml
index 0a175db86cb6..bafbf353d364 100644
--- a/x11-terms/roxterm/metadata.xml
+++ b/x11-terms/roxterm/metadata.xml
@@ -4,5 +4,8 @@
 	<herd>rox</herd>
 	<longdescription lang="en">
 	</longdescription>
+	<use>
+		<flag name="gtk3">Use gtk3 instead of gtk2 (and associated version of x11-libs/vte)</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/x11-terms/roxterm/roxterm-2.5.2.ebuild b/x11-terms/roxterm/roxterm-2.5.2.ebuild
new file mode 100644
index 000000000000..63cb3fbd762c
--- /dev/null
+++ b/x11-terms/roxterm/roxterm-2.5.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/roxterm-2.5.2.ebuild,v 1.1 2012/02/28 20:40:35 lack Exp $
+
+EAPI=4
+PYTHON_DEPEND="2:2.6"
+inherit gnome2-utils python
+
+DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
+HOMEPAGE="http://roxterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/roxterm/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls +gtk3"
+
+RDEPEND="dev-libs/dbus-glib
+	>=dev-libs/glib-2.16
+	gtk3?  ( x11-libs/gtk+:3 x11-libs/vte:2.90 )
+	!gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0    )
+	x11-libs/libICE
+	x11-libs/libSM"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/pkgconfig
+	dev-python/lockfile
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	nls? ( app-text/po4a sys-devel/gettext )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs 2 mscript.py
+
+	# build system is crap
+	sed -i -e 's:TerminalEmulator:System;&:' roxterm.desktop || die
+	sed -i -e '/ctx.install_doc/s:COPYING ::' mscript.py || die
+	sed -i -e "/CFLAGS/s:-O2 -g:${CFLAGS}:" {maitch,mscript}.py || die
+	sed -i \
+		-e "/LDFLAGS/s:'':'${LDFLAGS}':" \
+		-e 's:--mode=link:--mode=link --tag=CC:' \
+		maitch.py || die
+}
+
+src_configure() {
+	local myconf=( --prefix=/usr --docdir=/usr/share/doc/${PF} --destdir="${D}" )
+	use nls || myconf+=( --disable-gettext --disable-po4a --disable-translations )
+	use gtk3 || myconf+=( --disable-gtk3 )
+	./mscript.py configure "${myconf[@]}"
+}
+
+src_compile() { ./mscript.py build; }
+src_install() { ./mscript.py install; }
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }