[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2015-06-01 Thread Michael Sterrett (mr_bones_)
mr_bones_15/06/01 22:05:45

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  clean up app-emulation/emul-linux which has been removed
  
  (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)

Revision  ChangesPath
1.14 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.13&r2=1.14

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
+++ heretic2-demo-1.06a.ebuild  1 Jun 2015 22:05:45 -   1.14
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
-EAPI=4
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.14 2015/06/01 22:05:45 mr_bones_ Exp $
 
+EAPI=5
 inherit eutils unpacker multilib games
 
 DESCRIPTION="Third-person classic magical action-adventure game"
@@ -19,15 +19,8 @@
 
 DEPEND="games-util/loki_patch"
 RDEPEND="
-   || (
-   (
-   x11-libs/libX11[abi_x86_32(-)]
-   x11-libs/libXext[abi_x86_32(-)]
-   )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-   )
-   )"
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
@@ -41,16 +34,16 @@
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 
-   loki_patch patch.dat data/ || die "loki patch failed"
+   loki_patch patch.dat data/ || die
 
# Remove bad opengl library
rm -r "${demo}/gl_drivers/"
 
# Change to safe default of 800x600 and option of normal opengl driver
-   sed -i "${demo}"/base/default.cfg \
+   sed -i \
-e "s:fullscreen \"1\":fullscreen \"1\"\nset vid_mode \"4\":" \
-e "s:libGL:/usr/$(get_libdir)/libGL:" \
-   || die "sed failed"
+   "${demo}"/base/default.cfg || die
 
insinto "${dir}"
exeinto "${dir}"



1.12 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog   27 Jun 2014 11:42:54 -  1.11
+++ ChangeLog   1 Jun 2015 22:05:45 -   1.12
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.12 
2015/06/01 22:05:45 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett 
+  heretic2-demo-1.06a.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
   Support multilib packages in dependencies. Update/fix dependencies. Use






[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2014-06-27 Thread Michal Gorny (mgorny)
mgorny  14/06/27 11:42:54

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  Support multilib packages in dependencies. Update/fix dependencies. Use 
ABI=x86 to obtain proper libGL path for config.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  ChangesPath
1.13 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.12&r2=1.13

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- heretic2-demo-1.06a.ebuild  27 Dec 2012 08:51:42 -  1.12
+++ heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.12 2012/12/27 08:51:42 tupone Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
 EAPI=4
 
 inherit eutils unpacker multilib games
@@ -18,14 +18,16 @@
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
 
 DEPEND="games-util/loki_patch"
-RDEPEND="x86? (
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXau
-   x11-libs/libXdmcp )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs
-   app-emulation/emul-linux-x86-compat )"
+RDEPEND="
+   || (
+   (
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]
+   )
+   amd64? (
+   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+   )
+   )"
 
 S=${WORKDIR}
 
@@ -34,6 +36,8 @@
 QA_PREBUILT="${dir:1}/*"
 
 src_install() {
+   ABI=x86
+
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 



1.11 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog   27 Dec 2012 08:51:42 -  1.10
+++ ChangeLog   27 Jun 2014 11:42:54 -  1.11
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.10 
2012/12/27 08:51:42 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+
+  27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
+  Support multilib packages in dependencies. Update/fix dependencies. Use
+  ABI=x86 to obtain proper libGL path for config.
 
   27 Dec 2012; Tupone Alfredo  heretic2-demo-1.06a.ebuild:
   Use QA_PREBUILT. Bug #431230 by Diego Elio Pettenò
@@ -41,4 +45,3 @@
   +heretic2-demo-1.06a.ebuild:
   Initial import. Ebuild by Paul Bredbury . Closing bug
   #120358.
-






[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2014-06-27 Thread Michal Gorny (mgorny)
mgorny  14/06/27 11:42:54

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  Support multilib packages in dependencies. Update/fix dependencies. Use 
ABI=x86 to obtain proper libGL path for config.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  ChangesPath
1.13 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.12&r2=1.13

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- heretic2-demo-1.06a.ebuild  27 Dec 2012 08:51:42 -  1.12
+++ heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.12 2012/12/27 08:51:42 tupone Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
 EAPI=4
 
 inherit eutils unpacker multilib games
@@ -18,14 +18,16 @@
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
 
 DEPEND="games-util/loki_patch"
-RDEPEND="x86? (
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXau
-   x11-libs/libXdmcp )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs
-   app-emulation/emul-linux-x86-compat )"
+RDEPEND="
+   || (
+   (
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]
+   )
+   amd64? (
+   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+   )
+   )"
 
 S=${WORKDIR}
 
