gentoo resync : 28.04.2019

4 files changed, 88 insertions, 14 deletions

diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 0c73498298a4..a76dd12bbf78 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -2,9 +2,10 @@ AUX xchm-1.23-wx3.0-compat.patch 929 BLAKE2B 87f22da40033007e071ff3c1ca497247027
 AUX xchm.desktop 251 BLAKE2B 69b8a13fbf6129aedb89f558541728bdce055a585387d1cec49c08f86b6a5d972287b63fe2ba719b83bcab9270e07c1c0d50ccaeff36bc8cd291fa7602a67863 SHA512 c17e6e3957d4c0720e43dd64b169daf221e26652fd6487d2838a4c4aa86cd9640e651d55e6bc28dd4c4cc7b37624baf83df55061583f65eeecc592bd2c9a5e54
 AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab260034e162d16af2ecce463d74feb136b5b7bfd6e8544a56d883c349bf3158f750aba05212 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533
 DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
-DIST xchm-1.26.tar.gz 785338 BLAKE2B b5aedff3de1a3c79205f27b833e339fa24ac08710ab2c97199fdd10f5674ee7d4a4689e275d9f6df4b6eb34c60cf2d36c5938924c4c0d73e37c2a464a1c63695 SHA512 8ed0281a2b2969f83d474b89e828545096b4ad9ece451cff2bdb602079751f6f6ca2c8f3c8cd79740ab0b4e5b2c3a3f8ce4e6f4985dc158b5d76007b7bc549a3
-DIST xchm-1.27.tar.gz 957753 BLAKE2B 84df84712d092a29692d287570f35893fb38a47f571f112093b6b7529ee5bceb22c439e7842377b2181f823bd069911c4889dc6ff794654d18cee589cf78e897 SHA512 82b003569307fc76f35acea51fe3d615601f185e084a9789b9757db60547d45af84428b63efbe645f9e20161815a1801d6a96a38c004cb1280e4ede35b02c014
+DIST xchm-1.28.tar.gz 984545 BLAKE2B b91e6983823a3f08b2df296c7d651e1a3a017824034d86dc5cb51dd327fa240e098afe5c5a186d27d57f54e02e2c6546cfe8e82acfd21d89b2cbbedd2ed9a829 SHA512 5d773b097ec813d991ceba4842c5cf967d4f2d0e20c84aff636615a92d000bac36d5ebf244a18f416928bd9b24792a5baf19397694201372478cd13111080630
+DIST xchm-1.29.tar.gz 972533 BLAKE2B e114047f4c3e19bb4d4c28a74997c76c54a2dc286f1f0691f105824be693e3b51c7618717b5b5b5f3604ab3f4fa89d703e071a36be0bd05529b6f44710b0bd20 SHA512 678cea2947d58e9b173379d6df809be603ca77431a3181ee45e3c1f4a4a55a6c10a395eecb5c25feb14ad361d044355ae313d537f0abc9278c6e5ab37a8768f6
 EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
