Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 127 insertions, 21 deletions

diff --git a/x11-wm/subtle/ChangeLog b/x11-wm/subtle/ChangeLog
index 77c37dbfcb61..f17b1f337874 100644
--- a/x11-wm/subtle/ChangeLog
+++ b/x11-wm/subtle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/subtle
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/subtle/ChangeLog,v 1.6 2012/09/18 23:02:48 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/subtle/ChangeLog,v 1.7 2015/08/03 01:07:21 radhermit Exp $
+
+*subtle-0.11.3244 (03 Aug 2015)
+
+  03 Aug 2015; Tim Harder <radhermit@gentoo.org> +subtle-0.11.3244.ebuild,
+  subtle-9999.ebuild:
+  Version bump.
 
   18 Sep 2012; Tim Harder <radhermit@gentoo.org>
   files/subtle-0.11.3224-flags.patch:
diff --git a/x11-wm/subtle/Manifest b/x11-wm/subtle/Manifest
index b4b2ce77d004..2ca716e69618 100644
--- a/x11-wm/subtle/Manifest
+++ b/x11-wm/subtle/Manifest
@@ -4,19 +4,21 @@ Hash: SHA256
 AUX subtle-0.11.3224-flags.patch 1012 SHA256 7260f5d38a52ea1446cf6b2c50a8cc369ed820a8ea36a812c8425a831a02db9e SHA512 eb7e691603572eebf050155401c58fb3d186a9f5c84a872876d7ca739253907cd467786868d3cf87da44acf03b9ba0d31c9df7764e14c4193126ed746b32fca3 WHIRLPOOL e7df8909f123b986a9bd61e705d9a036f7ff3cc203a4fbe8857c6bda078ec3bf3480b921f0e4499b20656e4aba6c61a1b7a5dcb8192ecff1108cf05c24b3f887
 DIST subtle-0.10.3008-nu.tbz2 141363 SHA256 04f21c623715743719628dab11ac5ed542e724cef7590f5b084cd6d04d24f19e SHA512 2ac3b5cf8ec1ddf915fb30485af85df04e1461af56c6efcae44bdef6d8b13ca0cd9b2d1f7994546856250c05011d615a83bd15ee06cc3327f5382e23c96ca6bb WHIRLPOOL a1ff6b50011c0cb300bebf74b82a50266edba14237b2c52383a76ff41c6c42c2e8cef235a83e87bf529eb96cd5c4ec1a63285a7012286e0e0148b348e68ea11f
 DIST subtle-0.11.3224-xi.tbz2 144607 SHA256 a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2 SHA512 71612b49031ada0b12eacc29f193dd9be75dcc50a80206ea31cce875443d9ac134362135223aeb9c988da7dfca6759d166aacfd24286ae27ea00825c2447f607 WHIRLPOOL 85f0dc96396443d32a350636a277879dd96080011b280bf61bd9aa1e0b2a41f250da54eda45ef708b2adc7f8ffa2b25027e8fe716bc072d2fbf1be75c4c7ad37
+DIST subtle-0.11.3244.tar.gz 190549 SHA256 63f0a33ca187123f05f4f98b57fa05835d594ae9f018298e7e76e9a0be3f08b8 SHA512 3d6edd5cb1b5dcd058caeddf3ead024c7cce39684baca8bac9709683ce3130a5c8433cbe046d28dc7420637dd855a2b6775638097f78a5e701bb85e505e8167c WHIRLPOOL 1e555dbd211247c1c771dcd70a89fe0413bf4e0ad4255da0187c74dd05b22aeea738a299cf6b9eb0edb7801ab5b15e6e1f98d556fcd8ac654b3ed69a2a56dfbb
 EBUILD subtle-0.10.3008.ebuild 1782 SHA256 b6713f5e9784397edb54dbe17b5def8f8e6a6d58698c44a5997d3d5a38c07793 SHA512 5766fc4f1cd03ba4e03580688c18cc4c60fa873d2b23f7c97d6125cba25cde67cb74b6b37b1a4ab52a789648534b7b414040e65b79c9966debcdc50a2f41cfd8 WHIRLPOOL 943c8a484649aa8b8a9f39929f2cf13645b690767df451b41b778e14196b20e7fda8820a6559d69ca81ca191b845688ef2cb8d49d260cbc40f44ba150091ea40
 EBUILD subtle-0.11.3224.ebuild 1972 SHA256 38bf577108218e675c30688d9955a43611be7921ca457a49a42deb8d36d986eb SHA512 1a58054cb2a614c1939e938a0e4c863e64de1439e67feae8dc9fcf8fe455a81840d0a7465de779dd85c1c31f352fc00eb3026d86e879595c8419fdacf6ca9158 WHIRLPOOL 5a7d119f10d7610805357105489a5176a92fef3ae1c4822021c9522aafff556ca41d9d3d38a1964d090bfb8acd8f5d6660d3ba19ee7f592aac7e32786ecc697e
