public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/hardened-dev:uclibc commit in: x11-wm/awesome/, x11-wm/awesome/files/
@ 2013-05-29  2:52 Anthony G. Basile
  0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2013-05-29  2:52 UTC (permalink / raw
  To: gentoo-commits

commit:     6ca5a1809bbea1eeeb6ca6edd558896f0e53990a
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 02:52:20 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed May 29 02:52:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=6ca5a180

x11-wm/awesome: lost interest in pushing awesome through

Package-Manager: portage-2.1.11.62
RepoMan-Options: --force
Manifest-Sign-Key: 0xF52D4BBA

---
 x11-wm/awesome/awesome-3.4.11-r99.ebuild           | 121 ---------------------
 .../files/awesome-3.4.11-convert-path.patch        |  18 ---
 .../files/awesome-3.4.11-remove-backtrace.patch    |  22 ----
 x11-wm/awesome/files/awesome-3.4.2-backtrace.patch |  18 ---
 x11-wm/awesome/files/awesome-glib-fix.patch        |  13 ---
 .../awesome/files/awesome-gnome-xsession.desktop   |   7 --
 x11-wm/awesome/files/awesome-gnome.desktop         |   7 --
 x11-wm/awesome/files/awesome-gnome.session         |   6 -
 x11-wm/awesome/files/awesome-session               |  90 ---------------
 x11-wm/awesome/files/awesome.desktop               |   8 --
 x11-wm/awesome/metadata.xml                        |  13 ---
 11 files changed, 323 deletions(-)

diff --git a/x11-wm/awesome/awesome-3.4.11-r99.ebuild b/x11-wm/awesome/awesome-3.4.11-r99.ebuild
deleted file mode 100644
index 9c9d769..0000000
--- a/x11-wm/awesome/awesome-3.4.11-r99.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.11.ebuild,v 1.10 2012/05/11 07:29:16 ago Exp $
-
-EAPI="3"
-CMAKE_MIN_VERSION="2.8"
-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 x86"
-IUSE="dbus doc elibc_FreeBSD"
-
-COMMON_DEPEND=">=dev-lang/lua-5.1
-	dev-libs/libev
-	>=dev-libs/libxdg-basedir-1
-	media-libs/imlib2[png]
-	x11-libs/cairo[xcb]
-	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
-	>=x11-libs/libxcb-1.6
-	>=x11-libs/pango-1.19.3
-	>=x11-libs/startup-notification-0.10_p20110426
-	>=x11-libs/xcb-util-0.3.8
-	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
-	>=app-text/asciidoc-8.4.5
-	app-text/xmlto
-	dev-util/gperf
-	virtual/pkgconfig
-	media-gfx/imagemagick[png]
-	>=x11-proto/xcb-proto-1.5
-	>=x11-proto/xproto-7.0.15
-	doc? (
-		app-doc/doxygen
-		dev-lua/luadoc
-		media-gfx/graphviz
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		x11-misc/gxmessage
-		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_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-3.4.2-backtrace.patch"
-
-	# bug #396417
-	epatch "${FILESDIR}/${PN}-glib-fix.patch"
-
-	# bug  #408025
-	epatch "${FILESDIR}/${P}-convert-path.patch"
-
-	epatch "${FILESDIR}/${P}-remove-backtrace.patch"
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
-		-DSYSCONFDIR="${EPREFIX}"/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
-}

diff --git a/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch b/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch
deleted file mode 100644
index f06739c..0000000
--- a/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Mar 13 12:55:00 UTC 2012
-Subject: build system
-
-https://bugs.gentoo.org/show_bug.cgi?id=408025
-fix compilation when dev-libs/libee is installed
-
---- awesomeConfig.cmake
-+++ awesomeConfig.cmake
-@@ -57,7 +57,7 @@
- a_find_program(LUA_EXECUTABLE lua FALSE)
- a_find_program(LUADOC_EXECUTABLE luadoc FALSE)
- # theme graphics
--a_find_program(CONVERT_EXECUTABLE convert TRUE)
-+a_find_program(CONVERT_EXECUTABLE bin/convert TRUE)
- # doxygen
- include(FindDoxygen)
- # pkg-config

diff --git a/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch b/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch
deleted file mode 100644
index e5ee561..0000000
--- a/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur awesome-3.4.11.orig/awesomeConfig.cmake awesome-3.4.11/awesomeConfig.cmake
---- awesome-3.4.11.orig/awesomeConfig.cmake	2012-10-27 21:02:13.000000000 -0400
-+++ awesome-3.4.11/awesomeConfig.cmake	2012-10-27 21:02:47.000000000 -0400
-@@ -192,12 +192,12 @@
- endif()
- 
- # Check for backtrace
--include(CheckFunctionExists)
--CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
--if(NOT HAVE_BACKTRACE)
--    a_find_library(LIB_EXECINFO execinfo)
--    set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO})
--endif()
-+#include(CheckFunctionExists)
-+#CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
-+#if(NOT HAVE_BACKTRACE)
-+#    a_find_library(LIB_EXECINFO execinfo)
-+#    set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO})
-+#endif()
- 
- # Error check
- if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug

