summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-10-04 17:48:57 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-10-04 17:48:57 +0000
commit9ae12e49350512ad3055f7b5f499f2ce79ad772d (patch)
tree3de464d0ad98a9f20dd88ec865db9635714c2827 /x11-wm
parentVersion bump, fixes bug #336493 of window placement. (diff)
downloadhistorical-9ae12e49350512ad3055f7b5f499f2ce79ad772d.tar.gz
historical-9ae12e49350512ad3055f7b5f499f2ce79ad772d.tar.bz2
historical-9ae12e49350512ad3055f7b5f499f2ce79ad772d.zip
Bug #321433: update RDEPEND for all bg setters. Bug #314425: allow graphicsmagick as well as imagemagick.
Package-Manager: portage-2.2_rc88/cvs/Linux x86_64
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/awesome/ChangeLog6
-rw-r--r--x11-wm/awesome/Manifest4
-rw-r--r--x11-wm/awesome/awesome-3.4.8.ebuild23
3 files changed, 28 insertions, 5 deletions
diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index e8e106c6737a..fa9082d8774d 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-wm/awesome
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.107 2010/10/04 17:31:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.108 2010/10/04 17:48:57 robbat2 Exp $
+
+ 04 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> awesome-3.4.8.ebuild:
+ Bug #321433: update RDEPEND for all bg setters. Bug #314425: allow
+ graphicsmagick as well as imagemagick.
*awesome-3.4.8 (04 Oct 2010)
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 6934b4acd79f..362386cafa13 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -12,6 +12,6 @@ EBUILD awesome-3.4.4.ebuild 2061 RMD160 23da71707c30c18fca8920be2ffda4fd42949458
EBUILD awesome-3.4.5.ebuild 2041 RMD160 15be678ca4a6564ac91b7acbff7922256065a573 SHA1 3cb70d1f63e0dd72716bd0e4035a1f51fb3730d5 SHA256 e00d2a04d491a0d81ebc3255e4669c3528db1e1f02ed06e5f1bf0fa3e5d73ec5
EBUILD awesome-3.4.6.ebuild 2064 RMD160 104628fba48c9e7f073050b4fb3d27eec4a24ec2 SHA1 4dfa1e87ef6da02b5198138e5c142777108bd000 SHA256 f7513f005f02886170aa36306e51eac22646c2eeb7b6c88afc33ab2fb01e7436
EBUILD awesome-3.4.7.ebuild 2064 RMD160 68196bdc23350bbcba0eabf6980a5be5665d257d SHA1 da49d41e8c5641ad5124f73bd964b05fcbaaf5c9 SHA256 2288c02f793026463366a037275780fd55c44fbb4063be13aae1b9295b7fc7a6
-EBUILD awesome-3.4.8.ebuild 2062 RMD160 0e939ee0fbd19b9d4f818659a5090312128f897d SHA1 47b1c192e57115b5bc83e82246fab4128e44edfe SHA256 6c55f27eb182c8087077e0dcf9294f890e0551e345957f8056dcf486aa064a59
-MISC ChangeLog 15674 RMD160 0d8c395ba932ee3fa745616328fc391a572dada1 SHA1 74583cc12b15209615f8de238dbe39e8c5152cf5 SHA256 345480335d79ed7a9341e20fb0f4515ea438b1a98324f67a16610026084098f5
+EBUILD awesome-3.4.8.ebuild 2595 RMD160 b6eb356c075476eb7f40032b3e63256991b5bcd1 SHA1 3ca07dc624d142f261bce133767f3682127ca114 SHA256 3f5f145bc7b2552fda097c1886461561eb1184d735b51828cc3a7033262f8aa7
+MISC ChangeLog 15860 RMD160 b6950800994474fd12566f04340ff6fd6a04b9b3 SHA1 b7d7ecead9a0ed2a9868fa5c644eb37c3f08c0e2 SHA256 a4094c473687c4fcd14a112e8fec972aaf0641ff1d815534ccd16378d0b78261
MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
diff --git a/x11-wm/awesome/awesome-3.4.8.ebuild b/x11-wm/awesome/awesome-3.4.8.ebuild
index f8ececa7fd52..d240a49d660c 100644
--- a/x11-wm/awesome/awesome-3.4.8.ebuild
+++ b/x11-wm/awesome/awesome-3.4.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.1 2010/10/04 17:31:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.2 2010/10/04 17:48:57 robbat2 Exp $
EAPI="3"
inherit cmake-utils eutils
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
>=dev-util/cmake-2.6
dev-util/gperf
dev-util/pkgconfig
- media-gfx/imagemagick[png]
+ || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )
>=x11-proto/xcb-proto-1.5
>=x11-proto/xproto-7.0.15
doc? (
@@ -50,6 +50,25 @@ RDEPEND="${RDEPEND}
x11-apps/xmessage
)"
+# bug #321433: Need one of these to for awsetbg.
+# imagemagick provides 'display' and is further down the default list, but
+# listed here for completeness. 'display' however is only usable with
+# x11-apps/xwininfo also present.
+RDEPEND="${RDEPEND}
+ || (
+ ( x11-apps/xwininfo
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+ )
+ x11-misc/habak
+ media-gfx/feh
+ x11-misc/hsetroot
+ media-gfx/qiv
+ media-gfx/xv
+ x11-misc/xsri
+ media-gfx/xli
+ x11-apps/xsetroot
+ )"
+
DOCS="AUTHORS BUGS PATCHES README STYLE"
mycmakeargs="-DPREFIX=${EPREFIX}/usr