added alternative PyQt4 dep, for Funtoo

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index d3b760979e72ce79acd02301a1720607765bf1d7..5eeb5aad544783b6dfafd2f4cd4415f86f2523fd 100644 (file)
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.336 2014/11/23 12:37:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.337 2014/12/05 18:04:47 axs Exp $
+
+  05 Dec 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> calibre-1.48-r1.ebuild:
+  added alternative PyQt4 dep, for Funtoo
 
 *calibre-1.48-r1 (23 Nov 2014)
 

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index f16773bbdaca29dbc0acfefcf03c65667fa987bc..d32a36764c4c12ede606ebb94c4b4cfe2dfcbebd 100644 (file)
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX calibre-1.20-no_updates_dialog.patch 896 SHA256 fdc44ced4670ec51be8bacf796b8d793edc3f2735c235fdb1ba708cd3c9121d5 SHA512 84354a286d1258a9496e9adc68317c3016f1bb4551a090ded372376598dad989d02fe93d578a9c497154d49ec1fda098a9e3740145425a6cdbe80cf956ee8764 WHIRLPOOL 2348ce9d068d571d025abfccb5e07e6c2b4c4682242a1b7e77e777e3bc0e9684a214c80b1fa480214d8302115e7209e87a0b3edd140939274037a31445a17859
 AUX calibre-1.34-no_updates_dialog.patch 1902 SHA256 5e7909e814c3f5cc167674e91f8e2a9f19aafbc471d5044e2561cb9b41a2d672 SHA512 cadefae143474d924bbe1c3a2b48976c35cd660ee9762efd5757cdb7928e83ddade7e9a2d29871894efcb0051235491e2be5146ccb19168599c02ce3f6b9f274 WHIRLPOOL b926814819560fd88fe17faaf995856897366436814826311e1b09716e97f3c46082d23a9856a55a471f5ad8233f2a4d7bb3d80ad7d30e77caa1ac5e17ee7bd3
@@ -23,28 +23,16 @@ EBUILD calibre-1.25.ebuild 6866 SHA256 7e91b8f0d570a31b6ad5de2ef50e00938176a4566
 EBUILD calibre-1.29.ebuild 6877 SHA256 d90780aff0f34bed24447028ed0893c184f28bb924992c6d3eeec60e613e9083 SHA512 0d65541435f9e5ea40448c8c36e66997e34e86f887f84c2e5b411e0a4f2832847a38e1f8ce2507e81e58c2d02cf14199dcc571c0725251ceee7700d2df5bb719 WHIRLPOOL b242d53362b00556a6b7bd523e3528b72e9415211472bdbd83ab3023cafd5bd251be5f1259218725c504016cd5118a130c6bff5b70b9f839fccd0b2301dcf265
 EBUILD calibre-1.43.ebuild 7618 SHA256 dcbdc08725e1aa2d7cf2f59b534dc769716c325b34b6aa28ea0f01e70a4a91b4 SHA512 a1ab94dc6e09500c48f2c536e8cc1d67c5756c0d8628a947b0388e9a8182365941b47dc8633f9a5b017e6a105eb90179dea6423881021ef4ca113c9187fc27e8 WHIRLPOOL 4497c9ff4d73bc5364b0f425462e1f0deb7e44b6a8d4952cc1314ae42fa81ecde9d9e647296ddeacf6a3703c058ba9ce26abbe7110709dbd85880d51ac23a623
 EBUILD calibre-1.47.ebuild 7928 SHA256 ade95436b733ff6f03bca9389d3c42b45c5786ee62dcf8d3360e0c39adf1fb44 SHA512 13f53ba909b309368b413d16f125e44cb2a9ac0e927b19ba6e898b24f77768a4f862e442846ab4570410a4cc01b4e6a308aa85905b3bfe1ce2eb8d814a38344c WHIRLPOOL 74c4ee4e9cad8936ecd39e8fb3fcbba46c19dc59ab3629165682c51f5eea833885226a798e3949decbd308d5e63a5c937902b2c79215e72592c2ca9f411609cb