@@ -34,6 +36,8 @@
 QA_PREBUILT="${dir:1}/*"
 
 src_install() {
+   ABI=x86
+
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 



1.11 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog   27 Dec 2012 08:51:42 -  1.10
+++ ChangeLog   27 Jun 2014 11:42:54 -  1.11
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.10 
2012/12/27 08:51:42 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+
+  27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
+  Support multilib packages in dependencies. Update/fix dependencies. Use
+  ABI=x86 to obtain proper libGL path for config.
 
   27 Dec 2012; Tupone Alfredo  heretic2-demo-1.06a.ebuild:
   Use QA_PREBUILT. Bug #431230 by Diego Elio Pettenò
@@ -41,4 +45,3 @@
   +heretic2-demo-1.06a.ebuild:
   Initial import. Ebuild by Paul Bredbury . Closing bug
   #120358.
-






[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2015-06-01 Thread Michael Sterrett (mr_bones_)
mr_bones_15/06/01 22:05:45

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  clean up app-emulation/emul-linux which has been removed
  
  (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)

Revision  ChangesPath
1.14 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.13&r2=1.14

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
+++ heretic2-demo-1.06a.ebuild  1 Jun 2015 22:05:45 -   1.14
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
-EAPI=4
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.14 2015/06/01 22:05:45 mr_bones_ Exp $
 
+EAPI=5
 inherit eutils unpacker multilib games
 
 DESCRIPTION="Third-person classic magical action-adventure game"
@@ -19,15 +19,8 @@
 
 DEPEND="games-util/loki_patch"
 RDEPEND="
-   || (
-   (
-   x11-libs/libX11[abi_x86_32(-)]
-   x11-libs/libXext[abi_x86_32(-)]
-   )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-   )
-   )"
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
@@ -41,16 +34,16 @@
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 
-   loki_patch patch.dat data/ || die "loki patch failed"
+   loki_patch patch.dat data/ || die
 
# Remove bad opengl library
rm -r "${demo}/gl_drivers/"
 
# Change to safe default of 800x600 and option of normal opengl driver
-   sed -i "${demo}"/base/default.cfg \
+   sed -i \
-e "s:fullscreen \"1\":fullscreen \"1\"\nset vid_mode \"4\":" \
-e "s:libGL:/usr/$(get_libdir)/libGL:" \
-   || die "sed failed"
+   "${demo}"/base/default.cfg || die
 
insinto "${dir}"
exeinto "${dir}"



1.12 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog   27 Jun 2014 11:42:54 -  1.11
+++ ChangeLog   1 Jun 2015 22:05:45 -   1.12
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.12 
2015/06/01 22:05:45 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett 
+  heretic2-demo-1.06a.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
   Support multilib packages in dependencies. Update/fix dependencies. Use






[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2015-06-01 Thread Michael Sterrett (mr_bones_)
mr_bones_15/06/01 22:05:45

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  clean up app-emulation/emul-linux which has been removed
  
  (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)

Revision  ChangesPath
1.14 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.13&r2=1.14

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
+++ heretic2-demo-1.06a.ebuild  1 Jun 2015 22:05:45 -   1.14
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
-EAPI=4
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.14 2015/06/01 22:05:45 mr_bones_ Exp $
 
+EAPI=5
 inherit eutils unpacker multilib games
 
 DESCRIPTION="Third-person classic magical action-adventure game"
@@ -19,15 +19,8 @@
 
 DEPEND="games-util/loki_patch"
 RDEPEND="
-   || (
-   (
-   x11-libs/libX11[abi_x86_32(-)]
-   x11-libs/libXext[abi_x86_32(-)]
-   )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-   )
-   )"
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
@@ -41,16 +34,16 @@
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 
-   loki_patch patch.dat data/ || die "loki patch failed"
+   loki_patch patch.dat data/ || die
 
# Remove bad opengl library
rm -r "${demo}/gl_drivers/"
 
# Change to safe default of 800x600 and option of normal opengl driver
-   sed -i "${demo}"/base/default.cfg \
+   sed -i \
-e "s:fullscreen \"1\":fullscreen \"1\"\nset vid_mode \"4\":" \
-e "s:libGL:/usr/$(get_libdir)/libGL:" \
-   || die "sed failed"
+   "${demo}"/base/default.cfg || die
 
insinto "${dir}"
exeinto "${dir}"



1.12 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog   27 Jun 2014 11:42:54 -  1.11
+++ ChangeLog   1 Jun 2015 22:05:45 -   1.12
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.12 
2015/06/01 22:05:45 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett 
+  heretic2-demo-1.06a.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
   Support multilib packages in dependencies. Update/fix dependencies. Use






[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2015-06-01 Thread Michael Sterrett (mr_bones_)
mr_bones_15/06/01 22:05:45

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  clean up app-emulation/emul-linux which has been removed
  
  (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)

Revision  ChangesPath
1.14 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.13&r2=1.14

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
+++ heretic2-demo-1.06a.ebuild  1 Jun 2015 22:05:45 -   1.14
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
-EAPI=4
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.14 2015/06/01 22:05:45 mr_bones_ Exp $
 
+EAPI=5
 inherit eutils unpacker multilib games
 
 DESCRIPTION="Third-person classic magical action-adventure game"
@@ -19,15 +19,8 @@
 
 DEPEND="games-util/loki_patch"
 RDEPEND="
-   || (
-   (
-   x11-libs/libX11[abi_x86_32(-)]
-   x11-libs/libXext[abi_x86_32(-)]
-   )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-   )
-   )"
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
@@ -41,16 +34,16 @@
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 
-   loki_patch patch.dat data/ || die "loki patch failed"
+   loki_patch patch.dat data/ || die
 
# Remove bad opengl library
rm -r "${demo}/gl_drivers/"
 
# Change to safe default of 800x600 and option of normal opengl driver
-   sed -i "${demo}"/base/default.cfg \
+   sed -i \
-e "s:fullscreen \"1\":fullscreen \"1\"\nset vid_mode \"4\":" \
-e "s:libGL:/usr/$(get_libdir)/libGL:" \
-   || die "sed failed"
+   "${demo}"/base/default.cfg || die
 
insinto "${dir}"
exeinto "${dir}"



1.12 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog   27 Jun 2014 11:42:54 -  1.11
+++ ChangeLog   1 Jun 2015 22:05:45 -   1.12
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.12 
2015/06/01 22:05:45 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett 
+  heretic2-demo-1.06a.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
   Support multilib packages in dependencies. Update/fix dependencies. Use






[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2014-06-27 Thread Michal Gorny (mgorny)
mgorny  14/06/27 11:42:54

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  Support multilib packages in dependencies. Update/fix dependencies. Use 
ABI=x86 to obtain proper libGL path for config.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  ChangesPath
1.13 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.12&r2=1.13

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- heretic2-demo-1.06a.ebuild  27 Dec 2012 08:51:42 -  1.12
+++ heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.12 2012/12/27 08:51:42 tupone Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
 EAPI=4
 
 inherit eutils unpacker multilib games
@@ -18,14 +18,16 @@
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
 
 DEPEND="games-util/loki_patch"
-RDEPEND="x86? (
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXau
-   x11-libs/libXdmcp )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs
-   app-emulation/emul-linux-x86-compat )"
+RDEPEND="
+   || (
+   (
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]
+   )
+   amd64? (
+   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+   )
+   )"
 
 S=${WORKDIR}
 
