Version bump.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 123 insertions, 11 deletions

diff --git a/x11-wm/subtle/ChangeLog b/x11-wm/subtle/ChangeLog
index 72116864a299..7fe1f822ea19 100644
--- a/x11-wm/subtle/ChangeLog
+++ b/x11-wm/subtle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/subtle
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/subtle/ChangeLog,v 1.3 2011/10/29 05:38:09 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/subtle/ChangeLog,v 1.4 2012/06/20 19:33:35 radhermit Exp $
+
+*subtle-0.11.3224 (20 Jun 2012)
+
+  20 Jun 2012; Tim Harder <radhermit@gentoo.org> +subtle-0.11.3224.ebuild,
+  +files/subtle-0.11.3224-flags.patch:
+  Version bump.
 
   29 Oct 2011; Tim Harder <radhermit@gentoo.org> subtle-0.10.3008.ebuild,
   subtle-9999.ebuild:
diff --git a/x11-wm/subtle/Manifest b/x11-wm/subtle/Manifest
index 8005c10ddac6..b90a036eb381 100644
--- a/x11-wm/subtle/Manifest
+++ b/x11-wm/subtle/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX subtle-0.11.3224-flags.patch 998 RMD160 721eaf3bbc263f64d705c3404d633f170babe940 SHA1 98473551e5c1b955627f8a4e82778a276370d8c4 SHA256 e84f5fb906ce944403d342891a3c7d6e9d98bfb04c68d1d679da3857bbab4314
 DIST subtle-0.10.3008-nu.tbz2 141363 RMD160 6915726728be22af030060c8cd428983a65ddee1 SHA1 3b92f006148a991bf367c2dfa58d93bdb62d5d40 SHA256 04f21c623715743719628dab11ac5ed542e724cef7590f5b084cd6d04d24f19e
+DIST subtle-0.11.3224-xi.tbz2 144607 RMD160 b1d4096fd7ca4b53f83de8eecd698bd084fb5466 SHA1 08dca9e1d4a4b138d87ed267723822e5673a9d05 SHA256 a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2
 EBUILD subtle-0.10.3008.ebuild 1782 RMD160 7b6005932b7a3a2f4d0dcfd5f115dcc6c7ca3145 SHA1 ef29ce3624d66d988655770ccb5cb5803884b51c SHA256 b6713f5e9784397edb54dbe17b5def8f8e6a6d58698c44a5997d3d5a38c07793
+EBUILD subtle-0.11.3224.ebuild 1972 RMD160 7eb1e3ca7d3beb824fdf19e597a4b572f26aa0cc SHA1 8e618781b3ab14fd91f368edf1e0e4cdc1a52325 SHA256 38bf577108218e675c30688d9955a43611be7921ca457a49a42deb8d36d986eb
 EBUILD subtle-9999.ebuild 1778 RMD160 4d07129ea8ffbc5dcc6f4176e3357183fcbdac32 SHA1 cd6203118211dfe5e493df009eeacfd3e12e5bc6 SHA256 2cf7ef014fb2e9f04aeb35abb4c1c01447257fec681402d50f7db66e36300e68
-MISC ChangeLog 677 RMD160 401622375b60635bb4244b2d8e4fddb5d2be41f0 SHA1 04c4e0d4d50ed334a4973a39dadbffe2fa056786 SHA256 fedb7dda3d4de09dcc22b4dcc19dce4aa53b3487445363e663bb8e8dfe5b5c18
+MISC ChangeLog 841 RMD160 5e56ba7bea8cfec9f8098654646abd53143dc16d SHA1 b3dd0b19e4cfcd002612bf7daeea58b0782e74a3 SHA256 575a3e43886734aa2388ed84d9fe49cf2614f96ac9ab3bb054d7b7b9b3df1b31
 MISC metadata.xml 1136 RMD160 87d660cfdd159b1c9865bb7e2f9aa77317a8c944 SHA1 a297627f8b324873dc3f59c81ae2adb8c1bc1470 SHA256 19f442329c960be6f9c49347a9dab2c7bfa2971a1736efc7d7db5cfd44cf82e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOq5FNAAoJEEqz6FtPBkyjH4EIAJXHRTwAxriJKQdXvU2OEWDs