-EBUILD calibre-1.48-r1.ebuild 7826 SHA256 1d3639c2f8ebf2e429df6f260400d30157e24bf2ae1357a3fd01d925629c070a SHA512 2b9b04bb14718f41283a443eb649c127e717508af6b823526447e944968bfc032ffef6aeba096d7f4de8cd3cf6e3909246705bf7d4fa3668a8b8b256d198cf0a WHIRLPOOL 01bf2a5553a40dc7e8e431217da97edfb408434ec0861e4650b61f3cbfeb36db4df37f48be12826dd47c31429e4c969be705e3a4df86513623ddcc094c5f3733
+EBUILD calibre-1.48-r1.ebuild 7899 SHA256 b07b09db62e9eae94d59c9401bbd39191fd525d307c362337866338a037e7ef0 SHA512 c2f2cd748dc3ca7d5480e8d410e41f661efbf547009b878ac498daaee2733cb8db069cfc40d3628940456eec962c4a8592432091a6c56757888f0c6cc7621257 WHIRLPOOL e414405b0be405210a69bd4b1b4758edf8e07598f2d1b093a9f9ba62538652206cf100b6be4fcb614b715fc1d25c82bd10a8ff21e6b04fe3c89b175fba0d63e3
 EBUILD calibre-1.48.ebuild 7928 SHA256 294a160ad70a49273d2a4a6bbb814426d81cbe5a826616a2810da1dccffc0455 SHA512 31c71cb9f1e05e1f645fdd98080175f0ad9bebab3b5c6482c3216694e3112a2804f4f17308f2a5e2f851c74c5aa690f449a1bf8f8717b441a738dce5e60e2923 WHIRLPOOL 141115e28c2ad2c273edbd54a5113aac5677efcf3738a20e565b4fa051b1161e4ac8278fbf026677681fdc387a6b2c8543991455a97e5179cdf8f47f8bb2406c
 EBUILD calibre-2.7.0.ebuild 7885 SHA256 37b95a846898f4456dcb855e32b69882e6c5bf455b0e32e646ecf0bd7b0cc796 SHA512 43ffc977a8c79a8180a2f8b520c7a7564d7625ea80ccf767c523b65d0eaf867d4caa8c162a8a03015e57086cc3a55fd416d43c8ae502317cfcac0caaded9f5ab WHIRLPOOL 9b9de3fc99f5d8428597851c05e328052cd11b60dda11b1db5f55a372446033a2f1a16bdcd2e686f911cbf8faf67315af5d8b7fec4f183b33dd2dc0a49176f6e
 EBUILD calibre-2.9.0.ebuild 8151 SHA256 0ca512e8e7cadf4cd8b9989397061e546002e100ffb32a090179c4652a70e247 SHA512 6af373d39b1eeeae3b0c1db929a68d43b5eaa064228fe2351a05618dd1ee678ba68028cb942490d917a68f6d02c75bc5728c9cd177bcec68e2ed96450ead1fff WHIRLPOOL 1e1b9b7d8e462f7bd67f350454a4d57f147ca4a490bb282a25fcf497c1285d6275b17357557fb472cd739334ac6d076aa08e2c92fd9b3a60cb12dffb4ffd8c6d
