Version bump. Replace base_src_prepare with cmake-utils_src_prepare. Remove old.

(Portage version: 2.1.12.10/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

5 files changed, 24 insertions, 48 deletions

diff --git a/media-video/qx11grab/ChangeLog b/media-video/qx11grab/ChangeLog
index 1f11cc1da745..2c2f062cce9a 100644
--- a/media-video/qx11grab/ChangeLog
+++ b/media-video/qx11grab/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/qx11grab
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.34 2013/03/09 17:36:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.35 2013/06/28 13:30:38 kensington Exp $
+
+*qx11grab-0.4.8 (28 Jun 2013)
+
+  28 Jun 2013; Michael Palimaka <kensington@gentoo.org> +qx11grab-0.4.8.ebuild,
+  -files/0.4.3-fix-ffmpeg-filter-check.patch, -qx11grab-0.4.3.ebuild,
+  qx11grab-0.4.6.ebuild, qx11grab-0.4.7.ebuild:
+  Version bump. Replace base_src_prepare with cmake-utils_src_prepare. Remove
+  old.
 
   09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> qx11grab-0.4.6.ebuild:
   Stable for x86, wrt bug #460232
diff --git a/media-video/qx11grab/files/0.4.3-fix-ffmpeg-filter-check.patch b/media-video/qx11grab/files/0.4.3-fix-ffmpeg-filter-check.patch
deleted file mode 100644
index 73f4cd191b5b..000000000000
--- a/media-video/qx11grab/files/0.4.3-fix-ffmpeg-filter-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN qx11grab-0.4.3.orig/modules/FindFFmpeg.cmake qx11grab-0.4.3/modules/FindFFmpeg.cmake
---- qx11grab-0.4.3.orig/modules/FindFFmpeg.cmake	2012-04-22 17:37:13.146507207 +0200
-+++ qx11grab-0.4.3/modules/FindFFmpeg.cmake	2012-04-22 17:37:47.640075978 +0200
-@@ -156,9 +156,9 @@
- 
- MACRO (FFMPEG_FILTER_EXISTS FILTER VARIABLE)
-   TRY_RUN (filter_arg _filter_supported
--    ${CMAKE_BINARY_DIR}
--    ${CMAKE_MODULE_PATH}/check_ffmpeg_filter.c
--    COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
-+    ${CMAKE_BINARY_DIR}/CMakeTmp
-+    ${CMAKE_SOURCE_DIR}/modules/check_ffmpeg_filter.c
-+    COMPILE_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -std=gnu89"
-     CMAKE_FLAGS
-       "-DINCLUDE_DIRECTORIES:STRING=${FFMPEG_INCLUDEDIR}"
-       "-DLINK_LIBRARIES:STRING=${FFMPEG_AVUTIL_LIBRARY};${FFMPEG_AVFILTER_LIBRARY}"
-diff -urN qx11grab-0.4.3.orig/modules/check_ffmpeg_filter.c qx11grab-0.4.3/modules/check_ffmpeg_filter.c
---- qx11grab-0.4.3.orig/modules/check_ffmpeg_filter.c	2012-04-22 17:37:13.147507195 +0200
-+++ qx11grab-0.4.3/modules/check_ffmpeg_filter.c	2012-04-22 17:37:18.619438786 +0200
-@@ -27,7 +27,7 @@
- 
- int main(int argc, char **argv)
- {
--  if( ( argc < 1 ) || strlen(argv[1]) < 3 )
-+  if( ( argc < 2 ) || strlen(argv[1]) < 3 )
-   {
-     fprintf ( stderr, "Missing Filter arguments\n" );
-     return EXIT_FAILURE;
diff --git a/media-video/qx11grab/qx11grab-0.4.6.ebuild b/media-video/qx11grab/qx11grab-0.4.6.ebuild
index 90babeeaf57b..78c49f740df5 100644
--- a/media-video/qx11grab/qx11grab-0.4.6.ebuild
+++ b/media-video/qx11grab/qx11grab-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.6.ebuild,v 1.4 2013/03/09 17:36:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.6.ebuild,v 1.5 2013/06/28 13:30:38 kensington Exp $
 
 EAPI=4
 
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 PDEPEND="virtual/freedesktop-icon-theme"
 
 src_prepare() {
-	base_src_prepare
+	cmake-utils_src_prepare
 
 	# install docs into standard Gentoo location
 	sed -i -e "/DESTINATION share/ s:\${CMAKE_PROJECT_NAME}:doc/${PF}:" \
diff --git a/media-video/qx11grab/qx11grab-0.4.7.ebuild b/media-video/qx11grab/qx11grab-0.4.7.ebuild
index bdfae7d98f26..f67cf769b920 100644
--- a/media-video/qx11grab/qx11grab-0.4.7.ebuild
+++ b/media-video/qx11grab/qx11grab-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.7.ebuild,v 1.4 2013/03/02 22:42:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.7.ebuild,v 1.5 2013/06/28 13:30:38 kensington Exp $
 
 EAPI=5
 
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 PDEPEND="virtual/freedesktop-icon-theme"
 
 src_prepare() {
-	base_src_prepare
+	cmake-utils_src_prepare
 
 	# install docs into standard Gentoo location
 	sed -i -e "/DESTINATION share/ s:\${CMAKE_PROJECT_NAME}:doc/${PF}:" \
diff --git a/media-video/qx11grab/qx11grab-0.4.3.ebuild b/media-video/qx11grab/qx11grab-0.4.8.ebuild
index 377b9b5d2728..9bd4db280ffc 100644
--- a/media-video/qx11grab/qx11grab-0.4.3.ebuild
+++ b/media-video/qx11grab/qx11grab-0.4.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.3.ebuild,v 1.6 2013/03/02 22:42:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.8.ebuild,v 1.1 2013/06/28 13:30:38 kensington Exp $
 
-EAPI=4
+EAPI=5
 
 inherit cmake-utils
 
@@ -12,22 +12,22 @@ SRC_URI="http://qx11grab.hjcms.de/downloads/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="kde opengl pulseaudio"
 
 RDEPEND="
-	>=media-libs/alsa-lib-1.0.24
+	>=media-libs/alsa-lib-1.0.26
 	>=media-libs/fontconfig-2.4
 	>=media-libs/freetype-2.4:2
-	>=sys-apps/dbus-1.4.16
+	>=sys-apps/dbus-1.6.4
 	>=x11-libs/libX11-1.3.4
 	>=x11-libs/libXrandr-1.3
-	>=dev-qt/qtcore-4.7.2:4
-	>=dev-qt/qtdbus-4.7.2:4
-	>=dev-qt/qtgui-4.7.2:4[dbus]
-	>=virtual/ffmpeg-0.10.2-r1[X,encode,truetype]
+	>=dev-qt/qtcore-4.7.4:4
+	>=dev-qt/qtdbus-4.7.4:4
+	>=dev-qt/qtgui-4.7.4:4[dbus]
+	>=virtual/ffmpeg-9[X,encode,truetype]
 	kde? ( kde-base/kdelibs:4 )
-	opengl? ( >=dev-qt/qtopengl-4.7.2:4 )
+	opengl? ( >=dev-qt/qtopengl-4.7.4:4 )
 	pulseaudio? ( media-sound/pulseaudio )
 "
 DEPEND="${RDEPEND}
@@ -36,12 +36,8 @@ DEPEND="${RDEPEND}
 "
 PDEPEND="virtual/freedesktop-icon-theme"
 
-PATCHES=(
-	"${FILESDIR}/${PV}-fix-ffmpeg-filter-check.patch"
-)
-
 src_prepare() {
-	base_src_prepare
+	cmake-utils_src_prepare
 
 	# install docs into standard Gentoo location
 	sed -i -e "/DESTINATION share/ s:\${CMAKE_PROJECT_NAME}:doc/${PF}:" \