gentoo resync : 17.01.2010

8 files changed, 78 insertions, 5 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b4844ba262fd..534fe9564f22 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 07897d4c1dbd..0b2e6a1c6cec 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
 DIST iso-codes-4.4.tar.gz 13299605 BLAKE2B 485f3b0240f1892fb96f2b5c391b3f0adc593fac97d53748aa104208936d1bf81de1d40e742ab48e3663cea0ce5b28a20782df2f4eed251bab5b8a7055745d0e SHA512 d22ecdef75cd07b59ea0dbc87d25eb254676ab83297c1a43dbad9d3471ba355630f5588b4590972526f9e885b2e1ec307303ac0bb94b2dd5c707377c1cfa64d8
 EBUILD iso-codes-3.76.ebuild 2409 BLAKE2B fdfa564ff7e6c58aead012f18c879f62ac372677d3039a00a24d3e5764af36d3ae43fa818f4c5a57ba53980b3a54680db8e289d3d62fe26afd98652a84537049 SHA512 0d15de3e173f2788250d392a37c084422ff900483da231ffa720eb2cce56bdf8ea2b2bd2468109e59ec23fd6c6ce369bd953ac20b53b05c4bf20dbcc4369815e
-EBUILD iso-codes-4.4.ebuild 2635 BLAKE2B d41d87827ca74a6b46ef2a777fcc59dd3a819e59b9a6bdd66b3052d4024078365f6247ad9c08758522f25a305e182e15da879284218cfe1f6cbc56e3460b56a7 SHA512 23d2b4cfc8f4f5c57c1f509f99954a24b1e04388c71cc98670129f5e00b8fa5a98cf869fcb96a2e94ffa6df2861e397bbde0abb2523b80f94793ef8c6fc6e596
+EBUILD iso-codes-4.4.ebuild 2634 BLAKE2B 69c72da7ed1925668478955ac2d547c8ee71b1f6171a641c93c88e77984a11b3b0e6be774665c550a46d8dac8086f9683cb922cb6678de54ddaa215b8d13a4f2 SHA512 9e1f1deca150804f55d3a993c24c8c4412e8e19ec0acfa25840d81e769cca34cd9ea26974ada3663173e52579e0a969810ebc99083f8a80ac6ba2039766d3f7a
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-4.4.ebuild b/app-text/iso-codes/iso-codes-4.4.ebuild
index bf3fa6ef3f25..e5bd27de5b9f 100644
--- a/app-text/iso-codes/iso-codes-4.4.ebuild
+++ b/app-text/iso-codes/iso-codes-4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index a515dc21e3ff..56373801adcf 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -49,5 +49,5 @@ DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4
 EBUILD tesseract-3.05.02.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
 EBUILD tesseract-4.1.0-r1.ebuild 2058 BLAKE2B 3751e2c6e91b98a19d1685b18dbf8eb3efbb199c7188c8004928895abc367f7a9ea5e60117a6d0d9294d5b16181a1b13531884e195bdfd7262134ef7c4b7af5a SHA512 af6a73442d988fbfe3aa70bc5dd232d88424665bc69b0621295247f07667eeeb11fec1c3e1cda11dd7912d45ce095bbdb025e554d0f17b92d80b8a0baadcd11e
 EBUILD tesseract-4.1.1.ebuild 2058 BLAKE2B 3751e2c6e91b98a19d1685b18dbf8eb3efbb199c7188c8004928895abc367f7a9ea5e60117a6d0d9294d5b16181a1b13531884e195bdfd7262134ef7c4b7af5a SHA512 af6a73442d988fbfe3aa70bc5dd232d88424665bc69b0621295247f07667eeeb11fec1c3e1cda11dd7912d45ce095bbdb025e554d0f17b92d80b8a0baadcd11e
-EBUILD tesseract-9999.ebuild 1979 BLAKE2B f8f441ac97944f6d9a7239d0753e73e0b962fcc434bcd5741e4378ee91d054f254e7d9b55bdaacb5e5fe30bcdd224c611e2fb8880b3b04f9bdc26454d112fff9 SHA512 356a9202271d4a6b27b12ca30bcbd4dd06ab2da82bea81ef35a6c2135afcdd1e784a2da0b2c746047d9a1f9da3fe1b41af1454749612ef666cfb25342e69ef4d
+EBUILD tesseract-9999.ebuild 1984 BLAKE2B 2ba645fbf2b694c306b68f12a4340c827f513ef23c59e8d9be0cc956f5339ccccc29fa0c793143398afaa131b1a955214782809fe5b1d250fb5421bfd3bc69da SHA512 1fff8b3531684facc3eedfb41b9474ec2fd379e8a2669d3d53567d819d52a2899e6247a6b28c632d24d7a3aa1068d51b80d17387ad90668a227cfcde39ebb1c3
 MISC metadata.xml 1144 BLAKE2B 1b9ecd743c9a6b016ae04ea28b8bc2f80f6192c8c52d9d7e165cb8a2f222cc08408c97b0e01cebd4840b46cf0f046b2a7511b56c8f14b1a6434fea6e1149a48f SHA512 a86b76ef0f4bdf4339df2d061d1ef4c4fa80b60bc1d748a8c8c06023a9a5bc025bd14ee2d5e06f25706fc8055d8722cef41048e39908fc3771ec5ddd314eea4e
diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index f44c6f3d8fc8..36477196d955 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools git-r3 multilib-minimal toolchain-funcs
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
-EGIT_REPO_URI="https://github.com/${MY_PN}/${PN}.git"
+EGIT_REPO_URI="https://github.com/tesseract-ocr/${PN}.git"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-text/xhtml11/Manifest b/app-text/xhtml11/Manifest
new file mode 100644
index 000000000000..acf2a527c040
--- /dev/null
+++ b/app-text/xhtml11/Manifest
@@ -0,0 +1,3 @@
+DIST xhtml11-20101123.tar.gz 236494 BLAKE2B 06a4e43354c16d583a0d60c450cb9dc6e088bde3be3958da70b2c5ea2e85e137666032c8a25848d9acba459d829d7ba82da414483d8f855ac3c893a7ac7f5931 SHA512 8a38a61d44809459f1f8b02992a623836df1b4b7fb6b5e844ca039264d4c99e80170c84d8b90dede7142f5972e9668f4ff71c9e0ded82887e5b4116cf56a8506
+EBUILD xhtml11-20101123.ebuild 1659 BLAKE2B 544e9990f7845615782c771af212bd1035cf4b9a7b00af4df2f2c44fa95c5d94e83ddf5bd4e5d86825e2abcc14883364a08636cb41f88dc316f8f3e30c4edcb2 SHA512 ad16f58bd61691345aaa1f1d59b694a1caf3a02eecca1127e230ab3ba1c989ff0bf194435b18a19e789786539651cdafc6bb80b35bef54a78a536e88a9c1914d
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/xhtml11/metadata.xml b/app-text/xhtml11/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-text/xhtml11/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/xhtml11/xhtml11-20101123.ebuild b/app-text/xhtml11/xhtml11-20101123.ebuild
new file mode 100644
index 000000000000..f16bd3fd2d9b
--- /dev/null
+++ b/app-text/xhtml11/xhtml11-20101123.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
+HOMEPAGE="http://www.w3.org/TR/xhtml11/"
+SRC_URI="http://www.w3.org/TR/xhtml11/xhtml11.tgz -> ${P}.tar.gz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="app-text/sgml-common
+	dev-libs/libxml2"
+
+xml_catalog_setup() {
+	CATALOG="${EROOT}/etc/xml/catalog"
+	XMLTOOL="${BROOT}/usr/bin/xmlcatalog"
+	DTDDIR="${EROOT}/usr/share/sgml/${PN}"
+
+	[[ -x ${XMLTOOL} ]]
+}
+
+src_install() {
+	insinto /usr/share/sgml/${PN}
+	doins DTD/*.{cat,dcl,dtd,mod}
+
+	insinto /etc/sgml
+	newins - xhtml11.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/xhtml11/xhtml11.cat"
+	EOF
+
+	dodoc *.pdf *.ps
+	docinto html
+	dodoc *.html *.gif *.css
+}
+
+pkg_postinst() {
+	sgml-catalog-r1_pkg_postinst
+
+	xml_catalog_setup || return
+	einfo "Installing xhtml11 in the global XML catalog"
+	"${XMLTOOL}" --noout --add 'public' '-//W3C//DTD XHTML 1.1//EN' \
+		"${DTDDIR}"/xhtml11-flat.dtd "${CATALOG}"
+	"${XMLTOOL}" --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml11/DTD' \
+		"${DTDDIR}" "${CATALOG}"
+	"${XMLTOOL}" --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml11/DTD' \
+		"${DTDDIR}" "${CATALOG}"
+}
+
+pkg_postrm() {
+	sgml-catalog-r1_pkg_postrm
+
+	[[ -n ${REPLACED_BY_VERSION} ]] && return
+	xml_catalog_setup || return
+	einfo "Removing xhtml1 from the global XML catalog"
+	"${XMLTOOL}" --noout --del '-//W3C//DTD XHTML 1.1//EN' "${CATALOG}"
+	"${XMLTOOL}" --noout --del 'http://www.w3.org/TR/xhtml11/DTD' "${CATALOG}"
+}