4.4_pre6250: Minor cleanup. Fix build failure with >=sys-kernel/linux-headers-3.9.

9999: Minor cleanup.
Patch by Arfrever.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 20 insertions, 13 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index 8bb2502f2a4c..b9b159efab5d 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/kvirc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.154 2013/10/17 20:39:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.155 2013/10/17 20:51:41 floppym Exp $
+
+  17 Oct 2013; Mike Gilbert <floppym@gentoo.org> kvirc-4.4_pre6250.ebuild,
+  kvirc-9999.ebuild:
+  4.4_pre6250: Minor cleanup. Fix build failure with >=sys-kernel/linux-
+  headers-3.9. 9999: Minor cleanup. Patch by Arfrever.
 
   17 Oct 2013; Mike Gilbert <floppym@gentoo.org> -kvirc-4.2_pre6066.ebuild:
   Remove per Arfrever.
diff --git a/net-irc/kvirc/kvirc-4.4_pre6250.ebuild b/net-irc/kvirc/kvirc-4.4_pre6250.ebuild
index a57144b5f761..db7fc6b3a5bd 100644
--- a/net-irc/kvirc/kvirc-4.4_pre6250.ebuild
+++ b/net-irc/kvirc/kvirc-4.4_pre6250.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/net-irc/kvirc/kvirc-4.4_pre6250.ebuild,v 1.4 2013/03/02 22:55:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-4.4_pre6250.ebuild,v 1.5 2013/10/17 20:51:41 floppym Exp $
 
-EAPI="4"
+EAPI="5"
 PYTHON_DEPEND="python? 2"
 
 inherit cmake-utils flag-o-matic multilib python
@@ -16,11 +16,11 @@ SLOT="4"
 KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
 IUSE="audiofile dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus +ssl theora +transparency webkit"
 
-RDEPEND="sys-libs/zlib
-	x11-libs/libX11
-	>=dev-qt/qtcore-4.6:4
+RDEPEND=">=dev-qt/qtcore-4.6:4
 	>=dev-qt/qtgui-4.6:4
 	>=dev-qt/qtsql-4.6:4
+	sys-libs/zlib
+	x11-libs/libX11
 	dcc_video? (
 		media-libs/libv4l
 		theora? ( media-libs/libogg media-libs/libtheora )
@@ -33,7 +33,6 @@ RDEPEND="sys-libs/zlib
 	ssl? ( dev-libs/openssl )
 	webkit? ( >=dev-qt/qtwebkit-4.6:4 )"
 DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.6.4
 	virtual/pkgconfig
 	x11-proto/scrnsaverproto
 	nls? ( sys-devel/gettext )
@@ -60,6 +59,10 @@ src_prepare() {
 src_configure() {
 	append-flags -fno-strict-aliasing
 
+	if use dcc_video && has_version ">=sys-kernel/linux-headers-3.9"; then
+		append-cppflags -DV4L2_CID_HCENTER="\\\"(V4L2_CID_BASE+22)\\\"" -DV4L2_CID_VCENTER="\\\"(V4L2_CID_BASE+23)\\\""
+	fi
+
 	local libdir="$(get_libdir)"
 	local mycmakeargs=(
 		-DLIB_SUFFIX=${libdir#lib}
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index cc553ef7117d..064df9932b13 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.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/net-irc/kvirc/kvirc-9999.ebuild,v 1.37 2013/03/02 22:55:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.38 2013/10/17 20:51:41 floppym Exp $
 
-EAPI="4"
+EAPI="5"
 PYTHON_DEPEND="python? 2"
 
 inherit cmake-utils flag-o-matic multilib python subversion
@@ -18,11 +18,11 @@ SLOT="4"
 KEYWORDS=""
 IUSE="audiofile dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus +ssl theora +transparency webkit"
 
-RDEPEND="sys-libs/zlib
-	x11-libs/libX11
-	>=dev-qt/qtcore-4.6:4
+RDEPEND=">=dev-qt/qtcore-4.6:4
 	>=dev-qt/qtgui-4.6:4
 	>=dev-qt/qtsql-4.6:4
+	sys-libs/zlib
+	x11-libs/libX11
 	dcc_video? (
 		media-libs/libv4l
 		theora? ( media-libs/libogg media-libs/libtheora )
@@ -35,7 +35,6 @@ RDEPEND="sys-libs/zlib
 	ssl? ( dev-libs/openssl )
 	webkit? ( >=dev-qt/qtwebkit-4.6:4 )"
 DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.6.4
 	virtual/pkgconfig
 	x11-proto/scrnsaverproto
 	nls? ( sys-devel/gettext )