From d48c0f30ba797204c4bce524232e1b9a3fba723a Mon Sep 17 00:00:00 2001 From: Nikos Chantziaras Date: Thu, 9 Aug 2018 07:04:18 +0300 Subject: [PATCH] games-engines/hugor: delete 1.0, fix live ebuild and metadata 1.0 has issues with Qt 5 and Qt 4 was removed from portage. --- games-engines/hugor/Manifest | 18 +++++------ games-engines/hugor/hugor-1.0.ebuild | 57 ----------------------------------- games-engines/hugor/hugor-9999.ebuild | 34 ++++++++++----------- games-engines/hugor/metadata.xml | 5 +-- 4 files changed, 25 insertions(+), 89 deletions(-) rewrite games-engines/hugor/Manifest (98%) delete mode 100644 games-engines/hugor/hugor-1.0.ebuild diff --git a/games-engines/hugor/Manifest b/games-engines/hugor/Manifest dissimilarity index 98% index e01b9bd..cfba059 100644 --- a/games-engines/hugor/Manifest +++ b/games-engines/hugor/Manifest @@ -1,10 +1,8 @@ -AUX hicolor/128x128/mimetypes/application-x-hugo-image.png 22833 SHA256 47f20389394d71f3030e504fa670e155acfe4e9c9c1398226ff72b27f248d742 SHA512 51fb7eecd3193a95291f0b6d9bbc1fde141512ddee0e64f880cb3390bbc38a82311a91d4a54feadbcec8fa182ec8e5239df38807c2b1c55e3964afe294486d9e WHIRLPOOL cbdfe09634cd45523d908525ff017fb9ac51e2db2537d4f3f4d7131c3f6d9fa21c6845fd50c1ef6088c981c6e1701a3b15c10424cfbfced1b3b45447cc8e5476 -AUX hicolor/16x16/mimetypes/application-x-hugo-image.png 1022 SHA256 f6c7b10c2bc41f94738bea10f823eca981842b66816178dc7e9be82839227932 SHA512 4f688030b1ee752369680a7b614bad97cefbb3b3e3fe9fecf17d5c2ba67578c77c24647b258d6a7f57159fb83776fd4a365427beb9b3235a58481c942c3d4dbf WHIRLPOOL 03b85ecc329c51123478ef940683d4b1a3651075f6dc2113519f70d815e2daea1bf4743ff40def866043daf90eac93fc51f26d57d9b905f1786cac763457d71f -AUX hicolor/32x32/mimetypes/application-x-hugo-image.png 2836 SHA256 e516e35b87b74f5a9c1c95ade4a1575372651c6ebedd0d9e2ade7893b0a93671 SHA512 77baadef0f1a900fceff70cbea62b11bf215748f1d25e24cc3220f56b224922f8ad486dc39d9156f8a41d14ced90e3f0c319149816abddf7a025ef8764ec76ea WHIRLPOOL d96d566f436161911c85bdc265bfa9c083025cbdf1b6e38d003875261160ef09d438138adc76e88c718459ea887a5de5f1c998c1bd32da9fde5f2b826cae3bf5 -AUX hicolor/48x48/mimetypes/application-x-hugo-image.png 5138 SHA256 8c4803ba39a1deb934da997da650a51dd6d8603ebd1a6a818db18a16a8c70ec8 SHA512 57782001a9ed101b087d729e48ebf57f17b68256895566012503a52760aab09415041205b6d792944a1a9b68b2938d2e9d667b433b39daaf7846bdae49d15030 WHIRLPOOL f8107b0b3a35f39517d755bab014b1f85460f32ecfc3fd0f3e5ac39beb2a3e65a46ed1bcc280d15cfc5e0d58d6e4b04685b72e6caa9bb9f27ce9e49c62d93145 -AUX hugor.png 72965 SHA256 29115e5cf1ffae82643bd68ef3a62fe2b4b425649565dfc730b23bcb672baafe SHA512 4ecf9e8b2d50eaa43c2b2ae47ddeb8252f10995f51621a2961d8b230113d728d76f3212b320bc1ba9f2f0ef53cb7e876b68919f2193d5a8dddd2558a108f8c53 WHIRLPOOL 94ad35cfd9519e991502b7f6a8c691f7b2f18a6ca635085ed76c22ea1bc3b20a8400a33c0190f2a1a618efb78d2d2ba06ac21df741e294332846a4183b9e1862 -AUX hugor.xml 255 SHA256 a9b58636810f2370acd0e785df4e8e44d8f2f0971d28a0f28ce6cf15e4012887 SHA512 6f73ffa1fc95a682214347130462d5f3db27cf9f5e522f0707b1c98f563af3afdfe733e4a8b5e3cadbf1f1b461abcf80fc8ab43bb2f515c2012bb0919f547bf6 WHIRLPOOL 7335ef5b6a459eb9e4632b696a389bbee138a7868da79c650ecddc0a18e3b4d302bea0f5559db6d8f298af56b46fcd83b94cd5af09d8bcd2d6d40b9711654c64 -DIST hugor-1.0-src.tar.bz2 343552 SHA256 8106bcdf905d7e548d2964a09af9f684535ba41c917b55cecc271c47a30037e6 SHA512 7796062cd1e56070d51a7b41e9dd433cd7d1864f083f658a70881156cf45af40e0692d2897a1936ef24694a355bef7fecda646c748ca2b52fa2ec5acaa03700f WHIRLPOOL 31c450df9612c98186d784bcce00c80f049499a42b46a2c3808e7354f6f1b56e546860b83e2e3751cc4561922a4b1137edc215837a1f3a54e12da24e3c918a44 -EBUILD hugor-1.0.ebuild 1281 SHA256 b0991e53c10f24e9c3067e149967edfd845daa7b1f66157335b9c308451d2a46 SHA512 a6d4618874d836e9f19224ceab2592a1dde8454abafcde3d7ebd9056f3eba4aa560c971213e47900e5c2df175e8b642f2b3d684135c46be989abe50573b03030 WHIRLPOOL 9ef95530d3da5c4f178b67466cc94203d93166d7232dc359538aabc134b54ef76b6e7e0ab2e06fde3e16b197d0231fe00df7258098bafbb8ed748db782cc39f8 -EBUILD hugor-9999.ebuild 1558 SHA256 13628d496b6b6c5479de3286160b507085186272455adfba76ffdd6b404cc302 SHA512 25e23b2c3a98cfcc99c57c658ca85cf179080f929ea79d51db30d516563fc79c563e1c2d3cfb92c56441c642df75a9cf3270fee463cdfb75554350434954fa2c WHIRLPOOL 2b6b4b94ffeeae4dfa9a9ac72e8546cc213ca4a01006350400afe85e857bd7c4086bf766a849de55bd7009a8766d89ce1606552959696c9a77f3931fe89115c7 -MISC metadata.xml 448 SHA256 68f053757173e64190edbcc30b697be04a69de8fdf65763b661eb339d887b8d6 SHA512 bff61e5310632af09cc07a2189c6769a6d638acb9248cf46a3b796e60d8c101a56e82c3ff091c7eddb9224a92f27d21c49184b74bb1e4c8f7221635b8f398764 WHIRLPOOL ee99565db1db4c2c697336266aa6ffcd50c1e45b229b282a97d6ec8147f87d00617287be6e38ffc996837bed4234fc60d9bd931f125b4ead67b03a3c05a1dda7 +AUX hicolor/128x128/mimetypes/application-x-hugo-image.png 22833 BLAKE2B 7e71775e8f8b5a5045e1b494090e144d2b326c17c992664de5ecca02a773c9a2a3f60ddf9cc4f49bf381f1c066a120959e22d12f80032bd7960600f279d612dc SHA512 51fb7eecd3193a95291f0b6d9bbc1fde141512ddee0e64f880cb3390bbc38a82311a91d4a54feadbcec8fa182ec8e5239df38807c2b1c55e3964afe294486d9e +AUX hicolor/16x16/mimetypes/application-x-hugo-image.png 1022 BLAKE2B 09bb02bcb2c174a1a11293baac9e4009b93dfb6267318d3b87449f0994d2d0152637b7826c64f595e6cdf0d5225a5eede5283336e81d640c047a4f9f608047ed SHA512 4f688030b1ee752369680a7b614bad97cefbb3b3e3fe9fecf17d5c2ba67578c77c24647b258d6a7f57159fb83776fd4a365427beb9b3235a58481c942c3d4dbf +AUX hicolor/32x32/mimetypes/application-x-hugo-image.png 2836 BLAKE2B 18214e7072038742063c8b78a178aee2d4cd2fd85982a6e52d9a92f69f02565363ed8c13f6c71131b9c9a347c2f89efd389efc0a476b4980c9933c7cb538eec3 SHA512 77baadef0f1a900fceff70cbea62b11bf215748f1d25e24cc3220f56b224922f8ad486dc39d9156f8a41d14ced90e3f0c319149816abddf7a025ef8764ec76ea +AUX hicolor/48x48/mimetypes/application-x-hugo-image.png 5138 BLAKE2B 9b7005e5d9834bf0c5cc9b46c4a15b8e5a83cdb7d0d797425b10db857522c59ee49df6e47d0919f1fe669f77f0fae13139f2571d56aa2b6b52eaba6b1f8d3f10 SHA512 57782001a9ed101b087d729e48ebf57f17b68256895566012503a52760aab09415041205b6d792944a1a9b68b2938d2e9d667b433b39daaf7846bdae49d15030 +AUX hugor.png 72965 BLAKE2B 0a9d49a9fb6b4a52a20fc40de7c687ec2f69ef303dc555a3b53d8b890f5e6e6d1cd83b7fb5daa97af229874643f7fa8045f62b256d0cdc3634e8574bf8b77653 SHA512 4ecf9e8b2d50eaa43c2b2ae47ddeb8252f10995f51621a2961d8b230113d728d76f3212b320bc1ba9f2f0ef53cb7e876b68919f2193d5a8dddd2558a108f8c53 +AUX hugor.xml 255 BLAKE2B e85e4526087c7e460a45274cb109a43131a159cfe0df70e458e26d829a2df6c71002bc0ac0000aff8fd3f852682906835e13b86ac866f1061a9b0b07af865234 SHA512 6f73ffa1fc95a682214347130462d5f3db27cf9f5e522f0707b1c98f563af3afdfe733e4a8b5e3cadbf1f1b461abcf80fc8ab43bb2f515c2012bb0919f547bf6 +EBUILD hugor-9999.ebuild 1469 BLAKE2B 9af662a8602ec66d8d5eedd2352d4211fa220b508625f0efb4f403cc636196b7cc4da06ce1be7064e003e816b8df240b4c087a26e4f33f68c6a2729b99f79633 SHA512 1bdbf717657be5c873f7d3d4f457f2c13ef35789e8cad8e20040187eed7f4ae6e7c0ede26d67eae3da267de6bd1838fb0c2a8f6e58793dd0cae89bb3c3d902e1 +MISC metadata.xml 334 BLAKE2B 8f05e5eae2659c429d2608ce4734eb93b1f4f335ac42417ab67444ff1e5c8473854e5c92a023edb8c7bb493d5f8ab658ab99c793ced4a9877c2efc0ed89dd077 SHA512 d1ec3883786947aee62f2ee2791120fcd94c7e24d4d0b60e0cb12c3f47dd53c8ab6bf100191f879e87c539bed03c9f8cabead08c8509e88b0ff3e7ab50d8d223 diff --git a/games-engines/hugor/hugor-1.0.ebuild b/games-engines/hugor/hugor-1.0.ebuild deleted file mode 100644 index ec22a4a..0000000 --- a/games-engines/hugor/hugor-1.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils gnome2-utils fdo-mime qt4-r2 - -SRC_URI="https://github.com/realnc/hugor/releases/download/${PV}/hugor-${PV}-src.tar.bz2" -KEYWORDS="x86 amd64" -DESCRIPTION="Multimedia interpreter for Hugo text adventures" -HOMEPAGE="http://ifwiki.org/index.php/Hugor" - -LICENSE="Hugo" -SLOT="0" -IUSE="fmod +sdl" -REQUIRED_USE="^^ ( fmod sdl )" - -DEPEND="dev-qt/qtgui:4 - sdl? ( >=media-libs/sdl-mixer-1.2.12[mad,midi,modplug] ) - fmod? ( media-libs/fmod ) - x11-misc/shared-mime-info" - -src_configure() { - if use sdl; then - eqmake4 SOUND=sdl - else - eqmake4 SOUND=fmod - fi -} - -src_install() { - dobin "hugor" - dodoc README - doicon "${FILESDIR}/hugor.png" - make_desktop_entry hugor Hugor "hugor" Game "GenericName=Hugo Multimedia Interpreter\nMimeType=application/x-hugo-image;" - insinto /usr/share/icons - doins -r "${FILESDIR}/hicolor" - insinto /usr/share/mime/packages - doins "${FILESDIR}/hugor.xml" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} diff --git a/games-engines/hugor/hugor-9999.ebuild b/games-engines/hugor/hugor-9999.ebuild index 91ddd70..6a0653c 100644 --- a/games-engines/hugor/hugor-9999.ebuild +++ b/games-engines/hugor/hugor-9999.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI="5" +EAPI=6 if [ "$PV" != "9999" ]; then SRC_URI="https://github.com/realnc/hugor/releases/download/${PV}/hugor-${PV}-src.tar.bz2" @@ -12,11 +11,11 @@ else KEYWORDS="" fi -inherit eutils gnome2-utils fdo-mime qmake-utils +inherit gnome2-utils qmake-utils xdg if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="git://github.com/realnc/hugor.git" - inherit git-2 + EGIT_REPO_URI="https://github.com/realnc/hugor.git" + inherit git-r3 fi DESCRIPTION="Multimedia interpreter for Hugo text adventures" @@ -26,21 +25,21 @@ LICENSE="Hugo" SLOT="0" IUSE="+gstreamer" -RDEPEND="gstreamer? ( - media-libs/gst-plugins-good:1.0 - media-plugins/gst-plugins-libav - )" - -DEPEND="${RDEPEND} - dev-qt/qtgui:5 +DEPEND="dev-qt/qtgui:5 media-libs/sdl-mixer[mp3,mad,midi,mod] gstreamer? ( media-libs/gst-plugins-base:1.0 ) x11-misc/shared-mime-info" +RDEPEND="gstreamer? ( + media-libs/gst-plugins-good:1.0 + media-plugins/gst-plugins-libav + ) + ${DEPEND}" + src_configure() { local conf ! use gstreamer && conf="disable-video" - eqmake5 "${S}/hugor.pro" CONFIG+="${conf}" + eqmake5 hugor.pro CONFIG+="${conf}" -after CONFIG-=silent } src_install() { @@ -56,16 +55,15 @@ src_install() { pkg_preinst() { gnome2_icon_savelist + xdg_pkg_preinst } pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update gnome2_icon_cache_update + xdg_pkg_postinst } pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update gnome2_icon_cache_update + xdg_pkg_postrm } diff --git a/games-engines/hugor/metadata.xml b/games-engines/hugor/metadata.xml index 2e3aab8..81090a4 100644 --- a/games-engines/hugor/metadata.xml +++ b/games-engines/hugor/metadata.xml @@ -1,13 +1,10 @@ - no-herd - + realnc@gmail.com - Use SDL_mixer sound engine - Use FMOD sound engine Use gstreamer-1.0 to enable support for games that have video -- 2.11.4.GIT