From: Vlastimil Babka <caster@gentoo.org>
Date: Sat, 23 Feb 2008 19:55:53 +0000 (+0000)
Subject: Apply the patch for bug #208631 also in 3.5.9.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3f6e5ec7986e5489563823b5c6ed00cc38db660f;p=gentoo.git

Apply the patch for bug #208631 also in 3.5.9.
Package-Manager: portage-2.1.4.4
---

diff --git a/kde-base/qtjava/ChangeLog b/kde-base/qtjava/ChangeLog
index 4e19ad5bc815..642fb0880407 100644
--- a/kde-base/qtjava/ChangeLog
+++ b/kde-base/qtjava/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/qtjava
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.61 2008/02/20 23:34:49 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.62 2008/02/23 19:55:53 caster Exp $
+
+  23 Feb 2008; Vlastimil Babka <caster@gentoo.org> qtjava-3.5.9.ebuild:
+  Apply the patch for bug #208631 also in 3.5.9.
 
 *qtjava-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/qtjava/Manifest b/kde-base/qtjava/Manifest
index 5de0b0417a8f..0e5c1ee279d3 100644
--- a/kde-base/qtjava/Manifest
+++ b/kde-base/qtjava/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX no-gtk-glib-check.diff 949 RMD160 6df47b78e158fb7e38a49c30627421186d83e3da SHA1 234a650d3b629e41b2249ae99e6f7b0ee44fcf63 SHA256 f2721c8a1567ab9e259e216372a6552f8910fd33bc82390d8556aff00b0ba8df
 AUX no-libhpi.so-check.patch 1094 RMD160 e68eb3bcc1626056f2b1ae1edc87cbef2fa61f14 SHA1 77b567790c3a601412ec289332ff3421cbb33f40 SHA256 1111790213a8cf3c888d3444984cee824bcbe55b3b80043d2c01231b00b00b62
 AUX qtjava-3.5-javacflags.patch 483 RMD160 46183053d044bb5cf74275185c9c242cab319341 SHA1 f8d4e386201614ba0b9f59e9ab7a35569f34581e SHA256 e9ddce9f0f3cd0a8524b2595cc2956f13100c636112d4d9e189a9d3dc7961e31
 DIST kdebindings-3.5.8.tar.bz2 5724504 RMD160 2a8b335f4a70b35550e214607e62d7adfbec45ed SHA1 9e84a47cb5ce7b16f485f51996b12d8dd50898ad SHA256 ee6b6cc43c3e645e3b0d6a9fa239c5b725f66aee1d11fccc1cb4fc5e494d9e8a
 DIST kdebindings-3.5.9.tar.bz2 5737416 RMD160 c2c906a61c72eb8edfb6f9b82d74b7cc2d0c222c SHA1 14fcec6c93bffa94b10201dd03d87ffcd6fb5281 SHA256 76e2c05970d1edd15fc3850296ae791d7da0b19759794209dbb743919f5434ea
 EBUILD qtjava-3.5.8.ebuild 1487 RMD160 ed9344560d3996c1fe438e26425233a4ef7475cf SHA1 dc698068f8ec92530420940a9f7c178f7fb18373 SHA256 cd19a22d87a1f444267d685ea6217f85d58e492b3110bd9a0dd0e6254a7fd472
-EBUILD qtjava-3.5.9.ebuild 1394 RMD160 e583acee84e1122c7282ce8545b0a8542a9720d7 SHA1 269b778a4074ee35d4d301e4bec021b4a5bc0741 SHA256 bd32dfd8853c71d28dd5f977e37e1322b7e1310070eec49c836f918a6fd9aa37
-MISC ChangeLog 8140 RMD160 1dd5946921e4c7cb500695349c6a308718694cfe SHA1 9f16dfe92bb447cf732b9226be4805600dcaccb6 SHA256 9842cb2e909b26a834ee44ccc8370ad1a7cdce584a6b6d3b8ea7ca351ccbe2d0
+EBUILD qtjava-3.5.9.ebuild 1454 RMD160 da4961935d4e89f944021ffc46150444ad70f512 SHA1 e24c92a6eabd56c3233b7025bf0b84aa98181546 SHA256 a71985c5d810f8acce9781ddcb557f4775089ad2bb4ed959da8da2c6b107d33f
+MISC ChangeLog 8258 RMD160 1f4d64a8419958a0eb55aed63e18c197b4aad31e SHA1 067a5fed0ba643d824294047fe94c57099c0a9ed SHA256 c23247afd5d20f6c3265bdb326b928cb783d622015e7cc4669a55aacfb796d56
 MISC metadata.xml 174 RMD160 c2e418dc10e1431eec90cebd2bcd049ea84c164e SHA1 b29657b99bedc684ac7e40dfa561ef7da5fc4ad7 SHA256 9b93e47904abc783e4ed3714c950f453b6769b553b06fb1a0964b50beabf36e8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHvLkgCkvF58q80IkRAi4+AJ90RM7mvSYU14/orCnKIezot3fb7wCdHktD
-6vehoAHSgFOlIHdgm85tTX8=
-=+9Y1
------END PGP SIGNATURE-----
diff --git a/kde-base/qtjava/qtjava-3.5.9.ebuild b/kde-base/qtjava/qtjava-3.5.9.ebuild
index b0d1f477d310..d72612f057fb 100644
--- a/kde-base/qtjava/qtjava-3.5.9.ebuild
+++ b/kde-base/qtjava/qtjava-3.5.9.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/kde-base/qtjava/qtjava-3.5.9.ebuild,v 1.1 2008/02/20 23:34:49 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.9.ebuild,v 1.2 2008/02/23 19:55:53 caster Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -14,8 +14,10 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
+# libhpi for bug #208631
 PATCHES="${FILESDIR}/no-gtk-glib-check.diff
-		${FILESDIR}/${PN}-${SLOT}-javacflags.patch"
+		${FILESDIR}/${PN}-${SLOT}-javacflags.patch
+		${FILESDIR}/no-libhpi.so-check.patch"
 
 pkg_setup() {
 	if ! built_with_use x11-libs/qt:3 opengl ; then