diff options
| -rw-r--r-- | x11-libs/libqxt/ChangeLog | 13 | ||||
| -rw-r--r-- | x11-libs/libqxt/libqxt-0.2.4.ebuild | 40 | ||||
| -rw-r--r-- | x11-libs/libqxt/libqxt-0.2.5.ebuild | 9 | ||||
| -rw-r--r-- | x11-libs/libqxt/libqxt-0.4.ebuild | 57 | ||||
| -rw-r--r-- | x11-libs/libqxt/metadata.xml | 16 |
5 files changed, 88 insertions, 47 deletions
diff --git a/x11-libs/libqxt/ChangeLog b/x11-libs/libqxt/ChangeLog index d63208f32e04..d7910bb97e50 100644 --- a/x11-libs/libqxt/ChangeLog +++ b/x11-libs/libqxt/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-libs/libqxt -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/ChangeLog,v 1.5 2008/07/27 01:22:24 carlo Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/ChangeLog,v 1.6 2009/01/05 03:09:41 yngwin Exp $ + +*libqxt-0.4 (05 Jan 2009) + + 05 Jan 2009; Ben de Groot <yngwin@gentoo.org> metadata.xml, + -libqxt-0.2.4.ebuild, libqxt-0.2.5.ebuild, +libqxt-0.4.ebuild: + Version bump, fixing bug 217274, incorporating some changes proposed by + Toffanin in that bug report. Disabling parallel build, fixes bug 194730. + Renaming ssl useflag to more correct crypt, fixes bug 195659. Removing old + 0.2.4 version. Adding local useflag descriptions to metadata.xml. 27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> libqxt-0.2.5.ebuild: Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11. diff --git a/x11-libs/libqxt/libqxt-0.2.4.ebuild b/x11-libs/libqxt/libqxt-0.2.4.ebuild deleted file mode 100644 index 41740c5457cb..000000000000 --- a/x11-libs/libqxt/libqxt-0.2.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/libqxt-0.2.4.ebuild,v 1.3 2007/09/28 18:16:05 caleb Exp $ - -inherit eutils qt4 - -DESCRIPTION="The Qt eXTension library provides cross-platform utility classes to add functionality ontop of the Qt toolkit" -HOMEPAGE="http://libqxt.org/" -SRC_URI="mirror://sourceforge/libqxt/${P}.tar.gz" - -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="~x86 ~amd64" - -IUSE="ssl fastcgi debug" - -DEPEND=">=x11-libs/qt-4.2 - ssl? ( >=dev-libs/openssl-0.9.8 ) - fastcgi? ( >=dev-libs/fcgi-2.4 )" -RDEPEND="${DEPEND}" - -QT4_BUILT_WITH_USE_CHECK="png ssl" - -S="${WORKDIR}/${PN}" - -src_compile() { - local myconf - - use debug && myconf="${myconf} -debug" - use !ssl && myconf="${myconf} -nomake crypto" - use !fastcgi && myconf="${myconf} -nomake web" - - ./configure -prefix /usr ${myconf} - - emake || die "emake failed" -} - -src_install() { - emake INSTALL_ROOT="${D}" install || die "emake install failed" -} diff --git a/x11-libs/libqxt/libqxt-0.2.5.ebuild b/x11-libs/libqxt/libqxt-0.2.5.ebuild index fe061836ba49..470ac9cb0a9b 100644 --- a/x11-libs/libqxt/libqxt-0.2.5.ebuild +++ b/x11-libs/libqxt/libqxt-0.2.5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/libqxt-0.2.5.ebuild,v 1.3 2008/07/27 01:22:24 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/libqxt-0.2.5.ebuild,v 1.4 2009/01/05 03:09:41 yngwin Exp $ EAPI="1" inherit eutils qt4 -DESCRIPTION="The Qt eXTension library provides cross-platform utility classes to add functionality ontop of the Qt toolkit" +DESCRIPTION="The Qt eXTension library provides cross-platform utility classes for the Qt toolkit" HOMEPAGE="http://libqxt.org/" SRC_URI="mirror://sourceforge/libqxt/${P}.tar.gz" @@ -35,7 +35,8 @@ src_compile() { ./configure -prefix /usr ${myconf} - emake || die "emake failed" + # fails with parallel build, bug 194730 + emake -j1 || die "emake failed" } src_install() { diff --git a/x11-libs/libqxt/libqxt-0.4.ebuild b/x11-libs/libqxt/libqxt-0.4.ebuild new file mode 100644 index 000000000000..b3e4d47802f0 --- /dev/null +++ b/x11-libs/libqxt/libqxt-0.4.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/libqxt-0.4.ebuild,v 1.1 2009/01/05 03:09:41 yngwin Exp $ + +EAPI=2 +inherit eutils qt4 + +DESCRIPTION="The Qt eXTension library provides cross-platform utility classes for the Qt toolkit" +HOMEPAGE="http://libqxt.org/" +SRC_URI="mirror://sourceforge/libqxt/${P}.tar.gz" + +LICENSE="CPL-1.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="berkdb crypt debug doc sql web" + +RDEPEND="|| ( ( x11-libs/qt-gui:4 + x11-libs/qt-script:4 + berkdb? ( x11-libs/qt-sql:4 ) + sql? ( x11-libs/qt-sql:4 ) ) + =x11-libs/qt-4.3*:4[png] ) + berkdb? ( sys-libs/db ) + crypt? ( >=dev-libs/openssl-0.9.8 + || ( x11-libs/qt-core:4[ssl] =x11-libs/qt-4.3*:4[ssl] ) ) + web? ( >=dev-libs/fcgi-2.4 )" +DEPEND="${DEPEND} + doc? ( app-doc/doxygen )" + +src_configure() { + local myconf + myconf="-prefix /usr \ + -libdir /usr/$(get_libdir) \ + -docdir /usr/share/doc/${PF} \ + -qmake-bin /usr/bin/qmake \ + $(use debug && echo -debug) \ + $(use !berkdb && echo -no-db -nomake berkeley) \ + $(use !crypt && echo -nomake crypto -no-openssl) \ + $(use !sql && echo -nomake sql) \ + $(use !web && echo -nomake web)" + + ./configure ${myconf} || die "configure failed" +} + +src_compile() { + # parallel compilation fails, bug #194730 + emake -j1 || die "make failed" +} + +src_install() { + emake INSTALL_ROOT="${D}" install || die "emake install failed" + dodoc {AUTHORS,README,LICENSE,cpl1.0.txt} + + if use doc; then + doxygen Doqsyfile + dohtml -r deploy/docs/* + fi +} diff --git a/x11-libs/libqxt/metadata.xml b/x11-libs/libqxt/metadata.xml index 01a5c2875e0d..77e8afa99aca 100644 --- a/x11-libs/libqxt/metadata.xml +++ b/x11-libs/libqxt/metadata.xml @@ -1,5 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>qt</herd> + <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> </pkgmetadata> |