Commits

Providence SALUMU  committed 4d2be68

adds awesome + media files

  • Participants
  • Parent commits 92dad82

Comments (0)

Files changed (33)

File app-misc/task/ChangeLog

+# ChangeLog for app-misc/task
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/ChangeLog,v 1.26 2011/10/17 19:47:11 radhermit Exp $
+
+  17 Oct 2011; Tim Harder <radhermit@gentoo.org> -task-1.9.4.ebuild,
+  -task-2.0.0_beta3.ebuild, -files/task-2.0.0_beta1-rcdir.patch:
+  Remove old.
+
+*task-2.0.0_beta4 (17 Oct 2011)
+
+  17 Oct 2011; Tim Harder <radhermit@gentoo.org> +task-2.0.0_beta4.ebuild,
+  +files/task-2.0.0_beta4-rcdir.patch:
+  Version bump.
+
+  04 Oct 2011; Tim Harder <radhermit@gentoo.org> -task-2.0.0_beta1.ebuild,
+  -task-2.0.0_beta2.ebuild:
+  Remove old.
+
+*task-2.0.0_beta3 (04 Oct 2011)
+
+  04 Oct 2011; Tim Harder <radhermit@gentoo.org> +task-2.0.0_beta3.ebuild:
+  Version bump.
+
+*task-2.0.0_beta2 (22 Sep 2011)
+
+  22 Sep 2011; Tim Harder <radhermit@gentoo.org> +task-2.0.0_beta2.ebuild:
+  Version bump.
+
+*task-2.0.0_beta1 (19 Sep 2011)
+
+  19 Sep 2011; Tim Harder <radhermit@gentoo.org> +task-2.0.0_beta1.ebuild,
+  +files/task-2.0.0_beta1-rcdir.patch:
+  Version bump.
+
+  15 Sep 2011; Andreas Schuerch <nativemad@gentoo.org> task-1.9.4-r1.ebuild:
+  x86 stable, thanks JD. Bug 382513
+
+  13 Sep 2011; Markos Chandras <hwoarang@gentoo.org> task-1.9.4-r1.ebuild:
+  Stable on amd64 wrt bug #382513
+
+  10 Sep 2011; Tim Harder <radhermit@gentoo.org> task-1.9.4-r1.ebuild:
+  Migrate to the bash-completion-r1 eclass.
+
+*task-1.9.4-r1 (03 Aug 2011)
+
+  03 Aug 2011; Tim Harder <radhermit@gentoo.org>
+  +files/0001-Merge-Uri-support.patch, -files/task-1.9.2-configure.patch,
+  -task-1.9.3-r1.ebuild, +task-1.9.4-r1.ebuild:
+  Revision bump and remove old. Apply upstream patch to fix ssh syncing issue
+  (bug #377451).
+
+  14 Jun 2011; Markus Meier <maekke@gentoo.org> task-1.9.4.ebuild:
+  x86 stable, bug #370431
+
+  07 Jun 2011; Kenneth Prugh <ken69267@gentoo.org> task-1.9.4.ebuild:
+  amd64 stable, bug #370431
+
+  07 Jun 2011; Tim Harder <radhermit@gentoo.org> task-1.9.4.ebuild:
+  Update to EAPI 4 and install extra scripts in /usr/share/task/scripts instead
+  of under /usr/share/doc.
+
+  07 Jun 2011; Tim Harder <radhermit@gentoo.org> task-1.9.4.ebuild:
+  Follow standard bash-completion naming conventions (bug #369815 by Marcin
+  Mirosław).
+
+*task-1.9.4 (07 Mar 2011)
+
+  07 Mar 2011; Tim Harder <radhermit@gentoo.org> +task-1.9.4.ebuild,
+  +files/task-1.9.4-lua-automagic.patch, +files/task-1.9.4-rcdir.patch,
+  +files/task-1.9.4-remove-ncurses.patch:
+  Version bump. Use new cmake-based build system.
+
+  11 Feb 2011; Tim Harder <radhermit@gentoo.org> -task-1.9.2-r1.ebuild:
+  Remove old
+
+  11 Feb 2011; Markos Chandras <hwoarang@gentoo.org> task-1.9.3-r1.ebuild:
+  Stable on amd64 wrt bug #353353
+
+  09 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> task-1.9.3-r1.ebuild:
+  x86 stable wrt bug #353353
+
+*task-1.9.3-r1 (20 Nov 2010)
+
+  20 Nov 2010; Tim Harder <radhermit@gentoo.org>
+  files/task-1.9.2-configure.patch, -task-1.9.3.ebuild, +task-1.9.3-r1.ebuild:
+  Revbump and remove old. Change theme install path (bug #346159 by Roger
+  Luethi), change i18n install path, use correct directory locations in man
+  pages, remove old MY_P usage, and update patch file to remove hardcoded -O3
+  optimization.
+
+  19 Nov 2010; Markos Chandras <hwoarang@gentoo.org> task-1.9.2-r1.ebuild:
+  Stable on amd64 wrt bug #345575
+
+  19 Nov 2010; Thomas Kahle <tomka@gentoo.org> task-1.9.2-r1.ebuild:
+  x86 stable per bug 345575
+
+*task-1.9.3 (09 Nov 2010)
+
+  09 Nov 2010; Tim Harder <radhermit@gentoo.org> -task-1.9.3_beta2.ebuild,
+  +task-1.9.3.ebuild:
+  Version bump and remove old.
+
+*task-1.9.3_beta2 (26 Oct 2010)
+
+  26 Oct 2010; Tim Harder <radhermit@gentoo.org> -task-1.9.3_beta1.ebuild,
+  +task-1.9.3_beta2.ebuild:
+  Version bump and remove old.
+
+*task-1.9.3_beta1 (20 Oct 2010)
+
+  20 Oct 2010; Tim Harder <radhermit@gentoo.org> +task-1.9.3_beta1.ebuild:
+  Version bump to the latest beta release.
+
+*task-1.9.2-r1 (06 Oct 2010)
+
+  06 Oct 2010; Tim Harder <radhermit@gentoo.org> -task-1.9.2.ebuild,
+  +task-1.9.2-r1.ebuild, +files/task-1.9.2-configure.patch:
+  Revision bump and remove old. Apply patch to fix bug #339773, thanks to
+  James Rowe for reporting.
+
+*task-1.9.2 (03 Oct 2010)
+
+  03 Oct 2010; Tim Harder <radhermit@gentoo.org> +task-1.9.2.ebuild,
+  +metadata.xml:
+  New package for bug #317867.
+

File app-misc/task/Manifest

+AUX 0001-Merge-Uri-support.patch 778 RMD160 31a236a04afd5741305d826fa7a95800f9a3fe21 SHA1 db4c81a13f7ff07d304b5f73aa2cb8d67a5fa729 SHA256 ca9a0637756f0e4c9137a7f25edf28190265cc2c31e296977071f6f578add79c
+AUX task-1.9.4-include-unistd.patch 327 RMD160 f7fde33c9d9306ab6363217b321097af6b9e24ed SHA1 3df3237e5c0b7ef6ecaaf862a03da673c8bec0b7 SHA256 0746618cfa34d84756d5f6d6f436b60bbd7d150391cea9dab4bdcf4e799fe481
+AUX task-1.9.4-lua-automagic.patch 907 RMD160 4898aede6ad624eaaa2cf1268c100333b4518b67 SHA1 97bddfe68524fe11a0b7535ab814aaa96f15c834 SHA256 8e42b81c13030fb40342e127906ea528265bde9da61d7a48b67de56ef115f7cd
+AUX task-1.9.4-rcdir.patch 1585 RMD160 d7b50c3485e45cd628f38176eadc3a1984f9899c SHA1 163b9df7428b3422657f52dea84938898bab36b5 SHA256 e49f6a0a1ee5fd71a2bb0b3650f4196bd172128751fee7f2a00c32cbef5dde02
+AUX task-1.9.4-remove-ncurses.patch 701 RMD160 37ed0ee3e9997d5f9fda441626b78e77577ff01b SHA1 03be8ea636fd92db6dd2c4edffc7491de605bc3f SHA256 196c93c304077aac9e0be4644e29c3ae0c01b7a3b7eb9aec96d1f1e60c658d57
+AUX task-2.0.0_beta4-rcdir.patch 1735 RMD160 10ed2c2dd7c3e598b72afc0a052d957ee109734f SHA1 905af60d9bd445b035d0c6aa4e96172bd6909e6f SHA256 75656f1520b3a86bf23f9bfddea02ca76dc5bae687a89c791e6679f29cf88b1e
+DIST task-1.9.4.tar.gz 479079 RMD160 4f17bfd08d94fc2c9c2da74a2fe0a7322d15623d SHA1 b9bae255f4fa03970eced3ac0876935271d1d7a1 SHA256 1020621c9bf885c3216a5c11cacced3c916b6495e0d09846b7438a152618d34a
+DIST task-2.0.0.beta4.tar.gz 4167015 RMD160 dd803784b60bf5168b6c0d243598ff8211103ec9 SHA1 9b31fa334cc64c2e0e89aa66c5bf2d578325b32f SHA256 3cd8ccdf909af07608b46da6ad084766cdd6657d786b6b639da50e4fcb3236b1
+EBUILD task-1.9.4-r1.ebuild 1688 RMD160 3710e710f4b17d6640992886f73db0e01228f60a SHA1 8bb0b31bb0e19b22ec71cd647a8ade1a67eff14e SHA256 3792d9eb678017cf45dfa99f0cc1dbe0f8cbd810b2f1640d16cacb1282c7189d
+EBUILD task-2.0.0_beta4.ebuild 1591 RMD160 06fc24f0e8699127e6cb18132d5562436840e782 SHA1 916613a9484d907e59101cc1a8d5768a1d09ba40 SHA256 ba4cd7359156f0fa4f48a5463a18c8a91cc5a8189000f0afac25f7b29506932a
+MISC ChangeLog 4271 RMD160 91a418bbcc2253957b8983618b1d23f8ecc925c2 SHA1 959064d44ee84ad3a6ea8701740f0c2842f0e4ae SHA256 5b2846c2fc76b54eb0b7cd28090db1c4d7d86b10b0b855d58387fe064e841ec7
+MISC metadata.xml 228 RMD160 d76fb09804bd7c3340ad0845df7ba7187842f54e SHA1 fc25d06e901526005b042c254ba9b26359cf4d03 SHA256 1b7e281c5478397754b53aa513c61f0477cdbe9900bb3b795239e5770ee52665

File app-misc/task/files/0001-Merge-Uri-support.patch

+From 13f456a5763cd6f5f95b661c3034ddd844feb088 Mon Sep 17 00:00:00 2001
+Message-Id: <13f456a5763cd6f5f95b661c3034ddd844feb088.1299803526.git.johannes@schlatow.name>
+From: Johannes Schlatow <johannes@schlatow.name>
+Date: Fri, 11 Mar 2011 00:54:43 +0100
+Subject: [PATCH] Merge/Uri support
+
+- fixed autopush bug where e.g. 'ssh://' was omitted
+  (Uri::parse() was wrongly modifying the data member)
+---
+ src/Uri.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Uri.cpp b/src/Uri.cpp
+index 6695b94..36791ff 100644
+--- a/src/Uri.cpp
++++ b/src/Uri.cpp
+@@ -198,7 +198,7 @@ void Uri::parse ()
+   }
+ 
+   std::string::size_type pos;
+-  std::string uripart;
++  std::string data = this->data;
+   std::string pathDelimiter = "/";
+ 
+   user = "";
+-- 
+1.7.4.1
+