diff --git a/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch b/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch
deleted file mode 100644
index 4d481ea..0000000
--- a/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur awesome-3.4.2.orig/awesomeConfig.cmake awesome-3.4.2/awesomeConfig.cmake
---- awesome-3.4.2.orig/awesomeConfig.cmake	2009-11-27 04:03:25.000000000 +0900
-+++ awesome-3.4.2/awesomeConfig.cmake	2009-11-28 01:17:01.639797168 +0900
-@@ -167,6 +167,14 @@
- # Check for libev
- a_find_library(LIB_EV ev)
- 
-+# Check for backtrace
-+include(CheckFunctionExists)
-+CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
-+if(NOT HAVE_BACKTRACE)
-+    a_find_library(LIB_EXECINFO execinfo)
-+    set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO})
-+endif()
-+
- # Error check
- if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
-     message(FATAL_ERROR "lua library not found")

diff --git a/x11-wm/awesome/files/awesome-glib-fix.patch b/x11-wm/awesome/files/awesome-glib-fix.patch
deleted file mode 100644
index e3e6fcf..0000000
--- a/x11-wm/awesome/files/awesome-glib-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
->=glib-2.31 build fix
-
---- a/spawn.c
-+++ b/spawn.c
-@@ -24,7 +24,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- 
--#include <glib/gspawn.h>
-+#include <glib.h>
- 
- #include "spawn.h"
- #include "screen.h"

diff --git a/x11-wm/awesome/files/awesome-gnome-xsession.desktop b/x11-wm/awesome/files/awesome-gnome-xsession.desktop
deleted file mode 100644
index 9f3d67b..0000000
--- a/x11-wm/awesome/files/awesome-gnome-xsession.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry] 
-Encoding=UTF-8
-Name=Awesome GNOME
-Comment=GNOME with highly configurable window manager awesome
-TryExec=gnome-session
-Exec=gnome-session --session=awesome-gnome
-Type=XSession

diff --git a/x11-wm/awesome/files/awesome-gnome.desktop b/x11-wm/awesome/files/awesome-gnome.desktop
deleted file mode 100644
index ec2f237..0000000
--- a/x11-wm/awesome/files/awesome-gnome.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Awesome
-Comment=The awesome launcher!
-TryExec=awesome
-Exec=awesome

diff --git a/x11-wm/awesome/files/awesome-gnome.session b/x11-wm/awesome/files/awesome-gnome.session
deleted file mode 100644
index dd0c01b..0000000
--- a/x11-wm/awesome/files/awesome-gnome.session
+++ /dev/null
@@ -1,6 +0,0 @@
-[GNOME Session]
-Name=Awesome session
-RequiredComponents=gnome-settings-daemon;
-RequiredProviders=windowmanager;notifications;
-DefaultProvider-windowmanager=awesome-gnome
-DefaultProvider-notifications=notification-daemon

