gentoo resync : 21.07.2018

4 files changed, 3 insertions, 85 deletions

diff --git a/dev-tex/glossaries/Manifest b/dev-tex/glossaries/Manifest
index 2ec85297e7ca..0510ba798d8f 100644
--- a/dev-tex/glossaries/Manifest
+++ b/dev-tex/glossaries/Manifest
@@ -1,9 +1,5 @@
 DIST glossaries-3.04.zip 3838009 BLAKE2B 58316ac6442960ae3a48188b64cd382afba5c9ff53732b43c1b8309ee0e655dc5793bcd10571c8f610484145fe3ccc2fb4efff9acc49bcb657bb61f4c31a7b4c SHA512 1669c2288c31f1b1b79dc9776c55c2abfc8fd216482cf6175e9f788a2882cfe997ca13c9d93d317e4d31fcc9eba8dc977bc806874179654141ca7235ec7c3889
-DIST glossaries-4.07.zip 5009472 BLAKE2B 31337b682f0b69742e202e4be762a9e68d0fbac0052aa9b8736bc79a61db135f23f63aae8f065f76ea110bd009c6a7a8e41c95e477c2f8da9f7b4e5e71e0b87c SHA512 576c52b0502e9854ac1332142a724ed1b97b37502322d52195f343f864a82e249529715b0a637f984ab01662d288f2ba57f7a932d2523435d5147dfb43145d61
-DIST glossaries-4.11.zip 5411615 BLAKE2B 9d2c619ca7671d09d3e7aca90df8b30d6192affe23cae16a21a71cf423eb4ee45d6a4122c7fd495cee2eea468d9cba70ce11cb677238e9443006df49d36130be SHA512 f195bb16f4b000ccf3206ae3dd594f0252cf96942062daa3af9d667be2801d6686b0b2dc337327ba2258766a2d42dbf1ff9e4974e9a4f3b1ca41352f691b4fdb
 DIST glossaries-4.12.zip 5410108 BLAKE2B 681e91b4c057d649007675d05cab5eac219a73818c24c6c2e5f752721b65108f078dd05ee6340a686054359371f0f91549069087e2bd5679ddd8cfec961776b1 SHA512 34d5512a1d8daf3b8ddf3290e8da3ed69b835752ff93a166df5ccda95c9784fa3a63aa703926c5e90725cd4a204a43e8a718d460d7eb5dec7560927cc7ce7ef9
 EBUILD glossaries-3.04.ebuild 973 BLAKE2B 641e8e831a1262d98c2b88e3be9033574fd418ae7cc14fab2fe4ace3d6a931a555de1dcc27393c5a56e23d6542548d18e7a46f9b65b55b66d50b83094f3d0dec SHA512 fd532acbfca4db298a69c41ff72cc1e7410b4b423d7b18dd9206e0f4ce5621d2c5702471f9a810ce403da9d3594432a8c94bf0ee1069f4da4401af3e80240ae5
-EBUILD glossaries-4.07.ebuild 917 BLAKE2B a0f4125f0d01e143940a73a6dbd6ac6d07744ad9853f6ed61ea13a0e70d45a0032d43752974d9046755f3a2fda764ecd493f0a33e111c7293b747dda858c9d75 SHA512 ed185748c3b755df1cc117b64df2449187b233e1877dfe41ede99ae64782b7815e5b710cc9016082e09e241012e524a3a91b2a636773143917e9ab2600091864
-EBUILD glossaries-4.11.ebuild 917 BLAKE2B a0f4125f0d01e143940a73a6dbd6ac6d07744ad9853f6ed61ea13a0e70d45a0032d43752974d9046755f3a2fda764ecd493f0a33e111c7293b747dda858c9d75 SHA512 ed185748c3b755df1cc117b64df2449187b233e1877dfe41ede99ae64782b7815e5b710cc9016082e09e241012e524a3a91b2a636773143917e9ab2600091864
-EBUILD glossaries-4.12-r1.ebuild 1005 BLAKE2B 64bfd96e922be8f1b505de1ac13e3002afa9d4f0d9af877e4828831918003dfab499218e05f7d89a22d30089b8a3c861b55cf8362368a3285804d95629626542 SHA512 701e042b50c853de46731286b67ca96f947cba2dcac32f8a285d546668b6821f759f04b0c8d0410fe59980f0835ac84b7a485fb15b7e5b618ac7ca656348aa08
+EBUILD glossaries-4.12-r1.ebuild 958 BLAKE2B 3eb68c3417df86758a07d7bfa7428ff09cacfe4c01fdf6a31748fd5735930efca1c5771d035d22e47a45936210415593f94f83593fcdef7086aed023ea089580 SHA512 3a67ebdc0a8560134fd3ff844a0e9d3c12b539d1de0508c2898c0643a84dcb41cb6a04d9f749835375738e7ea72b6aa46166a4ba943476e82b297a98ce2fe21a
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/glossaries/glossaries-4.07.ebuild b/dev-tex/glossaries/glossaries-4.07.ebuild
deleted file mode 100644
index 7a740da96093..000000000000
--- a/dev-tex/glossaries/glossaries-4.07.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit latex-package
-
-DESCRIPTION="Create glossaries and lists of acronyms"
-HOMEPAGE="http://www.ctan.org/pkg/glossaries/"
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.zip"
-
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-RDEPEND="dev-lang/perl
-	dev-texlive/texlive-latexrecommended
-	>=dev-texlive/texlive-latexextra-2012"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-TEXMF="/usr/share/texmf-site"
-S=${WORKDIR}/${PN}
-
-src_install() {
-	latex-package_src_doinstall styles
-
-	dobin makeglossaries
-
-	dodoc CHANGES README
-	if use doc ; then
-		latex-package_src_doinstall pdf
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.tex
-	fi
-}
diff --git a/dev-tex/glossaries/glossaries-4.11.ebuild b/dev-tex/glossaries/glossaries-4.11.ebuild
deleted file mode 100644
index 7a740da96093..000000000000
--- a/dev-tex/glossaries/glossaries-4.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit latex-package
-
-DESCRIPTION="Create glossaries and lists of acronyms"
-HOMEPAGE="http://www.ctan.org/pkg/glossaries/"
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.zip"
-
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-RDEPEND="dev-lang/perl
-	dev-texlive/texlive-latexrecommended
-	>=dev-texlive/texlive-latexextra-2012"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-TEXMF="/usr/share/texmf-site"
-S=${WORKDIR}/${PN}
-
-src_install() {
-	latex-package_src_doinstall styles
-
-	dobin makeglossaries
-
-	dodoc CHANGES README
-	if use doc ; then
-		latex-package_src_doinstall pdf
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.tex
-	fi
-}
diff --git a/dev-tex/glossaries/glossaries-4.12-r1.ebuild b/dev-tex/glossaries/glossaries-4.12-r1.ebuild
index 7353e713cac8..1b77653e7f5d 100644
--- a/dev-tex/glossaries/glossaries-4.12-r1.ebuild
+++ b/dev-tex/glossaries/glossaries-4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ IUSE="doc examples"
 RDEPEND="dev-lang/perl
 	dev-texlive/texlive-latexrecommended
 	>=dev-texlive/texlive-latexextra-2012
-	|| ( dev-texlive/texlive-plaingeneric >=dev-texlive/texlive-genericextra-2014 )"
+	dev-texlive/texlive-plaingeneric"
 DEPEND="${RDEPEND}
 	app-arch/unzip"