Bump to recent svn version and import to main tree (bug #349367)

(Portage version: 2.1.11.14/cvs/Linux x86_64)

6 files changed, 249 insertions, 0 deletions

diff --git a/dev-games/gigi/ChangeLog b/dev-games/gigi/ChangeLog
new file mode 100644
index 000000000000..7fe6be58af5a
--- /dev/null
+++ b/dev-games/gigi/ChangeLog
@@ -0,0 +1,15 @@
+# ChangeLog for dev-games/gigi
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/gigi/ChangeLog,v 1.1 2012/09/11 15:57:21 tomka Exp $
+
+  05 May 2012; Mike Gilbert <floppym@gentoo.org> gigi-0.8.0_pre1074.ebuild:
+  Use pkgconfig virtual.
+
+*gigi-0.8.0_pre1074 (23 Apr 2012)
+
+  23 Apr 2012; hasufell <julian.ospald@googlemail.com>
+  +gigi-0.8.0_pre1074.ebuild, +files/gigi-0.8.0_pre1074-devil.patch,
+  +files/gigi-0.8.0_pre1074-docdir.patch,
+  +files/gigi-0.8.0_pre1074-libtool.patch, +metadata.xml:
+  New Ebuild for bug 349367 thanks to all
+
diff --git a/dev-games/gigi/files/gigi-0.8_pre20120910-devil.patch b/dev-games/gigi/files/gigi-0.8_pre20120910-devil.patch
new file mode 100644
index 000000000000..1b2ac31dd566
--- /dev/null
+++ b/dev-games/gigi/files/gigi-0.8_pre20120910-devil.patch
@@ -0,0 +1,18 @@
+From: hasufell <julian.ospald@googlemail.com>
+Date: Sun Apr 22 23:43:33 UTC 2012
+
+fix devil library variables
+
+!! applied on top of libtool.patch !!
+
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -176,7 +176,7 @@
+ 
+ set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LIBTOOL_LIB})
+ if (USE_DEVIL)
+-    list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})
++	list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARIES} ${ILU_LIBRARIES} ${ILUT_LIBRARIES})
+ else ()
+     if (JPEG_FOUND)
+         list(APPEND THIS_LIB_LINK_LIBS ${JPEG_LIBRARIES})
diff --git a/dev-games/gigi/files/gigi-0.8_pre20120910-docdir.patch b/dev-games/gigi/files/gigi-0.8_pre20120910-docdir.patch
new file mode 100644
index 000000000000..cd4635faac44
--- /dev/null
+++ b/dev-games/gigi/files/gigi-0.8_pre20120910-docdir.patch
@@ -0,0 +1,18 @@
+From: hasufell <julian.ospald@googlemail.com>
+Date: Thu Apr 19 19:26:44 UTC 2012
+
+fixed hardcoded DOCDIR
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -332,8 +332,8 @@
+     endif ()
+     if (BUILD_DOCUMENTATION AND NOT NO_DOCS_PACKAGE)
+         install(
+-            DIRECTORY ${CMAKE_BINARY_DIR}/doc/GG
+-            DESTINATION doc
++            DIRECTORY ${CMAKE_BINARY_DIR}/doc/GG/
++	    DESTINATION ${DOCDIR}
+         )
+     endif ()
+ elseif (BUILD_DOCUMENTATION)
diff --git a/dev-games/gigi/files/gigi-0.8_pre20120910-libtool.patch b/dev-games/gigi/files/gigi-0.8_pre20120910-libtool.patch
new file mode 100644
index 000000000000..29a7a4071eeb
--- /dev/null
+++ b/dev-games/gigi/files/gigi-0.8_pre20120910-libtool.patch
@@ -0,0 +1,93 @@
+diff -U 3 -dHrN gigi-0.8_pre20120910.orig/CMakeLists.txt gigi-0.8_pre20120910/CMakeLists.txt
+--- gigi-0.8_pre20120910.orig/CMakeLists.txt	2012-09-10 18:48:32.272877323 -0700
++++ gigi-0.8_pre20120910/CMakeLists.txt	2012-09-10 18:48:49.759553898 -0700
+@@ -228,36 +228,6 @@
+ ########################################
+ # Header Generation                    #
+ ########################################
+-if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h)
+-    if (UNIX)
+-        message("-- Configuring libltdl using \"libltdl/configure\" ...")
+-        execute_process(
+-            COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure
+-            WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl
+-            OUTPUT_QUIET
+-        )
+-    else ()
+-        file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h
+-             "/* WARNING: Generated by GG's build system.  All local changes will be lost! */
+-#define error_t int
+-#define HAVE_STDIO_H 1
+-#define HAVE_STDLIB_H 1
+-#define HAVE_STRING_H 1
+-#define HAVE_CTYPE_H 1
+-#define HAVE_MEMORY_H 1
+-#define HAVE_ERRNO_H 1
+-#define __WIN32__
+-#define HAVE_MEMCPY 1
+-#define HAVE_MEMMOVE 1
+-#define LTDL_OBJDIR \".libs\"
+-#define LTDL_DLOPEN_DEPLIBS 1
+-#define LTDL_SHLIBPATH_VAR \"PATH\"
+-#define LTDL_SHLIB_EXT \".dll\"
+-"
+-        )
+-    endif ()
+-endif ()
+-
+ configure_file(
+     ${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in
+     ${CMAKE_HOME_DIRECTORY}/GG/Config.h
+diff -U 3 -dHrN gigi-0.8_pre20120910.orig/GG/PluginInterface.h gigi-0.8_pre20120910/GG/PluginInterface.h
+--- gigi-0.8_pre20120910.orig/GG/PluginInterface.h	2012-09-10 18:48:32.301876786 -0700
++++ gigi-0.8_pre20120910/GG/PluginInterface.h	2012-09-10 18:49:02.264322634 -0700
+@@ -35,7 +35,7 @@
+ #if defined(__APPLE__) && defined(__MACH__)

+ # include "../libltdl/ltdl.h"

+ #else

+-# include <GG/ltdl.h>

++# include <ltdl.h>

+ #endif

+ 

+ #include <string>

+diff -U 3 -dHrN gigi-0.8_pre20120910.orig/src/CMakeLists.txt gigi-0.8_pre20120910/src/CMakeLists.txt
+--- gigi-0.8_pre20120910.orig/src/CMakeLists.txt	2012-09-10 18:48:32.327876305 -0700
++++ gigi-0.8_pre20120910/src/CMakeLists.txt	2012-09-10 18:48:49.759553898 -0700
+@@ -50,8 +50,6 @@
+     dialogs/FileDlg.cpp
+     dialogs/ThreeButtonDlg.cpp
+ 
+-    ../libltdl/ltdl.c
+-
+     adobe/adam.cpp
+     adobe/adam_evaluate.cpp
+     adobe/adam_parser.cpp
+@@ -162,14 +160,21 @@
+     )
+ endif ()
+ 
+-set_source_files_properties(${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.c PROPERTIES COMPILE_DEFINITIONS HAVE_CONFIG_H=1)
+-execute_process(
+-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl.h
+-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/config.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h
+-)
+-set_source_files_properties(${CMAKE_HOME_DIRECTORY}/GG/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h PROPERTIES GENERATED true)
++find_library(LIBTOOL_LIB ltdl)
++if (LIBTOOL_LIB)
++	MESSAGE(STATUS "  libtool-libraries : ${LIBTOOL_LIB}")
++else (LIBTOOL_LIB)
++	MESSAGE(FATAL_ERROR "libtool library not found!")
++endif (LIBTOOL_LIB)
+ 
+-set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES})
++find_file(LIBTOOL_HEADER ltdl.h PATHS ${CMAKE_INCLUDE_PATH})
++if (LIBTOOL_HEADER)
++	MESSAGE(STATUS "  libtool-header : ${LIBTOOL_HEADER}")
++else (LIBTOOL_HEADER)
++	MESSAGE(FATAL_ERROR "libtool header not found!")
++endif (LIBTOOL_HEADER)
++
++set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LIBTOOL_LIB})
+ if (USE_DEVIL)
+     list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})
+ else ()
diff --git a/dev-games/gigi/gigi-0.8_pre20120910.ebuild b/dev-games/gigi/gigi-0.8_pre20120910.ebuild
new file mode 100644
index 000000000000..ced8c16245f0
--- /dev/null
+++ b/dev-games/gigi/gigi-0.8_pre20120910.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/gigi/gigi-0.8_pre20120910.ebuild,v 1.1 2012/09/11 15:57:21 tomka Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit cmake-utils eutils python
+
+DESCRIPTION="An OpenGL interface library"
+HOMEPAGE="http://gigi.sourceforge.net"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${PF}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="devil doc eve ogre ois sdl static-libs threads"
+RESTRICT="test" # fails for unknown reasons
+
+RDEPEND="
+	>=dev-libs/boost-1.47
+	media-libs/freetype:2
+	sys-devel/libtool
+	sys-libs/zlib
+	x11-libs/libX11
+	virtual/opengl
+	devil? ( >=media-libs/devil-1.6.1 )
+	!devil? (
+		media-libs/libpng:0
+		media-libs/tiff:0
+		virtual/jpeg
+	)
+	ogre? (
+		>=dev-games/ogre-1.7.4[ois?]
+		ois? ( dev-games/ois )
+	)
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+REQUIRED_USE="ois? ( ogre )"
+
+CMAKE_USE_DIR="${S}"
+
+# For segfaults during compile see  https://qa.mandriva.com/show_bug.cgi?id=62558"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-docdir.patch
+
+	# use systems ltdl
+	rm -r "${CMAKE_USE_DIR}"/libltdl || die
+	epatch "${FILESDIR}"/${P}-libtool.patch
+
+	# fix devil (apply after libtool.patch)
+	epatch "${FILESDIR}"/${P}-devil.patch
+
+	python_convert_shebangs 2 GG/gen_signals.py
+}
+
+src_configure() {
+	# USE_DEVIL broken
+	# BUILD_TUTORIALS incomplete
+	local mycmakeargs=(
+		-DDOCDIR=/usr/share/doc/${PF}/html
+		-DRELEASE_COMPILE_FLAGS=""
+		$(cmake-utils_use_use devil DEVIL)
+		$(cmake-utils_use_build eve EXPERIMENTAL_EVE_SUPPORT)
+		$(cmake-utils_use_build ogre OGRE_DRIVER)
+		$(cmake-utils_use_build ois OGRE_OIS_PLUGIN)
+		$(cmake-utils_use_build sdl SDL_DRIVER)
+		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use_build static-libs STATIC)
+		$(cmake-utils_use_build threads MULTI_THREADED)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-games/gigi/metadata.xml b/dev-games/gigi/metadata.xml
new file mode 100644
index 000000000000..c5f7afa2d6aa
--- /dev/null
+++ b/dev-games/gigi/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>tomka@gentoo.org</email>
+    <name>Thomas Kahle</name>
+  </maintainer>
+  <use>
+    <flag name="devil">Use DevIL instead of libpng/libjpeg/libtiff</flag>
+    <flag name="eve">Add experimental eve support</flag>
+    <flag name="ogre">Add support for <pkg>dev-games/ogre</pkg></flag>
+    <flag name="ois">Add support for <pkg>dev-games/ois</pkg></flag>
+  </use>
+<longdescription lang="en">
+GiGi (aka GG) is a GUI library for OpenGL. It is platform-independent
+(it runs at least on Linux and Windows, and probably more),
+compiler-independent (it compiles under at GCC 3.4 or higher and
+MSVC++ 8.0 SP1 or higher, and probably more), and
+driver-independent. Reference drivers for SDL and Ogre are provided,
+and it is straightforward to write one for yourself should you decide
+to do so.
+
+The Gentoo version is slightly patched by the makers of
+games-strategy/freeorion.
+</longdescription>
+
+</pkgmetadata>