Version bump fixing bug #233598. Added qt4 built with zlib check, fixing bug #232714.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.25-gentoo-r5 x86_64

4 files changed, 18 insertions, 55 deletions

diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index bacddb06b532..ae558d927888 100644
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/keepassx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.26 2008/03/29 15:11:49 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.27 2008/08/01 18:33:25 tgurr Exp $
+
+*keepassx-0.3.2 (01 Aug 2008)
+
+  01 Aug 2008; Timo Gurr <tgurr@gentoo.org> -keepassx-0.3.1.ebuild,
+  -keepassx-0.3.1-r20.ebuild, +keepassx-0.3.2.ebuild:
+  Version bump fixing bug #233598. Added qt4 built with zlib check, fixing
+  bug #232714.
 
   29 Mar 2008; Timo Gurr <tgurr@gentoo.org> keepassx-0.3.1.ebuild:
   Remove the redundant qt3support check from keepassx-0.3.1.ebuild.
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index 920e6ca4011d..c0deb7c56df2 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -1,8 +1,7 @@
 AUX keepassx.desktop 281 RMD160 46d613482dc2aeb07e82f7d62b11e368457f1dec SHA1 7c37944fc0ea013579e266e70d3e78532a5a1a88 SHA256 1e550108aef3cdb614a391518f2b4e9de50f4611587ed103fe67ba5baf86b247
 DIST KeePassX-0.2.2.tar.gz 302656 RMD160 ba386cca105227120c0c50a500eee3b2b2bf24ec SHA1 bae4b984d32f2bb6220d17a135e3322c4df73fcb SHA256 ee588bd744195e394e7b618b8e0aeb25cbf37ca5b619b1c7e2176fd412b29cbd
-DIST KeePassX-0.3.1.tar.gz 501954 RMD160 e9b5e169169818323dd77ffc9256f0a983d3f86b SHA1 848f8f03b8c829d18e9b244b96859d52db23eb56 SHA256 1f37b67f64d1b8d13b9c9c51fdfe15fe1cb33d122773b12688bb5213510876d2
+DIST KeePassX-0.3.2.tar.gz 535979 RMD160 de9b682e8eb265f8e433b81e5ef56d4debf8dd73 SHA1 91c571978729245cac2ea6b339e2bfdce067f61e SHA256 a81fbd6aeaedc8a24777e2532b5b060ba2032c32980d8a393b8121c9ee73155d
 EBUILD keepassx-0.2.2-r1.ebuild 1050 RMD160 2b7dd9f3a3a788cc99cb69a618174e4eb969ef11 SHA1 cedaff20fe256336f44cd6e92d83b43ca6669d01 SHA256 c463403d4d5d47ac0a84d31695a9ff60086f7e1bc84384f57791e9bc776f5e83
-EBUILD keepassx-0.3.1-r20.ebuild 1065 RMD160 d5e554b07cf565fd1e56419a198f10aba3cd0887 SHA1 8753a0cd3d4ec0fd9a26a4d58c7da98b59e81b85 SHA256 a2dab9fa46f3f2ba4a641b22c66b0248765137d6b35175e7696aaa4ae35153ac
-EBUILD keepassx-0.3.1.ebuild 1190 RMD160 5bb781ae0c0158dfb5a3e64cb6bff8160b86290c SHA1 26bbb7f0e24008b4c6680dc14def08952e604a9d SHA256 d8748ff5660a50368d2c6ec62577400ac6c7e06fa48f68f507f44c332a7d2b08
-MISC ChangeLog 4921 RMD160 83d8be3d3c123e38be3c9012c1a95108d36f6486 SHA1 b8bea9b0870493fac09124fb8d2337324a8e5883 SHA256 d2fb87399f7cfd989c26294fd37421e678e414fd9fc7d1063e1313b4edc3b3fb
+EBUILD keepassx-0.3.2.ebuild 1052 RMD160 5b0cb50581ac2874b208abe64a0a776987aef953 SHA1 9d1a798cbbfd5b314d50646fa103d2a015b2b03d SHA256 005d545a5691628b9e370f6e525468900175b791868c5528db2981d22c9574ac
+MISC ChangeLog 5165 RMD160 3058b2e82ad0e8c7092b4ebcb73babbabb2f4748 SHA1 84962032e4a010fcab920a135d2d6539d136fd42 SHA256 e8f43386cdbb2b5e8d5c4ed1999054f470eafabef9eda66d57d15d4434d033a1
 MISC metadata.xml 495 RMD160 90266b304a5c8425582869e66f36475590a9aeea SHA1 4711ce96501403b2061f630bda3c86d42a09794e SHA256 3280fffee9ad925df39ffbf8a0a90f9eb469669d45934d2921bcbc0b1ed9b8ef
