New commits:
commit 9096da46cd745fc754cee72108a64abfb91c9398
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
xorg-server: added a message about udev vs hal for hotplugging,
removed dbus dependency as hal already depends on it, fixed configure
options set by those deps
commit 2fb1ea7f88a72360412ae2a09383dca0ba59439f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
libvdpau: made doxygen optional and removed texlive dependency
commit e83461b62025ca47082eeb829799b496f08e24bb
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
calibre: version 0.8.0 and fixed install path
commit aa9dbb9b116496d1a776fb789741fcc68dd1778e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
awesome: version 3.4.10, removed obsolete patch and added a BUILD fix to
avoid picking up the wrong convert executable
diff --git a/python-pypi/calibre/DETAILS b/python-pypi/calibre/DETAILS
index 3690938..87dfa03 100755
--- a/python-pypi/calibre/DETAILS
+++ b/python-pypi/calibre/DETAILS
@@ -1,5 +1,5 @@
SPELL=calibre
- VERSION=0.7.49
+ VERSION=0.8.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$VERSION/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index 49861a9..f9b2e97 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,3 +1,7 @@
+2011-05-11 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 0.8.0
+ * INSTALL: corrected prefix and install path
+
2011-03-11 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.7.49
diff --git a/python-pypi/calibre/INSTALL b/python-pypi/calibre/INSTALL
index 3a28ba5..d4342a7 100755
--- a/python-pypi/calibre/INSTALL
+++ b/python-pypi/calibre/INSTALL
@@ -1,2 +1,7 @@
# added --prefix to the default_install_python otherwise it doesn't run
-python setup.py install --prefix="$INSTALL_ROOT/" --root "$INSTALL_ROOT/"
"$@"
+python setup.py install --prefix="/usr" --staging-root "${INSTALL_ROOT}/usr"
"$@" &&
+
+# python install skips it, but calibre needs it...
+if [[ ! -e "${INSTALL_ROOT}/usr/bin/python2" ]]; then
+ ln -s "${INSTALL_ROOT}/usr/bin/python" "${INSTALL_ROOT}/usr/bin/python2"
+fi
diff --git a/python-pypi/calibre/calibre-0.7.49.tar.gz.sig
b/python-pypi/calibre/calibre-0.7.49.tar.gz.sig
deleted file mode 100644
index 17cbe79..0000000
Binary files a/python-pypi/calibre/calibre-0.7.49.tar.gz.sig and /dev/null
differ
diff --git a/python-pypi/calibre/calibre-0.8.0.tar.gz.sig
b/python-pypi/calibre/calibre-0.8.0.tar.gz.sig
new file mode 100644
index 0000000..823f5b1
Binary files /dev/null and b/python-pypi/calibre/calibre-0.8.0.tar.gz.sig
differ
diff --git a/windowmanagers/awesome/BUILD b/windowmanagers/awesome/BUILD
index ee02cb9..f9fc648 100755
--- a/windowmanagers/awesome/BUILD
+++ b/windowmanagers/awesome/BUILD
@@ -1,3 +1,4 @@
+export PATH="/sbin:/bin:/usr/bin:/usr/sbin" &&
cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr \
-DSYSCONFDIR=$INSTALLROOT/etc . &&
make
diff --git a/windowmanagers/awesome/DETAILS b/windowmanagers/awesome/DETAILS
index 43db9ae..4539354 100755
--- a/windowmanagers/awesome/DETAILS
+++ b/windowmanagers/awesome/DETAILS
@@ -1,9 +1,9 @@
SPELL=awesome
- VERSION=3.4.9
+ VERSION=3.4.10
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://awesome.naquadah.org/download/$SOURCE
-
SOURCE_HASH=sha512:3dce21e08e813e952371dc4e2e8f0bd523a5ef869aeceac6ac3c8b123fafd8344c5df11032cc5488129c5e7008194eb955653c7e8273de715e1f2bd0a7f8494d
+
SOURCE_HASH=sha512:403f05e97229623b338afdc390600aa8aeca37d4e2644fcf9165bada498978f6f29bfb929cf70590f6e3b34ca6f07769c3c5d6d46f45f6efa2480d0b5d9ad1e6
LICENSE[0]=MIT
KEYWORDS="windowmanagers"
WEB_SITE=http://awesome.naquadah.org/
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index 9c11c2c..82f6b41 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,10 @@
+2011-05-17 Arjan Bouter <abouter AT soucemage.org>
+ * DETAILS: version 3.4.10
+ * PRE_BUILD, awesome-3.4.8-cmake-2.8.4.patch: removed,
+ patch is no longer needed.
+ * BUILD: set PATH to have /usr/bin before /usr/sbin to avoid picking
up
+ libee's /usr/sbin/convert instead of imagemagick's /usr/bin/convert
+
2011-03-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, awesome-3.4.8-cmake-2.8.4.patch: added patch from
gentoo to fix build with cmake 2.8.4
diff --git a/windowmanagers/awesome/PRE_BUILD
b/windowmanagers/awesome/PRE_BUILD
deleted file mode 100755
index 75abd2d..0000000
--- a/windowmanagers/awesome/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SCRIPT_DIRECTORY/awesome-3.4.8-cmake-2.8.4.patch &&
-sedit 's:Exec=awesome:Exec=startawesome:' awesome.desktop
diff --git a/windowmanagers/awesome/awesome-3.4.8-cmake-2.8.4.patch
b/windowmanagers/awesome/awesome-3.4.8-cmake-2.8.4.patch
deleted file mode 100644
index bfa7ab0..0000000
--- a/windowmanagers/awesome/awesome-3.4.8-cmake-2.8.4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-fix compilation with cmake 2.8.4
-
-https://awesome.naquadah.org/bugs/index.php?do=details&task_id=869
-https://bugs.gentoo.org/show_bug.cgi?id=356009
---- awesome-3.4.9/CMakeLists.txt.orig
-+++ awesome-3.4.9/CMakeLists.txt
-@@ -274,14 +274,15 @@ endif()
-
- # {{{ Theme icons
- file(GLOB icon_sources RELATIVE ${SOURCE_DIR}
${SOURCE_DIR}/themes/*/titlebar/*.png)
--set(ALL_ICONS ${icon_sources})
-
- foreach(icon ${icon_sources})
- # Copy all icons to the build dir to simplify the following code.
- # Source paths are interpreted relative to ${SOURCE_DIR}, target paths
- # relative to ${BUILD_DIR}.
- get_filename_component(icon_path ${icon} PATH)
-+ get_filename_component(icon_name ${icon} NAME)
- file(COPY ${icon} DESTINATION ${icon_path})
-+ set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}")
- endforeach()
-
- macro(a_icon_convert match replacement input)
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 1d04c45..c081a4c 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -40,27 +40,27 @@ optional_depends libxvmc \
# May only select one:
# configure: error: Hotplugging through both libudev and dbus/hal not allowed
#
+# NOTE: as hal depends on dbus, we can safely enable/disable dbus's configure
+# options with hal
+#
# hal is preferred by upstream:
# --enable-config-udev Build udev support (default: auto)
# --enable-config-dbus Build D-BUS API support (default: no)
# --disable-config-hal Build HAL support (default: auto)
#
-optional_depends dbus \
- "--enable-config-dbus --disable-config-udev" \
- "--disable-config-dbus" \
- "Enable D-BUS API support" &&
+message "You can either use hal+dbus OR udev for hotplugging" &&
+message "but NOT both" &&
optional_depends hal \
- "--enable-config-hal --disable-config-udev" \
- "--disable-config-hal" \
- "Enable HAL support" &&
+ "--enable-config-hal --enable-config-dbus --disable-config-udev" \
+ "--disable-config-hal --disable-config-dbus" \
+ "Enable HAL support" &&