From d37b97a25b8b10f748eead6574b01f893f140b01 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Dec 2017 18:23:20 +0000 Subject: gentoo resync : 06.12.2017 --- app-text/Manifest.gz | Bin 54343 -> 54349 bytes app-text/djview/Manifest | 2 +- app-text/djview/djview-4.10.6.ebuild | 2 +- app-text/docbook-xsl-stylesheets/Manifest | 3 +- .../docbook-xsl-stylesheets-1.79.1-r1.ebuild | 95 -------------- .../docbook-xsl-stylesheets-1.79.1-r2.ebuild | 2 +- app-text/dos2unix/Manifest | 6 +- app-text/dos2unix/dos2unix-7.3.5.ebuild | 2 +- app-text/goldendict/Manifest | 1 - .../files/goldendict-1.0.1-gcc-4.7.patch | 40 ------ app-text/krop/Manifest | 2 - app-text/krop/krop-0.4.11.ebuild | 25 ---- app-text/poppler/Manifest | 7 +- .../poppler/files/poppler-0.62.0-openjpeg2.patch | 14 +++ app-text/poppler/poppler-0.62.0.ebuild | 139 +++++++++++++++++++++ app-text/poppler/poppler-9999.ebuild | 11 +- app-text/sword/Manifest | 1 - app-text/sword/files/sword-1.6.2-gcc47.patch | 35 ------ app-text/tidy-html5/Manifest | 4 +- app-text/tidy-html5/tidy-html5-5.4.0.ebuild | 18 --- app-text/tidy-html5/tidy-html5-5.6.0.ebuild | 18 +++ 21 files changed, 188 insertions(+), 239 deletions(-) delete mode 100644 app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild delete mode 100644 app-text/goldendict/files/goldendict-1.0.1-gcc-4.7.patch delete mode 100644 app-text/krop/krop-0.4.11.ebuild create mode 100644 app-text/poppler/files/poppler-0.62.0-openjpeg2.patch create mode 100644 app-text/poppler/poppler-0.62.0.ebuild delete mode 100644 app-text/sword/files/sword-1.6.2-gcc47.patch delete mode 100644 app-text/tidy-html5/tidy-html5-5.4.0.ebuild create mode 100644 app-text/tidy-html5/tidy-html5-5.6.0.ebuild (limited to 'app-text') diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 00e5334984cb..71a4c52540aa 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest index f002add5ef53..b653c78e46b1 100644 --- a/app-text/djview/Manifest +++ b/app-text/djview/Manifest @@ -5,7 +5,7 @@ DIST djview-4.10.tar.gz 1077198 SHA256 7caf7ee249edd994092b32a5573f111b2337ec991 DIST djview-4.9.tar.gz 930676 SHA256 d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94 WHIRLPOOL b522f9ba7283430fa7134f172b6a358c95da03e10fcf1e5f55bdd5c9be1f2929c07682e48e3a90695c838dfd2ffb875794c95e70d4096dd9595da402f76523fd EBUILD djview-4.10.3.ebuild 1977 BLAKE2B c8b701604d32cef042adb9c4cd12ff60f7b5b0cde1084984cbb36a8ce76572df1d0b5ff286166016f6b42a398b7b4b2ff5261320c1ebbc93296b56470e37d651 SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609 EBUILD djview-4.10.5.ebuild 1977 BLAKE2B c8b701604d32cef042adb9c4cd12ff60f7b5b0cde1084984cbb36a8ce76572df1d0b5ff286166016f6b42a398b7b4b2ff5261320c1ebbc93296b56470e37d651 SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609 -EBUILD djview-4.10.6.ebuild 1975 BLAKE2B 585cefe048c14a3d1f2b2dcbe3a89f84212a0022865dacf0b9e8782dbe8363784786d6642694072f8fe8b5cfdfb8e7808837373017c5a321c2dc24e8494a816e SHA512 e765f96a02c26f31150464201cedd3aaab7e54dbf2c352040c3f8fd7b2b9ce050d5d8fc4b94e84e10c2a0f3236d0cfa40544751cdc9290a6e200666c9d34ff79 +EBUILD djview-4.10.6.ebuild 1974 BLAKE2B c79ef9ea75611041256153d85484ac48a4cf31166b7ff052da1fea7ebbb49c380db597914c97164204848ffa4b6f647f53dead363bc67cbddd224d3ef824365c SHA512 f9e63674541a39acc816f4f9e7223e7dc8a42193946f127ea8554ac7177c2cad9e773619351d40eb2d4260af04ae5760ed2228c10f3f6f92775914d3ce88d32d EBUILD djview-4.10.ebuild 2027 BLAKE2B ca271d0bea9b072e044e37555c0621474115416ae0242933b442c8e4d318627ae338c83ef68903bb6f1ca62bba2ae29e5e6a33de5359baae500d6b112d196509 SHA512 3ceea3d4e3e82acf37d6612391b9f9d38d324a3e2a2ba8f8c6e667cbe5bf43cbf40c4fc5f2c055de82f521dbe8d76e448169d531e815d061ed5f38928d93cae5 EBUILD djview-4.9.ebuild 1946 BLAKE2B fb46a53d90cd4313c90acef2ec11350a7ef296154e9d0b37740c210f1495bf6588256cf7e7654b67dfcd4a92cd13cbe76f56838af2418107d780e6a2a748d8c3 SHA512 d9c66756fdd98c2ae8323a1c23f5f171b205e8c6dae4c6de256c15fee6bb3c870edec36b4278a8e524fff7e7984cc657d97c4e54aee890e9bac9295af674ff36 MISC metadata.xml 323 BLAKE2B c8498cdd0e1820eb610a9e2ede4e10287977c2eb71dd1b6b9862e3d11a34760cf8dcb5e9e59535ab0ceed04f3be2b00aa4942657a25fffc87b23966c2b2c1caf SHA512 53a7a7290a2286fd31248db31160697a3b2693275013a1ea453258f9ac52fa3ea7111718ca35a5eb1652050699e5be1111c7ebb73b2a3c699383d8305509a5c4 diff --git a/app-text/djview/djview-4.10.6.ebuild b/app-text/djview/djview-4.10.6.ebuild index a9cc140b5498..46134eee485f 100644 --- a/app-text/djview/djview-4.10.6.ebuild +++ b/app-text/djview/djview-4.10.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ~ppc64 x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 x86" IUSE="debug nsplugin" RDEPEND=" diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest index 7e0c16fd0ed8..f88b2436a060 100644 --- a/app-text/docbook-xsl-stylesheets/Manifest +++ b/app-text/docbook-xsl-stylesheets/Manifest @@ -1,5 +1,4 @@ AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7 -EBUILD docbook-xsl-stylesheets-1.79.1-r1.ebuild 2122 BLAKE2B b1a124e1349a4a6f0e267be4a57d1ef9a88d3c49570107fa8ec56cea286c242f31b34b3b05b80150fab519ea50d51587a84284ab44fb6ec5dd3b107f413c1311 SHA512 69c1f46596e62747f2011d69def968960f8243393998b5897f83dd4a641931e25dfe496ae502ee5c83714bc887b5c8023b8f208b1b3897d6f472eae134c2b2b3 -EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2204 BLAKE2B 698270179dc6ddfe8ee606832d30ef19a54c96bec803ae204ac593e378b3868b3d7d8591dd93c5e535b8a78ccf035e5e2724d459ccee2b183fa1ce93c80a8744 SHA512 01115efcec06425a1e1fbe0be634c474b757b10ca26e3b6e765a4d362cc1e1b39d5fb4ac2d938f83cd2806f0b7bf7dd2e65063322a972da88dbfe95725de8d1d +EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2192 BLAKE2B 94f7538707bf5c9a8af189ef1aefcc80e0179769e29f5544afb65558b714aced8fe2b398785c0899a9339441bf69eb18c0f3ebb0ac47c95546e2229607637116 SHA512 2941be8fa4651d201cda5d1ff36f007d267ebf1c34a2227459ca32c38d824c3432b406912bc4c1fc80d755fc3efd19cee2eff5b7e0d121c45093a02942788945 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892 diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild deleted file mode 100644 index f31e0f944d4f..000000000000 --- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -USE_RUBY="ruby20 ruby21 ruby22 ruby23" - -inherit ruby-single - -DOCBOOKDIR="/usr/share/sgml/${PN/-//}" -MY_PN="${PN%-stylesheets}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="XSL Stylesheets for Docbook" -HOMEPAGE="http://wiki.docbook.org/DocBookXslStylesheets" -SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ruby" - -RDEPEND=">=app-text/build-docbook-catalog-1.1 - ruby? ( ${RUBY_DEPS} )" - -S="${WORKDIR}/${MY_P}" - -# Makefile is broken since 1.76.0 -RESTRICT=test - -src_prepare() { - # Delete the unnecessary Java-related stuff and other tools as they - # bloat the stage3 tarballs massively. See bug #575818. - rm -rv extensions/ tools/ || die - find \( -name build.xml -o -name build.properties \) \ - -printf "removed %p\n" -delete || die - - if ! use ruby; then - rm -rv epub/ || die - fi -} - -# The makefile runs tests, not builds. -src_compile() { :; } - -src_test() { - emake check -} - -src_install() { - # The changelog is now zipped, and copied as the RELEASE-NOTES, so we - # don't need to install it - dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO - - insinto ${DOCBOOKDIR} - doins VERSION VERSION.xsl - - local i - for i in */; do - i=${i%/} - - cd "${S}"/${i} - for doc in ChangeLog README; do - if [ -e "$doc" ]; then - mv ${doc} ${doc}.${i} - dodoc ${doc}.${i} - rm ${doc}.${i} - fi - done - - doins -r "${S}"/${i} - done - - if use ruby; then - local cmd="dbtoepub${MY_PN#docbook-xsl}" - - # we can't use a symlink or it'll look for the library in the - # wrong path. - dodir /usr/bin - cat - > "${D}"/usr/bin/${cmd} < { - public: - typedef std::pair value_type; - T& getWithDefault(const Key& k, const T& defaultValue) { -- if (find(k) == this->end()) { -- insert(value_type(k, defaultValue)); -+ if (this->find(k) == this->end()) { -+ this->insert(value_type(k, defaultValue)); - } -- return (*(find(k))).second; -+ return (*(this->find(k))).second; - } - - T& operator[](const Key& k) { -- if (find(k) == this->end()) { -- insert(value_type(k, T())); -+ if (this->find(k) == this->end()) { -+ this->insert(value_type(k, T())); - } -- return (*(find(k))).second; -+ return (*(this->find(k))).second; - } - bool has(const Key& k, const T &val) const { -- typename std::multimap::const_iterator start = lower_bound(k); -- typename std::multimap::const_iterator end = upper_bound(k); -+ typename std::multimap::const_iterator start = this->lower_bound(k); -+ typename std::multimap::const_iterator end = this->upper_bound(k); - for (; start!=end; start++) { - if (start->second == val) - return true; diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest index ee13ea6a6c12..19e4bc65069a 100644 --- a/app-text/tidy-html5/Manifest +++ b/app-text/tidy-html5/Manifest @@ -1,3 +1,3 @@ -DIST tidy-html5-5.4.0.zip 573217 SHA256 aa9d611cdee60ef0d20941f6c5f09240189e3a90e4ef8994b15bf561ce3ed691 SHA512 788646c0c15a1be58695469977c340cbe7d37fada63faea34b67c1d7ffe6074ed2b6dcd6cc946a0ae99cd5319c9a8c5ffb81958f82b6097a35a3215bc1776fa8 WHIRLPOOL f081b17b22feb05c436756dea7e55cdd98608bc99d085db0121e0fdb297761dc7a87b4793586cdaf841bcc4a6bd1e08a566620030702482bd1ecce7dcdd94c86 -EBUILD tidy-html5-5.4.0.ebuild 526 BLAKE2B 6723e361038f98ef0fad63832c29f029ad22584750fc0f83a1dbf55c384b1cb8dda95de3ab8919e8058151f6b7330d0266f34437fb1579fa378e5b6ad8969197 SHA512 44a7e56d59986d4adb41dd03e56b0247c1b0e79152bbb9dc361e54c64abd6da2615a5b4c51b02ceb348fd0e853469f294996e894c389093185d6439efdbe7a59 +DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1 +EBUILD tidy-html5-5.6.0.ebuild 532 BLAKE2B 7db541ebf60f822376913b7664efa74143e0819ec4a3975a5d1dd096185edefbc4673cae58f903739e68e1a5447d1b1c6d14e92d34addf40ae096690da6a7b87 SHA512 32744326634b48af283bfcda94ecf9a96c9d4a8780afa975d1c2996ebc5d0e267eb7d0439dbdba6cdafcd472acaf5f7d3862cb692fb081e09a7981ebeea33c1e MISC metadata.xml 333 BLAKE2B 92aabf92af24245465d0e5b1f99faabf41cdb71fffd31b7fb1e8268c5d91977b44d3998ede7789f280031c80d70deb726ed201b896007d63fd0710ffbf8b120e SHA512 aedfa31a9188be8d3ad9ea8b278acf1b3e90f9b0c91dd63b00c19a90c6a74d16ee57d80810f39392564fbc1b782b35b6231a9b453f91e765296e5ec45d5c087b diff --git a/app-text/tidy-html5/tidy-html5-5.4.0.ebuild b/app-text/tidy-html5/tidy-html5-5.4.0.ebuild deleted file mode 100644 index fffb62956b10..000000000000 --- a/app-text/tidy-html5/tidy-html5-5.4.0.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents" -HOMEPAGE="http://www.html-tidy.org/" -SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.zip -> ${P}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -RDEPEND="!app-text/htmltidy" - -DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md ) diff --git a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild new file mode 100644 index 000000000000..4b81aaea49f2 --- /dev/null +++ b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents" +HOMEPAGE="http://www.html-tidy.org/" +SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +RDEPEND="!app-text/htmltidy" + +DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md ) -- cgit v1.2.3