diff options
Diffstat (limited to 'games-simulation')
-rw-r--r-- | games-simulation/Manifest.gz | bin | 3578 -> 3580 bytes | |||
-rw-r--r-- | games-simulation/openttd/Manifest | 10 | ||||
-rw-r--r-- | games-simulation/openttd/openttd-1.10.1.ebuild (renamed from games-simulation/openttd/openttd-1.9.1.ebuild) | 22 | ||||
-rw-r--r-- | games-simulation/openttd/openttd-1.9.2.ebuild | 185 | ||||
-rw-r--r-- | games-simulation/openttd/openttd-1.9.3.ebuild | 185 | ||||
-rw-r--r-- | games-simulation/openttd/openttd-9999.ebuild | 17 |
6 files changed, 23 insertions, 396 deletions
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz Binary files differindex 0dccbfce6291..27d36f284380 100644 --- a/games-simulation/Manifest.gz +++ b/games-simulation/Manifest.gz diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest index 290c1ee23400..21ce10e04892 100644 --- a/games-simulation/openttd/Manifest +++ b/games-simulation/openttd/Manifest @@ -1,11 +1,7 @@ AUX openttd-1.9.0-cflags.patch 1418 BLAKE2B 4c279bca0360d202d183488f61a19a5abc768cf55c2bb1ebaaa58ecd59f61584d4865bd7fc91260f14bd750b623884b88b6900e1c9cb89c007b32534e62ab510 SHA512 df1eeca21325b09c849191f7a60d0be1eee107a40b3cbb846f5c845d560f61a847ac66c427772c8e980d2ab2f51ccaa539938dd36c143f9af558293f9cf5c755 AUX openttd-1.9.0-dont_compress_manpages.patch 1137 BLAKE2B aa03bf141f1dac450b90ad9b54f4022dc981e041f40cd5ad9b7b522910788fcf30c85ac8ee3ba480c76df67f11b8258de7fe785259796b67bebc1a49ce1ed6e3 SHA512 0985a5826dddfb9a03bfc686de5ae2a36362d635865fde9ec2ee340672556d82517db94197d7de04630ba7558bee5ad4543debafd46e5dfd2bbec2eaa9354a18 AUX openttd.initd-r1 306 BLAKE2B d36e2f405a1b8808c708edd0c66e23d9976c2f5ef0fc2af3430bb8ba287c237dffe3d11cde6428b8ab668886ac4ff5eb4bc4fe5b39f205da4bf3d7773f66f7ef SHA512 bd04f9d812d5d68eebd953e9a667e5138d8e440139eb9c07f8da089495774b7d45e3b23bfb2af38ed053b333d4ead5f4be5c5fa877ad9f9bb0effee5c4a499dc -DIST openttd-1.9.1-source.tar.xz 6647548 BLAKE2B fd7d03221bea49345e2163ff700e62a12682f706c1dab3fc741136219b80094bf945dc0cefcd807a643d141841a307141bb760d4b06bf75fa18129c557b149c3 SHA512 44d907299a14fd09ebff980f7c212bbdbd5def880bc56bfe106c3efa8cb32472bbcafdbb145d3f4340a3bc96179418f78fe2ddc62dd067b464eca73313b477c1 -DIST openttd-1.9.2-source.tar.xz 6666860 BLAKE2B a28862b00f3ec5cd8f015445022746e08a298046de05a592a76f72ff72d76aae4584d48cfe021d3fe6920555b4848986b3e25b23998cac830da572c21f06e595 SHA512 a84a219c049147e9566967f96a01c84dde587e38da37b34ef756da99a2d14f1d418492030098f63c4ac60cb0db553f474aaf3b8a00c8abfd98f66adc14f523e4 -DIST openttd-1.9.3-source.tar.xz 6659508 BLAKE2B 653ddd14d257d25f6c51138765f310cb8166575375fb95227a9a2c06cd1b526d8af403cb736d17b98c49add26f668ab5c6f8ca7b5fcda5fea9093726b2fd4a21 SHA512 e2208f730cf26c2df9b1950e885e20471060217dd47f2483db3f1cc86b40658d71208f27caab38a9fa513cfddb33c791a0972336dfa902a6d110ef246d936a34 -EBUILD openttd-1.9.1.ebuild 5059 BLAKE2B 546a1d14347679495b60a397bc55d9a452c461e18c45751943c8f19983d5b5164e03843702f1b26cbe7f0d6e0909303f610f52735c6740e7cdc746d653d910b3 SHA512 abf97e9de9e170c619355f5d0b3dc509da9094c0bc620ed6982f5b47a3cc519ba0338ee500664e288d6e55c24477e610c39ca36d5ea90cce47aa5906cc9655ee -EBUILD openttd-1.9.2.ebuild 5059 BLAKE2B 546a1d14347679495b60a397bc55d9a452c461e18c45751943c8f19983d5b5164e03843702f1b26cbe7f0d6e0909303f610f52735c6740e7cdc746d653d910b3 SHA512 abf97e9de9e170c619355f5d0b3dc509da9094c0bc620ed6982f5b47a3cc519ba0338ee500664e288d6e55c24477e610c39ca36d5ea90cce47aa5906cc9655ee -EBUILD openttd-1.9.3.ebuild 5059 BLAKE2B 546a1d14347679495b60a397bc55d9a452c461e18c45751943c8f19983d5b5164e03843702f1b26cbe7f0d6e0909303f610f52735c6740e7cdc746d653d910b3 SHA512 abf97e9de9e170c619355f5d0b3dc509da9094c0bc620ed6982f5b47a3cc519ba0338ee500664e288d6e55c24477e610c39ca36d5ea90cce47aa5906cc9655ee -EBUILD openttd-9999.ebuild 4877 BLAKE2B e5e8fce784cc41262792ac0657bbaa241c075ac79edc58b7f1de180a35ca8aba1cc0cd7ac5c315eae6fa258efc2d291cac77590d130d2fc37a075b402cf0fb42 SHA512 aea87497dbdd2fb75681dd1e885eca49b5a500a0508d987b494347fc0bb6e517c79060daef07a70085c27610f77154371a8be37395e3e53ede20dc99caf8221f +DIST openttd-1.10.1-source.tar.xz 6741548 BLAKE2B a9cf7681d4180a27f3b51ec9e4cdfdc8eae8a3e51f3ab70caa638d19211336c2067bdeefddb59a3638cbd25d89d83fb8ee4170584e861fefe84013ec5c6ff69c SHA512 9e391c2c18687ce9d6fb1094da5dac1166ec409b17f5f4745486b24185e01380cfd806157b7fb9298c58f790995b43bc8c93d993e6a7e36a5b7cf153b7a1de89 +EBUILD openttd-1.10.1.ebuild 4993 BLAKE2B c5a4fcd3372d49f93668f7e019cbc3c4782bae3b0d81f9ee957e0ea255cdbc798b4e8a30e0369c8be048603ac2e56f820f71333c045b8fc6e1543603f84c98d0 SHA512 c25e356ed24cbabe999d6785e13cedb577927d508066dca9417cb7594cea995bca64268039b4d3470c551e957133e11688e392c0d326530a0e1308d8dd943d42 +EBUILD openttd-9999.ebuild 4993 BLAKE2B c5a4fcd3372d49f93668f7e019cbc3c4782bae3b0d81f9ee957e0ea255cdbc798b4e8a30e0369c8be048603ac2e56f820f71333c045b8fc6e1543603f84c98d0 SHA512 c25e356ed24cbabe999d6785e13cedb577927d508066dca9417cb7594cea995bca64268039b4d3470c551e957133e11688e392c0d326530a0e1308d8dd943d42 MISC metadata.xml 752 BLAKE2B 85476f4dbf68d94a5d95e35cff935edfe35caee4bd2a253c7bad747b0915b80f0f7009bf78e419417a05345210bed17dff8f82ce603480c96781323d7d5a89fd SHA512 ddb1fbbe98d5e0bc1e23385b38502603819b89bd1d9285b0193a55efe2263b8ab6e045c7befdc908303eea27de8c9148dbcc8e7b6c035b267f5c8ff0f16b4b56 diff --git a/games-simulation/openttd/openttd-1.9.1.ebuild b/games-simulation/openttd/openttd-1.10.1.ebuild index 49368f0e59a7..07ee1c248208 100644 --- a/games-simulation/openttd/openttd-1.9.1.ebuild +++ b/games-simulation/openttd/openttd-1.10.1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit xdg + +inherit toolchain-funcs xdg MY_PV="${PV/_rc/-RC}" MY_P="${PN}-${MY_PV}" @@ -20,11 +21,11 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" +IUSE="aplaymidi debug dedicated iconv icu +lzma lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" RESTRICT="test" # needs a graphics set in order to test RDEPEND="!dedicated? ( - media-libs/libsdl[sound,X,video] + media-libs/libsdl2[sound,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb @@ -36,6 +37,7 @@ RDEPEND="!dedicated? ( sys-libs/zlib:= ) ) + lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( @@ -72,6 +74,7 @@ src_configure() { --prefix-dir="${EPREFIX}/usr" $(use_with cpu_flags_x86_sse sse) $(use_with iconv) + $(use_with lzma) $(use_with lzo liblzo2) $(use_with png) $(usex debug '--enable-debug=3' '') @@ -80,11 +83,6 @@ src_configure() { # always built instead. --without-allegro - # libtimidity not needed except for some embedded platform - # nevertheless, it will be automagically linked if it is - # installed. Hence, we disable it. - --without-libtimidity - --without-fluidsynth ) @@ -106,7 +104,7 @@ src_configure() { # configure is a hand-written bash-script, so econf will not work. # It's all built as C++, upstream uses CFLAGS internally. - CFLAGS="" ./configure ${myopts[@]} || die + CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || die } src_compile() { @@ -117,9 +115,9 @@ src_install() { default if use dedicated ; then newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} + rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} || die fi - rm -f "${ED}"/usr/share/doc/${PF}/COPYING + rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die } pkg_preinst() { diff --git a/games-simulation/openttd/openttd-1.9.2.ebuild b/games-simulation/openttd/openttd-1.9.2.ebuild deleted file mode 100644 index 49368f0e59a7..000000000000 --- a/games-simulation/openttd/openttd-1.9.2.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit xdg - -MY_PV="${PV/_rc/-RC}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" -HOMEPAGE="http://www.openttd.org/" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git" -else - SRC_URI="https://proxy.binaries.openttd.org/openttd-releases/${MY_PV}/${MY_P}-source.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" -RESTRICT="test" # needs a graphics set in order to test - -RDEPEND="!dedicated? ( - media-libs/libsdl[sound,X,video] - icu? ( - dev-libs/icu-layoutex - dev-libs/icu-le-hb - >=dev-libs/icu-58.1:= - ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - sys-libs/zlib:= - ) - ) - lzo? ( dev-libs/lzo:2 ) - iconv? ( virtual/libiconv ) - png? ( - media-libs/libpng:0 - sys-libs/zlib:= - ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig" -PDEPEND=" - !dedicated? ( - openmedia? ( - games-misc/openmsx - games-misc/opensfx - ) - aplaymidi? ( media-sound/alsa-utils ) - !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) - ) - openmedia? ( >=games-misc/opengfx-0.4.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-cflags.patch - "${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch -) - -src_configure() { - local myopts=( - --binary-dir="bin" - --disable-strip - --doc-dir="share/doc/${PF}" - --install-dir="${D}" - --menu-group="Game;Simulation;" - --prefix-dir="${EPREFIX}/usr" - $(use_with cpu_flags_x86_sse sse) - $(use_with iconv) - $(use_with lzo liblzo2) - $(use_with png) - $(usex debug '--enable-debug=3' '') - # there is an allegro interface available as well as sdl, but - # the configure for it looks broken so the sdl interface is - # always built instead. - --without-allegro - - # libtimidity not needed except for some embedded platform - # nevertheless, it will be automagically linked if it is - # installed. Hence, we disable it. - --without-libtimidity - - --without-fluidsynth - ) - - if use dedicated ; then - myopts+=( --enable-dedicated ) - else - myopts+=( - $(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '') - $(use_with truetype freetype) - $(use_with icu) - --with-sdl - ) - fi - if use png || { use !dedicated && use truetype; } || use zlib ; then - myopts+=( --with-zlib ) - else - myopts+=( --without-zlib ) - fi - - # configure is a hand-written bash-script, so econf will not work. - # It's all built as C++, upstream uses CFLAGS internally. - CFLAGS="" ./configure ${myopts[@]} || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - default - if use dedicated ; then - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} - fi - rm -f "${ED}"/usr/share/doc/${PF}/COPYING -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use lzo ; then - elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not" - elog "required, disabling it does mean that loading old savegames" - elog "or scenarios from ancient versions (~0.2) will fail." - elog - fi - - if use dedicated ; then - ewarn "Warning: The init script will kill all running openttd" - ewarn "processes when triggered, including any running client sessions!" - else - if use aplaymidi ; then - elog "You have emerged with 'aplaymidi' for playing MIDI." - elog "This option is for those with a hardware midi device," - elog "or who have set up ALSA to handle midi ports." - elog "You must set the environment variable ALSA_OUTPUT_PORTS." - elog "Available ports can be listed by using 'aplaymidi -l'." - else - if ! use timidity ; then - elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'" - elog "in USE. Music may or may not work in-game. If you happen" - elog "to have timidity++ installed, music will work so long" - elog "as it remains installed, but OpenTTD will not depend on it." - fi - fi - if ! use openmedia ; then - elog - elog "OpenTTD was compiled without the 'openmedia' USE flag." - elog - elog "In order to play, you must at least install:" - elog "games-misc/opengfx, and games-misc/opensfx, or copy the " - elog "following 6 files from a version of Transport Tycoon Deluxe" - elog "(windows or DOS) to ~/.openttd/data/ or" - elog "${GAMES_DATADIR}/${PN}/data/." - elog - elog "From the WINDOWS version you need: " - elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf" - elog "OR from the DOS version you need: " - elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF" - elog - elog "File names are case sensitive, but should work either with" - elog "all upper or all lower case names" - elog - elog "In addition, in-game music will be unavailable: for music," - elog "install games-misc/openmsx, or use the in-game download" - elog "functionality to get a music set" - elog - fi - fi -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/games-simulation/openttd/openttd-1.9.3.ebuild b/games-simulation/openttd/openttd-1.9.3.ebuild deleted file mode 100644 index 49368f0e59a7..000000000000 --- a/games-simulation/openttd/openttd-1.9.3.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit xdg - -MY_PV="${PV/_rc/-RC}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" -HOMEPAGE="http://www.openttd.org/" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git" -else - SRC_URI="https://proxy.binaries.openttd.org/openttd-releases/${MY_PV}/${MY_P}-source.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" -RESTRICT="test" # needs a graphics set in order to test - -RDEPEND="!dedicated? ( - media-libs/libsdl[sound,X,video] - icu? ( - dev-libs/icu-layoutex - dev-libs/icu-le-hb - >=dev-libs/icu-58.1:= - ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - sys-libs/zlib:= - ) - ) - lzo? ( dev-libs/lzo:2 ) - iconv? ( virtual/libiconv ) - png? ( - media-libs/libpng:0 - sys-libs/zlib:= - ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig" -PDEPEND=" - !dedicated? ( - openmedia? ( - games-misc/openmsx - games-misc/opensfx - ) - aplaymidi? ( media-sound/alsa-utils ) - !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) - ) - openmedia? ( >=games-misc/opengfx-0.4.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-cflags.patch - "${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch -) - -src_configure() { - local myopts=( - --binary-dir="bin" - --disable-strip - --doc-dir="share/doc/${PF}" - --install-dir="${D}" - --menu-group="Game;Simulation;" - --prefix-dir="${EPREFIX}/usr" - $(use_with cpu_flags_x86_sse sse) - $(use_with iconv) - $(use_with lzo liblzo2) - $(use_with png) - $(usex debug '--enable-debug=3' '') - # there is an allegro interface available as well as sdl, but - # the configure for it looks broken so the sdl interface is - # always built instead. - --without-allegro - - # libtimidity not needed except for some embedded platform - # nevertheless, it will be automagically linked if it is - # installed. Hence, we disable it. - --without-libtimidity - - --without-fluidsynth - ) - - if use dedicated ; then - myopts+=( --enable-dedicated ) - else - myopts+=( - $(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '') - $(use_with truetype freetype) - $(use_with icu) - --with-sdl - ) - fi - if use png || { use !dedicated && use truetype; } || use zlib ; then - myopts+=( --with-zlib ) - else - myopts+=( --without-zlib ) - fi - - # configure is a hand-written bash-script, so econf will not work. - # It's all built as C++, upstream uses CFLAGS internally. - CFLAGS="" ./configure ${myopts[@]} || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - default - if use dedicated ; then - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} - fi - rm -f "${ED}"/usr/share/doc/${PF}/COPYING -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use lzo ; then - elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not" - elog "required, disabling it does mean that loading old savegames" - elog "or scenarios from ancient versions (~0.2) will fail." - elog - fi - - if use dedicated ; then - ewarn "Warning: The init script will kill all running openttd" - ewarn "processes when triggered, including any running client sessions!" - else - if use aplaymidi ; then - elog "You have emerged with 'aplaymidi' for playing MIDI." - elog "This option is for those with a hardware midi device," - elog "or who have set up ALSA to handle midi ports." - elog "You must set the environment variable ALSA_OUTPUT_PORTS." - elog "Available ports can be listed by using 'aplaymidi -l'." - else - if ! use timidity ; then - elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'" - elog "in USE. Music may or may not work in-game. If you happen" - elog "to have timidity++ installed, music will work so long" - elog "as it remains installed, but OpenTTD will not depend on it." - fi - fi - if ! use openmedia ; then - elog - elog "OpenTTD was compiled without the 'openmedia' USE flag." - elog - elog "In order to play, you must at least install:" - elog "games-misc/opengfx, and games-misc/opensfx, or copy the " - elog "following 6 files from a version of Transport Tycoon Deluxe" - elog "(windows or DOS) to ~/.openttd/data/ or" - elog "${GAMES_DATADIR}/${PN}/data/." - elog - elog "From the WINDOWS version you need: " - elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf" - elog "OR from the DOS version you need: " - elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF" - elog - elog "File names are case sensitive, but should work either with" - elog "all upper or all lower case names" - elog - elog "In addition, in-game music will be unavailable: for music," - elog "install games-misc/openmsx, or use the in-game download" - elog "functionality to get a music set" - elog - fi - fi -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/games-simulation/openttd/openttd-9999.ebuild b/games-simulation/openttd/openttd-9999.ebuild index 0299cc25d762..07ee1c248208 100644 --- a/games-simulation/openttd/openttd-9999.ebuild +++ b/games-simulation/openttd/openttd-9999.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit xdg + +inherit toolchain-funcs xdg MY_PV="${PV/_rc/-RC}" MY_P="${PN}-${MY_PV}" @@ -20,11 +21,11 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" +IUSE="aplaymidi debug dedicated iconv icu +lzma lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" RESTRICT="test" # needs a graphics set in order to test RDEPEND="!dedicated? ( - media-libs/libsdl[sound,X,video] + media-libs/libsdl2[sound,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb @@ -36,6 +37,7 @@ RDEPEND="!dedicated? ( sys-libs/zlib:= ) ) + lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( @@ -72,6 +74,7 @@ src_configure() { --prefix-dir="${EPREFIX}/usr" $(use_with cpu_flags_x86_sse sse) $(use_with iconv) + $(use_with lzma) $(use_with lzo liblzo2) $(use_with png) $(usex debug '--enable-debug=3' '') @@ -101,7 +104,7 @@ src_configure() { # configure is a hand-written bash-script, so econf will not work. # It's all built as C++, upstream uses CFLAGS internally. - CFLAGS="" ./configure ${myopts[@]} || die + CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || die } src_compile() { @@ -112,9 +115,9 @@ src_install() { default if use dedicated ; then newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} + rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} || die fi - rm -f "${ED}"/usr/share/doc/${PF}/COPYING + rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die } pkg_preinst() { |