Version bump, ebuild QA fixes. Remove old.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64

3 files changed, 24 insertions, 9 deletions

diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index 0e367d11ad04..afe6b4247ff5 100644
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.32 2008/11/07 18:59:29 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.33 2008/11/25 23:41:48 tgurr Exp $
+
+*keepassx-0.3.4 (25 Nov 2008)
+
+  25 Nov 2008; Timo Gurr <tgurr@gentoo.org> -keepassx-0.3.3.ebuild,
+  +keepassx-0.3.4.ebuild:
+  Version bump, ebuild QA fixes. Remove old.
 
   07 Nov 2008; Timo Gurr <tgurr@gentoo.org> keepassx-0.3.3.ebuild:
   Fix another qt check for monolithic qt.
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index 855dfb86ada9..07df28f4a38d 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -1,7 +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.3.tar.gz 536021 RMD160 6d3da31b6dd9882be264b5091f633be1955e97d0 SHA1 6c6405a1ea8e75c568688094bb576fae5c501b7e SHA256 954bce220c9581a32f68be2693c6cfb6b81f1b534c7d5f54f118bdc46674c37e
+DIST KeePassX-0.3.4.tar.gz 535822 RMD160 3f7f364d62e3cc54f54e12f74d7d88cfcf23f231 SHA1 d9204396a0878c3acbce875b42df2899561c5206 SHA256 41dc39f675f812d81e413f7d9684a458fbd4ac9819c91ccc31b504cef8de71ee
 EBUILD keepassx-0.2.2-r1.ebuild 1064 RMD160 80fd56121ade856a5aa1aeeebc94923bcd5e6b2b SHA1 8e3aa9a081b2ff6420971aa5d4a063368555d5fe SHA256 42433aadbc141f4ddcaba440d6df40e80fb20dd5d6b6e32113a01c0428ec1104
-EBUILD keepassx-0.3.3.ebuild 1134 RMD160 052da9f13d6146a247ae0a171560d8714332e295 SHA1 4e348900250cea9f1292bcd5d1e10fb49795a076 SHA256 d19ef87563068739745ea9d2f7d3a79e39694a9bb3d1c1ca29c0b247234ea4f7
-MISC ChangeLog 5920 RMD160 64a0f17734d939b251a5c330f08a58ad21f2189e SHA1 b5021e5c7668e6c8e8a1401c4f98c087bbb37b2d SHA256 51d41ad96c3f1a70928a3cc036e19538833dc47be1bbefca2c91e1da25032a08
+EBUILD keepassx-0.3.4.ebuild 1371 RMD160 f925914995a2b97b6bec0d64f5f2798b89750904 SHA1 0e934117e5c24b58bb013f0bf160da80145f829b SHA256 9fce37ebc6597bfe91cd4f8558fbe48ce2f2e8a8a1c853d577836608d7a5aac9
+MISC ChangeLog 6091 RMD160 e0dbe738547bc9440ccd0fce72b8af94383457bf SHA1 46f535769a34d3aa0e94ad97523e1b4581e43ff3 SHA256 d00b0f174705bb23c6691088ea2dd13ad5cbc561e1c1f76cbe46b886c9aaa297
 MISC metadata.xml 495 RMD160 90266b304a5c8425582869e66f36475590a9aeea SHA1 4711ce96501403b2061f630bda3c86d42a09794e SHA256 3280fffee9ad925df39ffbf8a0a90f9eb469669d45934d2921bcbc0b1ed9b8ef
diff --git a/app-admin/keepassx/keepassx-0.3.3.ebuild b/app-admin/keepassx/keepassx-0.3.4.ebuild
index 144ab01d1e2c..2f8d1667c59c 100644
--- a/app-admin/keepassx/keepassx-0.3.3.ebuild
+++ b/app-admin/keepassx/keepassx-0.3.4.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.3.ebuild,v 1.5 2008/11/07 18:59:29 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.3.4.ebuild,v 1.1 2008/11/25 23:41:48 tgurr Exp $
 
 EAPI="2"
 
@@ -14,24 +14,33 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug"
-DEPEND="|| ( ( x11-libs/qt-core:4
-			x11-libs/qt-gui:4
+DEPEND="|| ( ( x11-libs/qt-core:4[qt3support]
+			x11-libs/qt-gui:4[qt3support]
 			x11-libs/qt-xmlpatterns:4 )
 		( =x11-libs/qt-4.3*:4[png,qt3support,zlib] ) )"
 RDEPEND="${DEPEND}"
 
-src_compile() {
+src_configure() {
+	# generate translations
 	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 ${PN}.pro PREFIX="${D}/usr" ${myconf} || die "eqmake4 failed"
-	PATH=${PATH/\/usr\/lib\/distcc\/bin:} # workaround for bug #214327
+}
+
+src_compile(){
+	# workaround compile failure due to distcc, bug #214327
+	PATH=${PATH/\/usr\/lib\/distcc\/bin:}
 	emake || die "emake failed"
 }
 
 src_install(){
+	# workaround pre-stripping the keepassx binary during install, bug #248711
+	sed -i -e '/strip/d' "${S}"/src/Makefile || die "sed failed"
+
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc changelog todo || die "dodoc failed"
 }