File app-misc/task/files/task-1.9.4-include-unistd.patch

+diff --git a/task-1.9.4/src/Transport.cpp b/task-1.9.4/src/Transport.cpp
+index eda61d2..e10d2ca 100644
+--- a/task-1.9.4/src/Transport.cpp
++++ b/task-1.9.4/src/Transport.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include <iostream>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include "Transport.h"

File app-misc/task/files/task-1.9.4-lua-automagic.patch

+--- task-1.9.4/CMakeLists.txt.orig
++++ task-1.9.4/CMakeLists.txt
+@@ -30,14 +30,16 @@
+ set (PACKAGE_VERSION "${VERSION}")
+ set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
+ 
+-message ("-- Looking for Lua51")
+-find_package (Lua51)
+-if (LUA51_FOUND)
+-  message ("-- Found Lua51: ${LUA_LIBRARIES}")
+-  set (HAVE_LIBLUA true)
+-  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${LUA_INCLUDE_DIR})
+-  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${LUA_LIBRARIES})
+-endif (LUA51_FOUND)
++if( ENABLE_LUA )
++  message ("-- Looking for Lua51")
++  find_package (Lua51)
++  if (LUA51_FOUND)
++    message ("-- Found Lua51: ${LUA_LIBRARIES}")
++    set (HAVE_LIBLUA true)
++    set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${LUA_INCLUDE_DIR})
++    set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${LUA_LIBRARIES})
++  endif (LUA51_FOUND)
++endif (ENABLE_LUA )
+ 
+ message ("-- Looking for pthread")
+ find_path (PTHREAD_INCLUDE_DIR pthread.h)

File app-misc/task/files/task-1.9.4-rcdir.patch

+--- task-1.9.4.orig/CMakeLists.txt
++++ task-1.9.4/CMakeLists.txt
+@@ -9,6 +9,7 @@
+ SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
+ SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
+ SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
++SET (TASK_RCDIR  share/task CACHE STRING "Installation directory for rc files")
+ SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
+ 
+ message ("-- Looking for SHA1 references")
+--- task-1.9.4.orig/doc/CMakeLists.txt
++++ task-1.9.4/doc/CMakeLists.txt
+@@ -10,4 +10,4 @@
+                                                     FILES_MATCHING PATTERN "*.1")
+ install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN5DIR}
+                                                     FILES_MATCHING PATTERN "*.5")
+-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc   DESTINATION ${TASK_DOCDIR})
++install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc   DESTINATION ${TASK_RCDIR})
+--- task-1.9.4.orig/i18n/CMakeLists.txt
++++ task-1.9.4/i18n/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${TASK_DOCDIR}/i18n
++install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${TASK_RCDIR}/i18n
+                                                 FILES_MATCHING REGEX "strings.*"
+                                                                REGEX "tips.*"
+                                                                PATTERN "CMakeFiles" EXCLUDE)

File app-misc/task/files/task-1.9.4-remove-ncurses.patch

+--- task-1.9.4.orig/src/ui/Element.h
++++ task-1.9.4/src/ui/Element.h
+@@ -28,7 +28,6 @@
+ #define INCLUDED_ELEMENT
+ 
+ #include <string>
+-#include <ncurses.h>
+ class Layout;
+ 
+ class Element
+--- task-1.9.4.orig/src/ui/Layout.cpp
++++ task-1.9.4/src/ui/Layout.cpp
+@@ -25,7 +25,6 @@
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ 
+-#include <ncurses.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <pthread.h>
+--- task-1.9.4.orig/src/ui/UI.cpp
++++ task-1.9.4/src/ui/UI.cpp
+@@ -25,7 +25,6 @@
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ 
+-#include <ncurses.h>
+ #include <ctype.h>
+ #include <pthread.h>
+ #include "log.h"

File app-misc/task/files/task-2.0.0_beta4-rcdir.patch

+Install non-documentation files in the correct directory
+
+--- task-2.0.0.beta4.orig/CMakeLists.txt
++++ task-2.0.0.beta4/CMakeLists.txt
+@@ -9,6 +9,7 @@
+ SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
+ SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
+ SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
++SET (TASK_RCDIR  share/task CACHE STRING "Installation directory for rc files")
+ SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
+ 
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+--- task-2.0.0.beta4.orig/doc/CMakeLists.txt
++++ task-2.0.0.beta4/doc/CMakeLists.txt
+@@ -11,6 +11,6 @@
+                                                       FILES_MATCHING PATTERN "*.1")
+ install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/   DESTINATION ${TASK_MAN5DIR}
+                                                       FILES_MATCHING PATTERN "*.5")
+-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc     DESTINATION ${TASK_DOCDIR})
++install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc     DESTINATION ${TASK_RCDIR})
+ 
+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/ref/task-ref.pdf DESTINATION ${TASK_DOCDIR})
+--- task-2.0.0.beta4.orig/i18n/CMakeLists.txt
++++ task-2.0.0.beta4/i18n/CMakeLists.txt
+@@ -1,4 +1,4 @@
+ cmake_minimum_required (VERSION 2.8)
+-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${TASK_DOCDIR}/i18n
++install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${TASK_RCDIR}/i18n
+                                                 FILES_MATCHING REGEX "tips.*"
+                                                                PATTERN "CMakeFiles" EXCLUDE)

File app-misc/task/metadata.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>radhermit@gentoo.org</email>
+	<name>Tim Harder</name>
+</maintainer>
+</pkgmetadata>

File app-misc/task/task-1.9.4-r1.ebuild

