Permalink
Browse files

awesome: removed 3.4.7-r2, added 3.4.8, updated 9999

3.4.8: ooo patch
9999: removed -not required anymore- deprecated lua USE dep
  • Loading branch information...
1 parent 227730a commit 18974311bfd76785f59495e466e2f8f6714d3901 @wired committed Oct 13, 2010
Showing with 26 additions and 106 deletions.
  1. +3 −3 x11-wm/awesome/Manifest
  2. +0 −99 x11-wm/awesome/awesome-3.4.7-r2.ebuild
  3. +23 −4 x11-wm/awesome/awesome-9999.ebuild
@@ -5,6 +5,6 @@ AUX awesome-3.4.3-qt-xinerama-fix.patch 850 RMD160 e344db4fb9b88a1ec26f647bf7f31
AUX awesome-3.4.7-fix-multiscreen-window-placement.patch 1012 RMD160 92086374c413afdc125c6dbac082bbbfe5147c9d SHA1 ea6455383c469ac175d37f8ce4866e5516488897 SHA256 45f8d40bf4ae08ccd436527e2fe458f882c6e3b350c6c1afbb4eaa25c159c883
AUX awesome-session 1999 RMD160 2a92c71209f81ecaa302e03974b2f44e380abf38 SHA1 8d86595e00759508a5f20f54dab46d2c143c5033 SHA256 bee150a5b32a118c905ffe26df3f776f40a2db19230f6600cc2966b6c727838a
AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
-DIST awesome-3.4.7.tar.bz2 740612 RMD160 dc92977888c372d63bbfdc72919d6263733e3bd1 SHA1 c8e21323d4338be9b16e14890f54caf2ba1729ac SHA256 9284dd19fe6b8d2c6dbf1baaaef663998534f07ee958b7f52328973358771a45
-EBUILD awesome-3.4.7-r2.ebuild 2313 RMD160 5add9f7ce8ae645a501820f2b8c3b6e2f9fd10fd SHA1 3ed7e54799fc47ecbd34933557d4ebefbb2f8487 SHA256 4933edd2abfe4b0e6b72a00d5e95d6eba073cdd26f4d601c0f5c3fb708fd6aac
-EBUILD awesome-9999.ebuild 2152 RMD160 77b3a18837f616cb927f52d23b9d53b768803721 SHA1 c378b0d366c553981a580f818f1c688e535f0f30 SHA256 ca84599d3c96bae8436234779bc128dfdb2163b1ee6bdf750ad67175e17fc6d3
+DIST awesome-3.4.8.tar.bz2 741506 RMD160 f97c31631e81c003b7fc90e582d7d8bcae40981f SHA1 23748bccd8bd4999107354a24173811cbdc85740 SHA256 457b639779053a28d39a0039cdc2d76e6b1ae358b2b0d34467a05a75e959ff66
+EBUILD awesome-3.4.8.ebuild 2807 RMD160 66f7e9a442e2464494d68247a6c8466582949d1b SHA1 931f41c59ee2679a7fce6f526493ee8c69abc794 SHA256 64b5c8e771abb1a461d28c74b1c06182425c57f5d38d10eb34b6f9a6111a69c3
+EBUILD awesome-9999.ebuild 2690 RMD160 4e2f37ac435bcd4a761acbff9554fe3dffbd6d16 SHA1 f7125d6ff9d89d464f97f65057b88af74c071d9a SHA256 b59915729a7fe3b5397649e40694ced0bfc9e4cdd0d4ffaba31b667d1ac429e6
@@ -1,99 +0,0 @@
-# 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.5.ebuild,v 1.1 2010/05/12 13:47:21 matsuu Exp $
-
-EAPI="3"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD bash-completion"
-
-RDEPEND="
- >=dev-lang/lua-5.1[deprecated]
- dev-libs/libev
- >=dev-libs/libxdg-basedir-1
- media-libs/imlib2[png]
- x11-libs/cairo[xcb]
- || ( >x11-libs/libX11-1.3.5 <=x11-libs/libX11-1.3.5[xcb] )
- >=x11-libs/libxcb-1.4
- >=x11-libs/pango-1.19.3
- >=x11-libs/startup-notification-0.10
- >=x11-libs/xcb-util-0.3.6
- dbus? ( >=sys-apps/dbus-1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-DEPEND="${RDEPEND}
- >=app-text/asciidoc-8.4.5
- app-text/xmlto
- dev-util/gperf
- dev-util/pkgconfig
- media-gfx/imagemagick[png]
- >=x11-proto/xcb-proto-1.5
- >=x11-proto/xproto-7.0.15
- doc? (
- app-doc/doxygen
- dev-util/luadoc
- media-gfx/graphviz
- )"
-
-RDEPEND="${RDEPEND}
- app-shells/bash
- bash-completion? ( app-shells/bash-completion )
- || (
- x11-misc/gxmessage
- x11-apps/xmessage
- )"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.4.2-backtrace.patch"
-
- # kill handling of NET_CURRENT_DESKTOP
- # temp fix for openoffice bug #109550
- # doesn't seem to break anything else
- epatch "${FILESDIR}/${PN}-3.4.3-net-current-desktop-ooo.patch"
-
- epatch "${FILESDIR}/${P}-fix-multiscreen-window-placement.patch"
-}
-
-src_configure() {
- mycmakeargs="-DPREFIX=/usr
- -DSYSCONFDIR=/etc
- $(cmake-utils_use_with dbus DBUS)
- $(cmake-utils_use doc GENERATE_LUADOC)"
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- local myargs="all"
-
- if use doc ; then
- myargs="${myargs} doc"
- fi
- cmake-utils_src_make ${myargs}
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc ; then
- (
- cd "${CMAKE_BUILD_DIR}"/doc
- mv html doxygen
- dohtml -r doxygen || die
- )
- mv "${ED}"/usr/share/doc/${PN}/luadoc "${ED}"/usr/share/doc/${PF}/html/luadoc || die
- fi
- rm -rf "${ED}"/usr/share/doc/${PN} || die
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN} || die
-}
@@ -17,7 +17,7 @@ KEYWORDS=""
IUSE="dbus doc elibc_FreeBSD bash-completion"
RDEPEND="
- >=dev-lang/lua-5.1[deprecated]
+ >=dev-lang/lua-5.1
dev-libs/libev
>=dev-libs/libxdg-basedir-1
dev-libs/oocairo
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
app-text/xmlto
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? (
@@ -54,6 +54,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"
src_unpack() {
@@ -63,8 +82,8 @@ src_unpack() {
}
src_configure() {
- mycmakeargs="-DPREFIX=/usr
- -DSYSCONFDIR=/etc
+ mycmakeargs="-DPREFIX=${EPREFIX}/usr
+ -DSYSCONFDIR=${EPREFIX}/etc
$(cmake-utils_use_with dbus DBUS)
$(cmake-utils_use doc GENERATE_LUADOC)"

0 comments on commit 1897431

Please sign in to comment.