[hackers] [gentoo] Improved 3.9-beta1 ebuild. Different wmiircs have been split into different || Armando Di Cianno

From: <hg_AT_suckless.org>
Date: Thu, 19 Nov 2009 17:59:07 +0000 (UTC)

changeset: 6:40ede889e230
tag: tip
user: Armando Di Cianno <armando_AT_goodship.net>
date: Thu Nov 19 12:58:59 2009 -0500
files: dev-ruby/configuration/Manifest dev-ruby/configuration/configuration-1.1.0.ebuild dev-ruby/inochi/Manifest dev-ruby/inochi/inochi-1.1.1.ebuild dev-ruby/launchy/Manifest dev-ruby/launchy/launchy-0.3.3.ebuild dev-ruby/rumai/Manifest dev-ruby/rumai/rumai-3.1.0.ebuild dev-ruby/rumai/rumai-3.2.0.ebuild dev-ruby/trollop/Manifest dev-ruby/trollop/trollop-1.15.ebuild x11-wm/wmii/Manifest x11-wm/wmii/files/wmii.desktop x11-wm/wmii/files/wmii.desktop.tip x11-wm/wmii/wmii-3.9_beta1.ebuild x11-wm/wmii/wmii-9999.ebuild
description:
Improved 3.9-beta1 ebuild. Different wmiircs have been split into different
packages and dependency ebuilds have been added.

