diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /games-board/xmahjongg | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'games-board/xmahjongg')
| -rw-r--r-- | games-board/xmahjongg/Manifest | 3 | ||||
| -rw-r--r-- | games-board/xmahjongg/files/xmahjongg-3.7-autotools.patch | 26 | ||||
| -rw-r--r-- | games-board/xmahjongg/xmahjongg-3.7-r1.ebuild | 16 |
3 files changed, 37 insertions, 8 deletions
diff --git a/games-board/xmahjongg/Manifest b/games-board/xmahjongg/Manifest index 636e6cd5e53a..fdd478952185 100644 --- a/games-board/xmahjongg/Manifest +++ b/games-board/xmahjongg/Manifest @@ -1,3 +1,4 @@ +AUX xmahjongg-3.7-autotools.patch 556 BLAKE2B 7b0e4b0aeb818c16ba07160b4e126fceaf4260163c5ac543106bc49067d8e9b0b7e15b00fd912bd5d790604965d998a6d37ea6200efbab5e16005038f84f0029 SHA512 4c6ab7305b937e3ac94026831e2c63c3d5d7c3deb44b857ab0de54a936343ef8cd1fc6d8dbb3e9738bee6f8e298643e902eeeaf81ebddf8e500238aae24e686a DIST xmahjongg-3.7.tar.gz 551834 BLAKE2B 8a8d82fe6f88efc0b966440b27654a003f8928bf10ee7cdf54a95dd35108530794faa21d39c296c789a910e6867db831bbfbecefe8f873f26a52d0e877b45485 SHA512 eb952b38b2ea79f3037a6e8063042f4094e0719edd366c0327350aaf6484ee64ad5d174741bbb80fc49dba62eba4790ffc97eb1bf0d942149e614bde7bd1759a -EBUILD xmahjongg-3.7-r1.ebuild 678 BLAKE2B b50c04934ca6f5b5ae4b23620b79da7b3fdd1694c6fffc44e3e77b7463d545375b68444c78b5c2a60f2352d9294f3d371e1d7e780164b98f92156795ab37c523 SHA512 1af567a8301d87094c646c55184a5c4e54c5479bb53f3eaca1bc5fe3462851e270e04eea38b8ca1e33549d1737d0a546d2004e158bb7d93e697a6934b9a8e978 +EBUILD xmahjongg-3.7-r1.ebuild 705 BLAKE2B 361e64185c5119da067b042e9dc04607ae29d9808acde5eb62297805f33b327439589797ac63983767fbc8573ccf15a7028bbaa2440ce5ff887405f07e68f35c SHA512 84704b75961845e16d0a1a144cc32228de66cf96bd271ab570ba20a4657c9780f56c154b000f7495b8363772be398331e226d4268486cdfd0d9a2f56f8b6da28 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-board/xmahjongg/files/xmahjongg-3.7-autotools.patch b/games-board/xmahjongg/files/xmahjongg-3.7-autotools.patch new file mode 100644 index 000000000000..9efc02399804 --- /dev/null +++ b/games-board/xmahjongg/files/xmahjongg-3.7-autotools.patch @@ -0,0 +1,26 @@ +--- a/configure.in ++++ b/configure.in +@@ -9,8 +9,11 @@ + AC_PROG_CPP + AC_PROG_CXX + AC_PROG_CXXCPP ++AM_PROG_AR + AC_PROG_RANLIB +-if test -n "$GCC" ; then CC="$CC -Wall"; CXX="$CXX -Wall"; fi ++ ++CFLAGS="${CFLAGS} -Wall" ++CXXFLAGS="${CXXFLAGS} -Wall" + + AC_PATH_XTRA + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -32,7 +32,7 @@ + + INCLUDES = $(X_CFLAGS) -I$(top_srcdir)/include + +-xmahjongg_LDADD = $(LDADD) ../liblcdf/liblcdf.a @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ ++xmahjongg_LDADD = $(LDADD) ../liblcdf/liblcdf.a @X_LIBS@ -lX11 @X_EXTRA_LIBS@ + + + # diff --git a/games-board/xmahjongg/xmahjongg-3.7-r1.ebuild b/games-board/xmahjongg/xmahjongg-3.7-r1.ebuild index e05ea7454d84..15198d767d8a 100644 --- a/games-board/xmahjongg/xmahjongg-3.7-r1.ebuild +++ b/games-board/xmahjongg/xmahjongg-3.7-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 + +inherit autotools desktop DESCRIPTION="friendly GUI version of xmahjongg" HOMEPAGE="http://www.lcdf.org/xmahjongg/" @@ -11,21 +12,22 @@ SRC_URI="http://www.lcdf.org/xmahjongg/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} x11-libs/libXt" +PATCHES=( "${FILESDIR}"/${P}-autotools.patch ) + src_prepare() { default - sed -i \ - -e '/X_PRE_LIBS/s:-lSM -lICE::' \ - configure || die + mv configure.{in,ac} || die + eautoreconf } src_install() { default + newicon share/tiles/small.gif ${PN}.gif make_desktop_entry xmahjongg "Xmahjongg" /usr/share/pixmaps/${PN}.gif } |