From 10741c25791b2f47e3ea50e11b6dfa478070d77e Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 10 Feb 2010 19:21:38 +0000 Subject: Fix jpeg and poppler deps. Package-Manager: portage-2.2_rc62/cvs/Linux x86_64 --- kde-base/okular/ChangeLog | 6 +++++- kde-base/okular/Manifest | 20 +++++--------------- kde-base/okular/okular-4.3.3.ebuild | 12 +++--------- kde-base/okular/okular-4.3.4.ebuild | 12 +++--------- kde-base/okular/okular-4.3.5.ebuild | 12 +++--------- kde-base/okular/okular-4.4.0.ebuild | 9 +++------ 6 files changed, 22 insertions(+), 49 deletions(-) (limited to 'kde-base') diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog index aad554aba5c6..27b00d37874b 100644 --- a/kde-base/okular/ChangeLog +++ b/kde-base/okular/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/okular # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.61 2010/02/09 00:18:14 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.62 2010/02/10 19:21:38 ssuominen Exp $ + + 10 Feb 2010; Samuli Suominen okular-4.3.3.ebuild, + okular-4.3.4.ebuild, okular-4.3.5.ebuild, okular-4.4.0.ebuild: + Fix jpeg and poppler deps. *okular-4.4.0 (09 Feb 2010) diff --git a/kde-base/okular/Manifest b/kde-base/okular/Manifest index 63475d74be8f..522bc527c39c 100644 --- a/kde-base/okular/Manifest +++ b/kde-base/okular/Manifest @@ -1,20 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST kdegraphics-4.3.3.tar.bz2 3621439 RMD160 2b9a02cbefb07bb2191eaf94b8f078f43ef2e393 SHA1 f3d3155a6edf4fbf39e4dc07d9a6a52965f3f344 SHA256 f846d42d26cf5a3aad711ea1d1f05871f6467e8f5ecc6ca0722daa41719b396d DIST kdegraphics-4.3.4.tar.bz2 3621926 RMD160 ccadc26a9c1133267082b8f390f9a769ae579c66 SHA1 bb32171b0d562d5698d4f0526be2b069e99f7448 SHA256 0cb2eeaeb731a75709aaaef2861a84aaf1df70aeb0c444038027683ee29a413c DIST kdegraphics-4.3.5.tar.bz2 3621398 RMD160 4ff533350eae5df929a7f02a2f545af348783eeb SHA1 f8cb6afe5df3e548dafc0d0757bdc635675f85e8 SHA256 aa5a8783f56906c4569604687fd2fdc196b17dcda59659adcc60b4bca1710fd8 DIST kdegraphics-4.4.0.tar.bz2 3807110 RMD160 01237b78b1e4375b9215d0a647ce90d1d7238fe1 SHA1 d221007269b8a3719bf56a89a970935e86f6c4fd SHA256 327156eeb4a9989e04d62ce6e378c96a34c9438242a824e743227ea7cc442775 -EBUILD okular-4.3.3.ebuild 1402 RMD160 fe32ba87bc7697775c0222c072280f29a6be1f92 SHA1 91ce920dfe72503c5cea36e1bda0ec1a68017ac2 SHA256 46ddaffabc1e5b4c30e038c8df7f91536a54b993fe0e3f91146532d453911b8b -EBUILD okular-4.3.4.ebuild 1420 RMD160 d2f028c0eaf1472f948c723f3cd0808f5b762293 SHA1 0653b133618ffd7d070572e26827918ccea0ef8f SHA256 5ad9c1c0124e547ff53becc20eac63a7c329ed96ded14c3d94e6824f8525efc7 -EBUILD okular-4.3.5.ebuild 1433 RMD160 1f0f8ed7b672c206b1cee2e30f86b566ef49dbc2 SHA1 a3f99263322b9fab06896a311d17af4088d6f736 SHA256 38e701d7e057518b0110472da47bed7a2dca599be8ed7364072e1475cc6550d8 -EBUILD okular-4.4.0.ebuild 1392 RMD160 5c52e37def9065a7bc7716a096101a3f85ee16d2 SHA1 b9002aa55c689c49ecda270f12bf3760f08e4ab4 SHA256 a08489cf8a4a64a356f8c6e2abd364726f68db717acc9e276e27cb40460b6590 -MISC ChangeLog 8025 RMD160 4d4ac0302765b448c3a5e4a23f873878bb2b4497 SHA1 a0541b7c627f8740a3a643d1475396a691b78248 SHA256 04eb9e569dae7a8a72e1da924b8f6007dd93cfc7a2054b4a1e171d1bfe188b7e +EBUILD okular-4.3.3.ebuild 1354 RMD160 d436896b64fa05b91fdb6a8341ab9be8b0b64199 SHA1 ebc6a588b93c0de5b03ce1d486eb9ece06d602b6 SHA256 e124d4d851b5bdeec0e84a19920f4eb44216096b2b4e121d97bb20825624b4e9 +EBUILD okular-4.3.4.ebuild 1371 RMD160 8f0f72f7ea4f3673c31bd187aee4bfb08fa0a358 SHA1 44576d994973b2f4b9031bbc3c46396f788ef722 SHA256 79ef1a36b86798aa3390c7a4d71685a66e9ba77c4ee493fbfc5d63ef7b65ab23 +EBUILD okular-4.3.5.ebuild 1371 RMD160 e980d672d014cc543a48301854bfc0b280826945 SHA1 9fb6b55b272e32f96db8c4fe663763a54b882bc4 SHA256 3846edc4c1102a9a6b85be8f98951ed01c73a8ede885492f707f77916a3832fe +EBUILD okular-4.4.0.ebuild 1371 RMD160 67631db35991d98cd7491d937d981eb1b65f2950 SHA1 f76f1f878fe3aff7d2757dbb33e13bf3beb712c2 SHA256 4617ffc7425b93d21a8bb5781d88fbf000612a6fa0aaa4b20b48512a2bfe431e +MISC ChangeLog 8198 RMD160 0f089daf6e00cada25e2e1004a8ad00b641e243a SHA1 ec37a35b94765b3b24d81124a8dc7607c2ee80aa SHA256 965d7c9fb97fd49f2e9e50a7073926fe8d9efec317e4baa7f96e5c64b102cf91 MISC metadata.xml 342 RMD160 2857cb76c50c3e210a583d1801907d2f782ddfa2 SHA1 6a46017e8205a774ec2d91d009174cc5fb21e076 SHA256 dbbb7111504dadeb35c244cc4f84f7e641f46f1644d99a9c2159bd16d4b0e8a8 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAktwqc4ACgkQ5BmOA85PVLg3OwCgpMvcbS7BUgHmgEYrrkeisDMv -xScAn3crA6dBr1EurM0FwNVtkAkuY9R5 -=Xl9t ------END PGP SIGNATURE----- diff --git a/kde-base/okular/okular-4.3.3.ebuild b/kde-base/okular/okular-4.3.3.ebuild index 883d7294e123..2ac968dfffe0 100644 --- a/kde-base/okular/okular-4.3.3.ebuild +++ b/kde-base/okular/okular-4.3.3.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/kde-base/okular/okular-4.3.3.ebuild,v 1.7 2010/01/19 02:17:30 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.3.3.ebuild,v 1.8 2010/02/10 19:21:38 ssuominen Exp $ EAPI="2" @@ -18,14 +18,8 @@ DEPEND=" crypt? ( app-crypt/qca:2 ) djvu? ( app-text/djvu ) ebook? ( app-text/ebook-tools ) - jpeg? ( media-libs/jpeg ) - pdf? ( - || ( - >=virtual/poppler-0.12.1[lcms] - virtual/poppler - ) - >=virtual/poppler-qt4-0.8.5 - ) + jpeg? ( media-libs/jpeg:0 ) + pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4] ) ps? ( app-text/libspectre ) tiff? ( media-libs/tiff ) " diff --git a/kde-base/okular/okular-4.3.4.ebuild b/kde-base/okular/okular-4.3.4.ebuild index 2fad23d92756..708df48fa8cb 100644 --- a/kde-base/okular/okular-4.3.4.ebuild +++ b/kde-base/okular/okular-4.3.4.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/kde-base/okular/okular-4.3.4.ebuild,v 1.4 2010/01/21 10:11:34 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.3.4.ebuild,v 1.5 2010/02/10 19:21:38 ssuominen Exp $ EAPI="2" @@ -18,14 +18,8 @@ DEPEND=" crypt? ( app-crypt/qca:2 ) djvu? ( app-text/djvu ) ebook? ( app-text/ebook-tools ) - jpeg? ( media-libs/jpeg ) - pdf? ( - || ( - >=virtual/poppler-0.12.1[lcms] - virtual/poppler - ) - >=virtual/poppler-qt4-0.8.5 - ) + jpeg? ( media-libs/jpeg:0 ) + pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4] ) ps? ( app-text/libspectre ) tiff? ( media-libs/tiff ) " diff --git a/kde-base/okular/okular-4.3.5.ebuild b/kde-base/okular/okular-4.3.5.ebuild index 30b2367eed60..37141897a0e8 100644 --- a/kde-base/okular/okular-4.3.5.ebuild +++ b/kde-base/okular/okular-4.3.5.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/kde-base/okular/okular-4.3.5.ebuild,v 1.1 2010/01/25 17:29:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.3.5.ebuild,v 1.2 2010/02/10 19:21:38 ssuominen Exp $ EAPI="2" @@ -18,14 +18,8 @@ DEPEND=" crypt? ( app-crypt/qca:2 ) djvu? ( app-text/djvu ) ebook? ( app-text/ebook-tools ) - jpeg? ( media-libs/jpeg ) - pdf? ( - || ( - >=virtual/poppler-0.12.1[lcms] - =virtual/poppler-qt4-0.8.5 - ) + jpeg? ( media-libs/jpeg:0 ) + pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4] ) ps? ( app-text/libspectre ) tiff? ( media-libs/tiff ) " diff --git a/kde-base/okular/okular-4.4.0.ebuild b/kde-base/okular/okular-4.4.0.ebuild index d46f874a8fea..b9adf64f09d2 100644 --- a/kde-base/okular/okular-4.4.0.ebuild +++ b/kde-base/okular/okular-4.4.0.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/kde-base/okular/okular-4.4.0.ebuild,v 1.1 2010/02/09 00:18:14 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.4.0.ebuild,v 1.2 2010/02/10 19:21:38 ssuominen Exp $ EAPI="2" @@ -18,11 +18,8 @@ DEPEND=" crypt? ( app-crypt/qca:2 ) djvu? ( app-text/djvu ) ebook? ( app-text/ebook-tools ) - jpeg? ( media-libs/jpeg ) - pdf? ( - >=virtual/poppler-0.12.3[lcms] - >=virtual/poppler-qt4-0.12.3 - ) + jpeg? ( media-libs/jpeg:0 ) + pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4] ) ps? ( app-text/libspectre ) tiff? ( media-libs/tiff ) " -- cgit v1.2.3-65-gdbad