diff -r 01ec893d0ae2 -r 40ede889e230 dev-ruby/configuration/Manifest
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-ruby/configuration/Manifest Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,2 @@
+DIST configuration-1.1.0.gem 9216 RMD160 62706752fa92fc6762df44192ab907a2040e5b2b SHA1 7b5ffc98f756b815507990b825df383b01542878 SHA256 3acbdb1d2d0c322af632e3f7dfdbfb706e99b28f33baf8fea65c155783253b62
+EBUILD configuration-1.1.0.ebuild 229 RMD160 6d71f8e2ad3aba6a7b71c84d7b32f70e6c163bdf SHA1 4ca18d34932a8be5903c02d6129586a6695d4180 SHA256 c6703287f862b0278559fafc9d4f9ba48c3d81016947bf8e2a6fc7f0bf5ece0c
diff -r 01ec893d0ae2 -r 40ede889e230 dev-ruby/configuration/configuration-1.1.0.ebuild
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-ruby/configuration/configuration-1.1.0.ebuild Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,16 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit gems
+
+USE_RUBY="ruby18"
+
+DESCRIPTION=""
+HOMEPAGE=""
+LICENSE=""
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
diff -r 01ec893d0ae2 -r 40ede889e230 dev-ruby/inochi/Manifest
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-ruby/inochi/Manifest Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,2 @@
+DIST inochi-1.1.1.gem 329216 RMD160 e2a0034b430e10e83706525af344f5040bcfe3bc SHA1 fcdd7ac31368e3432582b6dbc5dc9d018b69a2f9 SHA256 84964c4202fb364bd915dbbe21df774a4dc30a455dd7dc01dc34886f9b2de8ec
+EBUILD inochi-1.1.1.ebuild 287 RMD160 f8169780ac766aa79efa966669a9a1270b95cac2 SHA1 25f5872213fe2141d8000074761c422b10724bef SHA256 ef92438ef49516df433fa9b549ce2f4e835a69172e6530ac25b83475264c614b
diff -r 01ec893d0ae2 -r 40ede889e230 dev-ruby/inochi/inochi-1.1.1.ebuild
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-ruby/inochi/inochi-1.1.1.ebuild Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit gems
+
+USE_RUBY="ruby18"
+
+DESCRIPTION=""
+HOMEPAGE=""
+LICENSE=""
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ ${DEPEND}
+ dev-ruby/trollop
+ dev-ruby/launchy
+"
diff -r 01ec893d0ae2 -r 40ede889e230 dev-ruby/launchy/Manifest
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-ruby/launchy/Manifest Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,2 @@
+DIST launchy-0.3.3.gem 15872 RMD160 a760e0107b5887174e42538bd176e16da4d99c61 SHA1 b2e4e990d59c89d2a4fabf99a722586966328553 SHA256 64dfba1a020107a0fda1a5cd14c08ed8d635cfb4fc745c1df12f68edc5357f5d
+EBUILD launchy-0.3.3.ebuild 290 RMD160 93d5340cd3223de7e97ab7c71b44d75b241cde60 SHA1 ea967a486dd1c9a78136bde02e07dd8b3d961b2b SHA256 4e0c4694af12d84d1095689023fa3a5e74df0dcbfe3162bf9fc743a836d5e114
diff -r 01ec893d0ae2 -r 40ede889e230 dev-ruby/launchy/launchy-0.3.3.ebuild
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-ruby/launchy/launchy-0.3.3.ebuild Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit gems
+
+USE_RUBY="ruby18"
+
+DESCRIPTION=""
+HOMEPAGE=""
+LICENSE=""
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ ${DEPEND}
+ dev-ruby/rake
+ dev-ruby/configuration
+"
diff -r 01ec893d0ae2 -r 40ede889e230 dev-ruby/rumai/Manifest
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-ruby/rumai/Manifest Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,4 @@
+DIST rumai-3.1.0.gem 287232 RMD160 3d84118e1230cdbf6d33b81e8f476a9d634bf01c SHA1 edcac7760781217148f9ca02534008d677f2d907 SHA256 00f636ba72308d565969804e60d7728d03b7f1d8f4f8678aaf9c3655790685e0
+DIST rumai-3.2.0.gem 285696 RMD160 00848acab6987a1fdeb3ed815c2353f929889337 SHA1 152c934e0ff396c6e4586bc41fc4d73bedde87d6 SHA256 246ec67c492ae308b8a8d3616b7df33950c03166444051d7a5a64c97c97e76f3
+EBUILD rumai-3.1.0.ebuild 464 RMD160 0ff3944fa37140193b237b3ade3960a6e69c255b SHA1 11d54e7c822245e8f9edd84d42eeef8198474998 SHA256 ccf8bac4849fd5df3d57c2720b09a0c62c3048f0596c9c69e9bab066788def18
+EBUILD rumai-3.2.0.ebuild 464 RMD160 0ff3944fa37140193b237b3ade3960a6e69c255b SHA1 11d54e7c822245e8f9edd84d42eeef8198474998 SHA256 ccf8bac4849fd5df3d57c2720b09a0c62c3048f0596c9c69e9bab066788def18
diff -r 01ec893d0ae2 -r 40ede889e230 dev-ruby/rumai/rumai-3.1.0.ebuild
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-ruby/rumai/rumai-3.1.0.ebuild Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,28 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit gems
+
+USE_RUBY="ruby18"
+
+DESCRIPTION="Ruby interface to the WMII window manager."
+HOMEPAGE="http://snk.tuxfamily.org/lib/rumai"
+LICENSE="ISC"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ ${DEPEND}
+ dev-ruby/rake
+ dev-ruby/trollop
+ dev-ruby/configuration
+ dev-ruby/launchy
+ dev-ruby/inochi
+"
+RDEPEND="
+ ${DEPEND}
+ >=x11-wm/wmii-3.7
+"
diff -r 01ec893d0ae2 -r 40ede889e230 dev-ruby/rumai/rumai-3.2.0.ebuild
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-ruby/rumai/rumai-3.2.0.ebuild Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,28 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit gems
+
+USE_RUBY="ruby18"
+
+DESCRIPTION="Ruby interface to the WMII window manager."
+HOMEPAGE="http://snk.tuxfamily.org/lib/rumai"
+LICENSE="ISC"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ ${DEPEND}
+ dev-ruby/rake
+ dev-ruby/trollop
+ dev-ruby/configuration
+ dev-ruby/launchy
+ dev-ruby/inochi
+"
+RDEPEND="
+ ${DEPEND}
+ >=x11-wm/wmii-3.7
+"
diff -r 01ec893d0ae2 -r 40ede889e230 dev-ruby/trollop/Manifest
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-ruby/trollop/Manifest Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,2 @@
+DIST trollop-1.15.gem 20992 RMD160 998d01f0ee369059e93a923dbb4c7b59982f1fc9 SHA1 291a445ef14e24e691e6dc7f006c7352b632b82d SHA256 13b647dd51be5a2fc6e7c0497034e17f69fbb0bc5c715c5220b5767bbb49ad77
+EBUILD trollop-1.15.ebuild 229 RMD160 6d71f8e2ad3aba6a7b71c84d7b32f70e6c163bdf SHA1 4ca18d34932a8be5903c02d6129586a6695d4180 SHA256 c6703287f862b0278559fafc9d4f9ba48c3d81016947bf8e2a6fc7f0bf5ece0c
diff -r 01ec893d0ae2 -r 40ede889e230 dev-ruby/trollop/trollop-1.15.ebuild
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-ruby/trollop/trollop-1.15.ebuild Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,16 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit gems
+
+USE_RUBY="ruby18"
+
+DESCRIPTION=""
+HOMEPAGE=""
+LICENSE=""
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
diff -r 01ec893d0ae2 -r 40ede889e230 x11-wm/wmii/Manifest
--- a/x11-wm/wmii/Manifest Thu Nov 19 10:01:18 2009 -0500
+++ b/x11-wm/wmii/Manifest Thu Nov 19 12:58:59 2009 -0500
@@ -1,8 +1,10 @@
 AUX XSessions/wmii 24 RMD160 465c7abd7e9781008f69e19d916b169ea979f8b1 SHA1 b856f51f40b261b4c01f7180bbd850e8ae971b2f SHA256 60c560ab7fee9c6e7e0fb4c625da251e1b0ca2959e6adefece60e431ebdd040b
 AUX config.local.mk 179 RMD160 f6a550f6bde29e1c4f3b7fffbdd9a316cc8ede90 SHA1 d1859508af1dd459a40171446139b407be45b602 SHA256 70695fa8766eb936715fc12c13c7a4167e5b5a4fa8b37384a2579b69d37131a1
