diff options
Diffstat (limited to 'games-board')
| -rw-r--r-- | games-board/Manifest.gz | bin | 9879 -> 9878 bytes | |||
| -rw-r--r-- | games-board/xscrabble/Manifest | 4 | ||||
| -rw-r--r-- | games-board/xscrabble/files/xscrabble-2.10-ranlib.patch | 13 | ||||
| -rw-r--r-- | games-board/xscrabble/xscrabble-2.10-r5.ebuild (renamed from games-board/xscrabble/xscrabble-2.10-r4.ebuild) | 24 |
4 files changed, 33 insertions, 8 deletions
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz Binary files differindex a516c61bff51..00f6029b9177 100644 --- a/games-board/Manifest.gz +++ b/games-board/Manifest.gz diff --git a/games-board/xscrabble/Manifest b/games-board/xscrabble/Manifest index 18b7550caabb..6613cf5bf2d6 100644 --- a/games-board/xscrabble/Manifest +++ b/games-board/xscrabble/Manifest @@ -1,8 +1,10 @@ AUX xscrabble-2.10-build.patch 309 BLAKE2B 99b1e6b3b361f7343560e39b6a3114f8d6de71077dd54de53488937bb404290101dd9b2e5f148947f1c4c82a91f52c3337c547be2f64a8c4e0679fd5ec70bc32 SHA512 4b5a5c88d41400ca82549d1b01fea64d1cce5cc8f3cb1c4d6c1be9bd028c814d3aa14583c56786917757e09cb3c18898a0059f82f4c979f423b746a896de7dc6 AUX xscrabble-2.10-implicit-declaration.patch 244 BLAKE2B 8fe268dbd47e643fb8438218dc69a4edbbcef7e55c5e482e14ac79e78b53bf6c74a63c6915ecf92611e85cc12f6a34345ce03adb8609e702674ef697683cd002 SHA512 403ff36897f7de466acaa95e4e8adf7dc096c73c1b0d90988962487465c0ee4078a2905d6a92d3740867cd5fbfdf5c6ec5eeec3a58c55dd2dbe249a20344c01f AUX xscrabble-2.10-path-fixes.patch 1098 BLAKE2B d0144aa6d8d81a30d43f6359bc4562a3d62aca10bcfc243efcec562c598bd67ba509889e1e68facbbf66cb5e1e2739fd6d04e3829ada60798e3bf3cc368be09f SHA512 0c33331e6704f384341e27356dd0974a26316b38a54f23f6370b989c85b7c080a90ad1ae7fd7aed776a66fbfa8a4a4abb5c37ee3cb63403913b8134ee0a88baa +AUX xscrabble-2.10-ranlib.patch 448 BLAKE2B f877bc5fc32a10674155d6963c4cc7fe13e6bf840445b217c46ee778e0f482fb3b08ece6c18342166548814fbfcf9aa454fcf7af50e4700c2be81383402ff1c9 SHA512 03a6f56362fdd1093315d5669a1d9a45a0f197053bd340914367b26a5daed1d9103c8d38fc2fdd838b77124d5466a7f8f0080d4aa812b320a37dada7fd59e8f9 +DIST xscrabble-2.10-gcc15.patch 32518 BLAKE2B 6f548b1195ceb58bee0317d59ed3a72abec858d42ca59828c2dc64d10cc9504c2b00a8df093c4789ed35f40b5f7c413ed7bf781483d9de76a3a38b7c9b145f4c SHA512 d20a04e6ba036b9f69af315ef3c0ae160967a2fc66c71b6921967097de7dbffe77f8da1014ad37d81a3a58bdb8805f428db659c572e751fd8802373df0a60870 DIST xscrabble-2.10.tgz 83575 BLAKE2B 0a7ac0713e8b48eaf770d11d8ddf5fc383f870437dbc12b6e90df3fb4c28559e28523f46461e306dde59a68cebf58e854959e58ec688201223eec9825e3c5e7a SHA512 38137b3dfd3156c3748719136a30fbc7f04910538bdbdec3e9d50e3efe326ab7119a45171e0fa2cd95cd81f0642070e2e011c165284766eb7a14bd7d2aa660db DIST xscrabble_en.tgz 393527 BLAKE2B 3f5b9d8030ba2711e64b2cc015f8662bdcfc2d3155d34b17be243a57e8c7dc3e4ad5fc6414c745654a8ea5771a9914d38bf5ce95b42e9b7daa70907bd9105b06 SHA512 05e4bca6ec2a9b7698f5c266bf5cede574cbef87883d7cac6dc35084fa2976dcd23f3a2215b674b9f36d7c170e6af021c3ec0884f06c9803cd67ec300651ac41 DIST xscrabble_fr.tgz 810737 BLAKE2B 26f5601f5d09232a5145c66d1d359c7a6b389a83f10c1ebcddc7579160d417e0b0b9e5bccf7322128451f3941cdeb2177b26f4ddf9a8224ffd551d95f4a83d72 SHA512 f5425fa8bffec57e6eff16a3d33ae4569fc00343e0ed5e4f4e1e189ed02a5be7416c1549b1978042e030efbfb3a484abcac9479e7fe43de929b11d8ccf8ea3e1 -EBUILD xscrabble-2.10-r4.ebuild 2078 BLAKE2B c482c07f7551e094e912e1fba6e82b827d5aabddb2deca5bdfc789abb289f9ec03bbd3d2311f3fbc37676000970ab58c8ef9a4087e608925f24213175a624e8c SHA512 dddd40900a88bb1979a9b40b3bef168a65bb33f8f266f059733a5d96c00a9859bae0a9d3ad7536aea33acfe44e5d03c190f8af987d9876f3314994253755236d +EBUILD xscrabble-2.10-r5.ebuild 2265 BLAKE2B 45e7d6c8e3064faabf51175e73793a3c3543adf1b4263cf8d958f40c828a23054be6ea93801e5f8000b3475a7ce5431dd0d6bb667b7c98051d1bd6acddae2409 SHA512 aa5d9c663504486d1a1433bd6b42265efc5b3a0a8dd73abfd0a3f59519e7fa34bd5bac098215f4dcaecaf34df6699e44bb6898f2008771091b0f9bee4c793dd4 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135 diff --git a/games-board/xscrabble/files/xscrabble-2.10-ranlib.patch b/games-board/xscrabble/files/xscrabble-2.10-ranlib.patch new file mode 100644 index 000000000000..95bdc85262db --- /dev/null +++ b/games-board/xscrabble/files/xscrabble-2.10-ranlib.patch @@ -0,0 +1,13 @@ +Fail build if compilation failed, use ranlib + +--- a/build ++++ b/build +@@ -36,7 +36,7 @@ if test "$1" = "bin" ; then + #define RULES_FILE \"$LIBDIR/en/scrabble_rules\" + " > src/config.h + xmkmf -a +- make CC="${CC}" CCOPTIONS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" ++ make CC="${CC}" AR="${AR} cq" RANLIB="${RANLIB}" CCOPTIONS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" || exit 1 + echo " + Now, type './build install' to install programs in $BINDIR + " diff --git a/games-board/xscrabble/xscrabble-2.10-r4.ebuild b/games-board/xscrabble/xscrabble-2.10-r5.ebuild index d8a308d70fe6..d5451b99b18c 100644 --- a/games-board/xscrabble/xscrabble-2.10-r4.ebuild +++ b/games-board/xscrabble/xscrabble-2.10-r5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic toolchain-funcs @@ -9,17 +9,25 @@ DESCRIPTION="An X11 clone of the well-known Scrabble" HOMEPAGE="http://freshmeat.net/projects/xscrabble/?topic_id=80" SRC_URI="ftp://ftp.ac-grenoble.fr/ge/educational_games/${P}.tgz l10n_fr? ( ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_fr.tgz ) - ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_en.tgz" + ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_en.tgz + https://files.asokolov.org/gentoo/${P}-gcc15.patch +" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="l10n_fr" -DEPEND="x11-libs/libXaw" +DEPEND=" + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXpm + x11-libs/libXt +" RDEPEND=" ${DEPEND} acct-group/gamestat + media-fonts/font-misc-misc !<x11-terms/kterm-6.2.0-r7 " BDEPEND=" @@ -32,6 +40,8 @@ PATCHES=( "${FILESDIR}"/${P}-path-fixes.patch "${FILESDIR}"/${P}-build.patch "${FILESDIR}"/${P}-implicit-declaration.patch + "${DISTDIR}"/${P}-gcc15.patch + "${FILESDIR}"/${P}-ranlib.patch ) src_unpack() { @@ -48,8 +58,8 @@ src_prepare() { # Don't strip binaries sed -i '/install/s/-s //' build || die - # Respect AR, RANLIB - sed -i 's/CC="${CC}"/& AR="${AR} cq" RANLIB="${RANLIB}"/' build || die + + sed -i "s|REAL_APPDEFAULTS=|REAL_APPDEFAULTS=${EPREFIX}|" build || die } src_configure() { @@ -79,7 +89,7 @@ src_install() { for f in "${ED}/usr/$(get_libdir)"/X11/app-defaults/* ; do [[ -L ${f} ]] && continue sed -i \ - -e "s:/usr/games/lib/scrabble/:/usr/share/${PN}/:" \ + -e "s:/usr/games/lib/scrabble/:${EPREFIX}/usr/share/${PN}/:" \ -e "s:fr/eng:fr/en:" \ ${f} || die "sed ${f} failed" done |