-EBUILD xchm-1.26.ebuild 1022 BLAKE2B cc9f00fa40103bfd9792f081b7e425d9250dbe29c6188bd428fd2ee65cceeaba6a087680476f898a4e23051abeefb210a8406d2ccb81530a4f5e2bc7a80e669e SHA512 e533a82a1be1e78a3f30882abfbb1723a0328b662f81afd36490154d29a54e82cf928a9ca4a2bc9a5a74dd478a2554b9b3ac4e9cfb274e5e14b2f66f7e0d6c63
-EBUILD xchm-1.27.ebuild 1022 BLAKE2B cc9f00fa40103bfd9792f081b7e425d9250dbe29c6188bd428fd2ee65cceeaba6a087680476f898a4e23051abeefb210a8406d2ccb81530a4f5e2bc7a80e669e SHA512 e533a82a1be1e78a3f30882abfbb1723a0328b662f81afd36490154d29a54e82cf928a9ca4a2bc9a5a74dd478a2554b9b3ac4e9cfb274e5e14b2f66f7e0d6c63
+EBUILD xchm-1.28.ebuild 1192 BLAKE2B 3224add5ca8eb50105b7d28a37b067e66cd2e59b300811a5292524649ea75762bcb3d9d65ce84c826d5aa5b61f11a133bfcef1d8e34cc7718d45bdbd58a7b0ee SHA512 d891a2f14a044ac381af8a07d023f8bbb03a72203dc9982b644f5b26045ac89fd4469c83d56d6a5893fb3b704c1a0112054b0e8217d849b0471003c3f57a8134
+EBUILD xchm-1.29.ebuild 1192 BLAKE2B 3224add5ca8eb50105b7d28a37b067e66cd2e59b300811a5292524649ea75762bcb3d9d65ce84c826d5aa5b61f11a133bfcef1d8e34cc7718d45bdbd58a7b0ee SHA512 d891a2f14a044ac381af8a07d023f8bbb03a72203dc9982b644f5b26045ac89fd4469c83d56d6a5893fb3b704c1a0112054b0e8217d849b0471003c3f57a8134
+EBUILD xchm-9999.ebuild 1118 BLAKE2B 9c76ae3a49f85f51f83aedce892c8a0725e751bad5a7db5e90a938b91de3170702b77054f0b4f8418f97b0f0603a64da81f79314f63b891b0758be6d570be8b0 SHA512 11ca7a580fd5f37319ed5e6b0adf2b13f8a02ecfe1101ab0cb74fe8a581e5702fcc03d2337cb287d71f90a39f1bfc789aaa75cc43e1d1d20e7551947a144dbc9
 MISC metadata.xml 350 BLAKE2B f6872e04718f72ae186772afc32f65a55ed55f078f53c6b3a8448bffcf006eb65ef1923e98d369af3e9c6fda5977bd148ae13a2d8e32ab2e2a6680a4ec5fe2c6 SHA512 956319a7ec2b136c5a1b38a51ab1fb61f81274dc2898eff1441393ddc4d0c204854093800210b9e44ef214427e4664f61d0ba1c3a8c43d8f21812b55371e3e66
diff --git a/app-text/xchm/xchm-1.26.ebuild b/app-text/xchm/xchm-1.28.ebuild
index a2c546cdaf3c..8a1516c32201 100644
--- a/app-text/xchm/xchm-1.26.ebuild
+++ b/app-text/xchm/xchm-1.28.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 WX_GTK_VER="3.0-gtk3"
-
-inherit wxwidgets xdg-utils
+inherit autotools wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
@@ -13,18 +12,26 @@ SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
 
-DEPEND="
+RDEPEND="
 	>=dev-libs/chmlib-0.36
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	nls? ( virtual/libintl )
 "
-RDEPEND="
-	${DEPEND}
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
 "
 
 src_prepare() {
 	setup-wxwidgets
 	default
+	eautoreconf # Still needed on the next release?
+}
+
+src_configure() {
+	econf $(use_enable nls)
 }
 
 src_install() {
diff --git a/app-text/xchm/xchm-1.27.ebuild b/app-text/xchm/xchm-1.29.ebuild
index a2c546cdaf3c..8a1516c32201 100644
--- a/app-text/xchm/xchm-1.27.ebuild
+++ b/app-text/xchm/xchm-1.29.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 WX_GTK_VER="3.0-gtk3"
-
-inherit wxwidgets xdg-utils
+inherit autotools wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
@@ -13,18 +12,26 @@ SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
 
-DEPEND="
+RDEPEND="
 	>=dev-libs/chmlib-0.36
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	nls? ( virtual/libintl )
 "
-RDEPEND="
-	${DEPEND}
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
 "
 
 src_prepare() {
 	setup-wxwidgets
 	default
+	eautoreconf # Still needed on the next release?
+}
+
+src_configure() {
+	econf $(use_enable nls)
 }
 
 src_install() {
diff --git a/app-text/xchm/xchm-9999.ebuild b/app-text/xchm/xchm-9999.ebuild
new file mode 100644
index 000000000000..bff0e4a4ffac
--- /dev/null
+++ b/app-text/xchm/xchm-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0-gtk3"
+inherit autotools git-r3 wxwidgets xdg-utils
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="https://github.com/rzvncj/xCHM/"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="nls"
+
+RDEPEND="
+	>=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	setup-wxwidgets
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS README ChangeLog
+
+	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
+
+	domenu "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}