diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-04 11:22:40 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-04 11:22:40 +0100 |
| commit | fe1c8b732bd548b699d4c2ef725f67f8b8c8911c (patch) | |
| tree | 84c0b6ca01b7cb63c7d6e685a63823200ce1007f /games-strategy/glob2 | |
| parent | 7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (diff) | |
gentoo resync : 04.05.2018
Diffstat (limited to 'games-strategy/glob2')
| -rw-r--r-- | games-strategy/glob2/Manifest | 6 | ||||
| -rw-r--r-- | games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch | 4 | ||||
| -rw-r--r-- | games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch | 4 | ||||
| -rw-r--r-- | games-strategy/glob2/glob2-0.9.4.4-r2.ebuild (renamed from games-strategy/glob2/glob2-0.9.4.4-r1.ebuild) | 28 |
4 files changed, 19 insertions, 23 deletions
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest index 90b485682ff6..8cfd63e1a78b 100644 --- a/games-strategy/glob2/Manifest +++ b/games-strategy/glob2/Manifest @@ -1,8 +1,8 @@ -AUX glob2-0.9.4.4-gcc44.patch 184 BLAKE2B 4db1a71f4458ff28f263855c61639d60fe0203b6d9bc3267556257d4e16c2cfa659e03e01fcc9082b33dac01dbce2807d5d7ec644d83be042e880e5e475dd51b SHA512 e3d5d84c4c9240806ec97eace315b92288da4cbb28da230f91e3dc9aa224d4b7e010d4e132b53a538ae7d477a72320b27b482e9423182d1496751dbec58f461f +AUX glob2-0.9.4.4-gcc44.patch 188 BLAKE2B bd6fc1a3ad79eb29e070d53099079c403553add1e8fcf513d8c5cf58902120ff0735ad0cc78d396329ababf64d94355c21b9e2269046467b8a68069cee0afdc4 SHA512 c341e484311fa508f9a034d216729fa7a8251e6fb710fe6417bd0a000b89a870cf5a24850e6126a704f160fee064fa7211973da8f3720dbd9a96df86adcd67fd AUX glob2-0.9.4.4-gcc49.patch 907 BLAKE2B f7ad515c19660af0713ca8c79c40a4c225372da85d17dfa58bc4a31e65bdced9a24ae9ff3f8f57f623da0011b24d841618bfc8fe09000703db94bc9e89a66971 SHA512 7a1f19fe40effa577b2eb03ec4f2ddd7df78bff1c3df25c8b15df37d9feb03e4583e1776e4c2240130f318f9fa643d2d662492c9c5be46ed659bd587f88eafac AUX glob2-0.9.4.4-gcc6.patch 1767 BLAKE2B 41716842d1d0552e4ea05e4ae189b92ea600ca5e31604bf19e5659ca6690c7e394d25f11baf3fee07b9bdfcba6a748586b152a0141312daad89ab76946ea4d82 SHA512 d2eddfe657f81a1ec085298f09aafb904d22a80d601aca6405d92d6f17b28d0f3f3b5b445a9423988b7bc8869ca41698783e4139928f9f2ba33093ded6a3cb02 -AUX glob2-0.9.4.4-scons-blows.patch 904 BLAKE2B 45368edec58d1e5421b195eb29eb9a410d45b79a90516e8064f883759d80d34ff7d63e1d3acd73e196b0c37b2d9491ca6e9d83a4163604a1d6caa2b07a330b2c SHA512 1018f2481d82df9b5e8ddd497fc1878a58a13e54c369e3e3f3a9f541f5140a92fec54460da5ff76c6913ad202385c53534d4c88e0140b8d4f65b759e23393a7b +AUX glob2-0.9.4.4-scons-blows.patch 908 BLAKE2B 6d677c0588dbad9f44307579549946c8979b956331be3ef667fb4bbcd6fdf3e9889b22cd4c9458a76f487b12bc73ae73dfba03e0c1f86fb228e1934b1d4e67cc SHA512 0d805014200c76ca571ecc97c284b9168f280df0e88060c880b284b8e3d5490c1512708857bb22a0b2a4e4b78716d98ae26ae552531f661bb38f6dd75af474d3 AUX glob2-0.9.4.4-underlinking.patch 672 BLAKE2B 59fbd0afacd468cc6a2e6e18336c524653697f42404124d9b2347246130ba390a202cb2b88fa223bd80063e6555211a5065cbf08dd4d113b7dadd2e0ad9a3f41 SHA512 24551c73af34badaa4a464da30c771c95082f0bfe83f351b264abddc578d5486a71f1a79b02d13ff48753e67059f8350752e77eb89397029833647bb74d79d21 DIST glob2-0.9.4.4.tar.gz 11338986 BLAKE2B 047f27385c9b819c6ca2614406d340ff2cb7dcc26c8a20a205b11dce234af4ea52cb4eb04b7ed5b695382b17b34b5dd50387d61cfecaced16ee61b3c69c2921f SHA512 c82ace807ad208bc386b730f1fe6d6162640a9468440482f3584f8ccab825967660d8bbf6b3bebf70c74d1ed95f153cd9b5a0bd72dc247a1f97176c6c737f6ca -EBUILD glob2-0.9.4.4-r1.ebuild 1359 BLAKE2B 58ceb47c146236b1f413f7fa9ba467a33c099fb71cacdc59abd9f86bd9d4755147b9ba2f4d45252fe89867a405cbce651c9e62ddad9c4864fcb1144cb99c332d SHA512 ebdd3dcc79fb25babdfd3ff81323ef778a9da2b9c4980edc7e059eb19d8fc7037a1bec7b9b56ab05992accf0d50b552ec90896a7188c031f43b51995698d9457 +EBUILD glob2-0.9.4.4-r2.ebuild 1251 BLAKE2B 41c2a82cecb07b7e544d457519af07829702584b083990933ac2f2a64024cc10e3a5bd9546dcf9712fa762560efbae6bf3ffdd3d53d45ffc3259d3d145947f39 SHA512 aff57e535f19cae25e86dd0f85edbcccec499951d5e12c2c718bc83f70f061de9b6b5f705a4da86e0d2dee51f815383e73f6495e0644a9eb5fed9c4396876e36 MISC metadata.xml 637 BLAKE2B 405198c067618ace05cf22e6b790a356eb643cddf921f07a37516cc661f37706adab72edde18639abaa5b23ebfe771877ced14f1eacb3d9da83ed5c9e32213f5 SHA512 af021418808275511478f34bcbd4a3fadd193a583c7e94c676e94d39d10fb23c8d2de7b3ef5c8da81f2f6291a3bf9d0cc09448aea1b16959e7c811ba38d64e66 diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch index 5ce62ea6e46c..8d2da78cee23 100644 --- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch +++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch @@ -1,5 +1,5 @@ ---- libgag/include/StreamBackend.h.old -+++ libgag/include/StreamBackend.h +--- a/libgag/include/StreamBackend.h.old ++++ b/libgag/include/StreamBackend.h @@ -28,6 +28,9 @@ #ifdef putc #undef putc diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch index b0fb92d47974..b3e6e86eb485 100644 --- a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch +++ b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch @@ -1,5 +1,5 @@ ---- SConstruct.orig -+++ SConstruct +--- a/SConstruct.orig ++++ b/SConstruct @@ -1,6 +1,7 @@ EnsureSConsVersion(0, 96, 92) import sys diff --git a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild index 2268ae605173..fe7cdc7b1729 100644 --- a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild +++ b/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils gnome2-utils scons-utils games +EAPI=6 +inherit desktop gnome2-utils scons-utils DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs" HOMEPAGE="http://globulation2.org/" @@ -23,17 +23,16 @@ RDEPEND=" media-libs/sdl-ttf media-libs/speex virtual/glu - virtual/opengl" + virtual/opengl +" DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch -} +PATCHES=( "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch ) src_configure() { myesconsargs=( - INSTALLDIR="${GAMES_DATADIR}"/${PN} - DATADIR="${GAMES_DATADIR}"/${PN} + INSTALLDIR=/usr/share/${PN} + DATADIR=/usr/share/${PN} ) escons data } @@ -43,23 +42,20 @@ src_compile() { } src_install() { - dogamesbin src/${PN} - insinto "${GAMES_DATADIR}"/${PN} + dobin src/${PN} + insinto /usr/share/${PN} doins -r campaigns data maps scripts - find "${D}/${GAMES_DATADIR}"/${PN} -name SConscript -exec rm -f '{}' + + find "${ED}"/usr/share/${PN} -name SConscript -exec rm -f '{}' + newicon -s 48 data/icons/glob2-icon-48x48.png ${PN}.png make_desktop_entry glob2 "Globulation 2" - dodoc README* - prepgamesdirs + einstalldocs } pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update } |