-AUX wmii.desktop 130 RMD160 338c701c61153324e468ec74f34ad002bb73fc92 SHA1 5c68931813df9f95991588a5604c4a54ac6aaf87 SHA256 3051043bff34ff94484884ee23d0e143d6b82952dd62db32c2f8c71e56b07cb9
+AUX wmii.desktop 121 RMD160 ce7d82f84e2ae07609d94516587cbe0d0caa96c4 SHA1 155f9f65d21929e2af359d7e6f2513adf44c8136 SHA256 36770dab753dc2e6745dac9c02bc8f76f21e44c526d6dabbae97949dbbacd8f2
+AUX wmii.desktop.orig 121 RMD160 ce7d82f84e2ae07609d94516587cbe0d0caa96c4 SHA1 155f9f65d21929e2af359d7e6f2513adf44c8136 SHA256 36770dab753dc2e6745dac9c02bc8f76f21e44c526d6dabbae97949dbbacd8f2
+AUX wmii.desktop.tip 130 RMD160 338c701c61153324e468ec74f34ad002bb73fc92 SHA1 5c68931813df9f95991588a5604c4a54ac6aaf87 SHA256 3051043bff34ff94484884ee23d0e143d6b82952dd62db32c2f8c71e56b07cb9
 DIST wmii+ixp-3.9b1.tbz 423229 RMD160 488f218db58340e8cdf3becba6e402b8af770e9e SHA1 5659f44ee2d3432ef4d08b15fc4c7304c65e1c43 SHA256 b46ecfd6edce640b19d753d79615c851349b6b1d2179368bada612ca8aab0444
-EBUILD wmii-3.9_beta1.ebuild 1407 RMD160 abde08875dc3e5f5b0198527842a8c2c4872929f SHA1 6a4347d3356040ffb61938a636dbcd09670c64d1 SHA256 23468918cc8c5cd0d742b9dc84b40c006c7d05b261fc48509edcf7853f4e5b33
-EBUILD wmii-9999.ebuild 1019 RMD160 406e269ad8ceb555b64d878707fe044c10dfb88e SHA1 cf6d4f352aea2089a72e01fda886ce92b73d98fd SHA256 bc05c743a4d2548b75d8a0ff1739d47e31835f82c1b10b8742e677d57ec38678
+EBUILD wmii-3.9_beta1.ebuild 1546 RMD160 5c4bf56533d5eb39f8225fa4adceb48991c04a98 SHA1 18adb4e35860e31fb85471d843816fb9e3921326 SHA256 acce666a4b903aec6062d0df736cc378cb47f9ee7a3f9a5f55be42ad8ad6fe9a
+EBUILD wmii-9999.ebuild 1040 RMD160 f34a8cf593f6928be473c6cc981eabd5650177f0 SHA1 d31820d8767caf2b42b9cff8696ed43071d93e94 SHA256 c425dcaf8c6108774e87a99845098ef6899f0f453415b00e85b196d698155a8b
 MISC ChangeLog 260 RMD160 1636fb5f77c5a4d0a5aab12eb8c312d11e33b8bd SHA1 70a78c939529c38086b72b7a6db30f4b1f89f4ce SHA256 051e8f27763130fe1c3a79470c84406c15ca2ed6e5146dbe54e62bf9987aed0e
 MISC metadata.xml 694 RMD160 b27e1e913d7a707733df5bb14d4e91a9a13205a8 SHA1 d138f55f94500a33f9ba7fdd23ce16c15a0064bc SHA256 1cc3ccf0aa43e62a6f2abe83e39df917e2261c6bd327a6ae2d50b0edfd3b17a8
diff -r 01ec893d0ae2 -r 40ede889e230 x11-wm/wmii/files/wmii.desktop
--- a/x11-wm/wmii/files/wmii.desktop Thu Nov 19 10:01:18 2009 -0500
+++ b/x11-wm/wmii/files/wmii.desktop Thu Nov 19 12:58:59 2009 -0500
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=wmii
-Comment=window manager improved 2 Tip
+Comment=window manager improved 2
 Exec=wmii
 TryExec=wmii