@@ -34,6 +36,8 @@
 QA_PREBUILT="${dir:1}/*"
 
 src_install() {
+   ABI=x86
+
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 



1.11 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog   27 Dec 2012 08:51:42 -  1.10
+++ ChangeLog   27 Jun 2014 11:42:54 -  1.11
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.10 
2012/12/27 08:51:42 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+
+  27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
+  Support multilib packages in dependencies. Update/fix dependencies. Use
+  ABI=x86 to obtain proper libGL path for config.
 
   27 Dec 2012; Tupone Alfredo  heretic2-demo-1.06a.ebuild:
   Use QA_PREBUILT. Bug #431230 by Diego Elio Pettenò
@@ -41,4 +45,3 @@
   +heretic2-demo-1.06a.ebuild:
   Initial import. Ebuild by Paul Bredbury . Closing bug
   #120358.
-






[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2014-06-27 Thread Michal Gorny (mgorny)
mgorny  14/06/27 11:42:54

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  Support multilib packages in dependencies. Update/fix dependencies. Use 
ABI=x86 to obtain proper libGL path for config.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  ChangesPath
1.13 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.12&r2=1.13

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- heretic2-demo-1.06a.ebuild  27 Dec 2012 08:51:42 -  1.12
+++ heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.12 2012/12/27 08:51:42 tupone Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
 EAPI=4
 
 inherit eutils unpacker multilib games
@@ -18,14 +18,16 @@
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
 
 DEPEND="games-util/loki_patch"
-RDEPEND="x86? (
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXau
-   x11-libs/libXdmcp )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs
-   app-emulation/emul-linux-x86-compat )"
+RDEPEND="
+   || (
+   (
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]
+   )
+   amd64? (
+   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+   )
+   )"
 
 S=${WORKDIR}
 
