media-video/qx11grab: Version bump.

svn path=/sunrise/; revision=10985

5 files changed, 82 insertions, 25 deletions

diff --git a/media-video/qx11grab/ChangeLog b/media-video/qx11grab/ChangeLog
index 717d96a3d..061165063 100644
--- a/media-video/qx11grab/ChangeLog
+++ b/media-video/qx11grab/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for media-video/qx11grab
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*qx11grab-0.2.1_rc4 (10 Jul 2010)
+
+  10 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
+  -qx11grab-0.1.8.ebuild, +qx11grab-0.2.1_rc4.ebuild,
+  +files/qx11grab-0.2.1_rc4-as-needed.patch:
+  Version bump.
+
 *qx11grab-0.1.8 (17 Dec 2009)
 
   17 Dec 2009; Ondrej Sukup (mimi_vx) <mimi.vx@gmail.com>
diff --git a/media-video/qx11grab/Manifest b/media-video/qx11grab/Manifest
index cab863170..403c1d796 100644
--- a/media-video/qx11grab/Manifest
+++ b/media-video/qx11grab/Manifest
@@ -1,4 +1,5 @@
-DIST qx11grab-0.1.8.tar.bz2 78212 RMD160 f302233b5bf8b8c007c2353be75ccc6d505501e6 SHA1 3fbb9199bc6142f822336f266b781175fd6d00f6 SHA256 54e5e16a2655de784f92d83ada23a673b57a6e7a6ca5684c3a567d427fcbe3fb
-EBUILD qx11grab-0.1.8.ebuild 442 RMD160 68f92f9d0f90fb371d5164e14a2a3a0e265a73e2 SHA1 43a92b5d8426c3c82f4e2fe56d84f6a632df5a54 SHA256 db5a15795be6eb044fb02b31b958cf508fef394877753e74f202f0ba40d1a72a
-MISC ChangeLog 307 RMD160 75da433ad643bb9b2973e3a3f036bffa00a837f3 SHA1 c60936fc7597712a35eb3d276bf4fb37a6348585 SHA256 aed00bd431cc85fcc83e890a8b4f1b2b427a9aefb9ad64d3c31126c19112c0fd
+AUX qx11grab-0.2.1_rc4-as-needed.patch 764 RMD160 a8f7dca62866fcde97142ebf5c5deb2390f638ef SHA1 94378c1dcc527f1fa554bbc704211883fec915f1 SHA256 b9918d60d7497370141ebc7a02065c0bf6085b4fcb11bbb4788563f741718f46
+DIST qx11grab-0.2.1_rc4.tar.bz2 147299 RMD160 162dec4ea4a41033a9cc2a0b835202ef24cb8f44 SHA1 b14b6d3329a2578d466dbdb7b9c4e1ec243f4009 SHA256 06a4589fcb2c53496fe7b877cd91ebe70d658ed10e7bdbb1927a95d2f4747dc3
+EBUILD qx11grab-0.2.1_rc4.ebuild 845 RMD160 f96e7511b2b0df2697d210b5886d6f7c057c965c SHA1 8abb8258c579d62eec5f13b6baec13bd757735c5 SHA256 b98ad73c57c2b218f7249e3909397f64d71b6f043213fcf09082fb4cb552f884
+MISC ChangeLog 527 RMD160 8dc072717e54aac3aaf4c0018b3ff352701d00cb SHA1 ba65e0b4d8cc6c014141f219b5e236b1ed54156a SHA256 91a66842cf813f2f9e579bed8c43ea70afaa0465e4bbdf11cd789120c6419292
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/media-video/qx11grab/files/qx11grab-0.2.1_rc4-as-needed.patch b/media-video/qx11grab/files/qx11grab-0.2.1_rc4-as-needed.patch
new file mode 100644
index 000000000..8105fbc41
--- /dev/null
+++ b/media-video/qx11grab/files/qx11grab-0.2.1_rc4-as-needed.patch
@@ -0,0 +1,26 @@
+From bd874e9f7291d09368b386aca7dcf1a6b07ca6de Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
+Date: Sat, 10 Jul 2010 20:39:30 +0200
+Subject: [PATCH] Reorder libs to fix linking with -Wl,--as-needed.
+
+---
+ qx11grab-0.2.1.rc4/src/CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/qx11grab-0.2.1.rc4/src/CMakeLists.txt b/qx11grab-0.2.1.rc4/src/CMakeLists.txt
+index 4c1c386..4aaff91 100644
+--- a/qx11grab-0.2.1.rc4/src/CMakeLists.txt
++++ b/qx11grab-0.2.1.rc4/src/CMakeLists.txt
+@@ -69,8 +69,8 @@ ADD_EXECUTABLE (qx11grab
+ )
+ 
+ TARGET_LINK_LIBRARIES (qx11grab
+-  ${QX11GRAB_LIBRARIES}
+   TableEditor
++  ${QX11GRAB_LIBRARIES}
+ )
+ 
+ INSTALL (TARGETS qx11grab DESTINATION bin)
+-- 
+1.7.1.1
+
diff --git a/media-video/qx11grab/qx11grab-0.1.8.ebuild b/media-video/qx11grab/qx11grab-0.1.8.ebuild
deleted file mode 100644
index 2d6438357..000000000
--- a/media-video/qx11grab/qx11grab-0.1.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit qt4-r2
-
-DESCRIPTION="X11 desktop video grabber tray"
-HOMEPAGE="http://qx11grab.hjcms.de/?ref=welcome&lang=en"
-SRC_URI="http://qx11grab.hjcms.de/Downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/qt-gui:4[dbus]"
-RDEPEND="${DEPEND}
-	media-video/ffmpeg[X]"
diff --git a/media-video/qx11grab/qx11grab-0.2.1_rc4.ebuild b/media-video/qx11grab/qx11grab-0.2.1_rc4.ebuild
new file mode 100644
index 000000000..94c9db81a
--- /dev/null
+++ b/media-video/qx11grab/qx11grab-0.2.1_rc4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit cmake-utils eutils flag-o-matic versionator
+
+MY_P=${PN}-$(replace_version_separator _ .)
+DESCRIPTION="X11 desktop video grabber tray"
+HOMEPAGE="http://qx11grab.hjcms.de/"
+SRC_URI="http://qx11grab.hjcms.de/Downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/qt-gui:4[dbus]
+	media-video/ffmpeg[X]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# Required by ffmpeg headers.
+	append-flags -D__STDC_CONSTANT_MACROS
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	# Move docs to DOCDIR.
+	sed -i \
+		-e "s:share/qx11grab:share/doc/${PF}:" \
+		-e '/COPYING/d' \
+		CMakeLists.txt
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	prepalldocs
+}