-Icon=wmii.png
-Type=XSession
+Icon=
+Type=Application
diff -r 01ec893d0ae2 -r 40ede889e230 x11-wm/wmii/files/wmii.desktop.tip
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11-wm/wmii/files/wmii.desktop.tip Thu Nov 19 12:58:59 2009 -0500
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=wmii
+Comment=window manager improved 2 Tip
+Exec=wmii
+TryExec=wmii
+Icon=wmii.png
+Type=XSession
diff -r 01ec893d0ae2 -r 40ede889e230 x11-wm/wmii/wmii-3.9_beta1.ebuild
--- a/x11-wm/wmii/wmii-3.9_beta1.ebuild Thu Nov 19 10:01:18 2009 -0500
+++ b/x11-wm/wmii/wmii-3.9_beta1.ebuild Thu Nov 19 12:58:59 2009 -0500
@@ -1,54 +1,64 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.6-r2.ebuild,v 1.3 2009/07/13 13:17:29 omp Exp $
+# $Header: $
 
 inherit eutils multilib toolchain-funcs
 
+MY_P="${PN}+ixp-${PV/_beta/b}"
+
 DESCRIPTION="A dynamic window manager for X11"
 HOMEPAGE="http://wmii.suckless.org/"
-SRC_URI="http://dl.suckless.org/wmii/wmii+ixp-3.9b1.tbz"
-S="${WORKDIR}/wmii+ixp-3.9b1"
+SRC_URI="http://dl.suckless.org/wmii/${MY_P}.tbz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
+IUSE="ruby python plan9port"
 
-DEPEND="~sys-libs/libixp-0.4
- x11-libs/libX11"
-RDEPEND="${DEPEND}
+DEPEND="
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXrandr
+ x11-libs/libXinerama
+"
+RDEPEND="
+ ${DEPEND}
         x11-apps/xmessage
         x11-apps/xsetroot
- x11-misc/dmenu
- media-fonts/font-misc-misc"
+ x11-terms/xterm
+ ruby? (
+ >=dev-ruby/rumai-3.2.0
+ >=x11-misc/dmenu-4.0
+ )
+ python? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
         unpack ${A}
         cd "${S}"
 
-# sed -i -e "s/dmenu -b/dmenu/" \
-# rc/{sh.wmii,wmiirc.sh} || die "sed failed"
-
         sed -i \
                 -e "/^PREFIX/s|=.*|= /usr|" \
                 -e "/^ ETC/s|=.*|= /etc|" \
                 -e "/^ LIBDIR/s|=.*|= /usr/$(get_libdir)|" \
+ -e "/^CFLAGS/s|+=.*|+= |" \
                 config.mk || die "sed failed"
-
- # bug 231299
- #epatch "${FILESDIR}"/${P}-64bit-safe.patch
+ # Probably should fix and add these, too
+# -e "/^CC/s|=.*|= $(tc-getCC) -c|"\
+# -e "/^LD/s|=.*|= $(tc-getCC)|"\
+# -e "/^AR/s|=.*|= $(tc-getAR) crs|"\
 }
 
 src_compile() {
- emake -j1 || die "emake failed"
+ emake -j1|| die "emake failed"
 }
 
 src_install() {
- emake -j1 DESTDIR="${D}" install || die "emake install failed"
- dodoc NOTES README TODO
-
- # Rid paths of temporary install directory. (bug #199551)
- #sed -i -e "s|${D}||g" "${D}/usr/bin/wmiistartrc"
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc NEWS NOTES README TODO
 
         echo -e "#!/bin/sh\n/usr/bin/wmii" > "${T}/${PN}"
         exeinto /etc/X11/Sessions
@@ -56,4 +66,8 @@
 
         insinto /usr/share/xsessions
         doins "${FILESDIR}/${PN}.desktop"
+
+ use ruby || rm -Rf ${D}/etc/wmii/ruby
+ use python || rm -Rf ${D}/etc/wmii/python
+ use plan9port || rm -Rf ${D}/etc/wmii/plan9port
 }
diff -r 01ec893d0ae2 -r 40ede889e230 x11-wm/wmii/wmii-9999.ebuild
--- a/x11-wm/wmii/wmii-9999.ebuild Thu Nov 19 10:01:18 2009 -0500
+++ b/x11-wm/wmii/wmii-9999.ebuild Thu Nov 19 12:58:59 2009 -0500
@@ -45,5 +45,5 @@
         doexe "${FILESDIR}/XSessions/${PN}"
 
         insinto /usr/share/xsessions
- doins "${FILESDIR}/${PN}.desktop"
+ newins "${FILESDIR}/${PN}.desktop.tip" "${PN}.desktop"
 }
Received on Thu Nov 19 2009 - 17:59:07 UTC

This archive was generated by hypermail 2.2.0 : Thu Nov 19 2009 - 18:00:08 UTC