Update live ebuild.

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

3 files changed, 30 insertions, 22 deletions

diff --git a/x11-wm/subtle/ChangeLog b/x11-wm/subtle/ChangeLog
index 7fe1f822ea19..fd85d630756f 100644
--- a/x11-wm/subtle/ChangeLog
+++ b/x11-wm/subtle/ChangeLog
@@ -1,6 +1,9 @@
 # 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.4 2012/06/20 19:33:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/subtle/ChangeLog,v 1.5 2012/06/20 19:40:15 radhermit Exp $
+
+  20 Jun 2012; Tim Harder <radhermit@gentoo.org> subtle-9999.ebuild:
+  Update live ebuild.
 
 *subtle-0.11.3224 (20 Jun 2012)
 
diff --git a/x11-wm/subtle/Manifest b/x11-wm/subtle/Manifest
index b90a036eb381..a49e8b0692df 100644
--- a/x11-wm/subtle/Manifest
+++ b/x11-wm/subtle/Manifest
@@ -6,17 +6,17 @@ DIST subtle-0.10.3008-nu.tbz2 141363 RMD160 6915726728be22af030060c8cd428983a65d
 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 841 RMD160 5e56ba7bea8cfec9f8098654646abd53143dc16d SHA1 b3dd0b19e4cfcd002612bf7daeea58b0782e74a3 SHA256 575a3e43886734aa2388ed84d9fe49cf2614f96ac9ab3bb054d7b7b9b3df1b31
+EBUILD subtle-9999.ebuild 1919 RMD160 98b3efd879f790f7dbc4928fad2506a809bc9b86 SHA1 a07cb44ccdd9280f4c07250eaadfbee69e2ca520 SHA256 44954875ee0e2b56fd13b8629fdcbbc0687d4ef1ff9a9c61614a5df846222b27
+MISC ChangeLog 933 RMD160 29cdcf12067567f969b367f13ae650defc7706e7 SHA1 02660fdd40556afcb2d8b02f184e1f117fc082b8 SHA256 6fcb553c2dc4cbf68011a2ee28d03d72118df39bf08e933c9fce6acb560a2db5
 MISC metadata.xml 1136 RMD160 87d660cfdd159b1c9865bb7e2f9aa77317a8c944 SHA1 a297627f8b324873dc3f59c81ae2adb8c1bc1470 SHA256 19f442329c960be6f9c49347a9dab2c7bfa2971a1736efc7d7db5cfd44cf82e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP4iWZAAoJEEqz6FtPBkyjzVEIAJQxFNYNmpE0jLFanyjh6Vyf
-TnenkOGYA3ZxngMHROkhIh3+6ipoSNx3CQndSxajhUNauEOFIe5eIIgMFTgR11lV
-X1VV+u4Hv4fBdpIq5q2egcoHGDrl3Y24/S1oQFClRqfr+OLrlVHogTBNCE+iqR/R
-ILr4qDWlE+0el6B92QIJzSlfTRTB0rdlOULWgS4GxtxWzFQtz7fZZt37P4Hps9+C
-V4SzQzJK0j926B8n6U9m/DMinrdSc16jD+df78xJfoDwt/I7b4Op7c+NE7A3djsX
-34rKm0Z5tqfndDvGA70aQ1RvX+5wvO8LSUt5sRZLrpPYa1DH4ikCkKwzcf7bJD0=
-=vF2E
+iQEcBAEBCgAGBQJP4iclAAoJEEqz6FtPBkyjRkcIAIxMhzEZKoWIDTxHWD3Bzzh5
+zEpywQKou0/x15QqmICxxAGyZ0EOha4NJJAOy38OY9tQ0i+icESxLIwmv3ZDvUdc
+YefB+ATKFr2KwAPghUBuS/uhAXxxnWH/ljIxrBhXEgNbO2TkOCMHJq9eLgMOKhV1
+QpkxNpAIaLmZ+snhHf7JHeEm+Wjx3TOEVeoFFwv9MdMlsyGLW2NIEFQJVap1c8P2
+PyJ/jQBUNiofk728bRw5+8+lem7vYN+asejnrBIX8T2ZJcoFhsDFOhhBZLUdipEX
+b8yavRZ2fo2wbHfQmFsa55nTtZknyNpRVJCJUhNJVxG9/u0psuUchKu65vQDzBM=
+=Nuit
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/subtle/subtle-9999.ebuild b/x11-wm/subtle/subtle-9999.ebuild
index d1db0358a5c9..b6b5e4eed766 100644
--- a/x11-wm/subtle/subtle-9999.ebuild
+++ b/x11-wm/subtle/subtle-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-9999.ebuild,v 1.4 2011/10/29 05:38:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/subtle/subtle-9999.ebuild,v 1.5 2012/06/20 19:40:15 radhermit Exp $
 
 EAPI="4"
 USE_RUBY="ruby19"
 
-inherit mercurial ruby-ng
+inherit mercurial ruby-ng toolchain-funcs
 
 EHG_REPO_URI="http://hg.subforge.org/subtle"
 
@@ -24,7 +24,8 @@ RDEPEND="x11-libs/libX11
 	xpm? ( x11-libs/libXpm )
 	xtest? ( x11-libs/libXtst )
 	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 ruby_add_rdepend "dev-ruby/archive-tar-minitar"
 ruby_add_bdepend "dev-ruby/rake"
@@ -42,15 +43,19 @@ each_ruby_configure() {
 	use xtest && myconf+=" xtest=yes" || myconf+=" xtest=no"
 	use xrandr && myconf+=" xrandr=yes" || myconf+=" xrandr=no"
 
-	${RUBY} -S rake destdir="${D}" ${myconf} config || die
+	${RUBY} -S rake -v CC="$(tc-getCC)" destdir="${D}" ${myconf} config || die
 }
 
 each_ruby_compile() {
-	${RUBY} -S rake build || die
+	${RUBY} -S rake -v build || die
+}
+
+all_ruby_compile() {
+	use doc && { rake rdoc || die ; }
 }
 
 each_ruby_install() {
-	${RUBY} -S rake install || die
+	${RUBY} -S rake -v install || die
 }
 
 all_ruby_install() {
@@ -61,15 +66,15 @@ all_ruby_install() {
 	EOF
 	fperms a+x /etc/X11/Sessions/${PN}
 
+	insinto /usr/share/xsessions
+	doins data/${PN}.desktop
+
 	dodoc AUTHORS NEWS
 
-	if use doc ; then
-		rake rdoc || die
-		dohtml -r html/*
-	fi
+	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 yet."
+	elog "is not in the tree."
 }