Version bump to 2.24 Bug #188153

Package-Manager: portage-2.1.9.24/cvs/Linux i686

5 files changed, 169 insertions, 2 deletions

diff --git a/games-util/glbsp/ChangeLog b/games-util/glbsp/ChangeLog
index fb3755a4aa72..220570938bb0 100644
--- a/games-util/glbsp/ChangeLog
+++ b/games-util/glbsp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-util/glbsp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/glbsp/ChangeLog,v 1.10 2010/10/01 08:04:07 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/glbsp/ChangeLog,v 1.11 2010/11/25 10:58:59 tupone Exp $
+
+*glbsp-2.24 (25 Nov 2010)
+
+  25 Nov 2010; Tupone Alfredo <tupone@gentoo.org> +glbsp-2.24.ebuild,
+  +files/glbsp-2.24-fltk.patch, +files/glbsp-2.24-ldflags.patch:
+  Version bump to 2.24 Bug #188153 by Davide Cendron
 
   01 Oct 2010; Tupone Alfredo <tupone@gentoo.org> glbsp-2.20.ebuild,
   +files/glbsp-2.20-ldflags.patch:
diff --git a/games-util/glbsp/Manifest b/games-util/glbsp/Manifest
index 7b60c9ed19ea..ea1511278771 100644
--- a/games-util/glbsp/Manifest
+++ b/games-util/glbsp/Manifest
@@ -1,5 +1,9 @@
 AUX glbsp-2.20-ldflags.patch 735 RMD160 f9f5fb9615b7aa6e7b0f868de1835686afa024ad SHA1 19416bcc2d3a5ae6aa2068d7d500401a529eb71f SHA256 17416914195cf79f2b29261c33af5441dcfadcdce2f40639fb873dcb91a81e30
+AUX glbsp-2.24-fltk.patch 1821 RMD160 fb3cfbd2cb856e2a5663dcb8bfdc1c2b6af8a873 SHA1 7bffd7a8e09da5caf786b4b3ee38ce7e179d4093 SHA256 6d56a41d533ed18ce8c0511a398ef98c2a623135d25fbdfe9e0619d4457f719e
+AUX glbsp-2.24-ldflags.patch 737 RMD160 1546b4740fb4d94be7653219b1beceec9d240057 SHA1 6eb1769726f9da91162ec53f001e519233685b2a SHA256 5eb6dec09423ac2a2d47267948390a0404d267c32afe2df3ace92cc6773d9822
 DIST glbsp_src_220.tar.gz 172283 RMD160 519a5bd72e41d7d00900df02b94363181a2438c1 SHA1 2b9f5e6441d9b94eed6cdb384b82537dbed33bbf SHA256 0b68b82962aff8c66c4663a5283fa28ef1287beb303dc0c09325e1cecaa8e4d3
+DIST glbsp_src_224.tar.gz 230977 RMD160 6c33d375898f57202993fdc975ade547725f78b5 SHA1 b4dcdefa623199d1e0df5cf98783a06404ea3e0c SHA256 e3b7c4bce21c2f9b77732a9b5920b6877e884b31dd1ed9273776538dba48a75c
 EBUILD glbsp-2.20.ebuild 1488 RMD160 d5780a8046f3f3919a8ff39fff33f0d716e8947e SHA1 5fa82ffdd10bccbd642df75d80f417dd56e3b8c8 SHA256 cca20d7366d5e3be5cfcb40569811c448ae17d7d3d09992aee7f30ae893c437d
