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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 156 insertions, 18 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/Manifest b/x11-libs/libqxt/Manifest
index 3f79c07887c0..c5b60fe64841 100644
--- a/x11-libs/libqxt/Manifest
+++ b/x11-libs/libqxt/Manifest
@@ -1,14 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libqxt-0.5.0-gcc4.4.patch 260 RMD160 59648526b4d43f65c32cc5cc7b38758b18a39d93 SHA1 81c0e767b40077b5385c395a51da023e64202496 SHA256 49d934981db89569c0b961c9661f3199512bad5f774adf5db3b9029195ee66c2
+AUX libqxt-use-system-qdoc3.patch 944 RMD160 698011fd8a2b0063be9ff61f0e08f8884d7af86b SHA1 0c07d4ffd40b9e5dddcbcdafb14b3e50c8cefe82 SHA256 cbd383b3dc9c749eb51c8947c0ce58336a7fbc5183385d9e59412aa4238aa065
 DIST libqxt-0.2.5.tar.gz 715837 RMD160 55d698d23fe98b12c17efe8c17ac6f02f9cf1031 SHA1 7af5d535a622e6169f088055640160e33a259504 SHA256 ba4038691458de31282e6dd9377b39b8e466757bdfffb014e05da1f0c02dccbf
 DIST libqxt-0.4.tar.gz 1758216 RMD160 6a6306911855cb8e801a3f860af1f4bfd8dd62f4 SHA1 2059e5e5bd4a00494f8c373cd1e00e95663cee36 SHA256 957e59ad1b72f47cd9f4e764ee0eb99b8f6651ee210d8cc7f14217815f18c4d2
 DIST libqxt-0.5.0.tgz 4127658 RMD160 794e77c939625a0a895796a4ebbf68afedbc36f4 SHA1 1efc37f7128a9300034030ad4ae57f5f6d3a8db9 SHA256 b4b43833edf0b42990ab499cda0132d112a6a2ed14a58b91a88b91470741cce6
 DIST libqxt-0.5.1.tar.gz 4123619 RMD160 11f7cefe37903a47cdf8a63b67acb4aa7d2ac7b6 SHA1 0fcfe4d1fac5378b51643627d2ef800f1c02f3ff SHA256 2570d0f11981b73b62cc6bbff34fdf8fbcc9a3f37c20cb2baaac3f2e25231488
+DIST libqxt-0.6.0.tar.bz2 2194316 RMD160 1c16090f3c2a3a8ffa2006fe58492651afdc1e83 SHA1 617a855695d525d1456f08654ab24ddc9dc75a55 SHA256 20b062018deb66e978fe53ca131ff699ffdca1afa5028aca8f424d8e9355bacb
 DIST libqxt-0.6.0.tar.gz 2601776 RMD160 16db68a63c701a9800363a3d5a082a63da0a6ebe SHA1 341c826f04dbba8983b970f65830a040b18c331f SHA256 42a2fab3e4e12528f674e8b331b4298eff9862dff5ea8898d6382b0de1e269ed
 EBUILD libqxt-0.2.5-r1.ebuild 1103 RMD160 4e703b16cd0268fbe76806eb58c702df2d46576d SHA1 30574364bc3d71b61694fa94d221a5bb15e85a1a SHA256 72fe50ef44ba6d38239a153355e6c2499217d60d04ddcba71a8e5c1c19eb1b80
 EBUILD libqxt-0.4-r1.ebuild 1572 RMD160 b4f34b3031dd8ee0c0939e505c07f38a5bb5a5e6 SHA1 c9ea2ffa44de222e13326dad5496c9e2aa154334 SHA256 1b2aad76c9b6f5a76e6ece36532039efc18c8546979fce47040f2d5fa42b3958
 EBUILD libqxt-0.5.0.ebuild 1549 RMD160 0eddfd1b2814d9dd9023d89768177e2aef50b4e6 SHA1 a7632abb8837d69711ea674ff167bc12499c352e SHA256 2a6f519792d0cce3e379e851a4031833f50c5689147f5f71169bef848d3ad589
 EBUILD libqxt-0.5.1.ebuild 1498 RMD160 bd8ea35232010be7c6348d38566b493ce608c43a SHA1 f3d36ca74aca2fd3f871ec2093ee29b2e94650ed SHA256 c8c4b2f0432da0dfaee2a31e922e5088928b199cf48258c6b4c759d64eef2eae
 EBUILD libqxt-0.6.0-r1.ebuild 1792 RMD160 04e90338bc8e7c79ac0903ca70fd9437240239cf SHA1 c9a58abcf00f78c22354cbf7ed0880831048908a SHA256 cba5a28e6c22ea52dfedb78df91493330ef4b4f4244cb20fd5d90ad0fece2863
+EBUILD libqxt-0.6.0-r2.ebuild 2595 RMD160 08fc2d4c532e94329641c9466f9fc772ad71a6ce SHA1 137b825d00fc0232c5a3b5739e564f87f11aa581 SHA256 c3ad68113fc1d1470bb555fb5beb28ff4a29d1bfdadee902d617110bcf968baa
 EBUILD libqxt-0.6.0.ebuild 1406 RMD160 a2d5bac6c43802cdc2b2c12cadff89b2aeb586c9 SHA1 dca3821fe69efcd53b0ed07cc16010ee7da0bd2b SHA256 d4ea5b20d1df1ebf0290fb9c204775b09539918b007dd7d2443342b295748285
-MISC ChangeLog 2742 RMD160 a15efd5f0459dc173606d39ea23494da88045973 SHA1 b6988c42283d3a76b2b694443c6b74e70e9af316 SHA256 19f2151cc97d7390a3db4170ca7b3a547e8c928a1d1f113e2073ce5208ad3182
-MISC metadata.xml 549 RMD160 d6b8bae6b4b8d6652cf600e4b8326c34eb127482 SHA1 8ee1a6ab03878d6c28b4ae3ddeb252f61f2bcd8e SHA256 7eb6b256743b4f3c94862a8a0eb812ab7d6010b53922b016734c21c250a10619
+MISC ChangeLog 3209 RMD160 b237bfa121ef318edbad56a0f8bf4267471f54f5 SHA1 33505ebadb22c3fd0d379083bfcba152343c8d6a SHA256 0f6d65606356ae0458b78802628fbfca6688652baa706b614b9d037d05fcd16e
+MISC metadata.xml 383 RMD160 3d842b571cf86ba48bd8d777ce12947da0319f72 SHA1 14a7e1b67630047a5ee21426f713e74bc3509da7 SHA256 c397087be31d7620e7285d28f966695a15df2fd88ab4c36c8138cd837ce98b27
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkxuSxoACgkQ9/cejkQaxBBkUQCfbr/QrRvx0YRUIwWJgpbWl5RU
+mMgAnjq2N7XjCgZDlbvzeNDOMoozOeQa
+=5sCp
+-----END PGP SIGNATURE-----
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>