@@ -34,6 +36,8 @@
 QA_PREBUILT="${dir:1}/*"
 
 src_install() {
+   ABI=x86
+
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 



1.11 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog   27 Dec 2012 08:51:42 -  1.10
+++ ChangeLog   27 Jun 2014 11:42:54 -  1.11
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.10 
2012/12/27 08:51:42 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+
+  27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
+  Support multilib packages in dependencies. Update/fix dependencies. Use
+  ABI=x86 to obtain proper libGL path for config.
 
   27 Dec 2012; Tupone Alfredo  heretic2-demo-1.06a.ebuild:
   Use QA_PREBUILT. Bug #431230 by Diego Elio Pettenò
@@ -41,4 +45,3 @@
   +heretic2-demo-1.06a.ebuild:
   Initial import. Ebuild by Paul Bredbury . Closing bug
   #120358.
-






[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2014-06-27 Thread Michal Gorny (mgorny)
mgorny  14/06/27 11:42:54

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  Support multilib packages in dependencies. Update/fix dependencies. Use 
ABI=x86 to obtain proper libGL path for config.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  ChangesPath
1.13 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.12&r2=1.13

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- heretic2-demo-1.06a.ebuild  27 Dec 2012 08:51:42 -  1.12
+++ heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.12 2012/12/27 08:51:42 tupone Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
 EAPI=4
 
 inherit eutils unpacker multilib games
@@ -18,14 +18,16 @@
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
 
 DEPEND="games-util/loki_patch"
-RDEPEND="x86? (
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXau
-   x11-libs/libXdmcp )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs
-   app-emulation/emul-linux-x86-compat )"
+RDEPEND="
+   || (
+   (
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]
+   )
+   amd64? (
+   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+   )
+   )"
 
 S=${WORKDIR}
 
@@ -34,6 +36,8 @@
 QA_PREBUILT="${dir:1}/*"
 
 src_install() {
+   ABI=x86
+
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 



1.11 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog   27 Dec 2012 08:51:42 -  1.10
+++ ChangeLog   27 Jun 2014 11:42:54 -  1.11
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.10 
2012/12/27 08:51:42 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+
+  27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
+  Support multilib packages in dependencies. Update/fix dependencies. Use
+  ABI=x86 to obtain proper libGL path for config.
 
   27 Dec 2012; Tupone Alfredo  heretic2-demo-1.06a.ebuild:
   Use QA_PREBUILT. Bug #431230 by Diego Elio Pettenò
@@ -41,4 +45,3 @@
   +heretic2-demo-1.06a.ebuild:
   Initial import. Ebuild by Paul Bredbury . Closing bug
   #120358.
-






[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2015-06-01 Thread Michael Sterrett (mr_bones_)
mr_bones_15/06/01 22:05:45

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  clean up app-emulation/emul-linux which has been removed
  
  (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)

Revision  ChangesPath
1.14 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.13&r2=1.14

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
+++ heretic2-demo-1.06a.ebuild  1 Jun 2015 22:05:45 -   1.14
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
-EAPI=4
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.14 2015/06/01 22:05:45 mr_bones_ Exp $
 
+EAPI=5
 inherit eutils unpacker multilib games
 
 DESCRIPTION="Third-person classic magical action-adventure game"
@@ -19,15 +19,8 @@
 
 DEPEND="games-util/loki_patch"
 RDEPEND="
-   || (
-   (
-   x11-libs/libX11[abi_x86_32(-)]
-   x11-libs/libXext[abi_x86_32(-)]
-   )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-   )
-   )"
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
@@ -41,16 +34,16 @@
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 
-   loki_patch patch.dat data/ || die "loki patch failed"
+   loki_patch patch.dat data/ || die
 
# Remove bad opengl library
rm -r "${demo}/gl_drivers/"
 
# Change to safe default of 800x600 and option of normal opengl driver
-   sed -i "${demo}"/base/default.cfg \
+   sed -i \
-e "s:fullscreen \"1\":fullscreen \"1\"\nset vid_mode \"4\":" \
-e "s:libGL:/usr/$(get_libdir)/libGL:" \
-   || die "sed failed"
+   "${demo}"/base/default.cfg || die
 
insinto "${dir}"
exeinto "${dir}"



1.12 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog   27 Jun 2014 11:42:54 -  1.11
+++ ChangeLog   1 Jun 2015 22:05:45 -   1.12
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.12 
2015/06/01 22:05:45 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett 
+  heretic2-demo-1.06a.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
   Support multilib packages in dependencies. Update/fix dependencies. Use






[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2014-06-27 Thread Michal Gorny (mgorny)
mgorny  14/06/27 11:42:54

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  Support multilib packages in dependencies. Update/fix dependencies. Use 
ABI=x86 to obtain proper libGL path for config.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  ChangesPath
1.13 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.12&r2=1.13

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- heretic2-demo-1.06a.ebuild  27 Dec 2012 08:51:42 -  1.12
+++ heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.12 2012/12/27 08:51:42 tupone Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
 EAPI=4
 
 inherit eutils unpacker multilib games
@@ -18,14 +18,16 @@
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
 
 DEPEND="games-util/loki_patch"
-RDEPEND="x86? (
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXau
-   x11-libs/libXdmcp )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs
-   app-emulation/emul-linux-x86-compat )"
+RDEPEND="
+   || (
+   (
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]
+   )
+   amd64? (
+   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+   )
+   )"
 
 S=${WORKDIR}
 
