Version bump. Renamed 'crypt' useflag to 'ssl' and fixed description of 'web' useflag...

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

diff --git a/x11-libs/libqxt/ChangeLog b/x11-libs/libqxt/ChangeLog
index 1f26ddb682ae987a35911b007771b9623e3361b4..5d11bc943a0dd759c8e7737a72781727bf17be1e 100644 (file)
--- a/x11-libs/libqxt/ChangeLog
+++ b/x11-libs/libqxt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libqxt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/ChangeLog,v 1.17 2011/11/12 00:09:01 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/ChangeLog,v 1.18 2011/11/12 16:22:31 pesa Exp $
+
+*libqxt-0.6.1 (12 Nov 2011)
+
+  12 Nov 2011; Davide Pesavento <pesa@gentoo.org> +libqxt-0.6.1.ebuild,
+  -libqxt-0.6.0-r2.ebuild, metadata.xml:
+  Version bump. Renamed 'crypt' useflag to 'ssl' and fixed description of 'web'
+  useflag. Removed old.
 
   12 Nov 2011; Davide Pesavento <pesa@gentoo.org>
   -files/libqxt-0.5.0-gcc4.4.patch, -libqxt-0.2.5-r1.ebuild,

diff --git a/x11-libs/libqxt/Manifest b/x11-libs/libqxt/Manifest
index 2c9210557dd43d85d9c1cf088a1e323208de5eef..3f5d922b9af4cad6e65423d928049ff4b1dcb6c4 100644 (file)
--- a/x11-libs/libqxt/Manifest
+++ b/x11-libs/libqxt/Manifest
@@ -1,5 +1,5 @@
 AUX libqxt-use-system-qdoc3.patch 944 RMD160 698011fd8a2b0063be9ff61f0e08f8884d7af86b SHA1 0c07d4ffd40b9e5dddcbcdafb14b3e50c8cefe82 SHA256 cbd383b3dc9c749eb51c8947c0ce58336a7fbc5183385d9e59412aa4238aa065
-DIST libqxt-0.6.0.tar.bz2 2194316 RMD160 1c16090f3c2a3a8ffa2006fe58492651afdc1e83 SHA1 617a855695d525d1456f08654ab24ddc9dc75a55 SHA256 20b062018deb66e978fe53ca131ff699ffdca1afa5028aca8f424d8e9355bacb
-EBUILD libqxt-0.6.0-r2.ebuild 2595 RMD160 08fc2d4c532e94329641c9466f9fc772ad71a6ce SHA1 137b825d00fc0232c5a3b5739e564f87f11aa581 SHA256 c3ad68113fc1d1470bb555fb5beb28ff4a29d1bfdadee902d617110bcf968baa
-MISC ChangeLog 3531 RMD160 9c5f33cfc88942cf507ec44b65ee6fa707c269d3 SHA1 ea12dbc3bd960f480759bac37c2b2c8a7bc570d1 SHA256 118cfac07046a7d8323194593521466963b2a43ee286ff672082671b9656d0d2
-MISC metadata.xml 383 RMD160 3d842b571cf86ba48bd8d777ce12947da0319f72 SHA1 14a7e1b67630047a5ee21426f713e74bc3509da7 SHA256 c397087be31d7620e7285d28f966695a15df2fd88ab4c36c8138cd837ce98b27
+DIST libqxt-0.6.1.tar.bz2 2196608 RMD160 ed18e9f0f1b46756eeda73a050c231817c21a875 SHA1 813e4c1767e073e274ce8ad3e03409a55d3f63c4 SHA256 e937e453d109ab1003b04cdb267037f8d1af796dcfab7ac33df07b2fe046ee0d
+EBUILD libqxt-0.6.1.ebuild 2287 RMD160 910f4334ac7c7fbd937ab610a5514a487424d42d SHA1 6b1a356db7d50b5eeda7c7e84a5739ddfb1f07f3 SHA256 41ceea1da81b88b298a0d31de0509c973e92fd4c385d23466f2b04ad4dbce466
+MISC ChangeLog 3778 RMD160 3acb7b8a5a6e2f8a3adef3a76168a93c169c8274 SHA1 78e0f5f8dba56d4810e92727c30d92d1ecd673ce SHA256 85a8c0bf8c3bd3d791f1c0a431d8456299f3ff9211297438af093a63b3a280ce
+MISC metadata.xml 382 RMD160 71d76afc0964e744b0a3ea5d23a734fe95a31e26 SHA1 43d9db35247ab7284eff6fc7ce906892036364ec SHA256 32558621e45f23abea47a3279437b39e8383f2544bbdb7a2baa021ace33a6bac

diff --git a/x11-libs/libqxt/libqxt-0.6.0-r2.ebuild b/x11-libs/libqxt/libqxt-0.6.1.ebuild
similarity index 61%
rename from x11-libs/libqxt/libqxt-0.6.0-r2.ebuild
rename to x11-libs/libqxt/libqxt-0.6.1.ebuild
index c1983479e33aade404dbf2560ba1cc649a443bf2..61c044d02d48c655b71837821f1c18e544e0ba7b 100644 (file)
--- a/x11-libs/libqxt/libqxt-0.6.0-r2.ebuild
+++ b/x11-libs/libqxt/libqxt-0.6.1.ebuild
@@ -1,41 +1,41 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/libqxt-0.6.1.ebuild,v 1.1 2011/11/12 16:22:31 pesa Exp $
 
-EAPI="3"
+EAPI=4
 
 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"
+SRC_URI="http://dev.libqxt.org/libqxt/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"
+IUSE="berkdb debug doc sql ssl 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? (
+       sql? ( x11-libs/qt-sql:4 )
+       ssl? (
                >=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 )
+       doc? ( x11-libs/qt-assistant:4 )
 "
 RDEPEND="${COMMON_DEPEND}
        xscreensaver? ( x11-libs/libXScrnSaver )
 "
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}-${PN}-v${PV}"
 
 DOCS="AUTHORS CHANGES README"
 PATCHES=(
@@ -45,12 +45,6 @@ PATCHES=(
 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
 }
@@ -64,9 +58,9 @@ src_configure() {
                        -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 ssl || echo -no-openssl)
                        $(use web || echo -nomake web)
                        $(use zeroconf || echo -no-zeroconf -nomake zeroconf)
                        -verbose"
@@ -81,18 +75,18 @@ src_compile() {
 
        if use doc; then
                einfo "Building documentation"
-               emake docs || die
+               emake docs
        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
+               einfo
+               einfo "In case you want to browse ${PN} documentation using"
+               einfo "Qt Assistant, perform the following steps:"
+               einfo "  1. Open the Assistant"
+               einfo "  2. Edit -> Preferences -> Documentation -> Add"
+               einfo "  3. Add this path: ${EPREFIX}/usr/share/doc/${PF}/qxt.qch"
+               einfo
        fi
 }

diff --git a/x11-libs/libqxt/metadata.xml b/x11-libs/libqxt/metadata.xml
index 361ad5bfb5597f3a439db59721652575820f9263..32c24a498f1da9c469af077cd2a2ee7b47e474ce 100644 (file)
--- a/x11-libs/libqxt/metadata.xml
+++ b/x11-libs/libqxt/metadata.xml
@@ -5,7 +5,7 @@
 <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="web">Build the QxtWeb module</flag>
        <flag name="zeroconf">Build the QxtZeroconf module</flag>
 </use>
 </pkgmetadata>