-EBUILD subtle-9999.ebuild 1919 SHA256 44954875ee0e2b56fd13b8629fdcbbc0687d4ef1ff9a9c61614a5df846222b27 SHA512 513215bba6f2bb7acc23f5bd4ec12dedfb7c9b31cafdad7a8d986fc777c122abe54de8d97ce078023ef989506b756c9931d566f82dfaa0f94f8a2df1c33c4a7b WHIRLPOOL bd833ad531b9f92312b28a16a55918f50f99c821d59cfc1be212517c0fdfb17b092ccc8360479d2a8bdadc84949ccf0bb069cfa17461cbc6ac5811b5018a0924
-MISC ChangeLog 1050 SHA256 ca0129f4a0abfc00ca1ab94551aaf9ff110b6e5c1aac24ec49907671d5786f37 SHA512 32ded4692e9b5d44498393e47b70bc1fc5534f0d0bb199e085086e7dbc39fe1deb126572650d253199db1172010b2ab929e358f249aed4a5dff762e722f9dfba WHIRLPOOL 4830ff76959a7357f71a6489a897e2b3d4a2a168a6f4fcf5434b023ae238c1b285aa5a29032916ab4d1e6c6a5dcae213d9885be87a387a2c8bf9de016e5ac6ec
+EBUILD subtle-0.11.3244.ebuild 2129 SHA256 6394e2315dbb410cd96ba224769815b85615a2a6034483db6f3ae992f7526de5 SHA512 03e901a4c4b526d7f269dd183de314318e9d630fb0156a04b548372567c448dc4c1d7c0d4d8754934da22043601b5b460b9eeb877568e5fe87d51395f9304e3d WHIRLPOOL 3cf491ce13802505cf20b3e61f6e7975c74008ad8ab17491f50eadb3024fee047141374f99bdecdae29337b0f68c3bb6620ffeeb6abed173b9dad4ef348d4bc3
+EBUILD subtle-9999.ebuild 2124 SHA256 e341bc2c0666dfd02713de2e51364286b5139bff534fbffb5d887ed7693552b1 SHA512 b1928e211c9cccd4d0fb6909df7d5fc03051bef50d6b578f9e99dbe3cabb33c675823487f7d329e4c108d353655f655617ac6232e3b8641163e9ccb013073146 WHIRLPOOL 35fade5567ff88ffa6e5991bccd93b70d1b4f22d77dc6a73d86352f57d455944b7c87431c7773a1b9f878115b1033f4902a26a72721a788522b83fb075505b4f
+MISC ChangeLog 1197 SHA256 43e1048aae815ee7e15d574d5929f219863a4bfe2bfd94baa676b4c8b0d7c941 SHA512 62f1ed9c85df0fd75041ba38fe881cc9ca4fe5942df7d075469ee90f41c81cb67628bf9b2e328c75dd852679aa5746a04116acf91610ef4a1cf87bdcbb24e74f WHIRLPOOL abe062dee7933874f225ddf791e9b2fa0b1e9bb521c565f19a48f90ec39152f206a29fd7e299c8c66a37bb13cae7739734063ab5794d506f26ea12953ca380d2
 MISC metadata.xml 1136 SHA256 19f442329c960be6f9c49347a9dab2c7bfa2971a1736efc7d7db5cfd44cf82e7 SHA512 b8a1df2da6adee302bc4585174e9204ed8ea8d17d287cc079a2219b03f213adcecb8e22945250ea6fc709b34b55043bd9a085769d17ebc5af11164078db70069 WHIRLPOOL ce3b3053197f032af0ebbb7973d04eec702ca0c6f79fdfd66461b35a9dd9a56351acfbb61436810dea25010476460b15fe08869ceb76b7ae2be2833762d719c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJQWP2eAAoJEEqz6FtPBkyjjwIH/3pXgTvesiHxR2UB/jBTselj
