Stable latest on amd64 and x86. Punt older.

(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

7 files changed, 11 insertions, 181 deletions

diff --git a/media-video/qx11grab/ChangeLog b/media-video/qx11grab/ChangeLog
index c33447e94133..13615110f70d 100644
--- a/media-video/qx11grab/ChangeLog
+++ b/media-video/qx11grab/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/qx11grab
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.25 2012/05/05 08:58:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.26 2012/05/16 09:37:36 scarabeus Exp $
+
+  16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/0.4.1-detect-avconv-presets-dir.patch,
+  -files/0.4.1-fix-install-destination.patch,
+  -files/0.4.1-fix-typos-in-CMakeLists.patch,
+  -files/0.4.1-optional-pulseaudio.patch, -qx11grab-0.4.1-r2.ebuild,
+  qx11grab-0.4.3.ebuild:
+  Stable latest on amd64 and x86. Punt older.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> qx11grab-0.4.1-r2.ebuild,
   qx11grab-0.4.3.ebuild:
diff --git a/media-video/qx11grab/files/0.4.1-detect-avconv-presets-dir.patch b/media-video/qx11grab/files/0.4.1-detect-avconv-presets-dir.patch
deleted file mode 100644
index ad4dc3ce882e..000000000000
--- a/media-video/qx11grab/files/0.4.1-detect-avconv-presets-dir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- qx11grab-0.4.1.orig/CMakeLists.txt	2012-03-17 18:01:02.533911733 +0100
-+++ qx11grab-0.4.1/CMakeLists.txt	2012-03-17 18:01:37.014480664 +0100
-@@ -155,8 +155,8 @@
- 
- SET (FFMPEG_INCLUDEDIR ${FFMPEG_STATIC_INCLUDE_DIRS})
- 
--FIND_PATH (_ffmpeg_sharedir
--  NAMES ffmpeg
-+FIND_FILE (FFMPEG_SHAREDIR
-+  NAMES ffmpeg avconv
-   PATH_SUFFIXES ${FFMPEG_SUFFIX}
-   PATHS
-     /usr/share
-@@ -165,15 +165,8 @@
-     $ENV{AVCONV_DATADIR}
-   DOC "Find FFmpeg data directory for ffpreset files"
-   NO_DEFAULT_PATH
--  NO_SYSTEM_ENVIRONMENT_PATH
--  NO_CMAKE_PATH
- )
- 
--IF (_ffmpeg_sharedir)
--  SET (FFMPEG_SHAREDIR "${_ffmpeg_sharedir}/ffmpeg" CACHE PATH
--    "FFmpeg data directory for ffpreset files (PATH)")
--ENDIF (_ffmpeg_sharedir)
--
- ##############################################################
- ## PulseAudio 
- ##############################################################
diff --git a/media-video/qx11grab/files/0.4.1-fix-install-destination.patch b/media-video/qx11grab/files/0.4.1-fix-install-destination.patch
deleted file mode 100644
index 70325762be8d..000000000000
--- a/media-video/qx11grab/files/0.4.1-fix-install-destination.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur qx11grab-0.4.1.orig/CMakeLists.txt qx11grab-0.4.1/CMakeLists.txt
---- qx11grab-0.4.1.orig/CMakeLists.txt	2012-03-17 20:12:08.421574605 +0100
-+++ qx11grab-0.4.1/CMakeLists.txt	2012-03-17 20:24:11.833530710 +0100
-@@ -318,7 +318,7 @@
- 
- INSTALL (FILES
-   ${ARCHIVE_OUTPUT_PATH}/qx11grab.1
--  DESTINATION share/man/man1/qx11grab.1
-+  DESTINATION share/man/man1/
- )
- 
- ##############################################################
-diff -Naur qx11grab-0.4.1.orig/icons/CMakeLists.txt qx11grab-0.4.1/icons/CMakeLists.txt
---- qx11grab-0.4.1.orig/icons/CMakeLists.txt	2012-03-17 20:12:08.410574742 +0100
-+++ qx11grab-0.4.1/icons/CMakeLists.txt	2012-03-17 20:19:27.200089116 +0100
-@@ -20,7 +20,8 @@
- ## Pixmaps
- INSTALL (FILES
-   qx11grab_36.png
--  DESTINATION share/pixmaps/qx11grab.png
-+  DESTINATION share/pixmaps/
-+  RENAME qx11grab.png
-   COMPONENT data
- )
- 
diff --git a/media-video/qx11grab/files/0.4.1-fix-typos-in-CMakeLists.patch b/media-video/qx11grab/files/0.4.1-fix-typos-in-CMakeLists.patch
deleted file mode 100644
index d74a41dfc138..000000000000
--- a/media-video/qx11grab/files/0.4.1-fix-typos-in-CMakeLists.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur qx11grab-0.4.1.orig/CMakeLists.txt qx11grab-0.4.1/CMakeLists.txt
---- qx11grab-0.4.1.orig/CMakeLists.txt	2012-03-06 14:30:53.127203576 +0100
-+++ qx11grab-0.4.1/CMakeLists.txt	2012-03-06 14:31:40.214614902 +0100
-@@ -393,7 +393,7 @@
- MESSAGE ("")
- MESSAGE ("Optional Packages:")
- summary (PULSE_FOUND "pulseaudio" TRUE)
--summary (KDE_FOUND "kde4" TRUE)
-+summary (KDE4_FOUND "kde4" TRUE)
- MESSAGE ("")
- 
- ## EOF
-diff -Naur qx11grab-0.4.1.orig/src/filters/watermark/CMakeLists.txt qx11grab-0.4.1/src/filters/watermark/CMakeLists.txt
---- qx11grab-0.4.1.orig/src/filters/watermark/CMakeLists.txt	2012-03-06 14:30:53.147203326 +0100
-+++ qx11grab-0.4.1/src/filters/watermark/CMakeLists.txt	2012-03-06 14:32:00.158365566 +0100
-@@ -35,7 +35,7 @@
- TARGET_LINK_LIBRARIES (${target_plugin}
-   ${QT_QTCORE_LIBRARY}
-   ${QT_QTGUI_LIBRARY}
--  ${QT_QTBUS_LIBRARY}
-+  ${QT_QTDBUS_LIBRARY}
-   qx11grabinterface
- )
- 
diff --git a/media-video/qx11grab/files/0.4.1-optional-pulseaudio.patch b/media-video/qx11grab/files/0.4.1-optional-pulseaudio.patch
deleted file mode 100644
index dfc74f9249fd..000000000000
--- a/media-video/qx11grab/files/0.4.1-optional-pulseaudio.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur qx11grab-0.4.1.orig/CMakeLists.txt qx11grab-0.4.1/CMakeLists.txt
---- qx11grab-0.4.1.orig/CMakeLists.txt	2012-03-06 14:41:47.888017941 +0100
-+++ qx11grab-0.4.1/CMakeLists.txt	2012-03-06 14:46:32.774456369 +0100
-@@ -178,21 +178,26 @@
- ## PulseAudio 
- ##############################################################
- 
--SET (PULSE_SUFFIX "" CACHE STRING
--  "pulse pkg-config or library file suffix (STRING)"
--)
-+OPTION (ENABLE_PULSE "Enable PulseAudio Support (ON/OFF)" OFF)
-+IF (ENABLE_PULSE)
-+  SET (PULSE_SUFFIX "" CACHE STRING
-+    "pulse pkg-config or library file suffix (STRING)"
-+  )
- 
--SET (PULSE_VERSION "0.9" CACHE STRING
--  "Required libpulse${PULSE_SUFFIX} Version" FORCE
--)
-+  SET (PULSE_VERSION "0.9" CACHE STRING
-+    "Required libpulse${PULSE_SUFFIX} Version" FORCE
-+  )
- 
--PKG_CHECK_MODULES (PULSE 
--  libpulse${PULSE_SUFFIX}>=${PULSE_VERSION}
--)
-+  PKG_CHECK_MODULES (PULSE 
-+    libpulse${PULSE_SUFFIX}>=${PULSE_VERSION}
-+  )
- 
--IF (PULSE_FOUND)
--  ADD_DEFINITIONS (-DHAVE_PULSE)
--ENDIF (PULSE_FOUND)
-+  IF (PULSE_FOUND)
-+    ADD_DEFINITIONS (-DHAVE_PULSE)
-+  ELSE (PULSE_FOUND)
-+    MESSAGE (FATAL_ERROR "PulseAudio not found")
-+  ENDIF (PULSE_FOUND)
-+ENDIF (ENABLE_PULSE)
- 
- ##############################################################
- ## Xorg 
diff --git a/media-video/qx11grab/qx11grab-0.4.1-r2.ebuild b/media-video/qx11grab/qx11grab-0.4.1-r2.ebuild
deleted file mode 100644
index 1a7cb4be55bc..000000000000
--- a/media-video/qx11grab/qx11grab-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.1-r2.ebuild,v 1.4 2012/05/05 08:58:50 jdhore Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="X11 desktop video grabber tray"
-HOMEPAGE="http://qx11grab.hjcms.de/"
-SRC_URI="http://qx11grab.hjcms.de/downloads/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="opengl pulseaudio"
-
-RDEPEND="
-	>=media-libs/alsa-lib-1.0.24
-	>=media-libs/fontconfig-2.4
-	>=media-libs/freetype-2.4:2
-	>=sys-apps/dbus-1.4.16
-	>=x11-libs/libX11-1.3.4
-	>=x11-libs/libXrandr-1.3
-	>=x11-libs/qt-core-4.7.2:4
-	>=x11-libs/qt-dbus-4.7.2:4
-	>=x11-libs/qt-gui-4.7.2:4[dbus]
-	>=virtual/ffmpeg-0.9[X,encode]
-	opengl? ( >=x11-libs/qt-opengl-4.7.2:4 )
-	pulseaudio? ( >=media-sound/pulseaudio-1.1 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PDEPEND="virtual/freedesktop-icon-theme"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-detect-avconv-presets-dir.patch"
-	"${FILESDIR}/${PV}-fix-install-destination.patch"
-	"${FILESDIR}/${PV}-fix-typos-in-CMakeLists.patch"
-	"${FILESDIR}/${PV}-optional-pulseaudio.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# install docs into standard Gentoo location
-	sed -i -e "s: share/\${CMAKE_PROJECT_NAME}: share/doc/${PF}:" \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable opengl)
-		$(cmake-utils_use_enable pulseaudio PULSE)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-video/qx11grab/qx11grab-0.4.3.ebuild b/media-video/qx11grab/qx11grab-0.4.3.ebuild
index 98da26c190b0..de82aaa6fa27 100644
--- a/media-video/qx11grab/qx11grab-0.4.3.ebuild
+++ b/media-video/qx11grab/qx11grab-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4 2012/05/05 08:58:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.3.ebuild,v 1.5 2012/05/16 09:37:36 scarabeus Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ 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="