diff --git a/app-admin/keepassx/keepassx-0.3.1.ebuild b/app-admin/keepassx/keepassx-0.3.1.ebuild
deleted file mode 100644
index cbdacd8f577c..000000000000
--- a/app-admin/keepassx/keepassx-0.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.3.1.ebuild,v 1.2 2008/03/29 15:11:49 tgurr Exp $
-
-EAPI="1"
-
-inherit eutils qt4
-
-DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions."
-HOMEPAGE="http://keepassx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/keepassx/KeePassX-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-DEPEND=">=x11-libs/qt-4.1:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/KeePassX-${PV}"
-
-pkg_setup() {
-	if ! built_with_use --missing true x11-libs/qt png ; then
-		eerror
-		eerror "You need to rebuild x11-libs/qt with USE=\"png\" enabled."
-		eerror
-		die "Please rebuild x11-libs/qt with USE=\"png\"."
-	fi
-}
-
-src_compile() {
-	cd "${S}/src"
-	lrelease src.pro || die "lrelease failed"
-	mv "${S}"/src/translations/*.qm "${S}"/share/keepassx/i18n
-	cd "${S}"
-	use debug && myconf="DEBUG=1"
-	eqmake4 keepass.pro PREFIX="${D}/usr" ${myconf} || die "eqmake4 failed"
-	emake || die "emake failed"
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc changelog todo
-}
diff --git a/app-admin/keepassx/keepassx-0.3.1-r20.ebuild b/app-admin/keepassx/keepassx-0.3.2.ebuild
index fdc0df830e3f..81a5e7b2ae4c 100644
--- a/app-admin/keepassx/keepassx-0.3.1-r20.ebuild
+++ b/app-admin/keepassx/keepassx-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.3.1-r20.ebuild,v 1.1 2008/03/17 22:48:10 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.3.2.ebuild,v 1.1 2008/08/01 18:33:25 tgurr Exp $
 
 EAPI="1"
 
@@ -14,12 +14,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug"
-DEPEND="( >=x11-libs/qt-core-4.4.0_beta1:4
-	>=x11-libs/qt-gui-4.4.0_beta1:4
-	>=x11-libs/qt-xmlpatterns-4.4.0_beta1:4 )"
+DEPEND="|| ( ( x11-libs/qt-core:4
+			x11-libs/qt-gui:4
+			x11-libs/qt-xmlpatterns:4 )
+		>=x11-libs/qt-4.3:4 )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/KeePassX-${PV}"
+QT4_BUILT_WITH_USE_CHECK="zlib"
 
 src_compile() {
 	cd "${S}/src"
@@ -27,7 +28,7 @@ src_compile() {
 	mv "${S}"/src/translations/*.qm "${S}"/share/keepassx/i18n
 	cd "${S}"
 	use debug && myconf="DEBUG=1"
-	eqmake4 keepass.pro PREFIX="${D}/usr" ${myconf} || die "eqmake4 failed"
+	eqmake4 ${PN}.pro PREFIX="${D}/usr" ${myconf} || die "eqmake4 failed"
 	emake || die "emake failed"
 }