Revbump to fix issues reported on bug #331585. Thanks to Davide Pesavento <davidepesa@gmail.com> for his work, patches,review and testing

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 141 insertions, 16 deletions

diff --git a/x11-libs/libqxt/ChangeLog b/x11-libs/libqxt/ChangeLog
index 69de4896b085..ce035cb6f24c 100644
--- a/x11-libs/libqxt/ChangeLog
+++ b/x11-libs/libqxt/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-libs/libqxt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/ChangeLog,v 1.14 2010/07/07 23:41:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/ChangeLog,v 1.15 2010/08/20 09:26:59 hwoarang Exp $
+
+*libqxt-0.6.0-r2 (20 Aug 2010)
+
+  20 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  +files/libqxt-use-system-qdoc3.patch, +libqxt-0.6.0-r2.ebuild,
+  metadata.xml:
+  Revbump to fix issues reported on bug #331585. New use flags, Adjusted
+  qt-assistant dependency, switched to qt4-r2 and EAPI=3, use systems'
+  qdoc3, fix arguments when crypt use flag was enabled. Many thanks to
+  Davide Pesavento <davidepesa@gmail.com> for his work, patches,review and
+  testing
 
 *libqxt-0.6.0-r1 (07 Jul 2010)
 
diff --git a/x11-libs/libqxt/files/libqxt-use-system-qdoc3.patch b/x11-libs/libqxt/files/libqxt-use-system-qdoc3.patch
new file mode 100644
index 000000000000..99f7650913f3
--- /dev/null
+++ b/x11-libs/libqxt/files/libqxt-use-system-qdoc3.patch
@@ -0,0 +1,24 @@
+--- libqxt~orig/doc/doc.pri	2010-08-19 17:06:12.000000000 +0200
++++ libqxt/doc/doc.pri	2010-08-19 17:08:16.000000000 +0200
+@@ -1,5 +1,3 @@
+-SUBDIRS += tools/3rdparty/qdoc3
+-
+ win32 {
+     QXT_WINCONFIG = release/
+     !CONFIG(release, debug|release) {
+@@ -16,14 +14,13 @@
+ }
+ 
+ $$unixstyle {
+-    QDOC = QXT_SOURCE_TREE=$$QXT_SOURCE_TREE QXT_BUILD_TREE=$$QXT_BUILD_TREE $$QXT_BUILD_TREE/tools/3rdparty/qdoc3/$${QXT_WINCONFIG}qdoc3
++    QDOC = QXT_SOURCE_TREE=$$QXT_SOURCE_TREE QXT_BUILD_TREE=$$QXT_BUILD_TREE $$[QT_INSTALL_BINS]/qdoc3
+ } else {
+     QDOC = set QXT_SOURCE_TREE=$$QXT_SOURCE_TREE&& set QXT_BUILD_TREE=$$QXT_BUILD_TREE&& $$QXT_BUILD_TREE/tools/3rdparty/qdoc3/$${QXT_WINCONFIG}qdoc3.exe
+     QDOC = $$replace(QDOC, "/", "\\\\")
+ }
+ 
+ adp_docs.commands = ($$QDOC -DQXT_DOXYGEN_RUN $$QXT_SOURCE_TREE/doc/src/qxt.qdocconf)
+-adp_docs.depends += sub-tools-3rdparty-qdoc3
+ docs.depends = adp_docs
+ QMAKE_EXTRA_TARGETS += adp_docs docs
+ 
diff --git a/x11-libs/libqxt/libqxt-0.6.0-r2.ebuild b/x11-libs/libqxt/libqxt-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..c1983479e33a
--- /dev/null
+++ b/x11-libs/libqxt/libqxt-0.6.0-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/libqxt-0.6.0-r2.ebuild,v 1.1 2010/08/20 09:26:59 hwoarang Exp $
+
+EAPI="3"
+
+inherit multilib qt4-r2
+
+DESCRIPTION="The Qt eXTension library provides cross-platform utility classes for the Qt toolkit"
+HOMEPAGE="http://libqxt.org/"
+SRC_URI="http://bitbucket.org/${PN}/${PN}/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="|| ( CPL-1.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb crypt debug doc sql web xscreensaver zeroconf"
+
+COMMON_DEPEND="
+	x11-libs/libXrandr
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	berkdb? ( >=sys-libs/db-4.6 )
+	crypt? (
+		>=dev-libs/openssl-0.9.8
+		x11-libs/qt-core:4[ssl]
+	)
+	sql? ( x11-libs/qt-sql:4 )
+	web? ( >=dev-libs/fcgi-2.4 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( x11-libs/qt-assistant )
+"
+RDEPEND="${COMMON_DEPEND}
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"
+
+S=${WORKDIR}/${PN}
+
+DOCS="AUTHORS CHANGES README"
+PATCHES=(
+	"${FILESDIR}/${PN}-use-system-qdoc3.patch"
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	# eqmake4 disables qmake cache, so we have to use config.pri
+	# to store configuration variables instead of .qmake.cache
+	sed -i -e '/^QMAKE_CACHE=/s:\.qmake\.cache:config.pri:' configure || die
+	sed -i -e '1i include(config.pri)' ${PN}.pro || die
+	sed -i -e '1i include(../config.pri)' src/qxtbase.pri || die
+
+	# remove insecure runpath
+	sed -i -e '/-Wl,-rpath/d' src/qxtlibs.pri || die
+}
+
+src_configure() {
+	# custom configure script
+	local myconf="./configure
+			-prefix '${EPREFIX}/usr'
+			-libdir '${EPREFIX}/usr/$(get_libdir)'
+			-docdir '${EPREFIX}/usr/share/doc/${PF}'
+			-qmake-bin '${EPREFIX}/usr/bin/qmake'
+			$(use debug && echo -debug || echo -release)
+			$(use berkdb || echo -no-db -nomake berkeley)
+			$(use crypt || echo -no-openssl)
+			$(use doc || echo -nomake docs)
+			$(use sql || echo -nomake sql)
+			$(use web || echo -nomake web)
+			$(use zeroconf || echo -no-zeroconf -nomake zeroconf)
+			-verbose"
+	echo ${myconf}
+	eval ${myconf} || die "./configure failed"
+
+	eqmake4 -recursive
+}
+
+src_compile() {
+	qt4-r2_src_compile
+
+	if use doc; then
+		einfo "Building documentation"
+		emake docs || die
+	fi
+}
+
+pkg_postinst() {
+	if use doc; then
+		elog
+		elog "In case you want to browse ${PN} documentation using"
+		elog "Qt Assistant, perform the following steps:"
+		elog "  1. Open the Assistant"
+		elog "  2. Edit->Preferences->Documentation->Add"
+		elog "  3. Add this path: ${EPREFIX}/usr/share/doc/${PF}/qxt.qch"
+		elog
+	fi
+}
diff --git a/x11-libs/libqxt/metadata.xml b/x11-libs/libqxt/metadata.xml
index 77e8afa99aca..361ad5bfb559 100644
--- a/x11-libs/libqxt/metadata.xml
+++ b/x11-libs/libqxt/metadata.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
-  <maintainer>
-    <email>qt@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="crypt">
-      Enable support for blowfish encryption using <pkg>dev-libs/openssl</pkg>
-    </flag>
-    <flag name="sql">
-      Enable support for SQL databases using <pkg>x11-libs/qt-sql</pkg>
-    </flag>
-    <flag name="web">
-      Enable web support using <pkg>dev-libs/fcgi</pkg>
-    </flag>
-  </use>
+<herd>qt</herd>
+<use>
+	<flag name="berkdb">Build the QxtBerkeley module</flag>
+	<flag name="sql">Build the QxtSql module</flag>
+	<flag name="web">Enable fast cgi bindings</flag>
+	<flag name="zeroconf">Build the QxtZeroconf module</flag>
+</use>
 </pkgmetadata>