Drop pointless gksu/kdesu dependency (bug 486442); major ebuild cleanup; remove older versions.

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

6 files changed, 73 insertions, 267 deletions

diff --git a/app-emulation/q4wine/ChangeLog b/app-emulation/q4wine/ChangeLog
index f37edff00685..1f88da219ba8 100644
--- a/app-emulation/q4wine/ChangeLog
+++ b/app-emulation/q4wine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/q4wine
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v 1.47 2013/12/17 21:31:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v 1.48 2013/12/28 00:07:53 pesa Exp $
+
+*q4wine-1.1_p2-r1 (28 Dec 2013)
+
+  28 Dec 2013; Davide Pesavento <pesa@gentoo.org> +q4wine-1.1_p2-r1.ebuild,
+  -q4wine-1.0_p3-r1.ebuild, -q4wine-1.1.ebuild, -q4wine-1.1_p1.ebuild,
+  -q4wine-1.1_p2.ebuild:
+  Drop pointless gksu/kdesu dependency (bug 486442); major ebuild cleanup;
+  remove older versions.
 
 *q4wine-1.1_p2 (17 Dec 2013)
 
diff --git a/app-emulation/q4wine/q4wine-1.0_p3-r1.ebuild b/app-emulation/q4wine/q4wine-1.0_p3-r1.ebuild
deleted file mode 100644
index 953e0fd83a3b..000000000000
--- a/app-emulation/q4wine/q4wine-1.0_p3-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.0_p3-r1.ebuild,v 1.1 2013/10/14 18:57:04 hwoarang Exp $
-
-EAPI="4"
-LANGS="cs de en es fa he it ru uk pl pt af"
-
-inherit cmake-utils
-
-# Upstream names the package PV-rX. We need to fix that to
-# PV_pX so we can use portage revisions.
-MY_PV="${PV/_p/-r}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Qt4 GUI configuration tool for Wine"
-HOMEPAGE="http://q4wine.brezblock.org.ua/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +icoutils +wineappdb -dbus gnome kde"
-
-for x in ${LANGS}; do
-	IUSE+=" linguas_${x}"
-done
-
-CDEPEND="dev-qt/qtgui:4
-	dev-qt/qtsingleapplication
-	dev-qt/qtsql:4[sqlite]"
-
-DEPEND="${CDEPEND}
-	dev-util/cmake"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	app-emulation/wine
-	>=sys-apps/which-2.19
-	icoutils? ( >=media-gfx/icoutils-0.26.0 )
-	sys-fs/fuseiso
-	kde? ( kde-base/kdesu )
-	gnome? ( x11-libs/gksu )
-	dbus? ( dev-qt/qtdbus:4 )"
-
-DOCS="README AUTHORS ChangeLog"
-
-PATCHES=( ${FILESDIR}/${PN}-qtsingleapp.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} \
-		-DWITH_SYSTEM_SINGLEAPP=ON \
-		$(cmake-utils_use debug DEBUG) \
-		$(cmake-utils_use_with icoutils ICOUTILS) \
-		$(cmake-utils_use_with wineappdb WINEAPPDB) \
-		$(cmake-utils_use_with dbus DBUS)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \;
-		fi
-	done
-}
diff --git a/app-emulation/q4wine/q4wine-1.1.ebuild b/app-emulation/q4wine/q4wine-1.1.ebuild
deleted file mode 100644
index d9e10954c804..000000000000
--- a/app-emulation/q4wine/q4wine-1.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1.ebuild,v 1.1 2013/11/16 11:29:23 hwoarang Exp $
-
-EAPI="4"
-LANGS="cs de en es fa he it ru uk pl pt af"
-
-inherit cmake-utils
-
-# Upstream names the package PV-rX. We need to fix that to
-# PV_pX so we can use portage revisions.
-MY_PV="${PV/_p/-r}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Qt4 GUI configuration tool for Wine"
-HOMEPAGE="http://q4wine.brezblock.org.ua/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +icoutils +wineappdb -dbus gnome kde"
-
-for x in ${LANGS}; do
-	IUSE+=" linguas_${x}"
-done
-
-CDEPEND="dev-qt/qtgui:4
-	dev-qt/qtsingleapplication
-	dev-qt/qtsql:4[sqlite]"
-
-DEPEND="${CDEPEND}
-	dev-util/cmake"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	app-emulation/wine
-	>=sys-apps/which-2.19
-	icoutils? ( >=media-gfx/icoutils-0.26.0 )
-	sys-fs/fuseiso
-	kde? ( kde-base/kdesu )
-	gnome? ( x11-libs/gksu )
-	dbus? ( dev-qt/qtdbus:4 )"
-
-DOCS="README AUTHORS ChangeLog"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} \
-		-DWITH_SYSTEM_SINGLEAPP=ON \
-		$(cmake-utils_use debug DEBUG) \
-		$(cmake-utils_use_with icoutils ICOUTILS) \
-		$(cmake-utils_use_with wineappdb WINEAPPDB) \
-		$(cmake-utils_use_with dbus DBUS)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \;
-		fi
-	done
-}
diff --git a/app-emulation/q4wine/q4wine-1.1_p1.ebuild b/app-emulation/q4wine/q4wine-1.1_p1.ebuild
deleted file mode 100644
index 150fcb5fa286..000000000000
--- a/app-emulation/q4wine/q4wine-1.1_p1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p1.ebuild,v 1.1 2013/12/01 12:26:07 hwoarang Exp $
-
-EAPI="4"
-LANGS="cs de en es fa he it ru uk pl pt af"
-
-inherit cmake-utils
-
-# Upstream names the package PV-rX. We need to fix that to
-# PV_pX so we can use portage revisions.
-MY_PV="${PV/_p/-r}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Qt4 GUI configuration tool for Wine"
-HOMEPAGE="http://q4wine.brezblock.org.ua/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +icoutils +wineappdb -dbus gnome kde"
-
-for x in ${LANGS}; do
-	IUSE+=" linguas_${x}"
-done
-
-CDEPEND="dev-qt/qtgui:4
-	dev-qt/qtsingleapplication
-	dev-qt/qtsql:4[sqlite]"
-
-DEPEND="${CDEPEND}
-	dev-util/cmake"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	app-emulation/wine
-	>=sys-apps/which-2.19
-	icoutils? ( >=media-gfx/icoutils-0.26.0 )
-	sys-fs/fuseiso
-	kde? ( kde-base/kdesu )
-	gnome? ( x11-libs/gksu )
-	dbus? ( dev-qt/qtdbus:4 )"
-
-DOCS="README AUTHORS ChangeLog"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} \
-		-DWITH_SYSTEM_SINGLEAPP=ON \
-		$(cmake-utils_use debug DEBUG) \
-		$(cmake-utils_use_with icoutils ICOUTILS) \
-		$(cmake-utils_use_with wineappdb WINEAPPDB) \
-		$(cmake-utils_use_with dbus DBUS)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \;
-		fi
-	done
-}
diff --git a/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild b/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild
new file mode 100644
index 000000000000..46915b5100e9
--- /dev/null
+++ b/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild,v 1.1 2013/12/28 00:07:53 pesa Exp $
+
+EAPI=5
+
+PLOCALES="af cs de en es fa he it ru uk pl pt"
+
+inherit cmake-utils l10n
+
+DESCRIPTION="Qt4 GUI configuration tool for Wine"
+HOMEPAGE="http://q4wine.brezblock.org.ua/"
+
+# Upstream names the package PV-rX. We change that to
+# PV_pX so we can use portage revisions.
+MY_PV=${PV/_p/-r}
+MY_P=${PN}-${MY_PV}
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus debug +icoutils +wineappdb"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsingleapplication
+	dev-qt/qtsql:4[sqlite]
+	dbus? ( dev-qt/qtdbus:4 )
+"
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	app-emulation/wine
+	>=sys-apps/which-2.19
+	sys-fs/fuseiso
+	icoutils? ( >=media-gfx/icoutils-0.26.0 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(README AUTHORS ChangeLog)
+
+remove_from_LINGUAS() {
+	sed -i -e "/SET\s*(\s*LINGUAS / s: ${1}_\w\w::" \
+		src/CMakeLists.txt || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	l10n_for_each_disabled_locale_do remove_from_LINGUAS
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT5=OFF
+		-DWITH_SYSTEM_SINGLEAPP=ON
+		$(cmake-utils_use debug)
+		$(cmake-utils_use_with dbus)
+		$(cmake-utils_use_with icoutils)
+		$(cmake-utils_use_with wineappdb)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-emulation/q4wine/q4wine-1.1_p2.ebuild b/app-emulation/q4wine/q4wine-1.1_p2.ebuild
deleted file mode 100644
index eea582b03c2c..000000000000
--- a/app-emulation/q4wine/q4wine-1.1_p2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2.ebuild,v 1.1 2013/12/17 21:31:52 hwoarang Exp $
-
-EAPI="4"
-LANGS="cs de en es fa he it ru uk pl pt af"
-
-inherit cmake-utils
-
-# Upstream names the package PV-rX. We need to fix that to
-# PV_pX so we can use portage revisions.
-MY_PV="${PV/_p/-r}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Qt4 GUI configuration tool for Wine"
-HOMEPAGE="http://q4wine.brezblock.org.ua/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +icoutils +wineappdb -dbus gnome kde"
-
-for x in ${LANGS}; do
-	IUSE+=" linguas_${x}"
-done
-
-CDEPEND="dev-qt/qtgui:4
-	dev-qt/qtsingleapplication
-	dev-qt/qtsql:4[sqlite]"
-
-DEPEND="${CDEPEND}
-	dev-util/cmake"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	app-emulation/wine
-	>=sys-apps/which-2.19
-	icoutils? ( >=media-gfx/icoutils-0.26.0 )
-	sys-fs/fuseiso
-	kde? ( kde-base/kdesu )
-	gnome? ( x11-libs/gksu )
-	dbus? ( dev-qt/qtdbus:4 )"
-
-DOCS="README AUTHORS ChangeLog"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} \
-		-DWITH_SYSTEM_SINGLEAPP=ON \
-		$(cmake-utils_use debug DEBUG) \
-		$(cmake-utils_use_with icoutils ICOUTILS) \
-		$(cmake-utils_use_with wineappdb WINEAPPDB) \
-		$(cmake-utils_use_with dbus DBUS)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \;
-		fi
-	done
-}