[gentoo-commits] repo/gentoo:master commit in: app-text/xchm/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     008f419c992bf6a5bc346a27e2505c379e346827
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 09:49:59 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 09:55:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=008f419c

app-text/xchm: Version 1.30

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 app-text/xchm/Manifest                               |  1 +
 app-text/xchm/{xchm-9999.ebuild => xchm-1.30.ebuild} | 13 ++++---------
 app-text/xchm/xchm-9999.ebuild                       |  6 +-----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 1691b48d3ea..57b99d8c3df 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -1,3 +1,4 @@
 DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
 DIST xchm-1.28.tar.gz 984545 BLAKE2B b91e6983823a3f08b2df296c7d651e1a3a017824034d86dc5cb51dd327fa240e098afe5c5a186d27d57f54e02e2c6546cfe8e82acfd21d89b2cbbedd2ed9a829 SHA512 5d773b097ec813d991ceba4842c5cf967d4f2d0e20c84aff636615a92d000bac36d5ebf244a18f416928bd9b24792a5baf19397694201372478cd13111080630
 DIST xchm-1.29.tar.gz 972533 BLAKE2B e114047f4c3e19bb4d4c28a74997c76c54a2dc286f1f0691f105824be693e3b51c7618717b5b5b5f3604ab3f4fa89d703e071a36be0bd05529b6f44710b0bd20 SHA512 678cea2947d58e9b173379d6df809be603ca77431a3181ee45e3c1f4a4a55a6c10a395eecb5c25feb14ad361d044355ae313d537f0abc9278c6e5ab37a8768f6
+DIST xchm-1.30.tar.gz 981171 BLAKE2B 6b2077e9cf8fa849121cee3681bd390218de1ce83c9c49117a186ddef107b15ee8f491eb93ae41ba8a2ea07ede306883ef0f8f0c357142e9ca333bdea8ebc50a SHA512 896d94f4fa3b728e37985b1a2e918596e20bed0a43cf90711d27ebfdcbe49e4a0794c17e1f6cfefb6f272adcc7fb22464e2c25c15d0f0afcbe94b867899eb1a5

diff --git a/app-text/xchm/xchm-9999.ebuild b/app-text/xchm/xchm-1.30.ebuild
similarity index 73%
copy from app-text/xchm/xchm-9999.ebuild
copy to app-text/xchm/xchm-1.30.ebuild
index bff0e4a4ffa..ae0694a9923 100644
--- a/app-text/xchm/xchm-9999.ebuild
+++ b/app-text/xchm/xchm-1.30.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=6
 WX_GTK_VER="3.0-gtk3"
-inherit autotools git-r3 wxwidgets xdg-utils
+inherit wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
-EGIT_REPO_URI="${HOMEPAGE}"
+SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="nls"
 
 RDEPEND="
@@ -27,7 +27,6 @@ DEPEND="
 src_prepare() {
 	setup-wxwidgets
 	default
-	eautoreconf
 }
 
 src_configure() {
@@ -35,14 +34,10 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	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

diff --git a/app-text/xchm/xchm-9999.ebuild b/app-text/xchm/xchm-9999.ebuild
index bff0e4a4ffa..1ceff8df2cd 100644
--- a/app-text/xchm/xchm-9999.ebuild
+++ b/app-text/xchm/xchm-9999.ebuild
@@ -35,14 +35,10 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	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