Allow use of alternate jpeg implementation.

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 22 insertions, 8 deletions

diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog
index c68b735ab681..abbbe3957a78 100644
--- a/app-office/abiword-plugins/ChangeLog
+++ b/app-office/abiword-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/abiword-plugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.80 2010/07/20 15:13:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.81 2010/11/08 22:54:33 eva Exp $
+
+  08 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  abiword-plugins-2.4.6.ebuild, abiword-plugins-2.6.8.ebuild:
+  Allow use of alternate jpeg implementation.
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org> abiword-plugins-2.4.6.ebuild,
   abiword-plugins-2.6.8.ebuild:
diff --git a/app-office/abiword-plugins/Manifest b/app-office/abiword-plugins/Manifest
index 08beba5c7368..367c29c757c2 100644
--- a/app-office/abiword-plugins/Manifest
+++ b/app-office/abiword-plugins/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX abiword-plugins-2.4.6-poppler-0.6-api.patch 452 RMD160 e3557bc1e3fec284e5b68459514e8973b3f24cdf SHA1 536669f3b353347ada9af4b28da51a2e98a1217f SHA256 18738b2bb410b8116be9a766aaeedddc1c1dc879668ccf77b16313e064594abc
 AUX abiword-plugins-2.6.8-glibc-2.10+api.patch 1120 RMD160 147b1bdc0897adc0e3c15f0c730e7dd2eae1b993 SHA1 41b2ef27700d98bc04b285fb6d1106bcc0b585a0 SHA256 3447c497f1aa0b4382f8c9aee1715a486113df31d37b7e3092bbe0ff29f534f0
 AUX abiword-plugins-2.6.8-glibc-2.10.patch 742 RMD160 a30d9041f47febc295cc2617430995da085be290 SHA1 b468c5684c334805be26c12321f4c063c78aa333 SHA256 3a5f7858c300edcc17d6e941e253062add63cda45e29d6a7e411a8f63e675faa
@@ -5,7 +8,14 @@ AUX poppler_abi_change.patch 766 RMD160 982e40c24d73111356501ec8687011f4f489c2c7
 DIST abiword-2.4.6.tar.bz2 24994889 RMD160 ca56800d811b3aca0af6b2fb6cd70cbea29ab792 SHA1 3011d221d09336f09f4bb0732add3405961a8623 SHA256 1ca509814d1ce939c98f2776f95351a2a6ea216d12c20be30d40eefd13f43020
 DIST abiword-2.6.8.tar.gz 9516443 RMD160 8fcf455a5226a5525b9a89f88c9916b20e973607 SHA1 fc979982edc3445385705afdb1e2ebb1fa53a4f6 SHA256 b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93
 DIST abiword-plugins-2.6.8.tar.gz 1991215 RMD160 be4e7b0fd87dfffc5f32f0a8a9d81f0ce403cc54 SHA1 fa8ad1985de5523f9993cef93af0dad174e8e5a5 SHA256 151517ae94e0f4c26370f31c903078bd0561b8088a63b532408ca128f0e65448
-EBUILD abiword-plugins-2.4.6.ebuild 2313 RMD160 668ad9860dad2ee3a662f793812e80f55451155b SHA1 68ad58b034ed28b5397e5a3955e9ec971e7bf5cc SHA256 0c9c571ba81dda3352c980a7009ec33d7a0ad4c661bcc7c7006c3639f653afb9
-EBUILD abiword-plugins-2.6.8.ebuild 2761 RMD160 bccb904cd15f6c0961b6be3cb7e7f70af54626e4 SHA1 a9790a014fda61645855c5c68a689f8c857ce271 SHA256 d62da09560dfff06770d74486e1b7d64b22325b1586e35326ae9f22ef5033cb9
-MISC ChangeLog 12855 RMD160 405a9e75a041cbe875959879d583b2b991b2a0f2 SHA1 386fe1ad4bff13cb31b2ada9ad80d9be16de0181 SHA256 fe407e56c123e27fb83a38b210786edb58579ea0d1c56b9d7a3658f9375e7fde
+EBUILD abiword-plugins-2.4.6.ebuild 2304 RMD160 15ff9854ab8e7bc6e6000d3cae5b5976720c2551 SHA1 17f3cd37181e16a68db16d81d16be07c131c7fb5 SHA256 8bf1d8fee749229c6d71f73f556f7a3fe9cedf98b0972e8d2ef95ace0bd4725f
+EBUILD abiword-plugins-2.6.8.ebuild 2750 RMD160 0379b3c97fc4121129089e2f7f511b6328580ac1 SHA1 70945e42148632fbbc218f9048f687def5efb002 SHA256 73db236a9ffc0962a76eb4f04e3285e54e172171d4e368e1b4f2a00d3a6013a5
+MISC ChangeLog 13018 RMD160 47d69b0327bd32356028f67943596aa8263c34c2 SHA1 ac6c3e0d38a0e47792d50fb6ca5367396b95831b SHA256 080c7a12e25dd35bc8e957e6c83dc35b04f012752e5bc0b72384c4b809b729c8
 MISC metadata.xml 661 RMD160 62a7f8bf572706492707cd13a3f2a0dca0ab02d4 SHA1 115f7b8afd4ddb817eada35ee7eb1f97487814fa SHA256 718687d15e1374defd90a1261a3d8b647d23db314eb321ef9d918771ec2c7c1e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzYjcoACgkQ1fmVwcYIWAakbwCfb32jEdf4S0069YWpH6CNHGU1
+ZXYAoKmLi5t6y1z6cNN44/4CMzvb/57q
+=XuZZ
+-----END PGP SIGNATURE-----
diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild
index e257fa69337b..305b8467c91f 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v 1.19 2010/07/20 15:13:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v 1.20 2010/11/08 22:54:33 eva Exp $
 
 EAPI=2
 
@@ -27,7 +27,7 @@ RDEPEND="=app-office/abiword-${PV}*
 	bzip2? ( app-arch/bzip2 )
 	gnome? ( >=x11-libs/goffice-0.1 )
 	grammar? ( >=dev-libs/link-grammar-4.2.2 )
-	jpeg?  ( >=media-libs/jpeg-6b-r2 )
+	jpeg?  ( virtual/jpeg:0 )
 	libgda? (
 		=gnome-extra/libgda-1*
 		=gnome-extra/libgnomedb-1* )
diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild
index 67177e362490..de02e2156427 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild,v 1.16 2010/07/20 15:13:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild,v 1.17 2010/11/08 22:54:33 eva Exp $
 
 EAPI=2
 
@@ -33,7 +33,7 @@ RDEPEND="=app-office/abiword-${PV}*
 	!alpha? ( !ia64? ( jabber? (
 		>=dev-libs/libxml2-2.4
 		>=net-libs/loudmouth-1.0.1 ) ) )
-	jpeg?  ( >=media-libs/jpeg-6b-r2:0 )
+	jpeg?  ( virtual/jpeg:0 )
 	libgda? (
 		=gnome-extra/libgda-1*
 		=gnome-extra/libgnomedb-1* )