+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/task-1.9.4-r1.ebuild,v 1.4 2011/09/14 20:25:29 nativemad Exp $
+
+EAPI=4
+
+inherit eutils cmake-utils bash-completion-r1
+
+DESCRIPTION="A task management tool with a command-line interface"
+HOMEPAGE="http://taskwarrior.org/projects/show/taskwarrior/"
+SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="lua vim-syntax zsh-completion"
+
+DEPEND="lua? ( dev-lang/lua )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Use the correct directory locations
+	sed -i -e "s:/usr/local/share/doc/task/rc:/usr/share/task/rc:" src/Config.cpp \
+		doc/man/taskrc.5.in doc/man/task-tutorial.5.in doc/man/task-color.5.in
+	sed -i -e "s:/usr/local/bin:/usr/bin:" doc/man/task-faq.5.in scripts/add-ons/*
+
+	# Don't automatically install scripts
+	sed -i -e '/scripts/d' CMakeLists.txt
+
+	epatch "${FILESDIR}"/${P}-rcdir.patch \
+		"${FILESDIR}"/${P}-lua-automagic.patch \
+		"${FILESDIR}"/${P}-remove-ncurses.patch \
+		"${FILESDIR}"/${P}-include-unistd.patch \
+		"${FILESDIR}"/0001-Merge-Uri-support.patch
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_enable lua LUA)
+		-DTASK_DOCDIR=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newbashcomp scripts/bash/task_completion.sh task
+
+	if use vim-syntax ; then
+		rm scripts/vim/README
+		insinto /usr/share/vim/vimfiles
+		doins -r scripts/vim/*
+	fi
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/zsh/*
+	fi
+
+	exeinto /usr/share/${PN}/scripts
+	doexe scripts/add-ons/*
+}

File app-misc/task/task-2.0.0_beta4.ebuild

+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/task-2.0.0_beta4.ebuild,v 1.1 2011/10/17 19:32:20 radhermit Exp $
+
+EAPI=4
+
+inherit eutils cmake-utils bash-completion-r1
+
+MY_P="${P/_/.}"
+DESCRIPTION="A task management tool with a command-line interface"
+HOMEPAGE="http://taskwarrior.org/projects/show/taskwarrior/"
+SRC_URI="http://taskwarrior.org/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lua vim-syntax zsh-completion"
+
+DEPEND="lua? ( dev-lang/lua )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Use the correct directory locations
+	sed -i -e "s:/usr/local/share/doc/task/rc:/usr/share/task/rc:" \
+		doc/man/taskrc.5.in doc/man/task-tutorial.5.in doc/man/task-color.5.in
+	sed -i -e "s:/usr/local/bin:/usr/bin:" doc/man/task-faq.5.in scripts/add-ons/*
+
+	# Don't automatically install scripts
+	sed -i -e '/scripts/d' CMakeLists.txt
+
+	epatch "${FILESDIR}"/${P}-rcdir.patch \
+		"${FILESDIR}"/${PN}-1.9.4-lua-automagic.patch
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_enable lua LUA)
+		-DTASK_DOCDIR=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newbashcomp scripts/bash/task_completion.sh task
+
+	if use vim-syntax ; then
+		rm scripts/vim/README
+		insinto /usr/share/vim/vimfiles
+		doins -r scripts/vim/*
+	fi
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/zsh/*
+	fi
+
+	exeinto /usr/share/${PN}/scripts
+	doexe scripts/add-ons/*
+}

File dev-util/dmd-common/Manifest

 DIST dmd.2.044.zip 10252413 RMD160 99ff444ef8e9ab619464ea170e2f8d1d6b2205ed SHA1 9676b9fc437203782d17a8f4b4801a6c261a9534 SHA256 da1998ed31585acd30b3c8a3859b772a2544c3c8c0217f931d35e2050c559a00
 DIST dmd.2.045.zip 10253186 RMD160 4211265494ea87140480e133c663d6bb4c345dca SHA1 2da888c5c748b1c7845c8c15085856f10f580cbe SHA256 ef74b1e9197a74d78bcdf676e46fd8155a0bccd3d1c8d5aec47c127e20e0c2fa
 DIST dmd.2.046.zip 10267835 RMD160 8eb122dbf0ae589e32bfd81ed1e3f645d3fcd3ac SHA1 d40a4119064b8a2635543f9d43513b3069099987 SHA256 842e69faa8baf1d73f3bce3ea37ae7a86db1297d946425458a243db239fe34b1
+DIST dmd.2.056.zip 19678819 RMD160 d323972e326c113b8976a494d783389f8999c34a SHA1 1b0c80c1415b9fb22e992c6c8dcb5b40674cccfb SHA256 22aea9e97f271cf64fbcb71458fa3454b6eef4bb5a2ed7061f753a4e91c9f515
 EBUILD dmd-common-2.026.ebuild 916 RMD160 820831152f307858268ece418af2f81a3dbcf30b SHA1 f228488ec36797980b2b66928ac23688bd084507 SHA256 dc7a934535f05451b581fe0ceefa132e91fdd108d661ee8b7f3389960f40d4cd
 EBUILD dmd-common-2.027.ebuild 916 RMD160 820831152f307858268ece418af2f81a3dbcf30b SHA1 f228488ec36797980b2b66928ac23688bd084507 SHA256 dc7a934535f05451b581fe0ceefa132e91fdd108d661ee8b7f3389960f40d4cd
 EBUILD dmd-common-2.028.ebuild 916 RMD160 820831152f307858268ece418af2f81a3dbcf30b SHA1 f228488ec36797980b2b66928ac23688bd084507 SHA256 dc7a934535f05451b581fe0ceefa132e91fdd108d661ee8b7f3389960f40d4cd
 EBUILD dmd-common-2.044.ebuild 919 RMD160 96c9b67b320e9912124952b0aa897641be9212f0 SHA1 b664cba3641a47eb0b73b64c1d79c629bfd8bfa6 SHA256 7885a00a9fd38e1a2e3ce811d24ccc21787d0f6c682fe0dc373b64407cd433de
 EBUILD dmd-common-2.045.ebuild 919 RMD160 96c9b67b320e9912124952b0aa897641be9212f0 SHA1 b664cba3641a47eb0b73b64c1d79c629bfd8bfa6 SHA256 7885a00a9fd38e1a2e3ce811d24ccc21787d0f6c682fe0dc373b64407cd433de
 EBUILD dmd-common-2.046.ebuild 919 RMD160 96c9b67b320e9912124952b0aa897641be9212f0 SHA1 b664cba3641a47eb0b73b64c1d79c629bfd8bfa6 SHA256 7885a00a9fd38e1a2e3ce811d24ccc21787d0f6c682fe0dc373b64407cd433de
+EBUILD dmd-common-2.056.ebuild 1000 RMD160 bb521b4f0eecc7a9cfc7db7f047f3bda8f041679 SHA1 da9a5e05bb9b98dc0b6050c3bf8deae676c0a99c SHA256 fcce61ae516fd91a294c8074cf03bd67d95c867ec2477f24c9162e50ebe53992

File dev-util/dmd-common/dmd-common-2.056.ebuild

+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+MY_P=${P/-common/}
+MY_P=${MY_P/-/.}
+
+DESCRIPTION="Common tools and docs for Digital Mars compilers"
+HOMEPAGE="http://www.digitalmars.com/d/"
+SRC_URI="http://ftp.digitalmars.com/${MY_P}.zip"
+
+LICENSE="DMD"
+RESTRICT="mirror strip"
+SLOT="2"
+KEYWORDS="~x86 ~amd64"
+
+IUSE=""
+
+S="${WORKDIR}"
+
+DEPEND="sys-apps/findutils"
+RDEPEND="amd64? ( app-emulation/emul-linux-x86-compat )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd dmd2/linux/bin64
+
+	rm *.TXT 
+
+	# Fix permissions
+	fperms guo=r `find . -type f`
+	fperms guo=rx `find . -type d`
+	fperms guo=rx dumpobj obj2asm rdmd
+
+	rm dmd
+}
+
+src_install() {
+	cd "${S}/dmd2"
+
+	# Man pages
+	doman man/man1/dmd.1
+	doman man/man1/dmd.conf.5
+	doman man/man1/dumpobj.1
+	doman man/man1/obj2asm.1
+	doman man/man1/rdmd.1
+	rm -r man
+
+	# conf
+	insinto /etc
+	doins linux/bin64/dmd.conf || die
+	rm linux/bin64/dmd.conf
+
+	# Tools
+	dobin linux/bin64/*
+}

File media-sound/ncmpcpp/ChangeLog

+# ChangeLog for media-sound/ncmpcpp
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ChangeLog,v 1.54 2011/10/16 21:42:55 jer Exp $
+
+*ncmpcpp-0.5.8 (16 Oct 2011)
+
+  16 Oct 2011; Jeroen Roovers <jer@gentoo.org> +ncmpcpp-0.5.8.ebuild:
+  Version bump. EAPI bump. Eclass bump.
+
+  11 Jun 2011; Markus Meier <maekke@gentoo.org> ncmpcpp-0.5.7.ebuild:
+  arm stable, bug #369335
+
+  10 Jun 2011; Jeroen Roovers <jer@gentoo.org> ncmpcpp-0.5.7.ebuild:
+  Add dev-util/pkgconfig to DEPEND by Cedric (bug #370863).
+
+  08 Jun 2011; Markus Meier <maekke@gentoo.org> ncmpcpp-0.5.7.ebuild:
+  x86 stable, bug #369335
+
+  05 Jun 2011; Jeroen Roovers <jer@gentoo.org> ncmpcpp-0.5.7.ebuild:
+  Stable for HPPA (bug #369335).
+
+  05 Jun 2011; Markos Chandras <hwoarang@gentoo.org> ncmpcpp-0.5.7.ebuild:
+  Stable on amd64 wrt bug #369335
+
+*ncmpcpp-0.5.7 (22 Apr 2011)
+
+  22 Apr 2011; Jeroen Roovers <jer@gentoo.org> +ncmpcpp-0.5.7.ebuild:
+  Version bump.
+
+  11 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> ncmpcpp-0.5.6.ebuild:
+  x86 stable wrt bug #353652
+
+  07 Feb 2011; Jeroen Roovers <jer@gentoo.org> ncmpcpp-0.5.6.ebuild:
+  Stable for HPPA PPC (bug #353652).
+
+  05 Feb 2011; Alex Alexander <wired@gentoo.org> ncmpcpp-0.5.6.ebuild:
+  amd64 stable, bug #353652
+
+  08 Jan 2011; Michael Weber <xmw@gentoo.org> ncmpcpp-0.5.5.ebuild,
+  ncmpcpp-0.5.6.ebuild:
+  added ~arm/~sparc keyword
+
+*ncmpcpp-0.5.6 (03 Jan 2011)
+
+  03 Jan 2011; Jeroen Roovers <jer@gentoo.org> +ncmpcpp-0.5.6.ebuild:
+  Version bump.
+
+  18 Oct 2010; Jeroen Roovers <jer@gentoo.org> -ncmpcpp-0.5.4.ebuild,
+  ncmpcpp-0.5.5.ebuild:
+  Stable for HPPA (bug #341019).
+
+  15 Oct 2010; Brent Baude <ranger@gentoo.org> ncmpcpp-0.5.5.ebuild:
+  stable ppc, bug 341019
+
+  15 Oct 2010; Dane Smith <c1pher@gentoo.org> ncmpcpp-0.5.5.ebuild:
+  Stable on x86 wrt bug 341019.
+
+  14 Oct 2010; Alex Alexander <wired@gentoo.org> ncmpcpp-0.5.5.ebuild:
+  amd64 stable, bug #341019
+
+  14 Oct 2010; Jeroen Roovers <jer@gentoo.org> ncmpcpp-0.5.4.ebuild,
+  ncmpcpp-0.5.5.ebuild:
+  Marked ~ppc (bug #333757).
+
+*ncmpcpp-0.5.5 (05 Sep 2010)
+
+  05 Sep 2010; Jeroen Roovers <jer@gentoo.org> +ncmpcpp-0.5.5.ebuild:
+  Version bump.
+
+  29 Jul 2010; Alex Alexander <wired@gentoo.org> ncmpcpp-0.5.4.ebuild:
+  amd64 stable, bug #330123
+
+  29 Jul 2010; Christian Faulhammer <fauli@gentoo.org> ncmpcpp-0.5.4.ebuild:
+  stable x86, bug 330123
+
+  28 Jul 2010; Alex Alexander <wired@gentoo.org> ncmpcpp-0.5.4.ebuild:
+  don't die on +fftw -visualizer. fixes bug #330219
+
+  28 Jul 2010; Jeroen Roovers <jer@gentoo.org> ncmpcpp-0.5.4.ebuild:
+  Stable for HPPA (bug #330123).
+
+  12 Jun 2010; Alex Alexander <wired@gentoo.org> metadata.xml:
+  added myself as co-maintainer
+
+*ncmpcpp-0.5.4 (12 Jun 2010)
+
+  12 Jun 2010; Jeroen Roovers <jer@gentoo.org> +ncmpcpp-0.5.4.ebuild,
+  metadata.xml:
+  Version bump. Maintain.
+
+  11 Jun 2010; Ben de Groot <yngwin@gentoo.org> metadata.xml:
+  Removing myself as maintainer
+
+*ncmpcpp-0.5.3 (05 Apr 2010)
+
+  05 Apr 2010; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.5.3.ebuild:
+  Version bump
+
+*ncmpcpp-0.5.2 (26 Feb 2010)
+
+  26 Feb 2010; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.5.2.ebuild:
+  Version bump
+
+  09 Feb 2010; Pacho Ramos <pacho@gentoo.org> ncmpcpp-0.4.1.ebuild:
+  amd64 stable, bug 299357
+
+  05 Jan 2010; Christian Faulhammer <fauli@gentoo.org> ncmpcpp-0.4.1.ebuild:
+  stable x86, bug 299357
+
+  05 Jan 2010; Jeroen Roovers <jer@gentoo.org> ncmpcpp-0.4.1.ebuild:
+  Stable for HPPA (bug #299357).
+
+*ncmpcpp-0.5-r1 (05 Jan 2010)
+
+  05 Jan 2010; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.5-r1.ebuild,
+  +files/ncmpcpp-0.5-fix-toggle-command.patch:
+  Add upstream patch for bug 299463
+
+*ncmpcpp-0.5 (02 Jan 2010)
+
+  02 Jan 2010; Ben de Groot <yngwin@gentoo.org> -ncmpcpp-0.3.2.ebuild,
+  -ncmpcpp-0.3.4.ebuild, +ncmpcpp-0.5.ebuild:
+  Version bump. Add new dependency on libmpdclient. Force USE=visualizer on
+  for USE=fftw. Use dodoc to install documentation. Fixes bug 299283.
+  Remove obsolete versions.
+
+  21 Oct 2009; Markus Meier <maekke@gentoo.org> ncmpcpp-0.3.5.ebuild:
+  x86 stable, bug #285872
+
+  12 Oct 2009; Jeroen Roovers <jer@gentoo.org> ncmpcpp-0.3.5.ebuild:
+  Stable for HPPA (bug #285872).
+
+*ncmpcpp-0.4.1 (07 Oct 2009)
+
+  07 Oct 2009; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.4.1.ebuild,
+  metadata.xml:
+  Version bump, adding visualizer and fftw useflags
+
+  01 Oct 2009; Steve Dibb <beandog@gentoo.org> ncmpcpp-0.3.5.ebuild:
+  amd64 stable, bug 285872
+
+  22 Sep 2009; Jeroen Roovers <jer@gentoo.org> ncmpcpp-0.3.5.ebuild:
+  Marked ~hppa too.
+
+*ncmpcpp-0.3.5 (27 Jun 2009)
+
+  27 Jun 2009; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.3.5.ebuild,
+  metadata.xml:
+  Version bump. Added iconv, outputs and threads useflags.
+
+*ncmpcpp-0.3.4 (19 May 2009)
+
+  19 May 2009; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.3.4.ebuild:
+  Version bump
+
+  03 May 2009; Markus Meier <maekke@gentoo.org> ncmpcpp-0.3.2.ebuild:
+  amd64/x86 stable, bug #267986
+
+*ncmpcpp-0.3.3 (17 Apr 2009)
+
+  17 Apr 2009; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.3.3.ebuild:
+  Version bump
+
+*ncmpcpp-0.3.2 (17 Mar 2009)
+
+  17 Mar 2009; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.3.2.ebuild:
+  Version bump
+
+  29 Jan 2009; Ben de Groot <yngwin@gentoo.org> -ncmpcpp-0.3.ebuild,
+  ncmpcpp-0.3-r1.ebuild:
+  Drop the 0.3 ebuild that misses USE=clock and add message about changed
+  syntax.
+
+*ncmpcpp-0.3-r1 (27 Jan 2009)
+
+  27 Jan 2009; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.3-r1.ebuild:
+  Adding clock useflag
+
+*ncmpcpp-0.3 (26 Jan 2009)
+
+  26 Jan 2009; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.3.ebuild:
+  Version bump
+
+  11 Jan 2009; Markus Meier <maekke@gentoo.org> ncmpcpp-0.2.5.ebuild:
+  x86 stable, bug #254156
+
+  07 Jan 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  -ncmpcpp-0.2.3.ebuild, ncmpcpp-0.2.5.ebuild:
+  stable amd64, remove old
+
+  17 Dec 2008; Ben de Groot <yngwin@gentoo.org> ncmpcpp-0.2.5.ebuild:
+  Several minor ebuild improvements, thanks to angelos.
+
+  12 Dec 2008; Raúl Porcel <armin76@gentoo.org> ncmpcpp-0.2.4.ebuild:
+  x86 stable wrt #249993
+
+  05 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  ncmpcpp-0.2.4.ebuild:
+  stable amd64, bug 249993
+
+*ncmpcpp-0.2.5 (05 Dec 2008)
+
+  05 Dec 2008; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.2.5.ebuild:
+  Version bump, and move unicode to eapi-2 style use dep. Add minimal mpd
+  version supported as runtime dependency.
+
+*ncmpcpp-0.2.4 (15 Oct 2008)
+
+  15 Oct 2008; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.2.4.ebuild:
+  Version bump. Add message about new config files location.
+
+*ncmpcpp-0.2.3 (23 Sep 2008)
+
+  23 Sep 2008; Ben de Groot <yngwin@gentoo.org> +metadata.xml,
+  +ncmpcpp-0.2.3.ebuild:
+  Initial commit. Ebuild based on the one from upstream.
+

File media-sound/ncmpcpp/Manifest

+AUX ncmpcpp-0.5.7-include-unistd.patch 299 RMD160 57aa37e1289bfd02fa40f9f90b0746c6b4309cd6 SHA1 73a9e0ee10fca704480a2829e4af85cd5f4d5f27 SHA256 6b916f7506f1c429aca620e492da2dc41ed726e0b8e3b65126304aac3c57b6eb
+DIST ncmpcpp-0.5.6.tar.bz2 369977 RMD160 ee177e3b92f9882adcf2647b96505a83b7b5f61a SHA1 91ba1c22bf3b31809de70c35a6a34017867b0b19 SHA256 ed07e055c964ea5f21985db57bbb16e4223ba5c43376662efcf5020451b9bb79
+DIST ncmpcpp-0.5.7.tar.bz2 372049 RMD160 a291615ba87e954929623100bbebd33af18a383a SHA1 b0c981a6ff8db51ce18f27176bf2af296c5aa925 SHA256 cdb1813117fb55aafc3b72979ecc7077b22752cb0d91a6de4b6d22c38f1a6c23
+DIST ncmpcpp-0.5.8.tar.bz2 373853 RMD160 4b46bb793edc95d8e7d1d01fd135696c5e1e5e96 SHA1 2402a6e333484d64011d0135ea6659dc784adc5a SHA256 9d52e5c6192945aff2942acada37d52592441b8f786aae46f9c94147f4b373cd
+EBUILD ncmpcpp-0.5.6.ebuild 1930 RMD160 0493d0bb5850ac9bfe737df204b7cef0759dd1e1 SHA1 b84179b9a56f868d86fca0af3a8cdff095e805a7 SHA256 8a22f04fb2ab637a4a4bfd329bb1ce61de62a7932374c925d4b67879c5c5e8a6
+EBUILD ncmpcpp-0.5.7.ebuild 2022 RMD160 c7de8afe6f4c9666814ce4b60173dd93fd04597c SHA1 39c7f5f8788a0f80a4d907b3cb85d12fcde82b37 SHA256 679d002a5c5589cca346d1197b49c51738f6da77ad175b18309b3ebe70fca694
+EBUILD ncmpcpp-0.5.8.ebuild 1858 RMD160 81b08b4b0d94fcaeee609956dc152482940dba82 SHA1 53bf68cfecbf815797af55c1e600277f7a9bcd34 SHA256 3147d00d2109ce2395ddbf4d9480f4ee1407671c9c49297a7667b322eaeaa08b
+MISC ChangeLog 6752 RMD160 3f352fc04b9c8015385e7008fe0111b43bc82e16 SHA1 2545a5219cfabb945ba67db97247bca208f0ae1d SHA256 840519ae56d4ddb2743ce949ae9c8d22a38cc01102dbfe1d6c91223a3de41461
+MISC metadata.xml 627 RMD160 7d4f769fcb149d017bf762e55ac34586ce9e9642 SHA1 f33d1cdc2c264cd62f3a0294e1563e641895f533 SHA256 73bdf8ea0eaec96ab21a99b6000b977a63901ea6833f4cc4aabeeaa0de21e18b

File media-sound/ncmpcpp/files/ncmpcpp-0.5.7-include-unistd.patch

+diff --git a/ncmpcpp-0.5.7/src/window.cpp b/ncmpcpp-0.5.7/src/window.cpp
+index f6e3c5c..e980d12 100644
+--- a/ncmpcpp-0.5.7/src/window.cpp
++++ b/ncmpcpp-0.5.7/src/window.cpp
+@@ -25,6 +25,7 @@
+ # include <winsock.h>
+ #else
+ # include <sys/select.h>
++# include <unistd.h>
+ #endif
+ 
+ #include "error.h"

File media-sound/ncmpcpp/metadata.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</name>
+	</maintainer>
+	<use>
+		<flag name='clock'>Enable clock screen</flag>
+		<flag name='fftw'>Build the visualizer plugin that pulls in
+			<pkg>sci-libs/fftw</pkg></flag>
+		<flag name='outputs'>Enable outputs screen</flag>
+		<flag name='visualizer'>Enable visualizer screen with sound wave/frequency
+			spectrum modes</flag>
+	</use>
+</pkgmetadata>

File media-sound/ncmpcpp/ncmpcpp-0.5.6.ebuild

+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.5.6.ebuild,v 1.5 2011/02/11 12:24:05 phajdan.jr Exp $
+
+EAPI="2"
+inherit bash-completion eutils
+
+DESCRIPTION="An ncurses mpd client, ncmpc clone with some new features, written in C++"
+HOMEPAGE="http://unkart.ovh.org/ncmpcpp"
+SRC_URI="http://unkart.ovh.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+IUSE="bash-completion clock curl fftw iconv outputs taglib unicode visualizer"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ~sparc x86"
+
+DEPEND="sys-libs/ncurses[unicode?]
+	>=media-libs/libmpdclient-2.1
+	curl? ( net-misc/curl )
+	visualizer? ( fftw? ( sci-libs/fftw:3.0 ) )
+	iconv? ( virtual/libiconv )
+	taglib? ( media-libs/taglib )"
+RDEPEND="$DEPEND"
+
+src_configure() {
+	local myconf=""
+	if use fftw; then
+		myconf="$(use_with visualizer fftw)"
+		if ! use visualizer; then
+			ewarn "For the fftw USE flag to have any effect, you must also"
+			ewarn "enable the visualizer USE flag."
+		fi
+	else
+		myconf="--without-fftw"
+	fi
+	econf \
+		${myconf} \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable unicode) \
+		$(use_enable visualizer) \
+		$(use_with curl) \
+		$(use_with iconv) \
+		$(use_with taglib)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+
+	# use dodoc instead of upstream's doc install which does not compress
+	rm -rf "${D}"/usr/share/doc/${PN}
+	dodoc AUTHORS NEWS doc/config doc/keys || die "dodoc failed"
+
+	dobashcompletion doc/${PN}-completion.bash ${PN}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/keys"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+	bash-completion_pkg_postinst
+}

File media-sound/ncmpcpp/ncmpcpp-0.5.7.ebuild

+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.5.7.ebuild,v 1.6 2011/06/11 12:02:49 maekke Exp $
+
+EAPI="2"
+inherit bash-completion eutils
+
+DESCRIPTION="An ncurses mpd client, ncmpc clone with some new features, written in C++"
+HOMEPAGE="http://unkart.ovh.org/ncmpcpp"
+SRC_URI="http://unkart.ovh.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+IUSE="bash-completion clock curl fftw iconv outputs taglib unicode visualizer"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ~ppc ~sparc x86"
+
+RDEPEND="
+	sys-libs/ncurses[unicode?]
+	>=media-libs/libmpdclient-2.1
+	curl? ( net-misc/curl )
+	visualizer? ( fftw? ( sci-libs/fftw:3.0 ) )
+	iconv? ( virtual/libiconv )
+	taglib? ( media-libs/taglib )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+"
+
+src_configure() {
+	local myconf=""
+	if use fftw; then
+		myconf="$(use_with visualizer fftw)"
+		if ! use visualizer; then
+			ewarn "For the fftw USE flag to have any effect, you must also"
+			ewarn "enable the visualizer USE flag."
+		fi
+	else
+		myconf="--without-fftw"
+	fi
+	econf \
+		${myconf} \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable unicode) \
+		$(use_enable visualizer) \
+		$(use_with curl) \
+		$(use_with iconv) \
+		$(use_with taglib)
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-include-unistd.patch
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+
+	# use dodoc instead of upstream's doc install which does not compress
+	rm -rf "${D}"/usr/share/doc/${PN}
+	dodoc AUTHORS NEWS doc/config doc/keys || die "dodoc failed"
+
+	dobashcompletion doc/${PN}-completion.bash ${PN}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/keys"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+	bash-completion_pkg_postinst
+}

File media-sound/ncmpcpp/ncmpcpp-0.5.8.ebuild

+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.5.8.ebuild,v 1.1 2011/10/16 21:42:55 jer Exp $
+
+EAPI="4"
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="An ncurses mpd client, ncmpc clone with some new features, written in C++"
+HOMEPAGE="http://unkart.ovh.org/ncmpcpp"
+SRC_URI="http://unkart.ovh.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+IUSE="bash-completion clock curl fftw iconv outputs taglib unicode visualizer"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+
+RDEPEND="
+	sys-libs/ncurses[unicode?]
+	>=media-libs/libmpdclient-2.1
+	curl? ( net-misc/curl )
+	visualizer? ( fftw? ( sci-libs/fftw:3.0 ) )
+	iconv? ( virtual/libiconv )
+	taglib? ( media-libs/taglib )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+"
+
+src_configure() {
+	local myconf=""
+	if use fftw; then
+		myconf="$(use_with visualizer fftw)"
+		if ! use visualizer; then
+			ewarn "For the fftw USE flag to have any effect, you must also"
+			ewarn "enable the visualizer USE flag."
+		fi
+	else
+		myconf="--without-fftw"
+	fi
+	econf \
+		${myconf} \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable unicode) \
+		$(use_enable visualizer) \
+		$(use_with curl) \
+		$(use_with iconv) \
+		$(use_with taglib)
+}
+
+src_install() {
+	default
+
+	# use dodoc instead of upstream's doc install which does not compress
+	rm -rf "${D}"/usr/share/doc/${PN}
+	dodoc AUTHORS NEWS doc/config doc/keys
+
+	newbashcomp doc/${PN}-completion.bash ${PN}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/keys"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}

File x11-wm/awesome/Manifest

+AUX 3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch 23023 RMD160 961a5046e4abc1135d70308c2571468b98a78be4 SHA1 b50ad1167c1cfeade882eba44afb6727540a5170 SHA256 58da405ee5fc1bfa0f57b6c228bc1a3ae7420c9d37acb956419661a4b0f3c7ef
+AUX awesome-3.4-wibox.patch 441 RMD160 4da1255158674dc6a84bc6e3c92fec2a42e185c4 SHA1 e48807f774e320b8591cedee95b927035b89eaf7 SHA256 65fb44f12e4e12f4c34cc1362d0fb0b85979e7df94d8b8029642e36d1d94cd28
+AUX awesome-3.4.2-backtrace.patch 713 RMD160 b60e09f17c1452588020738df6657768080f4dcc SHA1 2845c4529f9189bf41ecd1c2df7eae36fbec329a SHA256 5738944681ce666fab1621c0abbb444356456fcea3ea2119f732c54ef4bf3f26
+AUX awesome-3.4.3-net-current-desktop-ooo.patch 695 RMD160 e5cc2573bce8022db8c9b9c0d7565b95892bbe44 SHA1 b7d38d59b6256cd7675840ae0b6584fc81cbd3f1 SHA256 401e3143d0f3619c0595642b0d2c1cee7d730c2e03aabf9f6aee320f2ac22917
+AUX awesome-3.4.3-qt-xinerama-fix.patch 850 RMD160 e344db4fb9b88a1ec26f647bf7f31f5366094c16 SHA1 47b1b42abf0dbcad0990232326242c554e37ab10 SHA256 e41183e4a45aa05de4f67da45dbdf1eabf7adf0629096f7db5b7d28f148a9c78
+AUX awesome-3.4.7-fix-multiscreen-window-placement.patch 1012 RMD160 92086374c413afdc125c6dbac082bbbfe5147c9d SHA1 ea6455383c469ac175d37f8ce4866e5516488897 SHA256 45f8d40bf4ae08ccd436527e2fe458f882c6e3b350c6c1afbb4eaa25c159c883
+AUX awesome-3.4.8-cmake-2.8.4.patch 878 RMD160 1793b87bc558377e8d117f104cd830c7b38b95e2 SHA1 95a5b453d5c11dee3dff058b81f9500c7362eb92 SHA256 6f4f3fc953739d5437cd4258f664677aef882acf873894c5300f6b35feff708d
+AUX awesome-session 1999 RMD160 2a92c71209f81ecaa302e03974b2f44e380abf38 SHA1 8d86595e00759508a5f20f54dab46d2c143c5033 SHA256 bee150a5b32a118c905ffe26df3f776f40a2db19230f6600cc2966b6c727838a
+AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
+DIST awesome-3.4.11.tar.bz2 758495 RMD160 1ceafb96ebe4e5b04c09dee5d6a69266516203b4 SHA1 b49f47618c014e9ada54336c0c31b616af0b9a1b SHA256 83fc42d4ea71914d1b456023ce53b546e22e8ccc11a73c4a39a1152d2f30b628
+EBUILD awesome-3.4.11.ebuild 2916 RMD160 cb26b81882e2f2d86e85819ecccc289e40738edd SHA1 8b29f849d8f8c1cb7f155e4de25b8b8a741495ed SHA256 131b3d48f0e11b97bdb74385daf9deb315b00efd5d3f492c0dbe88acae25a024
+EBUILD awesome-9999.ebuild 2614 RMD160 0f5be7a322fe64840210afa21665424fd307906c SHA1 bcf5a49a209e1a216b74b9188d4ba5ed47cdef4d SHA256 e529befb7c82c0c226e236b4218a8b3bf2928ae3252cf3885686f868e0d6f511
+MISC metadata.xml 255 RMD160 55d76cb4c854b53723cb2e447f289f5c661dc389 SHA1 5a237e00dc1c7c8a2b4c565c3884b060b805927f SHA256 ad624d5a908e1afc5bbe5ae20dc33b31f218a6c648fc960e149d6d1aa0c4c9bd

File x11-wm/awesome/awesome-3.4.11.ebuild

+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.10.ebuild,v 1.1 2011/05/16 21:05:05 robbat2 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 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+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
+	dev-util/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" \
+## 		"${FILESDIR}/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.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"
+## }
+
+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
+}

File x11-wm/awesome/awesome-9999.ebuild

+# 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 git cmake-utils eutils
+
+EGIT_REPO_URI="git://git.naquadah.org/awesome.git"
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="dbus doc elibc_FreeBSD"
+
+RDEPEND="
+	>=dev-lang/lua-5.1
+	dev-libs/libev
+	>=dev-libs/libxdg-basedir-1
+	dev-lua/oocairo
+	dev-lua/oopango
+	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] media-gfx/graphicsmagick[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="${RDEPEND}
+	|| (
+		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_unpack() {
+	git_src_unpack
+	# ugly way to get the git revision
+	echo -n "`git --git-dir="${GIT_DIR}" describe`-gentoo" > ${S}/.version_stamp
+}
+
+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
+}

File x11-wm/awesome/files/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch

+From 33e140552786f20a34c15852e88aaa27f3bed029 Mon Sep 17 00:00:00 2001
+From: Arnaud Fontaine <arnau@debian.org>
+Date: Wed, 27 Apr 2011 15:44:35 +0900
+Subject: [PATCH] Update the code following release of xcb-util 0.3.8.
+
+xcb-util is now split into several repositories since 0.3.8. This
+release also cleaned up the API a lot, thus update the code
+accordingly.
+
+Signed-off-by: Arnaud Fontaine <arnau@debian.org>
+---
+ awesome.c           |    2 +-
+ awesomeConfig.cmake |    7 ++---
+ client.c            |   56 +++++++++++++++++++++---------------------
+ client.h            |    6 ++--
+ common/xutil.c      |    1 -
+ event.c             |   10 +++---
+ ewmh.c              |    4 +-
+ property.c          |   68 +++++++++++++++++++++++++-------------------------
+ selection.c         |   14 +++++-----
+ systray.c           |    2 +-
+ window.c            |    4 +-
+ 11 files changed, 86 insertions(+), 88 deletions(-)
+
+diff --git a/awesome.c b/awesome.c
+index f89080c..1258b4c 100644
+--- a/awesome.c
++++ b/awesome.c
+@@ -154,7 +154,7 @@ scan(void)
+ 
+             if(!attr_r || attr_r->override_redirect
+                || attr_r->map_state == XCB_MAP_STATE_UNMAPPED
+-               || state == XCB_WM_STATE_WITHDRAWN)
++               || state == XCB_ICCCM_WM_STATE_WITHDRAWN)
+             {
+                 geom_wins[i] = NULL;
+                 p_delete(&attr_r);
+diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
+index 68b5ee3..5672afc 100644
+--- a/awesomeConfig.cmake
++++ b/awesomeConfig.cmake
+@@ -127,7 +127,7 @@ execute_process(
+ 
+ # Use pkgconfig to get most of the libraries
+ pkg_check_modules(AWESOME_COMMON_REQUIRED REQUIRED
+-    xcb>=1.4)
++    xcb>=1.6)
+ 
+ pkg_check_modules(AWESOME_REQUIRED REQUIRED
+     glib-2.0
+@@ -139,10 +139,9 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
+     xcb-xtest
+     xcb-xinerama
+     xcb-shape
+-    xcb-aux>=0.3.0
+-    xcb-atom>=0.3.0
++    xcb-util>=0.3.8
+     xcb-keysyms>=0.3.4
+-    xcb-icccm>=0.3.6
++    xcb-icccm>=0.3.8
+     xcb-image>=0.3.0
+     cairo-xcb
+     libstartup-notification-1.0>=0.10
+diff --git a/client.c b/client.c
+index 049e3d5..baae69f 100644
+--- a/client.c
++++ b/client.c
+@@ -52,7 +52,7 @@ luaA_client_gc(lua_State *L)
+     client_t *c = luaA_checkudata(L, 1, &client_class);
+     button_array_wipe(&c->buttons);
+     key_array_wipe(&c->keys);
+-    xcb_get_wm_protocols_reply_wipe(&c->protocols);
++    xcb_icccm_get_wm_protocols_reply_wipe(&c->protocols);
+     p_delete(&c->machine);
+     p_delete(&c->class);
+     p_delete(&c->instance);
+@@ -94,21 +94,21 @@ client_set_urgent(lua_State *L, int cidx, bool urgent)
+     if(c->urgent != urgent)
+     {
+         xcb_get_property_cookie_t hints =
+-            xcb_get_wm_hints_unchecked(globalconf.connection, c->window);
++            xcb_icccm_get_wm_hints_unchecked(globalconf.connection, c->window);
+ 
+         c->urgent = urgent;
+         ewmh_client_update_hints(c);
+ 
+         /* update ICCCM hints */
+-        xcb_wm_hints_t wmh;
+-        xcb_get_wm_hints_reply(globalconf.connection, hints, &wmh, NULL);
++        xcb_icccm_wm_hints_t wmh;
++        xcb_icccm_get_wm_hints_reply(globalconf.connection, hints, &wmh, NULL);
+ 
+         if(urgent)
+-            wmh.flags |= XCB_WM_HINT_X_URGENCY;
++            wmh.flags |= XCB_ICCCM_WM_HINT_X_URGENCY;
+         else
+-            wmh.flags &= ~XCB_WM_HINT_X_URGENCY;
++            wmh.flags &= ~XCB_ICCCM_WM_HINT_X_URGENCY;
+ 
+-        xcb_set_wm_hints(globalconf.connection, c->window, &wmh);
++        xcb_icccm_set_wm_hints(globalconf.connection, c->window, &wmh);
+ 
+         hook_property(c, "urgent");
+         luaA_object_emit_signal(L, cidx, "property::urgent", 0);
+@@ -721,7 +721,7 @@ HANDLE_GEOM(height)
+      *
+      * At this stage it's just safer to keep it in normal state and avoid confusion.
+      */
+-    window_state_set(c->window, XCB_WM_STATE_NORMAL);
++    window_state_set(c->window, XCB_ICCCM_WM_STATE_NORMAL);
+ 
+     if(!startup)
+     {
+@@ -767,14 +767,14 @@ client_geometry_hints(client_t *c, area_t geometry)
+     int32_t real_basew = 0, real_baseh = 0;
+ 
+     /* base size is substituted with min size if not specified */
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+     {
+         basew = c->size_hints.base_width;
+         baseh = c->size_hints.base_height;
+         real_basew = basew;
+         real_baseh = baseh;
+     }
+-    else if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
++    else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
+     {
+         basew = c->size_hints.min_width;
+         baseh = c->size_hints.min_height;
+@@ -783,12 +783,12 @@ client_geometry_hints(client_t *c, area_t geometry)
+         basew = baseh = 0;
+ 
+     /* min size is substituted with base size if not specified */
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
+     {
+         minw = c->size_hints.min_width;
+         minh = c->size_hints.min_height;
+     }
+-    else if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE)
++    else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+     {
+         minw = c->size_hints.base_width;
+         minh = c->size_hints.base_height;
+@@ -796,7 +796,7 @@ client_geometry_hints(client_t *c, area_t geometry)
+     else
+         minw = minh = 0;
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_ASPECT
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT
+        && c->size_hints.min_aspect_den > 0
+        && c->size_hints.max_aspect_den > 0
+        && geometry.height - real_baseh > 0
+@@ -838,7 +838,7 @@ client_geometry_hints(client_t *c, area_t geometry)
+     if(minh)
+         geometry.height = MAX(geometry.height, minh);
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE)
+     {
+         if(c->size_hints.max_width)
+             geometry.width = MIN(geometry.width, c->size_hints.max_width);
+@@ -846,7 +846,7 @@ client_geometry_hints(client_t *c, area_t geometry)
+             geometry.height = MIN(geometry.height, c->size_hints.max_height);
+     }
+ 
+-    if(c->size_hints.flags & (XCB_SIZE_HINT_P_RESIZE_INC | XCB_SIZE_HINT_BASE_SIZE)
++    if(c->size_hints.flags & (XCB_ICCCM_SIZE_HINT_P_RESIZE_INC | XCB_ICCCM_SIZE_HINT_BASE_SIZE)
+        && c->size_hints.width_inc && c->size_hints.height_inc)
+     {
+         uint16_t t1 = geometry.width, t2 = geometry.height;
+@@ -969,9 +969,9 @@ client_set_minimized(lua_State *L, int cidx, bool s)
+         c->minimized = s;
+         banning_need_update((c)->screen);
+         if(s)
+-            window_state_set(c->window, XCB_WM_STATE_ICONIC);
++            window_state_set(c->window, XCB_ICCCM_WM_STATE_ICONIC);
+         else
+-            window_state_set(c->window, XCB_WM_STATE_NORMAL);
++            window_state_set(c->window, XCB_ICCCM_WM_STATE_NORMAL);
+         ewmh_client_update_hints(c);
+         if(strut_has_value(&c->strut))
+             screen_emit_signal(globalconf.L, c->screen, "property::workarea", 0);
+@@ -1333,7 +1333,7 @@ client_unmanage(client_t *c)
+ 
+     /* Do this last to avoid races with clients. According to ICCCM, clients
+      * arent allowed to re-use the window until after this. */
+-    window_state_set(c->window, XCB_WM_STATE_WITHDRAWN);
++    window_state_set(c->window, XCB_ICCCM_WM_STATE_WITHDRAWN);
+ 
+     /* set client as invalid */
+     c->invalid = true;
+@@ -2052,9 +2052,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+ 
+     lua_createtable(L, 0, 1);
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_US_POSITION)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_US_POSITION)
+         u_or_p = "user_position";
+-    else if(c->size_hints.flags & XCB_SIZE_HINT_P_POSITION)
++    else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_POSITION)
+         u_or_p = "program_position";
+ 
+     if(u_or_p)
+@@ -2068,9 +2068,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         u_or_p = NULL;
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_US_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_US_SIZE)
+         u_or_p = "user_size";
+-    else if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE)
++    else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+         u_or_p = "program_size";
+ 
+     if(u_or_p)
+@@ -2083,7 +2083,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, u_or_p);
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
+     {
+         lua_pushnumber(L, c->size_hints.min_width);
+         lua_setfield(L, -2, "min_width");
+@@ -2091,7 +2091,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, "min_height");
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE)
+     {
+         lua_pushnumber(L, c->size_hints.max_width);
+         lua_setfield(L, -2, "max_width");
+@@ -2099,7 +2099,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, "max_height");
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_RESIZE_INC)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC)
+     {
+         lua_pushnumber(L, c->size_hints.width_inc);
+         lua_setfield(L, -2, "width_inc");
+@@ -2107,7 +2107,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, "height_inc");
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_ASPECT)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT)
+     {
+         lua_pushnumber(L, c->size_hints.min_aspect_num);
+         lua_setfield(L, -2, "min_aspect_num");
+@@ -2119,7 +2119,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, "max_aspect_den");
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_BASE_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE)
+     {
+         lua_pushnumber(L, c->size_hints.base_width);
+         lua_setfield(L, -2, "base_width");
+@@ -2127,7 +2127,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, "base_height");
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_WIN_GRAVITY)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_WIN_GRAVITY)
+     {
+         switch(c->size_hints.win_gravity)
+         {
+diff --git a/client.h b/client.h
+index d4ef52f..9674fac 100644
+--- a/client.h
++++ b/client.h
+@@ -123,7 +123,7 @@ struct client_t
+     /** Window holding command needed to start it (session management related) */
+     xcb_window_t leader_window;
+     /** Client's WM_PROTOCOLS property */
+-    xcb_get_wm_protocols_reply_t protocols;
++    xcb_icccm_get_wm_protocols_reply_t protocols;
+     /** Client logical screen */
+     screen_t *screen;
+     /** Client physical screen */
+@@ -248,8 +248,8 @@ client_raise(client_t *c)
+ static inline bool
+ client_isfixed(client_t *c)
+ {
+-    return (c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE
+-            && c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE
++    return (c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE
++            && c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE
+             && c->size_hints.max_width == c->size_hints.min_width
+             && c->size_hints.max_height == c->size_hints.min_height
+             && c->size_hints.max_width
+diff --git a/common/xutil.c b/common/xutil.c
+index 3d80e8d..c5a2127 100644
+--- a/common/xutil.c
++++ b/common/xutil.c
+@@ -25,7 +25,6 @@
+ #include "common/util.h"
+ 
+ #include <xcb/xcb.h>
+-#include <xcb/xcb_atom.h>
+ #include <xcb/xcb_icccm.h>
+ 
+ #include "common/xutil.h"
+diff --git a/event.c b/event.c
+index 8527ec5..a35918b 100644
+--- a/event.c
++++ b/event.c
+@@ -721,7 +721,7 @@ event_handle_clientmessage(xcb_client_message_event_t *ev)
+         client_t *c;
+         if((c = client_getbywin(ev->window))
+            && ev->format == 32
+-           && ev->data.data32[0] == XCB_WM_STATE_ICONIC)
++           && ev->data.data32[0] == XCB_ICCCM_WM_STATE_ICONIC)
+         {
+             luaA_object_push(globalconf.L, c);
+             client_set_minimized(globalconf.L, -1, true);
+@@ -795,13 +795,13 @@ static void
+ xerror(xcb_generic_error_t *e)
+ {
+     /* ignore this */
+-    if(e->error_code == XCB_EVENT_ERROR_BAD_WINDOW
+-       || (e->error_code == XCB_EVENT_ERROR_BAD_MATCH
++    if(e->error_code == XCB_WINDOW
++       || (e->error_code == XCB_MATCH
+            && e->major_code == XCB_SET_INPUT_FOCUS)
+-       || (e->error_code == XCB_EVENT_ERROR_BAD_VALUE
++       || (e->error_code == XCB_VALUE
+            && e->major_code == XCB_KILL_CLIENT)
+        || (e->major_code == XCB_CONFIGURE_WINDOW
+-           && e->error_code == XCB_EVENT_ERROR_BAD_MATCH))
++           && e->error_code == XCB_MATCH))
+         return;
+ 
+     warn("X error: request=%s, error=%s",
+diff --git a/ewmh.c b/ewmh.c
+index 0aa5de7..ba4776c 100644
+--- a/ewmh.c
++++ b/ewmh.c
+@@ -226,7 +226,7 @@ ewmh_update_net_active_window(int phys_screen)
+ 
+     xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE,
+ 			xutil_screen_get(globalconf.connection, phys_screen)->root,
+-			_NET_ACTIVE_WINDOW, WINDOW, 32, 1, &win);
++			_NET_ACTIVE_WINDOW, XCB_ATOM_WINDOW, 32, 1, &win);
+ }
+ 
+ static void
+@@ -425,7 +425,7 @@ ewmh_client_update_hints(client_t *c)
+         state[i++] = _NET_WM_STATE_DEMANDS_ATTENTION;
+ 
+     xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE,
+-                        c->window, _NET_WM_STATE, ATOM, 32, i, state);
++                        c->window, _NET_WM_STATE, XCB_ATOM_ATOM, 32, i, state);
+ }
+ 
+ /** Update the client active desktop.
+diff --git a/property.c b/property.c
+index d5090c6..d2223ef 100644
+--- a/property.c
++++ b/property.c
+@@ -105,14 +105,14 @@ property_update_wm_transient_for(client_t *c, xcb_get_property_reply_t *reply)
+ 
+     if(reply)
+     {
+-        if(!xcb_get_wm_transient_for_from_reply(&trans, reply))
++        if(!xcb_icccm_get_wm_transient_for_from_reply(&trans, reply))
+             return;
+     }
+     else
+     {
+-        if(!xcb_get_wm_transient_for_reply(globalconf.connection,
+-                                            xcb_get_wm_transient_for_unchecked(globalconf.connection,
+-                                                                               c->window),
++        if(!xcb_icccm_get_wm_transient_for_reply(globalconf.connection,
++                                            xcb_icccm_get_wm_transient_for_unchecked(globalconf.connection,
++                                                                                     c->window),
+                                             &trans, NULL))
+             return;
+     }
+@@ -160,15 +160,15 @@ property_update_wm_normal_hints(client_t *c, xcb_get_property_reply_t *reply)
+ {
+     if(reply)
+     {
+-        if(!xcb_get_wm_size_hints_from_reply(&c->size_hints, reply))
++        if(!xcb_icccm_get_wm_size_hints_from_reply(&c->size_hints, reply))
+             return;
+     }
+     else
+     {
+-        if(!xcb_get_wm_normal_hints_reply(globalconf.connection,
+-                                          xcb_get_wm_normal_hints_unchecked(globalconf.connection,
+-                                                                            c->window),
+-                                          &c->size_hints, NULL))
++        if(!xcb_icccm_get_wm_normal_hints_reply(globalconf.connection,
++                                                xcb_icccm_get_wm_normal_hints_unchecked(globalconf.connection,
++                                                                                        c->window),
++                                                &c->size_hints, NULL))
+             return;
+     }
+ }
+@@ -180,31 +180,31 @@ property_update_wm_normal_hints(client_t *c, xcb_get_property_reply_t *reply)
+ void
+ property_update_wm_hints(client_t *c, xcb_get_property_reply_t *reply)
+ {
+-    xcb_wm_hints_t wmh;
++    xcb_icccm_wm_hints_t wmh;
+ 
+     if(reply)
+     {
+-        if(!xcb_get_wm_hints_from_reply(&wmh, reply))
++        if(!xcb_icccm_get_wm_hints_from_reply(&wmh, reply))
+             return;
+     }
+     else
+     {
+-        if(!xcb_get_wm_hints_reply(globalconf.connection,
+-                                  xcb_get_wm_hints_unchecked(globalconf.connection, c->window),
+-                                  &wmh, NULL))
++        if(!xcb_icccm_get_wm_hints_reply(globalconf.connection,
++                                         xcb_icccm_get_wm_hints_unchecked(globalconf.connection, c->window),
++                                         &wmh, NULL))
+             return;
+     }
+ 
+     luaA_object_push(globalconf.L, c);
+-    client_set_urgent(globalconf.L, -1, xcb_wm_hints_get_urgency(&wmh));
+-    if(wmh.flags & XCB_WM_HINT_STATE &&
+-       wmh.initial_state == XCB_WM_STATE_WITHDRAWN)
++    client_set_urgent(globalconf.L, -1, xcb_icccm_wm_hints_get_urgency(&wmh));
++    if(wmh.flags & XCB_ICCCM_WM_HINT_STATE &&
++       wmh.initial_state == XCB_ICCCM_WM_STATE_WITHDRAWN)
+         client_set_border_width(globalconf.L, -1, 0);
+ 
+-    if(wmh.flags & XCB_WM_HINT_INPUT)
++    if(wmh.flags & XCB_ICCCM_WM_HINT_INPUT)
+         c->nofocus = !wmh.input;
+ 
+-    if(wmh.flags & XCB_WM_HINT_WINDOW_GROUP)
++    if(wmh.flags & XCB_ICCCM_WM_HINT_WINDOW_GROUP)
+         client_set_group_window(globalconf.L, -1, wmh.window_group);
+ 
+     lua_pop(globalconf.L, 1);
+@@ -217,18 +217,18 @@ property_update_wm_hints(client_t *c, xcb_get_property_reply_t *reply)
+ void
+ property_update_wm_class(client_t *c, xcb_get_property_reply_t *reply)
+ {
+-    xcb_get_wm_class_reply_t hint;
++    xcb_icccm_get_wm_class_reply_t hint;
+ 
+     if(reply)
+     {
+-        if(!xcb_get_wm_class_from_reply(&hint, reply))
++        if(!xcb_icccm_get_wm_class_from_reply(&hint, reply))
+             return;
+     }
+     else
+     {
+-        if(!xcb_get_wm_class_reply(globalconf.connection,
+-                                   xcb_get_wm_class_unchecked(globalconf.connection, c->window),
+-                                   &hint, NULL))
++        if(!xcb_icccm_get_wm_class_reply(globalconf.connection,
++                                         xcb_icccm_get_wm_class_unchecked(globalconf.connection, c->window),
++                                         &hint, NULL))
+             return;
+     }
+ 
+@@ -238,7 +238,7 @@ property_update_wm_class(client_t *c, xcb_get_property_reply_t *reply)
+ 
+     /* only delete reply if we get it ourselves */
+     if(!reply)
+-        xcb_get_wm_class_reply_wipe(&hint);
++        xcb_icccm_get_wm_class_reply_wipe(&hint);
+ }
+ 
+ static int
+@@ -308,30 +308,30 @@ property_update_net_wm_pid(client_t *c,
+ void
+ property_update_wm_protocols(client_t *c, xcb_get_property_reply_t *reply)
+ {
+-    xcb_get_wm_protocols_reply_t protocols;
++    xcb_icccm_get_wm_protocols_reply_t protocols;
+     xcb_get_property_reply_t *reply_copy;
+ 
+     if(reply)
+     {
+         reply_copy = p_dup(reply, 1);
+ 
+-        if(!xcb_get_wm_protocols_from_reply(reply_copy, &protocols))
+-	{
++        if(!xcb_icccm_get_wm_protocols_from_reply(reply_copy, &protocols))
++        {
+             p_delete(&reply_copy);
+             return;
+-	}
++        }
+     }
+     else
+     {
+         /* If this fails for any reason, we still got the old value */
+-        if(!xcb_get_wm_protocols_reply(globalconf.connection,
+-                                      xcb_get_wm_protocols_unchecked(globalconf.connection,
+-                                                                     c->window, WM_PROTOCOLS),
+-                                      &protocols, NULL))
++        if(!xcb_icccm_get_wm_protocols_reply(globalconf.connection,
++                                             xcb_icccm_get_wm_protocols_unchecked(globalconf.connection,
++                                                                                  c->window, WM_PROTOCOLS),
++                                             &protocols, NULL))
+             return;
+     }
+ 
+-    xcb_get_wm_protocols_reply_wipe(&c->protocols);
++    xcb_icccm_get_wm_protocols_reply_wipe(&c->protocols);
+     memcpy(&c->protocols, &protocols, sizeof(protocols));
+ }
+ 
+diff --git a/selection.c b/selection.c
+index 527ec40..44b57c5 100644
+--- a/selection.c
++++ b/selection.c
+@@ -86,18 +86,18 @@ luaA_selection_get(lua_State *L)
+         if(event_notify->selection == XCB_ATOM_PRIMARY
+            && event_notify->property != XCB_NONE)
+         {
+-            xcb_get_text_property_reply_t prop;
++            xcb_icccm_get_text_property_reply_t prop;
+             xcb_get_property_cookie_t cookie =
+-                xcb_get_text_property(globalconf.connection,
+-                                      event_notify->requestor,
+-                                      event_notify->property);
++                xcb_icccm_get_text_property(globalconf.connection,
++                                            event_notify->requestor,
++                                            event_notify->property);
+ 
+-            if(xcb_get_text_property_reply(globalconf.connection,
+-                                           cookie, &prop, NULL))
++            if(xcb_icccm_get_text_property_reply(globalconf.connection,
++                                                 cookie, &prop, NULL))
+             {