diff --git a/x11-wm/awesome/files/awesome-session b/x11-wm/awesome/files/awesome-session
deleted file mode 100644
index fe76946..0000000
--- a/x11-wm/awesome/files/awesome-session
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-# Awesome Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1
-
-# redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.awesome-errors" "${TMPDIR-/tmp}/awesome-$USER" "/tmp/awesome-$USER"
-do
-	if ( cp /dev/null "$errfile" 2> /dev/null )
-	then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
-
-userresources=$HOME/.Xresources 
-usermodmap=$HOME/.Xmodmap 
-userxkbmap=$HOME/.Xkbmap
-
-sysresources=/etc/X11/Xresources 
-sysmodmap=/etc/X11/Xmodmap 
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources 
-rh6sysmodmap=/etc/X11/xinit/Xmodmap 
-
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
-    xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
-    xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
-    setxkbmap `cat "$sysxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
-    setxkbmap `cat "$userxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
-    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
-       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
-       if [ -n "$xkbsymbols" ]; then
-           setxkbmap -symbols "$xkbsymbols"
-           XKB_IN_USE=yes
-       fi
-    fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
-    if [ -f "$rh6sysmodmap" ]; then
-       xmodmap "$rh6sysmodmap"
-    fi
-
-    if [ -f "$sysmodmap" ]; then
-       xmodmap "$sysmodmap"
-    fi
-
-    if [ -f "$usermodmap" ]; then
-       xmodmap "$usermodmap"
-    fi
-fi
-
-unset XKB_IN_USE
-
-# run all system xinitrc shell scripts.
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-    for i in /etc/X11/xinit/xinitrc.d/* ; do
-        if [ -x "$i" ]; then
-	    . "$i"
-        fi
-    done
-fi
-
-exec /usr/bin/awesome

diff --git a/x11-wm/awesome/files/awesome.desktop b/x11-wm/awesome/files/awesome.desktop
deleted file mode 100644
index 2341f83..0000000
--- a/x11-wm/awesome/files/awesome.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=awesome
-Comment=awesome the window manager 
-Exec=/etc/X11/Sessions/awesome
-TryExec=awesome
-Icon=
-Type=Application

diff --git a/x11-wm/awesome/metadata.xml b/x11-wm/awesome/metadata.xml
deleted file mode 100644
index 355ff77..0000000
--- a/x11-wm/awesome/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>matsuu@gentoo.org</email>
-		<name>MATSUU Takuto</name>
-	</maintainer>
-	<maintainer>
-		<email>wired@gentoo.org</email>
-		<name>Alex Alexander</name>
-	</maintainer>
-</pkgmetadata>
-


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: x11-wm/awesome/, x11-wm/awesome/files/
@ 2012-10-28  1:22 Anthony G. Basile
  0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2012-10-28  1:22 UTC (permalink / raw
  To: gentoo-commits

commit:     7ae0626a20748a9222940f649ee535f62bab7265
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 01:21:18 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 01:21:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=7ae0626a

x11-wm/awesome: switch to not using execinfo

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 0xD0455535

---
 x11-wm/awesome/awesome-3.4.11-r99.ebuild           |    5 ++-
 .../files/awesome-3.4.11-remove-backtrace.patch    |   22 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/x11-wm/awesome/awesome-3.4.11-r99.ebuild b/x11-wm/awesome/awesome-3.4.11-r99.ebuild
index 12b7e3e..9c9d769 100644
--- a/x11-wm/awesome/awesome-3.4.11-r99.ebuild
+++ b/x11-wm/awesome/awesome-3.4.11-r99.ebuild
@@ -26,8 +26,7 @@ COMMON_DEPEND=">=dev-lang/lua-5.1
 	>=x11-libs/startup-notification-0.10_p20110426
 	>=x11-libs/xcb-util-0.3.8
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	elibc_uclibc? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${COMMON_DEPEND}
@@ -80,6 +79,8 @@ src_prepare() {
 
 	# bug  #408025
 	epatch "${FILESDIR}/${P}-convert-path.patch"
+
+	epatch "${FILESDIR}/${P}-remove-backtrace.patch"
 }
 
 src_configure() {

diff --git a/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch b/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch
new file mode 100644
index 0000000..e5ee561
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch
@@ -0,0 +1,22 @@
+diff -Naur awesome-3.4.11.orig/awesomeConfig.cmake awesome-3.4.11/awesomeConfig.cmake
+--- awesome-3.4.11.orig/awesomeConfig.cmake	2012-10-27 21:02:13.000000000 -0400
++++ awesome-3.4.11/awesomeConfig.cmake	2012-10-27 21:02:47.000000000 -0400
+@@ -192,12 +192,12 @@
+ endif()
+ 
+ # Check for backtrace
+-include(CheckFunctionExists)
+-CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
+-if(NOT HAVE_BACKTRACE)
+-    a_find_library(LIB_EXECINFO execinfo)
+-    set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO})
+-endif()
++#include(CheckFunctionExists)
++#CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
++#if(NOT HAVE_BACKTRACE)
++#    a_find_library(LIB_EXECINFO execinfo)
++#    set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO})
++#endif()
+ 
+ # Error check
+ if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: x11-wm/awesome/, x11-wm/awesome/files/
@ 2012-10-28  1:10 Anthony G. Basile
  0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2012-10-28  1:10 UTC (permalink / raw
  To: gentoo-commits

commit:     d4787b5c581608436413be8ff45885690ef08072
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 01:08:53 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 01:08:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=d4787b5c

x11-wm/awesome: make use of breakout dev-libs/libexecinfo

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 0xD0455535

---
 x11-wm/awesome/awesome-3.4.11-r99.ebuild           |  120 ++++++++++++++++++++
 .../files/awesome-3.4.11-convert-path.patch        |   18 +++
 x11-wm/awesome/files/awesome-3.4.2-backtrace.patch |   18 +++
 x11-wm/awesome/files/awesome-glib-fix.patch        |   13 ++
 .../awesome/files/awesome-gnome-xsession.desktop   |    7 +
 x11-wm/awesome/files/awesome-gnome.desktop         |    7 +
 x11-wm/awesome/files/awesome-gnome.session         |    6 +
 x11-wm/awesome/files/awesome-session               |   90 +++++++++++++++
 x11-wm/awesome/files/awesome.desktop               |    8 ++
 x11-wm/awesome/metadata.xml                        |   13 ++
 10 files changed, 300 insertions(+), 0 deletions(-)

diff --git a/x11-wm/awesome/awesome-3.4.11-r99.ebuild b/x11-wm/awesome/awesome-3.4.11-r99.ebuild
new file mode 100644
index 0000000..b9be760
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.4.11-r99.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.11.ebuild,v 1.10 2012/05/11 07:29:16 ago Exp $
+
+EAPI="3"
+CMAKE_MIN_VERSION="2.8"
+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 ~x86"
+IUSE="dbus doc elibc_FreeBSD"
+
+COMMON_DEPEND=">=dev-lang/lua-5.1
+	dev-libs/libev
+	>=dev-libs/libxdg-basedir-1
+	media-libs/imlib2[png]
+	x11-libs/cairo[xcb]
+	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	elibc_uclibc? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${COMMON_DEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? (
+		app-doc/doxygen
+		dev-lua/luadoc
+		media-gfx/graphviz
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		x11-misc/gxmessage
+		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_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-3.4.2-backtrace.patch"
+
+	# bug #396417
+	epatch "${FILESDIR}/${PN}-glib-fix.patch"
+
+	# bug  #408025
+	epatch "${FILESDIR}/${P}-convert-path.patch"
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DPREFIX="${EPREFIX}"/usr
+		-DSYSCONFDIR="${EPREFIX}"/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
+}

diff --git a/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch b/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch
new file mode 100644
index 0000000..f06739c
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch
@@ -0,0 +1,18 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Mar 13 12:55:00 UTC 2012
+Subject: build system
+
+https://bugs.gentoo.org/show_bug.cgi?id=408025
+fix compilation when dev-libs/libee is installed
+
+--- awesomeConfig.cmake
++++ awesomeConfig.cmake
+@@ -57,7 +57,7 @@
+ a_find_program(LUA_EXECUTABLE lua FALSE)
+ a_find_program(LUADOC_EXECUTABLE luadoc FALSE)
+ # theme graphics
+-a_find_program(CONVERT_EXECUTABLE convert TRUE)
++a_find_program(CONVERT_EXECUTABLE bin/convert TRUE)
+ # doxygen
+ include(FindDoxygen)
+ # pkg-config

diff --git a/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch b/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch
new file mode 100644
index 0000000..4d481ea
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch
@@ -0,0 +1,18 @@
+diff -Naur awesome-3.4.2.orig/awesomeConfig.cmake awesome-3.4.2/awesomeConfig.cmake
+--- awesome-3.4.2.orig/awesomeConfig.cmake	2009-11-27 04:03:25.000000000 +0900
++++ awesome-3.4.2/awesomeConfig.cmake	2009-11-28 01:17:01.639797168 +0900
+@@ -167,6 +167,14 @@
+ # Check for libev
+ a_find_library(LIB_EV ev)
+ 
++# Check for backtrace
++include(CheckFunctionExists)
++CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
++if(NOT HAVE_BACKTRACE)
++    a_find_library(LIB_EXECINFO execinfo)
++    set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO})
++endif()
++
+ # Error check
+ if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
+     message(FATAL_ERROR "lua library not found")

diff --git a/x11-wm/awesome/files/awesome-glib-fix.patch b/x11-wm/awesome/files/awesome-glib-fix.patch
new file mode 100644
index 0000000..e3e6fcf
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-glib-fix.patch
@@ -0,0 +1,13 @@
+>=glib-2.31 build fix
+
+--- a/spawn.c
++++ b/spawn.c
+@@ -24,7 +24,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
+-#include <glib/gspawn.h>
++#include <glib.h>
+ 
+ #include "spawn.h"
+ #include "screen.h"

diff --git a/x11-wm/awesome/files/awesome-gnome-xsession.desktop b/x11-wm/awesome/files/awesome-gnome-xsession.desktop
new file mode 100644
index 0000000..9f3d67b
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome-xsession.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry] 
+Encoding=UTF-8
+Name=Awesome GNOME
+Comment=GNOME with highly configurable window manager awesome
+TryExec=gnome-session
+Exec=gnome-session --session=awesome-gnome
+Type=XSession

diff --git a/x11-wm/awesome/files/awesome-gnome.desktop b/x11-wm/awesome/files/awesome-gnome.desktop
new file mode 100644
index 0000000..ec2f237
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Awesome
+Comment=The awesome launcher!
+TryExec=awesome
+Exec=awesome

diff --git a/x11-wm/awesome/files/awesome-gnome.session b/x11-wm/awesome/files/awesome-gnome.session
new file mode 100644
index 0000000..dd0c01b
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome.session
@@ -0,0 +1,6 @@
+[GNOME Session]
+Name=Awesome session
+RequiredComponents=gnome-settings-daemon;
+RequiredProviders=windowmanager;notifications;
+DefaultProvider-windowmanager=awesome-gnome
+DefaultProvider-notifications=notification-daemon

diff --git a/x11-wm/awesome/files/awesome-session b/x11-wm/awesome/files/awesome-session
new file mode 100644
index 0000000..fe76946
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-session
@@ -0,0 +1,90 @@
+#!/bin/sh
+# Awesome Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.awesome-errors" "${TMPDIR-/tmp}/awesome-$USER" "/tmp/awesome-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec /usr/bin/awesome

diff --git a/x11-wm/awesome/files/awesome.desktop b/x11-wm/awesome/files/awesome.desktop
new file mode 100644
index 0000000..2341f83
--- /dev/null
+++ b/x11-wm/awesome/files/awesome.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=awesome
+Comment=awesome the window manager 
+Exec=/etc/X11/Sessions/awesome
+TryExec=awesome
+Icon=
+Type=Application

diff --git a/x11-wm/awesome/metadata.xml b/x11-wm/awesome/metadata.xml
new file mode 100644
index 0000000..355ff77
--- /dev/null
+++ b/x11-wm/awesome/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>matsuu@gentoo.org</email>
+		<name>MATSUU Takuto</name>
+	</maintainer>
+	<maintainer>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</name>
+	</maintainer>
+</pkgmetadata>
+


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-29  2:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-29  2:52 [gentoo-commits] proj/hardened-dev:uclibc commit in: x11-wm/awesome/, x11-wm/awesome/files/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2012-10-28  1:22 Anthony G. Basile
2012-10-28  1:10 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox