[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/

["Ben de Groot" <yngwin@gentoo.org>]

commit:     15286e4463fa770f69dcdbc7f943b63ffcdca8a8
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Wed Sep 19 08:31:16 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 08:31:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=15286e44

www-client/qupzilla: unify release and live ebuilds

---
 www-client/qupzilla/metadata.xml          |    6 +++
 www-client/qupzilla/qupzilla-1.3.5.ebuild |   55 -----------------------------
 www-client/qupzilla/qupzilla-9999.ebuild  |   51 ++++++++++++++++++++++-----
 3 files changed, 48 insertions(+), 64 deletions(-)

diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml
index 3cbebd8..b38ad16 100644
--- a/www-client/qupzilla/metadata.xml
+++ b/www-client/qupzilla/metadata.xml
@@ -2,4 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>qt</herd>
+  <use>
+    <flag name='nonblockdialogs'>Enable fancy non-blocking JavaScript dialogs
+      shown inside the page, not blocking the application window. When closing
+      browser windows with open dialogs, this can crash the application.
+    </flag>
+  </use>
 </pkgmetadata>

diff --git a/www-client/qupzilla/qupzilla-1.3.5.ebuild b/www-client/qupzilla/qupzilla-1.3.5.ebuild
deleted file mode 100644
index d2e50fe..0000000
--- a/www-client/qupzilla/qupzilla-1.3.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.3.1.ebuild,v 1.3 2012/08/16 10:01:11 johu Exp $
-
-EAPI=4
-PLOCALES="cs de el es fa fr hu it ja nl pl pt ru sk sr_BA sr_RS sv uk zh_CN zh_TW"
-inherit l10n multilib qt4-r2 vcs-snapshot
-
-MY_P="QupZilla-${PV}"
-
-DESCRIPTION="Qt WebKit web browser"
-HOMEPAGE="http://www.qupzilla.com/"
-SRC_URI="https://github.com/downloads/QupZilla/qupzilla/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus debug kde nonblockdialogs"
-
-DEPEND="
-	>=x11-libs/qt-core-4.7:4
-	>=x11-libs/qt-gui-4.7:4
-	>=x11-libs/qt-script-4.7:4
-	>=x11-libs/qt-sql-4.7:4
-	>=x11-libs/qt-webkit-4.7:4
-	dbus? ( >=x11-libs/qt-dbus-4.7:4 )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS BUILDING CHANGELOG FAQ README.md TODO"
-
-src_configure() {
-	# see BUILDING document for explanation of options
-	export QUPZILLA_PREFIX=${EPREFIX}/usr/
-	export USE_LIBPATH=${QUPZILLA_PREFIX}$(get_libdir)
-	export DISABLE_DBUS=$(use dbus && echo false || echo true)
-	export KDE=$(use kde && echo true || echo false) # in future this will enable nepomuk integration
-	export NONBLOCK_JS_DIALOGS=$(use nonblockdialogs && echo true || echo false)
-	has_version '>=x11-libs/qt-webkit-4.8.0:4' && export USE_QTWEBKIT_2_2=true
-
-	# needs qt-webkit with webgl enabled (which we currently don't)
-	# export USE_WEBGL=$(use webgl && echo true || echo false)
-
-	eqmake4
-}
-
-src_install() {
-	qt4-r2_src_install
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-rm_loc() {
-	rm "${D}"/usr/share/${PN}/locale/qt_${1}.qm || die
-}

diff --git a/www-client/qupzilla/qupzilla-9999.ebuild b/www-client/qupzilla/qupzilla-9999.ebuild
index a53d906..fbd42e5 100644
--- a/www-client/qupzilla/qupzilla-9999.ebuild
+++ b/www-client/qupzilla/qupzilla-9999.ebuild
@@ -1,19 +1,33 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.3.1.ebuild,v 1.3 2012/08/16 10:01:11 johu Exp $
+# $Header: $
 
 EAPI=4
 
-inherit multilib qt4-r2 git-2
+if [[ ${PV} == "9999" ]]; then
+	VCS_ECLASS=git-2
+	EGIT_REPO_URI="git://github.com/QupZilla/${PN}.git"
+	KEYWORDS=""
+else
+	VCS_ECLASS=vcs-snapshot
+	MY_P="QupZilla-${PV}"
+	SRC_URI="mirror://github/QupZilla/${PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+PLOCALES="cs_CZ de_DE el_GR es_ES es_VE fa_IR fr_FR hu_HU id_ID it_IT ja_JP
+ka_GE nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_BA sr_RS sv_SE uk_UA
+zh_CN zh_TW"
+
+inherit l10n multilib qt4-r2 ${VCS_ECLASS}
 
 DESCRIPTION="Qt WebKit web browser"
 HOMEPAGE="http://www.qupzilla.com/"
-EGIT_REPO_URI="git://github.com/QupZilla/${PN}.git"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="dbus debug kde"
+IUSE="dbus debug kde nonblockdialogs"
 
 DEPEND="
 	>=x11-libs/qt-core-4.7:4
@@ -21,17 +35,36 @@ DEPEND="
 	>=x11-libs/qt-script-4.7:4
 	>=x11-libs/qt-sql-4.7:4
 	>=x11-libs/qt-webkit-4.7:4
-	dbus? ( >=x11-libs/qt-dbus-4.7:4 )
-"
+	dbus? ( >=x11-libs/qt-dbus-4.7:4 )"
 RDEPEND="${DEPEND}"
 
-DOCS="AUTHORS CHANGELOG FAQ TODO"
+DOCS="AUTHORS BUILDING CHANGELOG FAQ README.md TODO"
+
+src_prepare() {
+	# remove outdated copies of localizations:
+	rm -rf bin/locale || die
+}
 
 src_configure() {
+	# see BUILDING document for explanation of options
 	export QUPZILLA_PREFIX=${EPREFIX}/usr/
 	export USE_LIBPATH=${QUPZILLA_PREFIX}$(get_libdir)
 	export DISABLE_DBUS=$(use dbus && echo false || echo true)
-	export KDE=$(use kde && echo true || echo false)
+	export KDE=$(use kde && echo true || echo false) # in future this will enable nepomuk integration
+	export NONBLOCK_JS_DIALOGS=$(use nonblockdialogs && echo true || echo false)
+	has_version '>=x11-libs/qt-webkit-4.8.0:4' && export USE_QTWEBKIT_2_2=true
+
+	# needs qt-webkit with webgl enabled (which we currently don't)
+	# export USE_WEBGL=$(use webgl && echo true || echo false)
 
 	eqmake4
 }
+
+src_install() {
+	qt4-r2_src_install
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+rm_loc() {
+	rm "${D}"/usr/share/${PN}/locale/${1}.qm || die
+}