summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2012-10-06 12:33:54 +0000
committerMichael Weber <xmw@gentoo.org>2012-10-06 12:33:54 +0000
commit386c14fbf1baf8a0599a28b8546250e6fc50ddfd (patch)
tree2ec9bf2f642f86d475b68500b1306592e32b5212
parentvirtual/awk support and move to /usr/bin (bug #426628) (diff)
downloadhistorical-386c14fbf1baf8a0599a28b8546250e6fc50ddfd.tar.gz
historical-386c14fbf1baf8a0599a28b8546250e6fc50ddfd.tar.bz2
historical-386c14fbf1baf8a0599a28b8546250e6fc50ddfd.zip
Add xmw patches as USE=-vanilla.
Package-Manager: portage-2.1.11.13/cvs/Linux x86_64
-rw-r--r--x11-wm/cwm/ChangeLog5
-rw-r--r--x11-wm/cwm/Manifest10
-rw-r--r--x11-wm/cwm/cwm-9999.ebuild17
3 files changed, 20 insertions, 12 deletions
diff --git a/x11-wm/cwm/ChangeLog b/x11-wm/cwm/ChangeLog
index 7f8b6b94b5f5..cdcc603e4dac 100644
--- a/x11-wm/cwm/ChangeLog
+++ b/x11-wm/cwm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-wm/cwm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.42 2012/07/31 00:53:35 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.43 2012/10/06 12:33:54 xmw Exp $
+
+ 06 Oct 2012; Michael Weber <xmw@gentoo.org> cwm-9999.ebuild:
+ Add xmw patches as USE=-vanilla.
31 Jul 2012; Michael Weber <xmw@gentoo.org> -cwm-4.2_p20110913-r1.ebuild,
-cwm-4.2_p20111229.ebuild, -files/cwm-4.2_p20110913-Makefile.patch:
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index f1383baa7034..86ebacb4636f 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
AUX cwm-4.2_p20111229-Makefile.patch 259 SHA256 b9259040e6475363bc9f701ccebde1db330e424bb49089170f01d8145ab0308d SHA512 d943debea5c55430b4304809bd9e0ae15d754dc6abd2a9b895f23186faaad12181f4752bf2c663f73aa99d605050c551e483556a6065e60571dc4b3a269bb610 WHIRLPOOL df8153c37b5c588385c48b4ef5131f41ccf7fe2a9022a5d5242040b3568324f9ae37b33f997c30944c674bc17845f43ba7b238f32b27b19d16e15f6aa0a3a529
DIST cwm-5.1.tar.gz 44095 SHA256 ea72081e6eafaccf6dd282524f5ce9ed2f4e6f8edc34d5aa88c941e8f398c571 SHA512 6bacd3b76aac4773c77e7216714d64f64f5b810904fb68ea62528e13a7326689ce0320b876086c044eac1cd0e24b71c541843c4c679af1184b93d9a9fe041eda WHIRLPOOL 0cb43dadc0aea17fa42168aae7b0a5bd28bab9d1587c2681a95a30ecff472627bc5d2a96a6fe7201e89c79a70b9ef729578dfbef394afcb69441bfa38d4d65df
EBUILD cwm-5.1.ebuild 866 SHA256 48d043cd4dedd988c4588059475d070e49a65cf2b0eba12c4f4fe6362cd6eea6 SHA512 b96e6c86c97cb0b772b56a19c6f2051966d534894e782d7d89fc67144174cc1f8bca3c185c11b73fc563a51196c364f3f9b4c87db884d429f0fd14dfba30e46e WHIRLPOOL 146a2ffd6ac1f953e4e57b8b1c9c5fc2c0db5a91e965ebd00d2944ff9419318f5607ad9063ff7aac5fb40ecfd2758913a664539446a05f0d0832fa942ccec2ef
-EBUILD cwm-9999.ebuild 918 SHA256 94949f89037bcdd7d97d90a36505ba649dda792a75dd15638bcf9ceee906a01e SHA512 474d1eed12a0c825287174014e803ba95f1925299b9b5e884503583eec27291808e252c4d61fb2dcac4b857888dcfd02bd551c80f5030820c64804c8e2e330f1 WHIRLPOOL fa81a15daf1ca120f6b46a62c8791ac58d242a7d48574c0cf23e7906245d10b6baedd08ecdd05676616148cea6c8acfe58d972b79f8503ef7b44dca1c8f5b103
-MISC ChangeLog 6216 SHA256 4778b1880d86f655e6505cc56f04f9223103ef5945ab2232aa20a442d9894557 SHA512 254517200a5a760b555be3b5375a461647cb1f835642811e18b27165da0ed91c08db400b4a944e08d852722fbeb781a356ceddc264836600bcc095910c938130 WHIRLPOOL ada8d871376f8cfa28b696598fd5cfedd0443d6055f6d3e5df7b977e889a448896db3785376490239e1af5ad0eb0641905b15bb834f1fda73ec3bc4c19aa04e8
+EBUILD cwm-9999.ebuild 1016 SHA256 bd21d5bcd37751ae67b4abf70887719cbe3ce430aaaadac282b2d16d1498a5d1 SHA512 fe79408cbf89c96a97003e21a2396e9c4994ab75b088dfb5f12977f4a2bcd962bad90c86cbc713ed86beacd9add3d7d1b1af45ecfa08307244e4ee6b665c5593 WHIRLPOOL 6cac5ee23528559bbdd57c7010f5b0c23be94c4cb7745278fab2d6565b1514f412bf403dd8e44d5fa07dddf0eaefbb26e7e4c1b5a408787796ef15deb6c5b4f5
+MISC ChangeLog 6315 SHA256 387f72785bba3534a4af3f51a95ddfca6240da016b06257b82425509fa1aad64 SHA512 c2ea85026a54a65832562d071550becc1b52446578124b661f25ee86c7ee001ff131119ee976150b56059032bdab2a9b0edad196c8a7f9b426531ace5b9e2c89 WHIRLPOOL 9a4dbef555eea4b9de476cc11ffc1359b9715f74192e7f7773b74957c7bd931acd6faa48535cff37409020e9208247e2e3b92c03dbe3cb30a0e2c719175c0452
MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlAXLE0ACgkQknrdDGLu8JBs5AD/Y1fkM62H4iUdOY2NB5bZ/DbC
-tvWNr6BckqBpGiBL9iEA/A3vgPNqK90ZjvxV2BZUXD8m56++HwxBGLoO1rFmymb+
-=XPmv
+iF4EAREIAAYFAlBwJVwACgkQknrdDGLu8JAq6wD+OGYq0A8RXTn0u4ocJVrQTwA5
+FOu4Qf5Jb8IesERVecQA/A5mVc/RYWlSG3uWPwfgaE30Ih/4siB3QWmQpr8l5xbY
+=u+UB
-----END PGP SIGNATURE-----
diff --git a/x11-wm/cwm/cwm-9999.ebuild b/x11-wm/cwm/cwm-9999.ebuild
index f7debac1ce83..a6e53cadb16d 100644
--- a/x11-wm/cwm/cwm-9999.ebuild
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -1,23 +1,20 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-9999.ebuild,v 1.3 2012/06/16 21:56:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-9999.ebuild,v 1.4 2012/10/06 12:33:54 xmw Exp $
EAPI=4
-EGIT_REPO_URI=https://github.com/chneukirchen/cwm.git
-EGIT_BRANCH=linux
-
inherit flag-o-matic toolchain-funcs git-2
DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
http://github.com/chneukirchen/cwm"
-SRC_URI=""
+EGIT_BRANCH=linux
LICENSE="ISC"
SLOT="0"
KEYWORDS=""
-IUSE=""
+IUSE="vanilla"
RDEPEND="x11-libs/libXft
x11-libs/libXinerama
@@ -26,6 +23,14 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
sys-devel/bison"
+pkg_setup() {
+ if use vanilla ; then
+ EGIT_REPO_URI="https://github.com/chneukirchen/cwm.git"
+ else
+ EGIT_REPO_URI="https://github.com/xmw/cwm.git"
+ fi
+}
+
src_compile() {
#append-cflags -D_GNU_SOURCE #bug 417047
emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)"