-MISC ChangeLog 53725 SHA256 ccc61bbad23a0824693f1a8114a1bce23505cb2e1998bbdb72f2e2c9b24cee6a SHA512 d52477959c9747e782b303b681ae7f6c628ac838d4ed3493fe5f69d5dbcd429e0ee331f568747e2996a92a1c03c1670eb953c7378162c8c485e1afdfd901cc47 WHIRLPOOL f0c74f48078d0da04914135c45e5c88b6c6e0518d08c777d62d9c7cdedd005fd3ccd19b14781d1571ff9b78d5fa580b4cd397dc172f44ca12bf8a90c90ca2484
+MISC ChangeLog 53848 SHA256 7730e197ad0829e11452ff56523d8b433cabd05de06f99784898be4487b3bb79 SHA512 3509ad983dac48b025a646dd753de272c605045fe70410cd78df09e37b192da8cadce3b159031b977a541fd5b26531dea015b284449baa5ca71bbf90349ab083 WHIRLPOOL f0c23eccbed78dd6ac014b6425306b17101bc52aac641e2e1b3bad3cc840da384313ac1f2ef362a44165b61ef81c398cc11f95bbdd9f2195b972b1b8354dcba8
 MISC metadata.xml 341 SHA256 796a5a95967784ec0e9295b5745962d2a20dd678fd7425e6bd6414b9b1fbae33 SHA512 0fa9fd10e81ff337e7e7d9a55d492f4cbcee79fd1771497214c39c0c2491759ba0ce7f62a1aade44e2165617da40111d0ba3a3802b679db66f60e66bff70e2ca WHIRLPOOL bd14a2fa77fbf2f7e3e30725ef299809e11696d5779ea80d8252efcd64e79bad7db9c331f8617ce220cfeaa6136e932130db85aeecf35412f99d9957cf3e9f08
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJUcdUgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirERwP/RBZcOuGmHoo5JFHRp1BPrjb
-qrd3wkLWTVACCDlz+6JqUCt521pcs19tMaD0SUNOwPqCsHztehv8dqOlSx5IpTT3
-ogo0YkecyRv9iJO2Yi4JUllDHqkHyJbmbdEsp02VGcWSZ5Cijkf+gx0p6fokKM76
-u7wtZ7qEx+cuNEJo/4OGMUL8ubSPP4EtDlf3th2TAdZzEkMWmEuSMVpOxTm+ycbw
-lvMNVyZVuQL46hpzgCF06sgg/AWiWbW/QJLKGDo+YEnesJQMsmnk8VzPekcmoWn8
-/2SraHGqDE5Pp+uNPDnBTEI1TkPm9avP5jrQMEWChuoq0w17/RZnDkBqb4LQjqNV
-XlKCOuSpwZbF+rJtRhIM/6i9Vw+KG48vRpyXTE7jJmvHF1jpRJzyWsD3ajz0/kbC
-Hxoox2dWVFrrGMbXs8cKPoRs7V24auijdLuRVcTSnWL+mVJQOgAAZwKT70gdVloG
-fCodhcgRMXtvCfAV1DRWuSf6LVNU1OP+8Z5V9n8nXSvmgVavStnz/ufo+m04dUVJ
-tFtJhqhgDA0kOd1QVpRrUo8k4k5mR+clsxADHmaNMKPV3u8qB4TcOxWLO6E+wfnC
-Fjwo3BwhsUS2u2muTGl49McRJbP7SCuiXFPhMM627m3LG2gp859RHicgFPQwMqfm
-vvXHXRJaPe9jetkBh1WV
-=Vu9g
+iF4EAREIAAYFAlSB88cACgkQ2ugaI38ACPDESAD7B1PzKb03zYzf9QyLyPXNruOl
+UCnvsh9rPRVOlu0N+WEA/0irlb/FPrpgzTdPp4V2oNdhS8HOi3Y+2Lpp+pJ2H2FD
+=T99y
 -----END PGP SIGNATURE-----

diff --git a/app-text/calibre/calibre-1.48-r1.ebuild b/app-text/calibre/calibre-1.48-r1.ebuild
index edda3a5edcd49a3e4020edd2db5ce8215541280d..2aa985138550b04ad0c06f5db951fdb919925073 100644 (file)
--- a/app-text/calibre/calibre-1.48-r1.ebuild
+++ b/app-text/calibre/calibre-1.48-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.48-r1.ebuild,v 1.1 2014/11/23 12:37:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.48-r1.ebuild,v 1.2 2014/12/05 18:04:47 axs Exp $
 
 EAPI=5
 
@@ -53,7 +53,10 @@ COMMON_DEPEND="
        >=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
        >=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
        >=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
-       <dev-python/PyQt4-4.11.3[X,svg,webkit,${PYTHON_USEDEP}]
+       || (
+               <dev-python/PyQt4-4.11.3[X,svg,webkit,${PYTHON_USEDEP}]
+               =dev-python/PyQt4-4.11.3-r1000[X,svg,webkit,${PYTHON_USEDEP}]
+       )
        dev-python/netifaces[${PYTHON_USEDEP}]
        dev-qt/qtdbus:4=
        dev-qt/qtsvg:4=