From: Ioannis Aslanidis <deathwing00@gentoo.org>
Date: Sun, 21 Jan 2007 11:38:43 +0000 (+0000)
Subject: Fixed bug #162659.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b983ee146d3513cea6ea5ba3c73c061a00625e16;p=gentoo.git

Fixed bug #162659.
Package-Manager: portage-2.1.2-r1
---

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index ed02380c76b4..80c4682f9c8b 100644
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/kphotoalbum
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.10 2007/01/13 19:41:57 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.11 2007/01/21 11:38:43 deathwing00 Exp $
+
+  21 Jan 2007; Ioannis Aslanidis <deathwing00@gentoo.org>
+  kphotoalbum-3.0.ebuild:
+  Fixed bug #162659. Now media-gfx/exiv2 support is optional for
+  kphotoalbum-3.0 as well.
 
 *kphotoalbum-3.0 (13 Jan 2007)
 
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index e49345b247b7..d87490c40f49 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -7,14 +7,14 @@ EBUILD kphotoalbum-2.2.ebuild 1253 RMD160 70e3c2f945a62fa90321686d044d21609f2f46
 MD5 38887ad80f2573deb9c1010a057392e4 kphotoalbum-2.2.ebuild 1253
 RMD160 70e3c2f945a62fa90321686d044d21609f2f46da kphotoalbum-2.2.ebuild 1253
 SHA256 7a0a5ce8149667f05226f971075f3d76c2f522c235613f61693264e561dfe806 kphotoalbum-2.2.ebuild 1253
-EBUILD kphotoalbum-3.0.ebuild 1301 RMD160 72ffb9de9748de152d185e82ef12e8c522304c23 SHA1 86d4bbf0b37892e3ecc6b95f88ec0ac03f318e10 SHA256 97501988ca2f2e1b16623f9f0dedc1b59f8545cfe0d9f32960e6485cde402b15
-MD5 b0cf39da45654701126f27a357c26d8e kphotoalbum-3.0.ebuild 1301
-RMD160 72ffb9de9748de152d185e82ef12e8c522304c23 kphotoalbum-3.0.ebuild 1301
-SHA256 97501988ca2f2e1b16623f9f0dedc1b59f8545cfe0d9f32960e6485cde402b15 kphotoalbum-3.0.ebuild 1301
-MISC ChangeLog 2731 RMD160 02a0cf8c014c4b3010beb26749c55da08cab9798 SHA1 17d865d5650e47148a32d8347cec49def6f712ce SHA256 2fe0ecf3a2b65f37129a8d4f8869621ad6605b48fb4c73bb96a62783874c8714
-MD5 ad33433ecc224975ebcb4fdec8ec70be ChangeLog 2731
-RMD160 02a0cf8c014c4b3010beb26749c55da08cab9798 ChangeLog 2731
-SHA256 2fe0ecf3a2b65f37129a8d4f8869621ad6605b48fb4c73bb96a62783874c8714 ChangeLog 2731
+EBUILD kphotoalbum-3.0.ebuild 1578 RMD160 99d90c2e7440299e7ebf90a705aa0e70b12ab796 SHA1 09f91ff2a96a0e4e596d98eea0b8c492f694e57c SHA256 e283ca02dc8d7ee80d25fae1bae227fd37949ad90ae6c0efe97dcf3774959a81
+MD5 29f77ae654c44d9ef1d63d171e1ec8b6 kphotoalbum-3.0.ebuild 1578
+RMD160 99d90c2e7440299e7ebf90a705aa0e70b12ab796 kphotoalbum-3.0.ebuild 1578
+SHA256 e283ca02dc8d7ee80d25fae1bae227fd37949ad90ae6c0efe97dcf3774959a81 kphotoalbum-3.0.ebuild 1578
+MISC ChangeLog 2913 RMD160 701d30d7ce97b73355c631b19665214044682861 SHA1 db38e4664520fba8fbd3f22b7089a7d3dab909f9 SHA256 4f12b076d89e0588e98c0f6ef1737d852c1622397fe92dd51e4fb45562cc4430
+MD5 722e514fc7c8366adb1cbcdcc4849429 ChangeLog 2913
+RMD160 701d30d7ce97b73355c631b19665214044682861 ChangeLog 2913
+SHA256 4f12b076d89e0588e98c0f6ef1737d852c1622397fe92dd51e4fb45562cc4430 ChangeLog 2913
 MISC metadata.xml 248 RMD160 2496433ba875280762276effbe643d23ed6ebc24 SHA1 d52a48022c4d51e5da3b9321d031d6a05e71092e SHA256 7c28b3f9ef364c8202e380a019e8688e0f488ed625969485fea60e5d1f8eeeb6
 MD5 63552b6108173d9d09b942a01217c9ab metadata.xml 248
 RMD160 2496433ba875280762276effbe643d23ed6ebc24 metadata.xml 248
@@ -26,9 +26,9 @@ MD5 0e164f5ae65225ed75697ef040967e13 files/digest-kphotoalbum-3.0 256
 RMD160 ca9a3623e2e722197d8f5bbb9aa330b898103638 files/digest-kphotoalbum-3.0 256
 SHA256 49218f918e254f470a755d8975df0af46845078b021aedbce2cc6fbb79fe91c1 files/digest-kphotoalbum-3.0 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFo5uq7IRIh26aCTkRAhH8AKC8MDRV/oYq8nYrNNY/Y59qXbVazACfcdIj
-ZZQB/Fm39xUu0ux8+nPkZXA=
-=q/4G
+iD8DBQFFs1DQQVeVlgLp4x8RAk5KAJ9UvjfPr27rJzIsPwr8kJ0jnD6N+ACcD20y
+0UdMJevA/cjwQDKqZrYXvGE=
+=5z+b
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/kphotoalbum/kphotoalbum-3.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-3.0.ebuild
index a425a6ced4f2..65ff60d81aa8 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-3.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.0.ebuild,v 1.1 2007/01/13 19:41:57 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.0.ebuild,v 1.2 2007/01/21 11:38:43 deathwing00 Exp $
 
 inherit kde
 
@@ -48,3 +48,14 @@ pkg_setup()
 	fi
 }
 
+src_compile()
+{
+	if ! use exif; then
+		einfo "NOTICE: You have the exif USE flag disabled. ${CATEGORY}/${PN}"
+		einfo "will be compiled without EXIF support unless you installed"
+		einfo "media-gfx/exiv2 manually."
+		local myconf="--disable-exiv2"
+	fi
+	kde_src_compile
+}
+