-MISC ChangeLog 1452 RMD160 1cc18977ff6fcba4bca1957754d7f050e2a4dbc6 SHA1 411aff473af98254367e0255ef557b5e2ddc0839 SHA256 31056a2ee2e4d5997fc85e888614720d8cc8ab4ca31a07d47403deb4015407aa
+EBUILD glbsp-2.24.ebuild 1872 RMD160 be26b473a7973668d6c44a8e91b801e777b05309 SHA1 bfc36a1b0e39481342ab508af0a4e601aba6d287 SHA256 6f470fb62f5631e736992cb62972bb506573bbc1e28bd961f168b288a88b19fd
+MISC ChangeLog 1668 RMD160 842d72d46a66ce351240565ed8526fd608418f37 SHA1 9946f7d68559ce2447a1dfb7310a7510bc60ffcc SHA256 43745369c016356e1bdc5ef86b0f6d59d760503f85fd557bb8970649747d38e4
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-util/glbsp/files/glbsp-2.24-fltk.patch b/games-util/glbsp/files/glbsp-2.24-fltk.patch
new file mode 100644
index 000000000000..342914e574be
--- /dev/null
+++ b/games-util/glbsp/files/glbsp-2.24-fltk.patch
@@ -0,0 +1,68 @@
+--- gui/local.h.old	2010-11-25 10:27:46.000000000 +0100
++++ gui/local.h	2010-11-25 10:28:58.000000000 +0100
+@@ -43,37 +43,37 @@
+ #include <limits.h>
+ #include <assert.h>
+ 
+-#include <FL/Fl.H>
+-#include <FL/Fl_Box.H>
+-#include <FL/Fl_Browser.H>
+-#include <FL/Fl_Button.H>
+-#include <FL/Fl_Check_Button.H>
+-#include <FL/Fl_Counter.H>
+-#include <FL/Fl_File_Icon.H>
+-#include <FL/Fl_Group.H>
+-#include <FL/Fl_Hold_Browser.H>
+-#include <FL/Fl_Image.H>
+-#include <FL/Fl_Input.H>
+-#include <FL/Fl_Menu_Bar.H>
+-#include <FL/Fl_Menu_Item.H>
+-#include <FL/Fl_Multiline_Output.H>
+-#include <FL/Fl_Multi_Browser.H>
+-#include <FL/Fl_Pack.H>
+-#include <FL/Fl_Pixmap.H>
+-#include <FL/Fl_Return_Button.H>
+-#include <FL/Fl_Round_Button.H>
+-#include <FL/Fl_Scrollbar.H>
+-#include <FL/Fl_Slider.H>
++#include <FL/Fl.h>
++#include <FL/Fl_Box.h>
++#include <FL/Fl_Browser.h>
++#include <FL/Fl_Button.h>
++#include <FL/Fl_Check_Button.h>
++#include <FL/Fl_Counter.h>
++#include <FL/Fl_File_Icon.h>
++#include <FL/Fl_Group.h>
++#include <FL/Fl_Hold_Browser.h>
++#include <FL/Fl_Image.h>
++#include <FL/Fl_Input.h>
++#include <FL/Fl_Menu_Bar.h>
++#include <FL/Fl_Menu_Item.h>
++#include <FL/Fl_Multiline_Output.h>
++#include <FL/Fl_Multi_Browser.h>
++#include <FL/Fl_Pack.h>
++#include <FL/Fl_Pixmap.h>
++#include <FL/Fl_Return_Button.h>
++#include <FL/Fl_Round_Button.h>
++#include <FL/Fl_Scrollbar.h>
++#include <FL/Fl_Slider.h>
+ #ifdef MACOSX
+-#include <FL/Fl_Sys_Menu_Bar.H>
++#include <FL/Fl_Sys_Menu_Bar.h>
+ #endif
+-#include <FL/Fl_Value_Input.H>
+-#include <FL/Fl_Widget.H>
+-#include <FL/Fl_Window.H>
++#include <FL/Fl_Value_Input.h>
++#include <FL/Fl_Widget.h>
++#include <FL/Fl_Window.h>
+ 
+-#include <FL/fl_ask.H>
+-#include <FL/fl_draw.H>
+-#include <FL/Fl_File_Chooser.H>
++#include <FL/fl_ask.h>
++#include <FL/fl_draw.h>
++#include <FL/Fl_File_Chooser.h>
+ 
+ 
+ //
diff --git a/games-util/glbsp/files/glbsp-2.24-ldflags.patch b/games-util/glbsp/files/glbsp-2.24-ldflags.patch
new file mode 100644
index 000000000000..e6adb0ff035c
--- /dev/null
+++ b/games-util/glbsp/files/glbsp-2.24-ldflags.patch
@@ -0,0 +1,22 @@
+--- Makefile.unx.old	2010-11-25 11:24:48.000000000 +0100
++++ Makefile.unx	2010-11-25 11:25:10.000000000 +0100
+@@ -79,8 +79,7 @@
+ 	$(CC) $(CMD_FLAGS) -c $^ -o $@
+ 
+ $(CMD_NAME): $(LIB_NAME) $(CMD_OBJS)
+-	$(CC) $(CMD_FLAGS) $(CMD_OBJS) -o $@ $(LIB_NAME) $(CMD_LIBS)
+-	$(STRIP) $@
++	$(CC) $(CMD_FLAGS) $(LDFLAGS) $(CMD_OBJS) -o $@ $(LIB_NAME) $(CMD_LIBS)
+ 
+ install: $(CMD_NAME)
+ 	cp $(CMD_NAME) $(INSTALL_PREFIX)/bin/
+--- Makefile.unx.old	2010-11-25 11:31:27.000000000 +0100
++++ Makefile.unx	2010-11-25 11:31:31.000000000 +0100
+@@ -125,7 +125,6 @@
+ 
+ $(GUI_NAME): $(LIB_NAME) $(GUI_OBJS)
+ 	$(CXX) $(GUI_FLAGS) $(GUI_OBJS) -o $@ $(LIB_NAME) $(GUI_LIBS)
+-	$(STRIP) $@
+ 
+ 
+ # ----- DOCUMENTATION ---------------------------------------------
diff --git a/games-util/glbsp/glbsp-2.24.ebuild b/games-util/glbsp/glbsp-2.24.ebuild
new file mode 100644
index 000000000000..1006b6510e33
--- /dev/null
+++ b/games-util/glbsp/glbsp-2.24.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/glbsp/glbsp-2.24.ebuild,v 1.1 2010/11/25 10:58:59 tupone Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator 1)
+DESCRIPTION="A node builder specially designed for OpenGL ports of the DOOM game engine"
+HOMEPAGE="http://glbsp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/glbsp/${PN}_src_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="fltk"
+
+RDEPEND="fltk? ( x11-libs/fltk:1.1 )"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}"/${P}-source
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	sed -i \
+		-e "/^CC=/s:=.*:=$(tc-getCC):" \
+		-e "/^CXX=/s:=.*:=$(tc-getCXX):" \
+		-e "/^AR=/s:ar:$(tc-getAR):" \
+		-e "/^RANLIB=/s:=.*:=$(tc-getRANLIB):" \
+		-e "s:-O2:${CFLAGS}:" \
+		-e "s:-O -g3:${CFLAGS}:" \
+		Makefile.unx \
+		nodeview/Makefile.unx \
+		|| die "sed failed"
+}
+
+src_compile() {
+	emake -f Makefile.unx || die "emake failed"
+	if use fltk ; then
+		emake -f Makefile.unx glBSPX \
+			FLTK_FLAGS="$(fltk-config --cflags)" \
+			FLTK_LIBS="$(fltk-config --use-images --ldflags)" \
+			|| die "emake failed"
+		emake -f Makefile.unx -C nodeview \
+			FLTK_CFLAGS="$(fltk-config --cflags)" \
+			FLTK_LIBS="$(fltk-config --use-images --ldflags)" \
+			|| die "emake failed"
+	fi
+}
+
+src_install() {
+	dobin glbsp || die "dobin failed"
+	dolib.a libglbsp.a || die "dolib.a failed"
+	doman glbsp.1
+	dodoc AUTHORS.txt glbsp.txt
+	insinto "/usr/include"
+	doins "src/glbsp.h" || die "doins failed"
+
+	if use fltk ; then
+		newbin glBSPX glbspx || die "newbin failed"
+		newicon gui/icon.xpm glbspx.xpm
+		make_desktop_entry glbspx glBSPX glbspx
+
+		dobin nodeview/nodeview || die "dobin failed"
+		docinto nodeview
+		dodoc nodeview/{README,TODO}.txt || die "dodoc failed"
+	fi
+}