diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /games-action/battalion | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'games-action/battalion')
4 files changed, 15 insertions, 15 deletions
diff --git a/games-action/battalion/Manifest b/games-action/battalion/Manifest index 3d3f8b7e0742..8b05d18e84ba 100644 --- a/games-action/battalion/Manifest +++ b/games-action/battalion/Manifest @@ -1,5 +1,5 @@ -AUX battalion-1.4b-fix-build-system.patch 1899 BLAKE2B cb53fff37506c874701549c1c4bdbae9760ece3bc7a51dd01da5d3acad6bfc491d36ff31eb6874f73680f67502210d58dacc28c11c22fcb7347d0d396ea07222 SHA512 66248fee82a88f416d255ff7e23c5ffeaac6a10bca22b93231645f9c9923b18df339dea2e38f6b4ab0a5189ce2650e7e21813060576ce1f70fe5e7c29d0f0bb0 -AUX battalion-1.4b-warning.patch 490 BLAKE2B 21f4bca09c2581e4054c0a03f7c1f65f527bbdf05dca8554c9da2350b01a56d6ad6efcfe2ed390392a48df40a82fb25f7a6d308d65131a5155594ec336e232d3 SHA512 ba216b192f454b07b14891dbc6c412b301257a91546b77c1e2053324248243422bfac43794849f44068afb65919958f466416d39826248b28dc71a644a1ee660 +AUX battalion-1.4b-fix-build-system.patch 1923 BLAKE2B a6c8ad95fde5629f1e49532ddfd0d7f81c40fdbdec934fce876b27496a71093c9065852e3ca912f0827be3989f09fa400512fe2b627fdd3a8804a13177664481 SHA512 ea078f3b6b7ac1a4156840c8479ecf4cd0cf17ea74c7aed6bf18a7894b9f7f0555a74c0e1c1188358f496b9b6ae2309289637cb67f2c5b80b0c2bfe09499b2fc +AUX battalion-1.4b-warning.patch 335 BLAKE2B 89980f750f2b7ca871ee9b37c0e07f39744cf577c117a99faf5cdd0e3ebd00bb21a3d39a66a0ec48e365dc14c81c822c1a8523925d11ef6e6ce182c82ce9bca9 SHA512 721f466e3c52cbac0d68379028e3c01bd86ab148f59f7d90ec5da536391781d6074cf3424727ba62d9e6991944ac49ea5ab3119ea6d9bf18eaa7e745ac52ccfd DIST battalion1.4b.tar.bz2 942342 BLAKE2B 6a4bd9afc7202d68c2cf62fbfe5b3b8377069263d71adaad006d2b4803d5989b130e0ef7fd5b1479a7698d79c819bc463ab19f2fa1493d4caf616708091e2c83 SHA512 c3c615772012c63a709aaeaf4f23246760bf577b82eeec7cf5b2a479c6240fe4a2f839aca50540299ed4bee9b297f61fb8b7e1f5af74ea357f0d7e749d86f84b -EBUILD battalion-1.4b-r1.ebuild 1545 BLAKE2B 9f11a189da4dea715299d7a18f205b7a42d6da9ac2ba359cab96a5562f9ca1d62a1c272b99e53245d1fbd467aa20ec3fc2059a1857544f2af739481a61affe7c SHA512 2c2a348a748108e648a439d3aa3a2c8ba3828ff8acbdce855a32b0f5e892a04c0db0de24bb3ba6a07254f1c8472ab0959ae000f1359390fd571d491f5e725830 +EBUILD battalion-1.4b-r1.ebuild 1579 BLAKE2B 631a55005fce3468a211922356cfa559d97a738d864ac22f046ed9b31aefc8d4d9602725d17b4a358114b0ed4df9e5c8a408924eeacfd02a44ca9630d3ada231 SHA512 534c5b747cfe5edd494f9bf759b2d5082f21f45e9b6bf56f28f925ab0d1c2ac5fafa6631028589443fdf85c7e34aeadfba69ed6936986b6b04de4a4d820d8781 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-action/battalion/battalion-1.4b-r1.ebuild b/games-action/battalion/battalion-1.4b-r1.ebuild index d601672cf212..ae310183dfe1 100644 --- a/games-action/battalion/battalion-1.4b-r1.ebuild +++ b/games-action/battalion/battalion-1.4b-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,19 +8,20 @@ inherit toolchain-funcs DESCRIPTION="Be a rampaging monster and destroy the city" HOMEPAGE="http://evlweb.eecs.uic.edu/aej/AndyBattalion.html" SRC_URI="http://evlweb.eecs.uic.edu/aej/BATTALION/${PN}${PV}.tar.bz2" +S="${WORKDIR}"/${PN}${PV} LICENSE="battalion HPND" SLOT="0" KEYWORDS="~x86" -IUSE="" DEPEND=" virtual/glu virtual/opengl x11-libs/libX11" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" + +DEPEND+=" virtual/pkgconfig" -S=${WORKDIR}/${PN}${PV} PATCHES=( "${FILESDIR}"/${P}-warning.patch "${FILESDIR}"/${PN}-1.4b-fix-build-system.patch @@ -47,7 +48,7 @@ src_prepare() { } src_configure() { - tc-export CC + tc-export CC PKG_CONFIG } src_install() { diff --git a/games-action/battalion/files/battalion-1.4b-fix-build-system.patch b/games-action/battalion/files/battalion-1.4b-fix-build-system.patch index fe209e1db953..3ebfb15f4b09 100644 --- a/games-action/battalion/files/battalion-1.4b-fix-build-system.patch +++ b/games-action/battalion/files/battalion-1.4b-fix-build-system.patch @@ -13,8 +13,8 @@ #GLIB = -lMesaGL -lMesaGLU # or -GLIB = -lGL -lGLU -+GLIB_CFLAGS = `pkg-config --cflags gl` `pkg-config --cflags glu` -+GLIB_LIBS = `pkg-config --libs gl` `pkg-config --libs glu` ++GLIB_CFLAGS = `${PKG_CONFIG} --cflags gl` `${PKG_CONFIG} --cflags glu` ++GLIB_LIBS = `${PKG_CONFIG} --libs gl` `${PKG_CONFIG} --libs glu` # STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING @@ -37,8 +37,8 @@ OBJ = battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o soundIt.o -LIBS = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext -+my_CPPFLAGS = -lm `pkg-config --cflags x11` `pkg-config --cflags xext` -I./. $(AUDIODEF) $(OS) -+my_LIBS = -lm `pkg-config --libs x11` `pkg-config --libs xext` ++my_CPPFLAGS = -lm `${PKG_CONFIG} --cflags x11` `${PKG_CONFIG} --cflags xext` -I./. $(AUDIODEF) $(OS) ++my_LIBS = -lm `${PKG_CONFIG} --libs x11` `${PKG_CONFIG} --libs xext` all: $(TARGET) diff --git a/games-action/battalion/files/battalion-1.4b-warning.patch b/games-action/battalion/files/battalion-1.4b-warning.patch index 91fd8ee51d3b..d27ae5ceb9a1 100644 --- a/games-action/battalion/files/battalion-1.4b-warning.patch +++ b/games-action/battalion/files/battalion-1.4b-warning.patch @@ -1,6 +1,5 @@ -diff -ru battalion1.4b.orig/net.c battalion1.4b/net.c ---- battalion1.4b.orig/net.c 2002-05-06 09:57:01.000000000 -0400 -+++ battalion1.4b/net.c 2015-03-30 18:29:23.885306334 -0400 +--- a/net.c ++++ b/net.c @@ -378,7 +378,7 @@ /* nother copy of this elsewhere */ |