[gentoo-commits] repo/gentoo:master commit in: games-arcade/lbreakout2/files/, games-arcade/lbreakout2/

2020-07-04 Thread David Seifert
commit: ba89ac49bbdb87a8b7997b68ddca61af0bd7405a
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jul  5 00:23:23 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jul  5 00:23:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba89ac49

games-arcade/lbreakout2: Call AM_PROG_AR

Closes: https://bugs.gentoo.org/724408
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Seifert  gentoo.org>

 .../lbreakout2/files/lbreakout2-2.6.5-gentoo.patch | 64 --
 games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild | 36 ++--
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch 
b/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
index 365274c581b..3284426749a 100644
--- a/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
+++ b/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
@@ -1,34 +1,24 @@
 lbreakout2-2.6.1.orig/Makefile.am
-+++ lbreakout2-2.6.1/Makefile.am
-@@ -1,13 +1,8 @@
- SUBDIRS = intl m4 po common gui game server client docs
- 
- EXTRA_DIST = config.rpath AUTHORS COPYING ChangeLog INSTALL README \
--README-SDL.txt TODO lbreakout2.spec touchall lbreakout32.gif \
--lbreakout48.gif lbreakout2.desktop.in win32_mancomp win32_preparchive
--
--desktopdir = $(datadir)/applications
--desktop_DATA = lbreakout2.desktop
--icondir = $(datadir)/icons
--icon_DATA = lbreakout48.gif
-+README-SDL.txt TODO lbreakout2.spec touchall \
-+win32_mancomp win32_preparchive
- 
- WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt \
- TODO lbreakout2.spec ABOUT-NLS
 lbreakout2-2.6.1.orig/common/gettext.h
-+++ lbreakout2-2.6.1/common/gettext.h
+--- a/common/gettext.h
 b/common/gettext.h
 @@ -24,6 +24,7 @@
  
  /* Get declarations of GNU message catalog functions.  */
  # include 
 +# include 
  
- #else
+ /* We need locale.h too, otherwise setlocale() bails out; cf. #643471 */
+ #if HAVE_LOCALE_H
+--- a/configure.in
 b/configure.in
+@@ -12,6 +12,7 @@
+ dnl Checks for programs.
+ AM_GNU_GETTEXT
+ AC_PROG_CC
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_EXEEXT
  
 lbreakout2-2.6.1.orig/configure.in
-+++ lbreakout2-2.6.1/configure.in
-@@ -80,8 +80,6 @@
+@@ -80,8 +81,6 @@
  [  --enable-netdebug   Enable net packet debugging.], 
netdebug_flag="-DNET_DEBUG_MSG" )
  AC_SUBST(netdebug_flag)
  
@@ -37,8 +27,8 @@
  locdir_flag="-DLOCALEDIR=\\\"$localedir\\\""
  
  dnl installation path
 lbreakout2-2.6.1.orig/docs/Makefile.am
-+++ lbreakout2-2.6.1/docs/Makefile.am
+--- a/docs/Makefile.am
 b/docs/Makefile.am
 @@ -7,11 +7,11 @@
  warp.jpg screen.jpg
  
@@ -54,8 +44,26 @@
  
  win32-install-script:
@for file in $(EXTRA_DIST); do \
 lbreakout2-2.6.1.orig/po/Makefile.in.in
-+++ lbreakout2-2.6.1/po/Makefile.in.in
+--- a/Makefile.am
 b/Makefile.am
+@@ -1,13 +1,8 @@
+ SUBDIRS = intl m4 po common gui game server client docs
+ 
+ EXTRA_DIST = config.rpath AUTHORS COPYING ChangeLog INSTALL README \
+-README-SDL.txt TODO lbreakout2.spec touchall lbreakout32.gif \
+-lbreakout48.gif lbreakout2.desktop.in win32_mancomp win32_preparchive
+-
+-desktopdir = $(datadir)/applications
+-desktop_DATA = lbreakout2.desktop
+-icondir = $(datadir)/icons
+-icon_DATA = lbreakout48.gif
++README-SDL.txt TODO lbreakout2.spec touchall \
++win32_mancomp win32_preparchive
+ 
+ WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt \
+ TODO lbreakout2.spec ABOUT-NLS
+--- a/po/Makefile.in.in
 b/po/Makefile.in.in
 @@ -24,7 +24,7 @@
  exec_prefix = @exec_prefix@
  datadir = @datadir@

diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild 
b/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
index 5be797a596d..129ed748d93 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools desktop flag-o-matic gnome2-utils
 
 levels_V=20141220
@@ -24,36 +25,38 @@ RDEPEND="
media-libs/libsdl[sound,joystick,video]
media-libs/sdl-net
media-libs/sdl-mixer
-   nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-   nls? ( sys-devel/gettext )
-"
+   nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_unpack() {
unpack ${P}.tar.gz
 
-   cd "${S}/client/levels"
+   cd "${S}/client/levels" || die
unpack ${PN}-levelsets-${levels_V}.tar.gz
 
-   if use themes ; then
-   mkdir "${WORKDIR}/themes"
-   cd "${WORKDIR}/themes"
+   if use themes; then
+   mkdir "${WORKDIR}"/themes || die
+   cd "${WORKDIR}"/themes || die
unpack ${PN}-themes-${themes_V}.tar.gz
 
# Delete a few 

[gentoo-commits] repo/gentoo:master commit in: games-arcade/lbreakout2/files/, games-arcade/lbreakout2/

2016-04-19 Thread Michael Sterrett
commit: 89fcf449d2750b442b33ea39ce3da704e6734ff9
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Apr 19 20:42:49 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Apr 19 20:43:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89fcf449

games-arcade/lbreakout2: version bump

Package-Manager: portage-2.2.26

 games-arcade/lbreakout2/Manifest   |  3 +
 .../lbreakout2/files/lbreakout2-2.6.5-gentoo.patch | 67 
 games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild| 93 ++
 3 files changed, 163 insertions(+)

diff --git a/games-arcade/lbreakout2/Manifest b/games-arcade/lbreakout2/Manifest
index 88ee91e..25f43f2 100644
--- a/games-arcade/lbreakout2/Manifest
+++ b/games-arcade/lbreakout2/Manifest
@@ -1,3 +1,6 @@
 DIST lbreakout2-2.6.4.tar.gz 3470380 SHA256 
0b90716d52e67c27ff41ab7aa5c09dad4f5f19a78076cc57dd4b4d7ed2c1dbd9 SHA512 
fe1787900c4379bdb8330ac8ff31138cbdb180449e5addb1c511a9778ab69f0b09a85e91659bb83663868a399d2644e6e084365702c23eac93da579e80fd68bc
 WHIRLPOOL 
6e39c2ad44e0eb970228fcc34726ba7845498a7f07500136974fd554540bdd84fd19b88edfbadbdf3e8986dc8fa2b9673d41feab9cb34bb3e6acbaaf61c1f52c
+DIST lbreakout2-2.6.5.tar.gz 3491519 SHA256 
9104d6175553da3442dc6a5fc407a669e2f5aff3eedc5d30409eb003b7a78d6f SHA512 
45c54bc9401131c96eba5fdcc08ca1324904fb50d3967acf7f29034045cbcd4c1d0b65f38eb33d8aace4cfe35f2a2e7a6c2319e4a6d6a1b41274dbe293a1747b
 WHIRLPOOL 
6e5f6f2ea51480cdaa1df7439c1efd09d38c2b88b114382effaa4c01e77b6460ad77510217fc5b66ceac32b7ee9c3c53ab6337fbab08caf66712dfdd6f270bd4
 DIST lbreakout2-levelsets-20120815.tar.gz 336355 SHA256 
9245fb2b0c52364b88619f11b79f68878f1522ada8fcddb0d2da74ec2027cb34 SHA512 
f9427c1716c6e9ab5d97c45849bb8d224da4c6f55c252b33d1bc3be8ff96470bc203c5a4dea5036138f6f2b07efe27f1f60763bf5460febebd0a4e0db8028bcc
 WHIRLPOOL 
08a68780fb232309219fe1867af813b7299f270c81cc86a86887a6fcfa3194d137a34ff8ce6c083a43047a2467f08a86357e1fcaff2c8fc93981ddd90e057560
+DIST lbreakout2-levelsets-20141220.tar.gz 372221 SHA256 
504d6581eba57cbe1272edf6ebf3f00d19ed2729ad0fd1e2ec49b7b504f14852 SHA512 
482c1e95a37735f7bca510fa34d0f046e89b5aa9528b9af9dfff5bcb3fe656140285a95670caae2565cc9ebd30c3dc87a1fe77a6b75061ce9349ee7e36aa13d5
 WHIRLPOOL 
d9a1523235a6672f5ce02f70cdb7bd0a353f34af500baba3739abf536c4d9cbec56596b254b34e64321d76a58d0eb34a775aa221f928219d3594d077a1c4722c
 DIST lbreakout2-themes-20111026.tar.gz 27462927 SHA256 
2da570b139b4eaaadb5e598328c90983a3da22fc41e45b8563fa732ab122028a SHA512 
a38856665eb3e9c0eaa0ff29817f7283237841368daa977b632df51842812e662da4343b5aa00265ed0765d4e4de1b4f11b7bf6c2650a9b9b1a8e0b440b8cf63
 WHIRLPOOL 
9c01ad4efac109c273a31ed5501cdc105affa6cc37e89831999e47120899018100ce902390efee8e6e6f414dbb996e1ceb08db5ac4eef478a361802a37cfd414
+DIST lbreakout2-themes-20141220.tar.gz 34006503 SHA256 
ab070460589b4dc414790f27baaa77ea4e5057fa966afd9094c7475653e9a002 SHA512 
6088ff4bd9dfbbeb91c74e4adb500593af88ea6796bdec577afb43fc4ea9819c4f2dae76b6b7a8ad1ce2ec32ef575e41a6fa924463107a5dcd211f50bb94a906
 WHIRLPOOL 
5ac3e83fb2751574828097456997ce013d182fa3c78d31b5096f62395ebbef6fd621f1cabc8222b58f9751c0f056bb6f04efc074acaba5aeaa8c95c2efdb8c7f

diff --git a/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch 
b/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
new file mode 100644
index 000..365274c
--- /dev/null
+++ b/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
@@ -0,0 +1,67 @@
+--- lbreakout2-2.6.1.orig/Makefile.am
 lbreakout2-2.6.1/Makefile.am
+@@ -1,13 +1,8 @@
+ SUBDIRS = intl m4 po common gui game server client docs
+ 
+ EXTRA_DIST = config.rpath AUTHORS COPYING ChangeLog INSTALL README \
+-README-SDL.txt TODO lbreakout2.spec touchall lbreakout32.gif \
+-lbreakout48.gif lbreakout2.desktop.in win32_mancomp win32_preparchive
+-
+-desktopdir = $(datadir)/applications
+-desktop_DATA = lbreakout2.desktop
+-icondir = $(datadir)/icons
+-icon_DATA = lbreakout48.gif
++README-SDL.txt TODO lbreakout2.spec touchall \
++win32_mancomp win32_preparchive
+ 
+ WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt \
+ TODO lbreakout2.spec ABOUT-NLS
+--- lbreakout2-2.6.1.orig/common/gettext.h
 lbreakout2-2.6.1/common/gettext.h
+@@ -24,6 +24,7 @@
+ 
+ /* Get declarations of GNU message catalog functions.  */
+ # include 
++# include 
+ 
+ #else
+ 
+--- lbreakout2-2.6.1.orig/configure.in
 lbreakout2-2.6.1/configure.in
+@@ -80,8 +80,6 @@
+ [  --enable-netdebug   Enable net packet debugging.], 
netdebug_flag="-DNET_DEBUG_MSG" )
+ AC_SUBST(netdebug_flag)
+ 
+-dnl set localedir
+-localedir=$datadir/locale
+ locdir_flag="-DLOCALEDIR=\\\"$localedir\\\""
+ 
+ dnl installation path
+--- lbreakout2-2.6.1.orig/docs/Makefile.am
 lbreakout2-2.6.1/docs/Makefile.am
+@@ -7,11 +7,11 @@
+ warp.jpg screen.jpg
+ 
+ install-data-local:
+-  $(mkinstalldirs) $(DESTDIR)$(doc_dir)/lbreakout2
++  $(mkinstalldirs) $(DESTDIR)$(doc_dir)
+   @for file in