From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- app-text/xchm/Manifest | 10 +++---- app-text/xchm/metadata.xml | 7 ++--- app-text/xchm/xchm-1.29.ebuild | 59 ------------------------------------------ app-text/xchm/xchm-1.30.ebuild | 56 --------------------------------------- app-text/xchm/xchm-1.31.ebuild | 20 ++++++-------- app-text/xchm/xchm-9999.ebuild | 28 ++++++++++---------- 6 files changed, 30 insertions(+), 150 deletions(-) delete mode 100644 app-text/xchm/xchm-1.29.ebuild delete mode 100644 app-text/xchm/xchm-1.30.ebuild (limited to 'app-text/xchm') diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest index 74d438f96e39..5ee968c4735a 100644 --- a/app-text/xchm/Manifest +++ b/app-text/xchm/Manifest @@ -2,12 +2,8 @@ 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.29.tar.gz 972533 BLAKE2B e114047f4c3e19bb4d4c28a74997c76c54a2dc286f1f0691f105824be693e3b51c7618717b5b5b5f3604ab3f4fa89d703e071a36be0bd05529b6f44710b0bd20 SHA512 678cea2947d58e9b173379d6df809be603ca77431a3181ee45e3c1f4a4a55a6c10a395eecb5c25feb14ad361d044355ae313d537f0abc9278c6e5ab37a8768f6 -DIST xchm-1.30.tar.gz 981171 BLAKE2B 6b2077e9cf8fa849121cee3681bd390218de1ce83c9c49117a186ddef107b15ee8f491eb93ae41ba8a2ea07ede306883ef0f8f0c357142e9ca333bdea8ebc50a SHA512 896d94f4fa3b728e37985b1a2e918596e20bed0a43cf90711d27ebfdcbe49e4a0794c17e1f6cfefb6f272adcc7fb22464e2c25c15d0f0afcbe94b867899eb1a5 DIST xchm-1.31.tar.gz 981450 BLAKE2B c0c1908332f4d76f2c4dcf64ed713ae500d1b2022dedb5cb0df294fcdd1ce87d5144ca7347d6bc70b43af29f047ee270ffe05f1ee8da2dae5a5e0586c342900a SHA512 b5e1e979948d202163265f99357b361bb78371a2cc7cdedcc2d2c78207466c3f8291f720c92405913c7c5b9f607d3951a8bb3be3ece3ba1f408ceeb79199e9b5 EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace -EBUILD xchm-1.29.ebuild 1212 BLAKE2B a92a0015f18489465890cb9d292aa8e834a732e9d3b13b4df7fff95a42e0a3f2654c0aa59dae7327fd09e1330b5d0d8ab885a757c6fbfdb01227f2c04957c26d SHA512 ae281e0998252802f558ed91ba1ff39ec04144b9b2f6666657bc27d2ed9320a0420cc7ade9aa25cf5846fd1fbb3e4c158c2a4d3f9d164026cbf1fa9d3108399e -EBUILD xchm-1.30.ebuild 1014 BLAKE2B b78f2480a9fb60cea85e74e185fc69b7cf34b429c53fb4d5a2b02b6287b88d156a29f2229dfa2332d080fbc8fa7b35a6c7165dcaffb60a9da12fb9739b352c75 SHA512 030b6a0e0100e1ba1ab2948eeeacb88fe42aa4d0d40be1746b2fd0a17d90178894a9034d66f8f7921160f2a4052a0e1f85f08c7cf191229f17badcc56ff0ad7c -EBUILD xchm-1.31.ebuild 977 BLAKE2B 624e6af9fcc645192601235324dc61af665c23633fdfeb1ef461ea0e30f68f47b9723c0ed80f05aa73cf683b4ce1f37e1ce509966c7aa97b2060a00c24ab87b8 SHA512 ed839bbf9adf445c192518682e2aded1a0a2063f9ff1baa07427121dca675193a8d75ea2c0b23ed999588777a434487e52f1b38e070b6ff1712626c105a96689 -EBUILD xchm-9999.ebuild 990 BLAKE2B b2b4cb34cbe9bb43b49add6f34b37b462431eb97d67e1c7f0b0e8c522a8fec4f43ccec99a0cf71b42788c7ccb86a4b22624601e15330fc77d90d65a1da54c3eb SHA512 93ed6be0693e82bf4750bd18761a219527e9ee621a349f7e1c027160c97e0c86889ef7fa1cbcf3ac7429555b4a8c54621cdf4729c76d789b1e7f234192b73310 -MISC metadata.xml 350 BLAKE2B f6872e04718f72ae186772afc32f65a55ed55f078f53c6b3a8448bffcf006eb65ef1923e98d369af3e9c6fda5977bd148ae13a2d8e32ab2e2a6680a4ec5fe2c6 SHA512 956319a7ec2b136c5a1b38a51ab1fb61f81274dc2898eff1441393ddc4d0c204854093800210b9e44ef214427e4664f61d0ba1c3a8c43d8f21812b55371e3e66 +EBUILD xchm-1.31.ebuild 947 BLAKE2B 2e5fe64c1009644c937f5001dbee0225753261825fee7ff78b59e851ad326962d2e508784461f15f092057b3ba970a4a09d520399f831b0f9a19d6b9d18bddb9 SHA512 8416e9df53ea552ac898762b3dd3e26bdd64fb27cf49e996864f557f3245c8d56bbb52c5a85e6c50e7f5dad54e60c9ff7e1c2f83c723986eddf5ccf2db5d5e5e +EBUILD xchm-9999.ebuild 1107 BLAKE2B 735bd0f230d0ea1a8cf34805dccbe600b29dd11fca03ac34dc9c96f96064214667f772a2fb2a67c58cf9a7184688282dab944955df83560426e0954510935e25 SHA512 82a8f548dbae62af0df893eed30cb3b332c1bba1ca1ec3af3a82a1f272fec3b57f159e9bdadfb916f422e822aeb0f55be0563d022b9300fe75642a55d4ea5e6b +MISC metadata.xml 370 BLAKE2B b7a2c5ee6e02f758f53ae1f67a982d8e3c0ceffed66524c9072801bc3cb803419824ce0a30b59f9dd16cae6381ae3b1a28a9b084c6dd71ab8d68a3a9be36e5a9 SHA512 f926ec5a7690046f0c1e73da64d5ab9eb662491cdb2ad24d44455ee5a4e94693188a3c8c17f777a0da120a44d57ca00f5713f5472c75f44215213ce41aceef2d diff --git a/app-text/xchm/metadata.xml b/app-text/xchm/metadata.xml index e0b21d3488e8..82e69e9cd642 100644 --- a/app-text/xchm/metadata.xml +++ b/app-text/xchm/metadata.xml @@ -1,11 +1,12 @@ - - desktop-misc@gentoo.org - Gentoo Desktop Miscellaneous Project + + marecki@gentoo.org + Marek Szuba + rzvncj/xCHM xchm diff --git a/app-text/xchm/xchm-1.29.ebuild b/app-text/xchm/xchm-1.29.ebuild deleted file mode 100644 index 7fc116cb157d..000000000000 --- a/app-text/xchm/xchm-1.29.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# 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 wxwidgets xdg-utils - -DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files" -HOMEPAGE="https://github.com/rzvncj/xCHM/" -SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -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 # Still needed on the next release? -} - -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 -} diff --git a/app-text/xchm/xchm-1.30.ebuild b/app-text/xchm/xchm-1.30.ebuild deleted file mode 100644 index e1a21d227bbe..000000000000 --- a/app-text/xchm/xchm-1.30.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# 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 wxwidgets xdg-utils - -DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files" -HOMEPAGE="https://github.com/rzvncj/xCHM/" -SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -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 -} - -src_configure() { - econf $(use_enable nls) -} - -src_install() { - default - - dodoc AUTHORS README ChangeLog - - domenu "${FILESDIR}"/xchm.desktop - insinto /usr/share/mime/packages - doins "${FILESDIR}"/xchm.xml -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/app-text/xchm/xchm-1.31.ebuild b/app-text/xchm/xchm-1.31.ebuild index 07a7c38f9ed6..276ca9d35624 100644 --- a/app-text/xchm/xchm-1.31.ebuild +++ b/app-text/xchm/xchm-1.31.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + WX_GTK_VER="3.0-gtk3" + inherit desktop wxwidgets xdg-utils DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files" @@ -11,18 +13,14 @@ SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ppc x86" IUSE="nls" -RDEPEND=" - >=dev-libs/chmlib-0.36 +RDEPEND=">=dev-libs/chmlib-0.36 x11-libs/wxGTK:${WX_GTK_VER}[X] - nls? ( virtual/libintl ) -" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) -" + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" src_configure() { econf $(use_enable nls) @@ -31,8 +29,6 @@ src_configure() { src_install() { default - dodoc AUTHORS README ChangeLog - 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 13396034ab8a..b652fcfc7a2e 100644 --- a/app-text/xchm/xchm-9999.ebuild +++ b/app-text/xchm/xchm-9999.ebuild @@ -2,27 +2,31 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + WX_GTK_VER="3.0-gtk3" -inherit autotools desktop git-r3 wxwidgets xdg-utils + +inherit autotools desktop wxwidgets xdg-utils DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files" HOMEPAGE="https://github.com/rzvncj/xCHM/" -EGIT_REPO_URI="https://github.com/rzvncj/xCHM/" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rzvncj/xCHM/" +else + SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~x86" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="nls" -RDEPEND=" - >=dev-libs/chmlib-0.36 +RDEPEND=">=dev-libs/chmlib-0.36 x11-libs/wxGTK:${WX_GTK_VER}[X] - nls? ( virtual/libintl ) -" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) -" + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" src_prepare() { default @@ -36,8 +40,6 @@ src_configure() { src_install() { default - dodoc AUTHORS README ChangeLog - domenu "${FILESDIR}"/xchm.desktop insinto /usr/share/mime/packages doins "${FILESDIR}"/xchm.xml -- cgit v1.2.3