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/lgeneral | |
| parent | 7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (diff) | |
gentoo resync : 04.05.2018
Diffstat (limited to 'games-strategy/lgeneral')
| -rw-r--r-- | games-strategy/lgeneral/Manifest | 2 | ||||
| -rw-r--r-- | games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild (renamed from games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild) | 38 |
2 files changed, 20 insertions, 20 deletions
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest index 67440d8c5840..a4304e1f2633 100644 --- a/games-strategy/lgeneral/Manifest +++ b/games-strategy/lgeneral/Manifest @@ -1,4 +1,4 @@ DIST lgeneral-1.3.1.tar.gz 1678892 BLAKE2B 701b22a8967c037e2385a1f1bbb2e91703cbffc7fff6383f3d593fab07dc01fa352f9ec3ee25dfbbdd5172c4e8cd804bd7f9fa2a84a3c6a22f581884c8d7d9d9 SHA512 4eb8fc6d1dc134792893f3f9b23833da75412fafefea66d699a27de1954d3c1338c7e5dedef842537303368387797ecea2158a477fe1d018e3af973dd5b755e5 DIST pg-data.tar.gz 410454 BLAKE2B 70b325636c43b69b7cdc2f074a0ac49af46db5c60ebeea5ecefaae18169509b05b4c452c34e8b0cd483d3565c54191623ff3eb900f24683252fd8c775ecdf847 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516 -EBUILD lgeneral-1.3.1-r1.ebuild 2022 BLAKE2B f42273e255ff9045a550a039f4eaa2a99f74928c7f55c63658187301b712a458d1e4f9243756b0e7a292aff422b5c42bf10cd2ad9a0482317756774ece18102b SHA512 1cc1b63ea06323231b8d7e8e473e6c356e49f6f6bf51fab62dde095477eaf0c4700c9c591633057974647bf6152ea27aa1732e3d31dc3304b59c4259647e4fb8 +EBUILD lgeneral-1.3.1-r2.ebuild 1922 BLAKE2B 743229424c55bc5581c30bcccf727efe5720294f8449e58113acf4a3b83a4a5c101430aad7ac12c0a1fbea35a053e93b5f05138b3a5d36ab22d9a662d2a86ee2 SHA512 5edbe0077b8fcca017235986c57c481ac88798494830015feaf57efee555614562fab26f17a51b9cd65621846e906ccac8e8657956af76db3e48c0ddefd10585 MISC metadata.xml 331 BLAKE2B ed6b281fa54a304ddd752e6bda476635922a0d9be37524a0e988666502279b85c793d455de63929c93e02f5b105367b78bea2eeb004e1a996d558159fe6443e2 SHA512 eef1e23a9d81b81e39f84ba41d70d39bf11f52acad42dc312548239919b7ce359a671f9b76dcdee92be92bc11c798d9031f3a641c13ab6febfe5bd978a4bbeeb diff --git a/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild b/games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild index 2cbe4796f69b..bc431e1c2933 100644 --- a/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild +++ b/games-strategy/lgeneral/lgeneral-1.3.1-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 autotools gnome2-utils games +EAPI=6 +inherit autotools desktop gnome2-utils MY_P="${P/_/}" MY_P="${MY_P/beta/beta-}" @@ -16,15 +16,19 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls" -RDEPEND="media-libs/libsdl[sound,video] +RDEPEND=" + media-libs/libsdl[sound,video] media-libs/sdl-mixer - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" DEPEND="${RDEPEND} - sys-devel/gettext" + sys-devel/gettext +" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" src_prepare() { + default sed -i \ -e '/desktop_DATA/d' \ -e '/icon_DATA/d' \ @@ -38,26 +42,25 @@ src_prepare() { # Build a temporary lgc-pg that knows about ${WORKDIR}: cp -pPR "${S}" "${WORKDIR}"/tmp-build || die sed -i \ - -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \ + -e "s:@GENTOO_DATADIR@:/usr/share:" \ -e "s:@D@::" \ {lgc-pg,src}/misc.c || die cd "${WORKDIR}"/tmp-build || die sed -i \ - -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \ + -e "s:@GENTOO_DATADIR@:/usr/share:" \ -e "s:@D@:${D}:" \ {lgc-pg,src}/misc.c || die } src_configure() { - egamesconf \ - $(use_enable nls) + econf $(use_enable nls) # Build the temporary lgc-pg: cd "${WORKDIR}"/tmp-build || die - egamesconf \ + econf \ --disable-nls \ - --datadir="${D}/${GAMES_DATADIR}" + --datadir="${D}/usr/share" } src_compile() { @@ -70,26 +73,23 @@ src_compile() { src_install() { default - keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain} + keepdir /usr/share/${PN}/{ai_modules,music,terrain} # Generate scenario data: - dodir "${GAMES_DATADIR}"/${PN}/gfx/{flags,units,terrain} #413901 + dodir /usr/share/${PN}/gfx/{flags,units,terrain} #413901 SDL_VIDEODRIVER=dummy "${WORKDIR}"/tmp-build/lgc-pg/lgc-pg --separate-bridges \ -s "${WORKDIR}"/pg-data \ - -d "${D}/${GAMES_DATADIR}"/${PN} || die + -d "${D}"/usr/share/${PN} || die doicon -s 48 lgeneral.png make_desktop_entry ${PN} LGeneral - prepgamesdirs } pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update } |