@@ -34,6 +36,8 @@
 QA_PREBUILT="${dir:1}/*"
 
 src_install() {
+   ABI=x86
+
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 



1.11 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog   27 Dec 2012 08:51:42 -  1.10
+++ ChangeLog   27 Jun 2014 11:42:54 -  1.11
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.10 
2012/12/27 08:51:42 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+
+  27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
+  Support multilib packages in dependencies. Update/fix dependencies. Use
+  ABI=x86 to obtain proper libGL path for config.
 
   27 Dec 2012; Tupone Alfredo  heretic2-demo-1.06a.ebuild:
   Use QA_PREBUILT. Bug #431230 by Diego Elio Pettenò
@@ -41,4 +45,3 @@
   +heretic2-demo-1.06a.ebuild:
   Initial import. Ebuild by Paul Bredbury . Closing bug
   #120358.
-






[gentoo-commits] gentoo-x86 commit in games-action/heretic2-demo: heretic2-demo-1.06a.ebuild ChangeLog

2015-06-01 Thread Michael Sterrett (mr_bones_)
mr_bones_15/06/01 22:05:45

  Modified: heretic2-demo-1.06a.ebuild ChangeLog
  Log:
  clean up app-emulation/emul-linux which has been removed
  
  (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)

Revision  ChangesPath
1.14 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?rev=1.14&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild?r1=1.13&r2=1.14

Index: heretic2-demo-1.06a.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- heretic2-demo-1.06a.ebuild  27 Jun 2014 11:42:54 -  1.13
+++ heretic2-demo-1.06a.ebuild  1 Jun 2015 22:05:45 -   1.14
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.13 2014/06/27 11:42:54 mgorny Exp $
-EAPI=4
+# $Header: 
/var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 
1.14 2015/06/01 22:05:45 mr_bones_ Exp $
 
+EAPI=5
 inherit eutils unpacker multilib games
 
 DESCRIPTION="Third-person classic magical action-adventure game"
@@ -19,15 +19,8 @@
 
 DEPEND="games-util/loki_patch"
 RDEPEND="
-   || (
-   (
-   x11-libs/libX11[abi_x86_32(-)]
-   x11-libs/libXext[abi_x86_32(-)]
-   )
-   amd64? (
-   app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-   )
-   )"
+   x11-libs/libX11[abi_x86_32(-)]
+   x11-libs/libXext[abi_x86_32(-)]"
 
 S=${WORKDIR}
 
@@ -41,16 +34,16 @@
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"
 
-   loki_patch patch.dat data/ || die "loki patch failed"
+   loki_patch patch.dat data/ || die
 
# Remove bad opengl library
rm -r "${demo}/gl_drivers/"
 
# Change to safe default of 800x600 and option of normal opengl driver
-   sed -i "${demo}"/base/default.cfg \
+   sed -i \
-e "s:fullscreen \"1\":fullscreen \"1\"\nset vid_mode \"4\":" \
-e "s:libGL:/usr/$(get_libdir)/libGL:" \
-   || die "sed failed"
+   "${demo}"/base/default.cfg || die
 
insinto "${dir}"
exeinto "${dir}"



1.12 games-action/heretic2-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/heretic2-demo/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog   27 Jun 2014 11:42:54 -  1.11
+++ ChangeLog   1 Jun 2015 22:05:45 -   1.12
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 
2014/06/27 11:42:54 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.12 
2015/06/01 22:05:45 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett 
+  heretic2-demo-1.06a.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   27 Jun 2014; Michał Górny  heretic2-demo-1.06a.ebuild:
   Support multilib packages in dependencies. Update/fix dependencies. Use