-gr31MMROZmO+8UUj5XJOSpqneIV9Fu/VRI3u3WqrKCEZGjphIH78EtIRmHmxeAXA
-1JoPaS03ewwIiSiKYSDeWb3IIttaKX1wKRoF6KtbKwnj8iDI7QV1EKu8pqU0FuTX
-KrYGxyOiCclOWvCeOiqxj4BLs7eGVp+9E5892lPTuMug2tQXTG6LB0xDrfpJC2Le
-wIPAyMwke4wjyANt9L5dqk+ST2prJx46KSJz5T1dxmSovJvExhdh7LShKouf0n9u
-fPrhd78Iwc4SrXcM7hAQd5iQ4NV4IKQK3WjfR3SjQVT5uFJuNZNGUNFTjHZ6DaY=
-=1u38
+iQEcBAEBCAAGBQJVvr7LAAoJEEqz6FtPBkyjMdwH+wRmxNx0yQUBOGoFkAZJkJnu
+xfEXOxS0LuRGrskroGXQgRp4sbYe6o89A7UznYYIS/5NXKr8J3EjOscRl6YQMY1+
+ep6G8scBLEhXtpSU9RCOuj2krpzzez6eDytLlie032jfrE9sXECJG5pff2EYZToh
+1/NI7rWg+Im29HeSAirsshaOVBLt2RPPnKnnJ1KbDJfHBvLhCIVdIr6qQkZLy6Bo
+eVggkodO6IzuE5DTVx+kpMSJV4SxbbEYt2CAviqCAVb9U9JFsaZRald+2Mqa0W9b
+Oz4kweeKEonwkyEBp17u1CVB2yJNDtH3Goo6uiCgHnEdxH/+IiSsCTktUa1VJvo=
+=56Hz
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/subtle/subtle-0.11.3244.ebuild b/x11-wm/subtle/subtle-0.11.3244.ebuild
new file mode 100644
index 000000000000..9bc058ac17c7
--- /dev/null
+++ b/x11-wm/subtle/subtle-0.11.3244.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/subtle/subtle-0.11.3244.ebuild,v 1.1 2015/08/03 01:07:21 radhermit Exp $
+
+EAPI="5"
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EHG_REPO_URI="http://hg.subforge.org/subtle"
+	EHG_CHECKOUT_DIR=${S}/all
+	inherit mercurial
+else
+	SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A manual tiling window manager"
+HOMEPAGE="http://subforge.org/projects/subtle/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc +xft xinerama xpm +xrandr +xtest"
+
+RDEPEND="x11-libs/libX11
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )
+	xtest? ( x11-libs/libXtst )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+ruby_add_rdepend "dev-ruby/archive-tar-minitar"
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		mercurial_src_unpack
+	else
+		default
+	fi
+}
+
+each_ruby_configure() {
+	local myconf
+	use debug && myconf+=" debug=yes" || myconf+=" debug=no"
+	use xft && myconf+=" xft=yes" || myconf+=" xft=no"
+	use xinerama && myconf+=" xinerama=yes" || myconf+=" xinerama=no"
+	use xpm && myconf+=" xpm=yes" || myconf+=" xpm=no"
+	use xtest && myconf+=" xtest=yes" || myconf+=" xtest=no"
+	use xrandr && myconf+=" xrandr=yes" || myconf+=" xrandr=no"
+
+	${RUBY} -S rake -v CC="$(tc-getCC)" destdir="${D}" ${myconf} config || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake -v build || die
+}
+
+all_ruby_compile() {
+	use doc && { rake rdoc || die ; }
+}
+
+each_ruby_install() {
+	${RUBY} -S rake -v install || die
+}
+
+all_ruby_install() {
+	dodir /etc/X11/Sessions
+	cat <<-EOF > "${D}/etc/X11/Sessions/${PN}"
+		#!/bin/sh
+		exec /usr/bin/subtle
+	EOF
+	fperms a+x /etc/X11/Sessions/${PN}
+
+	insinto /usr/share/xsessions
+	doins data/${PN}.desktop
+
+	dodoc AUTHORS NEWS
+
+	use doc && dohtml -r html/*
+}
+
+pkg_postinst() {
+	elog "Note that surserver will currently not work since dev-ruby/datamapper"
+	elog "is not in the tree."
+}
diff --git a/x11-wm/subtle/subtle-9999.ebuild b/x11-wm/subtle/subtle-9999.ebuild
index b6b5e4eed766..41331cc90f61 100644
--- a/x11-wm/subtle/subtle-9999.ebuild
+++ b/x11-wm/subtle/subtle-9999.ebuild
@@ -1,21 +1,26 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/subtle/subtle-9999.ebuild,v 1.5 2012/06/20 19:40:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/subtle/subtle-9999.ebuild,v 1.6 2015/08/03 01:07:21 radhermit Exp $
 
-EAPI="4"
-USE_RUBY="ruby19"
+EAPI="5"
+USE_RUBY="ruby20 ruby21 ruby22"
 
-inherit mercurial ruby-ng toolchain-funcs
+inherit ruby-ng toolchain-funcs
 
-EHG_REPO_URI="http://hg.subforge.org/subtle"
+if [[ ${PV} == "9999" ]]; then
+	EHG_REPO_URI="http://hg.subforge.org/subtle"
+	EHG_CHECKOUT_DIR=${S}/all
+	inherit mercurial
+else
+	SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="A manual tiling window manager"
 HOMEPAGE="http://subforge.org/projects/subtle/wiki"
-SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug doc +xft xinerama xpm +xrandr +xtest"
 
 RDEPEND="x11-libs/libX11
@@ -31,7 +36,11 @@ ruby_add_rdepend "dev-ruby/archive-tar-minitar"
 ruby_add_bdepend "dev-ruby/rake"
 
 all_ruby_unpack() {
-	mercurial_src_unpack
+	if [[ ${PV} == "9999" ]]; then
+		mercurial_src_unpack
+	else
+		default
+	fi
 }
 
 each_ruby_configure() {