-397W9a1Yl2sCVKuwimcrwztZ3XhkHKTP3iCBOAOXXqFo1ORY5wqMirkQzaCkE036
-9PuYoN4BgBwfF2TknCkzdixbyk+Momv+8BhPnW3lvd0EoviKNuxqo2XSCBttNU3j
-k0HLRNudVH5wjSGAm+cWhP1q548e5PDp3xAeNSuEM4uqiLy3F2bl4G2KwJAC0j9O
-Rh/nIhR/JOAGFpwcNqzibyL2isBkI5b3h9texhLer61h6LuIPuhV+guRi+nXDeJ0
-BM3ui4bz6WgOYAgbpuFV9myD8XQ+jI5jdN2vhpxLjG4Q7M1/QVJ1SpVptLzU7Jk=
-=13lP
+iQEcBAEBCgAGBQJP4iWZAAoJEEqz6FtPBkyjzVEIAJQxFNYNmpE0jLFanyjh6Vyf
+TnenkOGYA3ZxngMHROkhIh3+6ipoSNx3CQndSxajhUNauEOFIe5eIIgMFTgR11lV
+X1VV+u4Hv4fBdpIq5q2egcoHGDrl3Y24/S1oQFClRqfr+OLrlVHogTBNCE+iqR/R
+ILr4qDWlE+0el6B92QIJzSlfTRTB0rdlOULWgS4GxtxWzFQtz7fZZt37P4Hps9+C
+V4SzQzJK0j926B8n6U9m/DMinrdSc16jD+df78xJfoDwt/I7b4Op7c+NE7A3djsX
+34rKm0Z5tqfndDvGA70aQ1RvX+5wvO8LSUt5sRZLrpPYa1DH4ikCkKwzcf7bJD0=
+=vF2E
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/subtle/files/subtle-0.11.3224-flags.patch b/x11-wm/subtle/files/subtle-0.11.3224-flags.patch
new file mode 100644
index 000000000000..c8fb6554d90e
--- /dev/null
+++ b/x11-wm/subtle/files/subtle-0.11.3224-flags.patch
@@ -0,0 +1,23 @@
+--- subtle-0.11.3224-xi/Rakefile
++++ subtle-0.11.3224-xi/Rakefile
+@@ -63,9 +63,9 @@
+   "hdrdir"     => "",
+   "archdir"    => "",
+   "revision"   => "3224", #< Latest stable
+-  "cflags"     => "-Wall -Werror -Wpointer-arith -Wstrict-prototypes -Wunused -Wshadow -std=gnu99",
++  "cflags"     => "$(CFLAGS) -Wall -Wpointer-arith -Wstrict-prototypes -Wunused -Wshadow -std=gnu99",
+   "cpppath"    => "-I. -I$(builddir) -Isrc -Isrc/shared -Isrc/subtle -idirafter$(hdrdir) -idirafter$(archdir)",
+-  "ldflags"    => "-L$(libdir) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
++  "ldflags"    => "$(LDFLAGS) -L$(libdir) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
+   "extflags"   => "$(LDFLAGS) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
+   "rpath"      => "-L$(libdir) -Wl,-rpath=$(libdir)",
+   "checksums"  => []
+@@ -276,7 +276,7 @@
+ 
+     # Debug
+     if "yes" == @options["debug"]
+-      @options["cflags"] << " -g -DDEBUG"
++      @options["cflags"] << " -DDEBUG"
+     else
+       @options["cflags"] << " -DNDEBUG"
+     end
diff --git a/x11-wm/subtle/subtle-0.11.3224.ebuild b/x11-wm/subtle/subtle-0.11.3224.ebuild
new file mode 100644
index 000000000000..2c6b7daba0e0
--- /dev/null
+++ b/x11-wm/subtle/subtle-0.11.3224.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/subtle/subtle-0.11.3224.ebuild,v 1.1 2012/06/20 19:33:35 radhermit Exp $
+
+EAPI="4"
+USE_RUBY="ruby19"
+
+inherit ruby-ng toolchain-funcs
+
+GR="xi"
+
+DESCRIPTION="A manual tiling window manager"
+HOMEPAGE="http://subforge.org/projects/subtle/wiki"
+SRC_URI="http://subforge.org/attachments/download/81/${P}-${GR}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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"
+
+RUBY_S="${P}-${GR}"
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-flags.patch )
+
+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."
+}