[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2024-07-03 Thread Eli Schwartz
commit: 8d11899d26e069449b3f753623a3e93cdf21b063
Author: Eli Schwartz  gmail  com>
AuthorDate: Sun Jun 30 23:36:36 2024 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Wed Jul  3 22:36:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d11899d

dev-games/clanlib: mark as strict-aliasing unsafe

Fixed in newer slots.

Closes: https://bugs.gentoo.org/855308
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Eli Schwartz  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r2.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
index e14357adc276..6cb8b3b5e63e 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Multi-platform game development library"
 HOMEPAGE="https://github.com/sphair/ClanLib";
@@ -67,6 +67,13 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing
+   # https://bugs.gentoo.org/855308
+   # Fixed in newer versions
+   # Do not trust with LTO either.
+   append-flags -fno-strict-aliasing
+   filter-lto
+
# clanSound only controls mikmod/vorbis so there's
# no need to pass --{en,dis}able-clanSound ...
# clanDisplay only controls X, SDL, OpenGL plugins



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2024-07-03 Thread Eli Schwartz
commit: 81d83040e872fba7f5fbd318f56e01e3aa69a1e9
Author: Eli Schwartz  gmail  com>
AuthorDate: Sun Jun 30 23:55:45 2024 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Wed Jul  3 22:36:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d83040

dev-games/clanlib: update EAPI 7 -> 8

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Eli Schwartz  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r3.ebuild | 106 ++
 dev-games/clanlib/clanlib-2.3.7-r4.ebuild |   2 +-
 dev-games/clanlib/clanlib-4.1.0-r1.ebuild |  77 ++
 3 files changed, 184 insertions(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r3.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r3.ebuild
new file mode 100644
index ..91061dde6339
--- /dev/null
+++ b/dev-games/clanlib/clanlib-0.8.1-r3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Multi-platform game development library"
+HOMEPAGE="https://github.com/sphair/ClanLib";
+SRC_URI="mirror://gentoo/ClanLib-${PV}.tgz"
+S="${WORKDIR}"/ClanLib-${PV}
+
+LICENSE="ZLIB"
+SLOT="0.8"
+# Not big endian safe! #82779
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
+
+# opengl keyword does not drop the GL/GLU requirement.
+# Autoconf files need to be fixed
+RDEPEND="
+   media-libs/alsa-lib
+   media-libs/libpng:0
+   virtual/jpeg:0
+   virtual/glu
+   virtual/opengl
+   x11-libs/libXi
+   x11-libs/libXmu
+   x11-libs/libXxf86vm
+   mikmod? ( media-libs/libmikmod )
+   sdl? (
+   media-libs/libsdl[X]
+   media-libs/sdl-gfx
+   )
+   vorbis? ( media-libs/libvorbis )
+"
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto
+"
+
+PATCHES=(
+   "${FILESDIR}/${P}-ndebug.patch"
+   "${FILESDIR}/${P}-gcc43.patch"
+   "${FILESDIR}/${P}-gcc44.patch"
+   "${FILESDIR}/${P}-gcc47.patch"
+   "${FILESDIR}/${P}-gcc6.patch"
+   "${FILESDIR}/${P}-llvm.patch"
+   "${FILESDIR}/${P}-libpng15.patch"
+   "${FILESDIR}/${P}-docbuilder.patch"
+   "${FILESDIR}/${P}-glibc2.34.patch"
+   "${FILESDIR}/${P}-gcc12.patch"
+   "${FILESDIR}"/${P}-makefile-duplicate-headers.patch
+)
+
+DOCS=(
+   CODING_STYLE CREDITS NEWS PATCHES
+   README{,.anjuta,.distros,.kdevelop,.sdl,.upgrade} INSTALL.linux
+)
+
+src_prepare() {
+   default
+   eautoreconf
+   # See #739358
+   sed -i -e "s:libdir=\${exec_prefix}/lib:libdir=@libdir@:g" \
+   pkgconfig/*.pc.in || die
+}
+
+src_configure() {
+   # -Werror=strict-aliasing
+   # https://bugs.gentoo.org/855308
+   # Fixed in newer versions
+   # Do not trust with LTO either.
+   append-flags -fno-strict-aliasing
+   filter-lto
+
+   # clanSound only controls mikmod/vorbis so there's
+   # no need to pass --{en,dis}able-clanSound ...
+   # clanDisplay only controls X, SDL, OpenGL plugins
+   # so no need to pass --{en,dis}able-clanDisplay
+   # also same reason why we don't have to use clanGUI
+   econf \
+   --enable-dyn \
+   --enable-clanNetwork \
+   $(use_enable x86 asm386) \
+   $(use_enable doc docs) \
+   $(use_enable opengl clanGL) \
+   $(use_enable sdl clanSDL) \
+   $(use_enable vorbis clanVorbis) \
+   $(use_enable mikmod clanMikMod) \
+   $(use_enable ipv6 getaddr) \
+   $(use_enable static-libs static)
+}
+
+src_install() {
+   default
+
+   if use doc ; then
+   dodir /usr/share/doc/${PF}/html
+   mv "${D}"/usr/share/doc/clanlib/* 
"${D}"/usr/share/doc/${PF}/html/ || die
+   rm -rf "${D}"/usr/share/doc/clanlib
+   cp -r Examples Resources "${D}"/usr/share/doc/${PF}/ || die
+   fi
+
+   find "${ED}" -name '*.la' -delete || die
+}

diff --git a/dev-games/clanlib/clanlib-2.3.7-r4.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r4.ebuild
index 6ba2413bff53..24cbee039a3e 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r4.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools toolchain-funcs
 

diff --git a/dev-games/clanlib/clanlib-4.1.0-r1.ebuild 
b/dev-games/clanlib/clanlib-4.1.0-r1.ebuild
new file mode 100644
index ..8ddb515551e2
--- /dev/null
+++ b/dev-games/clanlib/clanlib-4.1.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_PN=ClanLib
+
+DESCRIPTION="Multi-platform game development library"
+HOMEPAGE="https://github.com/sphair/Clan

[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/, dev-games/clanlib/files/

2024-07-03 Thread Eli Schwartz
commit: 3fb8f40ec2c632603d3cef4949dbc46b4ccaadda
Author: Eli Schwartz  gmail  com>
AuthorDate: Sun Jun 30 23:30:50 2024 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Wed Jul  3 22:36:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb8f40e

dev-games/clanlib: add patch to successfully eautoreconf

It uses a heavily vintage autoconf 2.59 and libtool 1.5.22, which emits
an autoconf-based Modern C warning in configure probes and isn't
currently patch'able for e.g. LTO warning flags by elibtoolize.

Closes: https://bugs.gentoo.org/898980
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Eli Schwartz  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r2.ebuild  |  6 -
 .../clanlib-0.8.1-makefile-duplicate-headers.patch | 29 ++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
index 4235f050aabd..e14357adc276 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="Multi-platform game development library"
 HOMEPAGE="https://github.com/sphair/ClanLib";
 SRC_URI="mirror://gentoo/ClanLib-${PV}.tgz"
@@ -48,6 +50,7 @@ PATCHES=(
"${FILESDIR}/${P}-docbuilder.patch"
"${FILESDIR}/${P}-glibc2.34.patch"
"${FILESDIR}/${P}-gcc12.patch"
+   "${FILESDIR}"/${P}-makefile-duplicate-headers.patch
 )
 
 DOCS=(
@@ -57,6 +60,7 @@ DOCS=(
 
 src_prepare() {
default
+   eautoreconf
# See #739358
sed -i -e "s:libdir=\${exec_prefix}/lib:libdir=@libdir@:g" \
pkgconfig/*.pc.in || die

diff --git 
a/dev-games/clanlib/files/clanlib-0.8.1-makefile-duplicate-headers.patch 
b/dev-games/clanlib/files/clanlib-0.8.1-makefile-duplicate-headers.patch
new file mode 100644
index ..cdd7e67f83ab
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-makefile-duplicate-headers.patch
@@ -0,0 +1,29 @@
+From 54eb2a8e72f782792ab53d7c989deec52059990a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Sun, 30 Jun 2024 19:24:50 -0400
+Subject: [PATCH] build: fix duplicated header in Makefile.am
+
+Regenerating configure/Makefiles with newer autotools versions results
+in build failures: a more optimized routine is used for installing
+headers in bulk, which is sensitive to listing the same file twice as
+part of a single `install ...` invocation. Not present in newer clanlib
+versions.
+---
+ Sources/API/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Sources/API/Makefile.am b/Sources/API/Makefile.am
+index 5686330..8dcb56e 100644
+--- a/Sources/API/Makefile.am
 b/Sources/API/Makefile.am
+@@ -232,7 +232,6 @@ clanCore_includes = \
+   Core/System/event_trigger.h \
+   Core/System/console_window.h \
+   Core/System/keep_alive.h \
+-  Core/System/log.h \
+   Core/System/crash_reporter.h \
+   Core/System/call_stack.h \
+   Core/System/clanstring.h \
+-- 
+2.44.2
+



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2024-07-03 Thread Eli Schwartz
commit: 514b8668d9e8beeba0f6530fe1254df337e75f07
Author: Eli Schwartz  gmail  com>
AuthorDate: Sun Jun 30 23:51:10 2024 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Wed Jul  3 22:36:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514b8668

dev-games/clanlib: fix ignored USE=static-libs in slot 2.3

It is a no-op. In gentoo-historical-2.git, the addition of version 2.4.3
to the tree reworked the econf flags and dropped the functionality of
actually passing $(use_enable) based on this USE flag.

https://gitweb.gentoo.org/archive/repo/gentoo-2.git/commit/?id=dde0b5c459de07f06abeea223a9fe5612bdc0ab1

One might ponder why the flag should exist at all, if no one used it. In
fact, due to EAPI 7 it was always installed. :( That being said, the
other slots for this package supported it correctly, which means by
default they weren't installed.

Fix this slot to act the same way: correctly.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Eli Schwartz  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r4.ebuild | 120 ++
 1 file changed, 120 insertions(+)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r4.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r4.ebuild
new file mode 100644
index ..6ba2413bff53
--- /dev/null
+++ b/dev-games/clanlib/clanlib-2.3.7-r4.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_P=ClanLib-${PV}
+DESCRIPTION="Multi-platform game development library"
+HOMEPAGE="https://github.com/sphair/ClanLib";
+SRC_URI="mirror://gentoo/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 mikmod opengl +sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
+REQUIRED_USE="opengl? ( X )"
+
+BDEPEND="
+   virtual/pkgconfig
+   doc? (
+   app-text/doxygen
+   dev-lang/perl
+   media-gfx/graphviz
+   )
+"
+RDEPEND="
+   sys-libs/zlib
+   X? (
+   app-arch/bzip2
+   media-libs/libpng:0
+   media-libs/freetype
+   media-libs/fontconfig
+   media-libs/libjpeg-turbo:0=
+   x11-libs/libX11
+   opengl? ( virtual/opengl )
+   )
+   mikmod? (
+   media-libs/alsa-lib
+   media-libs/libmikmod
+   )
+   sqlite? ( dev-db/sqlite:3 )
+   sound? ( media-libs/alsa-lib )
+   vorbis? (
+   media-libs/alsa-lib
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-autotools.patch
+   "${FILESDIR}"/${P}-doc.patch
+   "${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
+   "${FILESDIR}"/${P}-glibc2.34.patch
+   "${FILESDIR}"/${P}-32bit-opengl.patch
+   # From Fedora
+   "${FILESDIR}"/${P}-gcc47.patch
+   "${FILESDIR}"/${P}-gcc7.patch
+   "${FILESDIR}"/${P}-non-x86.patch
+   "${FILESDIR}"/${P}-no-ldflags-for-conftest.patch
+   "${FILESDIR}"/${P}-no-wm_type-in-fs.patch
+)
+
+DOCS=( CODING_STYLE CREDITS PATCHES README )
+
+src_prepare() {
+   default
+
+   eautoreconf
+
+   ln -sf ../../../Sources/API 
Documentation/Utilities/ReferenceDocs/ClanLib || die
+}
+
+src_configure() {
+   # Add -DPACKAGE_BUGREPORT?
+   local myeconfargs=(
+   $(use_enable doc docs)
+   $(use_enable cpu_flags_x86_sse2 sse2)
+   $(use_enable opengl clanGL)
+   $(use_enable opengl clanGL1)
+   $(use_enable opengl clanGUI)
+   $(use_enable X clanDisplay)
+   $(use_enable vorbis clanVorbis)
+   $(use_enable mikmod clanMikMod)
+   $(use_enable sqlite clanSqlite)
+   $(use_enable ipv6 getaddr)
+   $(use_enable static-libs static)
+   )
+
+   use sound \
+   || use vorbis \
+   || use mikmod \
+   || myeconfargs+=( --disable-clanSound )
+
+   tc-export PKG_CONFIG
+
+   econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   emake
+
+   use doc && emake html
+}
+
+# html files are keeped in a directory that is dependent on the SLOT
+# so to keep eventual bookmarks to the doc from version to version
+src_install() {
+   default
+
+   find "${ED}" -type f -name '*.la' -delete || die
+
+   if use doc ; then
+   emake DESTDIR="${D}" install-html
+   dodoc -r Examples Resources
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2023-09-26 Thread Sam James
commit: c1c5a987682b51f6b1a7f6d16b5d5963aa01f89e
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 06:34:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 06:34:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c5a987

dev-games/clanlib: Stabilize 4.1.0 amd64, #914809

Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-4.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-4.1.0.ebuild 
b/dev-games/clanlib/clanlib-4.1.0.ebuild
index f8ffb5035212..27f4db725e7c 100644
--- a/dev-games/clanlib/clanlib-4.1.0.ebuild
+++ b/dev-games/clanlib/clanlib-4.1.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="ZLIB"
 SLOT="4.1"
-KEYWORDS="~amd64 x86" #not big endian safe #82779
+KEYWORDS="amd64 x86" #not big endian safe #82779
 IUSE="cpu_flags_x86_sse2 doc examples ipv6 opengl +sound static-libs X"
 REQUIRED_USE="opengl? ( X )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2023-09-26 Thread Sam James
commit: 430766d0eefb0a9e8baea7b76c83ee553fe6bea7
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 06:15:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 06:15:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=430766d0

dev-games/clanlib: Stabilize 4.1.0 x86, #914809

Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-4.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-games/clanlib/clanlib-4.1.0.ebuild 
b/dev-games/clanlib/clanlib-4.1.0.ebuild
index f3ae7bf96b0d..f8ffb5035212 100644
--- a/dev-games/clanlib/clanlib-4.1.0.ebuild
+++ b/dev-games/clanlib/clanlib-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="ZLIB"
 SLOT="4.1"
-KEYWORDS="~amd64 ~x86" #not big endian safe #82779
+KEYWORDS="~amd64 x86" #not big endian safe #82779
 IUSE="cpu_flags_x86_sse2 doc examples ipv6 opengl +sound static-libs X"
 REQUIRED_USE="opengl? ( X )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/files/, dev-games/clanlib/

2023-02-06 Thread Sam James
commit: a27030c936e32a14b0652aaac02788b9e41a607a
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  6 22:13:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  6 22:13:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27030c9

dev-games/clanlib: fix build w/ gcc 12

Closes: https://bugs.gentoo.org/877301
Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r2.ebuild |  3 ++-
 dev-games/clanlib/files/clanlib-0.8.1-gcc12.patch | 12 
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
index 71d3a0c5b785..4235f050aabd 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,7 @@ PATCHES=(
"${FILESDIR}/${P}-libpng15.patch"
"${FILESDIR}/${P}-docbuilder.patch"
"${FILESDIR}/${P}-glibc2.34.patch"
+   "${FILESDIR}/${P}-gcc12.patch"
 )
 
 DOCS=(

diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc12.patch 
b/dev-games/clanlib/files/clanlib-0.8.1-gcc12.patch
new file mode 100644
index ..68ed616b3ca7
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc12.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/877301
+--- a/Sources/API/Core/System/cl_assert.h
 b/Sources/API/Core/System/cl_assert.h
+@@ -33,6 +33,8 @@
+ #ifndef header_cl_assert
+ #define header_cl_assert
+ 
++#include 
++
+ #ifdef CL_API_DLL
+ #ifdef CL_CORE_EXPORT
+ #define CL_API_CORE __declspec(dllexport)



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2022-12-18 Thread Ionen Wolkens
commit: 77059bc5662b164e9583e31dc3e29e8f79a5c069
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Dec 19 06:28:08 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Dec 19 07:11:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77059bc5

dev-games/clanlib: drop 2.3.7-r2

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r2.ebuild | 108 --
 1 file changed, 108 deletions(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r2.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
deleted file mode 100644
index 600c112305e3..
--- a/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-MY_P=ClanLib-${PV}
-DESCRIPTION="Multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/";
-SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz";
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="ZLIB"
-SLOT="2.3"
-# Not big endian safe! #82779
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
-REQUIRED_USE="opengl? ( X )"
-
-BDEPEND="
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen dev-lang/perl )
-"
-RDEPEND="
-   sys-libs/zlib
-   X? (
-   app-arch/bzip2
-   media-libs/libpng:0
-   media-libs/freetype
-   media-libs/fontconfig
-   virtual/jpeg:0
-   x11-libs/libX11
-   opengl? ( virtual/opengl )
-   )
-   mikmod? (
-   media-libs/alsa-lib
-   media-libs/libmikmod
-   )
-   sqlite? ( dev-db/sqlite:3 )
-   sound? ( media-libs/alsa-lib )
-   vorbis? (
-   media-libs/alsa-lib
-   media-libs/libogg
-   media-libs/libvorbis
-   )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-autotools.patch
-   "${FILESDIR}"/${P}-doc.patch
-   "${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
-   "${FILESDIR}"/${P}-glibc2.34.patch
-   "${FILESDIR}"/${P}-32bit-opengl.patch
-)
-
-DOCS=( CODING_STYLE CREDITS PATCHES README )
-
-src_prepare() {
-   default
-
-   eautoreconf
-
-   ln -sf ../../../Sources/API 
Documentation/Utilities/ReferenceDocs/ClanLib || die
-}
-
-src_configure() {
-   # Add -DPACKAGE_BUGREPORT?
-   local myeconfargs=(
-   $(use_enable doc docs)
-   $(use_enable cpu_flags_x86_sse2 sse2)
-   $(use_enable opengl clanGL)
-   $(use_enable opengl clanGL1)
-   $(use_enable opengl clanGUI)
-   $(use_enable X clanDisplay)
-   $(use_enable vorbis clanVorbis)
-   $(use_enable mikmod clanMikMod)
-   $(use_enable sqlite clanSqlite)
-   $(use_enable ipv6 getaddr)
-   )
-
-   use sound \
-   || use vorbis \
-   || use mikmod \
-   || myeconfargs+=( --disable-clanSound )
-
-   tc-export PKG_CONFIG
-
-   econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-   emake
-
-   use doc && emake html
-}
-
-# html files are keeped in a directory that is dependent on the SLOT
-# so to keep eventual bookmarks to the doc from version to version
-src_install() {
-   default
-
-   if use doc ; then
-   emake DESTDIR="${D}" install-html
-   dodoc -r Examples Resources
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2022-12-18 Thread Ionen Wolkens
commit: f6ad6dea63083be5cd13be2b4273cc0b9dd9ff81
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Dec 19 06:29:01 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Dec 19 07:11:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ad6dea

dev-games/clanlib: enable USE=sound by default

sound being disabled typically doesn't make much sense on games
and their libraries, and the alsa dependency is trivial

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r3.ebuild | 2 +-
 dev-games/clanlib/clanlib-4.1.0.ebuild| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
index 975b63c0c925..adedc2bd65bf 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="ZLIB"
 SLOT="2.3"
 KEYWORDS="amd64 x86"
-IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
+IUSE="doc ipv6 mikmod opengl +sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
 REQUIRED_USE="opengl? ( X )"
 
 BDEPEND="

diff --git a/dev-games/clanlib/clanlib-4.1.0.ebuild 
b/dev-games/clanlib/clanlib-4.1.0.ebuild
index 257d24b427cb..f3ae7bf96b0d 100644
--- a/dev-games/clanlib/clanlib-4.1.0.ebuild
+++ b/dev-games/clanlib/clanlib-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="ZLIB"
 SLOT="4.1"
 KEYWORDS="~amd64 ~x86" #not big endian safe #82779
-IUSE="cpu_flags_x86_sse2 doc examples ipv6 opengl sound static-libs X"
+IUSE="cpu_flags_x86_sse2 doc examples ipv6 opengl +sound static-libs X"
 REQUIRED_USE="opengl? ( X )"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2022-12-18 Thread Ionen Wolkens
commit: 957448e9ffb07cfd1234e63fad26899d8ceb6c8d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Dec 19 06:32:16 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Dec 19 07:11:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=957448e9

dev-games/clanlib: replace dead SRC_URI/HOMEPAGE in old slots

Closes: https://bugs.gentoo.org/881253
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r2.ebuild | 6 +++---
 dev-games/clanlib/clanlib-2.3.7-r3.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
index dc731f1467d2..71d3a0c5b785 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/";
-SRC_URI="http://clanlib.org/download/releases-${PV:0:3}/ClanLib-${PV}.tgz";
+HOMEPAGE="https://github.com/sphair/ClanLib";
+SRC_URI="mirror://gentoo/ClanLib-${PV}.tgz"
 S="${WORKDIR}"/ClanLib-${PV}
 
 LICENSE="ZLIB"

diff --git a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
index adedc2bd65bf..f3998ba284cb 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
@@ -7,8 +7,8 @@ inherit autotools toolchain-funcs
 
 MY_P=ClanLib-${PV}
 DESCRIPTION="Multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/";
-SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz";
+HOMEPAGE="https://github.com/sphair/ClanLib";
+SRC_URI="mirror://gentoo/${MY_P}.tgz"
 S="${WORKDIR}"/${MY_P}
 
 LICENSE="ZLIB"



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2022-12-13 Thread Arthur Zamarin
commit: 4e17260cbbd81b85d184c7c35d8e391d319204fd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Dec 13 18:06:10 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Dec 13 18:06:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e17260c

dev-games/clanlib: Stabilize 2.3.7-r3 x86, #885753

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
index d5d41ff83ea1..18f978d26e13 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="ZLIB"
 SLOT="2.3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
 REQUIRED_USE="opengl? ( X )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2022-12-13 Thread Arthur Zamarin
commit: 0aa18963b0d3d0d0b1ff0bfa2541b1f3464d46d3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Dec 13 18:06:11 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Dec 13 18:06:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa18963

dev-games/clanlib: Stabilize 2.3.7-r3 amd64, #885753

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
index 18f978d26e13..975b63c0c925 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="ZLIB"
 SLOT="2.3"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
 REQUIRED_USE="opengl? ( X )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2022-10-28 Thread Pacho Ramos
commit: 1bb9c87c365738a5a9122f196b2a50555aa83297
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Oct 28 22:46:14 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Oct 28 22:47:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb9c87c

dev-games/clanlib: Update dependency

Signed-off-by: Pacho Ramos  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
index 6707f8386f74..d5d41ff83ea1 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
media-libs/libpng:0
media-libs/freetype
media-libs/fontconfig
-   virtual/jpeg:0
+   media-libs/libjpeg-turbo:0=
x11-libs/libX11
opengl? ( virtual/opengl )
)



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/files/, dev-games/clanlib/

2022-10-28 Thread Pacho Ramos
commit: 1554cb63d8cf42132e194290366165f7ada66e6f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Oct 28 22:44:57 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Oct 28 22:47:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1554cb63

dev-games/clanlib: Drop .la files, fix dependencies and fixes from Fedora

Closes: https://bugs.gentoo.org/842165
Closes: https://bugs.gentoo.org/599634
Closes: https://bugs.gentoo.org/819396
Signed-off-by: Pacho Ramos  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r3.ebuild  | 119 +
 dev-games/clanlib/files/clanlib-2.3.7-gcc47.patch  | 107 ++
 dev-games/clanlib/files/clanlib-2.3.7-gcc7.patch   |  20 
 .../clanlib-2.3.7-no-ldflags-for-conftest.patch|  19 
 .../files/clanlib-2.3.7-no-wm_type-in-fs.patch |  12 +++
 .../clanlib/files/clanlib-2.3.7-non-x86.patch  |  38 +++
 6 files changed, 315 insertions(+)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
new file mode 100644
index ..6707f8386f74
--- /dev/null
+++ b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_P=ClanLib-${PV}
+DESCRIPTION="Multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/";
+SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz";
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
+REQUIRED_USE="opengl? ( X )"
+
+BDEPEND="
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-lang/perl
+   media-gfx/graphviz
+   )
+"
+RDEPEND="
+   sys-libs/zlib
+   X? (
+   app-arch/bzip2
+   media-libs/libpng:0
+   media-libs/freetype
+   media-libs/fontconfig
+   virtual/jpeg:0
+   x11-libs/libX11
+   opengl? ( virtual/opengl )
+   )
+   mikmod? (
+   media-libs/alsa-lib
+   media-libs/libmikmod
+   )
+   sqlite? ( dev-db/sqlite:3 )
+   sound? ( media-libs/alsa-lib )
+   vorbis? (
+   media-libs/alsa-lib
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-autotools.patch
+   "${FILESDIR}"/${P}-doc.patch
+   "${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
+   "${FILESDIR}"/${P}-glibc2.34.patch
+   "${FILESDIR}"/${P}-32bit-opengl.patch
+   # From Fedora
+   "${FILESDIR}"/${P}-gcc47.patch
+   "${FILESDIR}"/${P}-gcc7.patch
+   "${FILESDIR}"/${P}-non-x86.patch
+   "${FILESDIR}"/${P}-no-ldflags-for-conftest.patch
+   "${FILESDIR}"/${P}-no-wm_type-in-fs.patch
+)
+
+DOCS=( CODING_STYLE CREDITS PATCHES README )
+
+src_prepare() {
+   default
+
+   eautoreconf
+
+   ln -sf ../../../Sources/API 
Documentation/Utilities/ReferenceDocs/ClanLib || die
+}
+
+src_configure() {
+   # Add -DPACKAGE_BUGREPORT?
+   local myeconfargs=(
+   $(use_enable doc docs)
+   $(use_enable cpu_flags_x86_sse2 sse2)
+   $(use_enable opengl clanGL)
+   $(use_enable opengl clanGL1)
+   $(use_enable opengl clanGUI)
+   $(use_enable X clanDisplay)
+   $(use_enable vorbis clanVorbis)
+   $(use_enable mikmod clanMikMod)
+   $(use_enable sqlite clanSqlite)
+   $(use_enable ipv6 getaddr)
+   )
+
+   use sound \
+   || use vorbis \
+   || use mikmod \
+   || myeconfargs+=( --disable-clanSound )
+
+   tc-export PKG_CONFIG
+
+   econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   emake
+
+   use doc && emake html
+}
+
+# html files are keeped in a directory that is dependent on the SLOT
+# so to keep eventual bookmarks to the doc from version to version
+src_install() {
+   default
+
+   find "${ED}" -type f -name '*.la' -delete || die
+
+   if use doc ; then
+   emake DESTDIR="${D}" install-html
+   dodoc -r Examples Resources
+   fi
+}

diff --git a/dev-games/clanlib/files/clanlib-2.3.7-gcc47.patch 
b/dev-games/clanlib/files/clanlib-2.3.7-gcc47.patch
new file mode 100644
index ..58b55ccf0291
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-gcc47.patch
@@ -0,0 +1,107 @@
+diff -up ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp~ 
ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp~   2011-07-22 
10:03:21.0 +0200
 ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp2012-01-12 
22:16:39.779011207 +0100
+@@ -34,6 +34,7 @@
+ #

[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/files/, dev-games/clanlib/

2022-08-17 Thread Andreas Sturmlechner
commit: 030556fc39dd85f565939b35d169227e7c922eaa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 16 21:42:06 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 17 11:53:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030556fc

dev-games/clanlib: drop 4.0.0, EAPI-6--

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-games/clanlib/Manifest |  1 -
 dev-games/clanlib/clanlib-4.0.0.ebuild | 82 --
 .../files/clanlib-4.0.0-fix-build-system.patch | 25 ---
 .../files/clanlib-4.0.0-freetype_pkgconfig.patch   | 21 --
 4 files changed, 129 deletions(-)

diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 80783aecafbe..a54ac9118f5b 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,4 +1,3 @@
 DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 
7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9
 SHA512 
277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
 DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 
109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d
 SHA512 
73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
-DIST clanlib-4.0.0.tar.gz 7435551 BLAKE2B 
243fc2519ee90a12af37e8925c99db77785a9a5da497d870545bb489e76cbfcbb4cac81352731326a0cc59689a361b8ab14db2bb1e255da07696e378a9cfb6e5
 SHA512 
e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe
 DIST clanlib-4.1.0.tar.gz 6871886 BLAKE2B 
0aeb9e89998a9ef6975bf16a2e77f461e6415aacda9a26a5c0a9c6ec3c19a136a5f092c7866b60898251fbd6cb8aa7e96c86f6b87afb564824298fac77bf20c3
 SHA512 
34f5d1fdb7b071a218f081a6b06a6018a9c20cedc4c8500a9796be02d335f06fa148304379eeb1a35e08b9a734e504ceb490a6558a43d1611187bd97be01f4b0

diff --git a/dev-games/clanlib/clanlib-4.0.0.ebuild 
b/dev-games/clanlib/clanlib-4.0.0.ebuild
deleted file mode 100644
index 26eea39ba088..
--- a/dev-games/clanlib/clanlib-4.0.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-MY_PN=ClanLib
-
-DESCRIPTION="Multi-platform game development library"
-HOMEPAGE="https://github.com/sphair/ClanLib";
-SRC_URI="https://github.com/sphair/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="4.0"
-KEYWORDS="~amd64 ~x86" #not big endian safe #82779
-IUSE="cpu_flags_x86_sse2 doc examples ipv6 opengl sound static-libs X"
-REQUIRED_USE="opengl? ( X )"
-
-RDEPEND="
-   sys-libs/zlib
-   X? (
-   media-libs/freetype:2
-   media-libs/fontconfig
-   x11-libs/libX11
-   opengl? (
-   virtual/opengl
-   x11-libs/libXrender
-   )
-   )
-   sound? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   doc? (
-   app-doc/doxygen
-   dev-lang/perl
-   media-gfx/graphviz
-   )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.0.0-fix-build-system.patch
-   "${FILESDIR}"/${PN}-4.0.0-freetype_pkgconfig.patch #658424
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   local myeconfargs=(
-   $(use_enable doc docs)
-   $(use_enable cpu_flags_x86_sse2 sse2)
-   $(use_enable opengl clanGL)
-   $(use_enable opengl clanUI)
-   $(use_enable X clanDisplay)
-   $(use_enable sound clanSound)
-   $(use_enable ipv6 getaddr)
-   $(use_enable static-libs static)
-   )
-
-   tc-export PKG_CONFIG
-
-   econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-   default
-   use doc && emake html
-}
-
-src_install() {
-   default
-
-   use doc && emake DESTDIR="${D}" install-html
-   use examples && dodoc -r Examples Resources
-
-   # package provides .pc files
-   find "${ED}" -name '*.la' -delete || die
-}

diff --git a/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch 
b/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch
deleted file mode 100644
index a3500e22f7e1..
--- a/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-* Fix AM_CONDITIONAL to always be invoked
-* Install html files in proper --htmldir
-
 a/configure.ac
-+++ b/configure.ac
-@@ -437,8 +437,8 @@
-   fi
-   
-   if test "$enable_clanSound" = "auto"; then enable_clanSound=yes; fi
--  AM_CONDITIONAL(ALSA, t

[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2021-10-21 Thread Ionen Wolkens
commit: 5d8e8298775654ece9bacaef932cd7fe9d70c74b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Oct 22 00:51:18 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Oct 22 02:20:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8e8298

dev-games/clanlib: drop 0.8.1-r1, 2.3.7-r1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r1.ebuild |  93 --
 dev-games/clanlib/clanlib-2.3.7-r1.ebuild | 106 --
 2 files changed, 199 deletions(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
deleted file mode 100644
index d5fb6234027..000
--- a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/";
-SRC_URI="http://clanlib.org/download/releases-${PV:0:3}/ClanLib-${PV}.tgz";
-S="${WORKDIR}"/ClanLib-${PV}
-
-LICENSE="ZLIB"
-SLOT="0.8"
-# Not big endian safe! #82779
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
-
-# opengl keyword does not drop the GL/GLU requirement.
-# Autoconf files need to be fixed
-RDEPEND="
-   media-libs/alsa-lib
-   media-libs/libpng:0
-   virtual/jpeg:0
-   virtual/glu
-   virtual/opengl
-   x11-libs/libXi
-   x11-libs/libXmu
-   x11-libs/libXxf86vm
-   mikmod? ( media-libs/libmikmod )
-   sdl? (
-   media-libs/libsdl[X]
-   media-libs/sdl-gfx
-   )
-   vorbis? ( media-libs/libvorbis )
-"
-DEPEND="
-   ${RDEPEND}
-   x11-base/xorg-proto
-"
-
-PATCHES=(
-   "${FILESDIR}/${P}-ndebug.patch"
-   "${FILESDIR}/${P}-gcc43.patch"
-   "${FILESDIR}/${P}-gcc44.patch"
-   "${FILESDIR}/${P}-gcc47.patch"
-   "${FILESDIR}/${P}-gcc6.patch"
-   "${FILESDIR}/${P}-llvm.patch"
-   "${FILESDIR}/${P}-libpng15.patch"
-   "${FILESDIR}/${P}-docbuilder.patch"
-)
-
-DOCS=(
-   CODING_STYLE CREDITS NEWS PATCHES
-   README{,.anjuta,.distros,.kdevelop,.sdl,.upgrade} INSTALL.linux
-)
-
-src_prepare() {
-   default
-   # See #739358
-   sed -i -e "s:libdir=\${exec_prefix}/lib:libdir=@libdir@:g" \
-   pkgconfig/*.pc.in || die
-}
-
-src_configure() {
-   # clanSound only controls mikmod/vorbis so there's
-   # no need to pass --{en,dis}able-clanSound ...
-   # clanDisplay only controls X, SDL, OpenGL plugins
-   # so no need to pass --{en,dis}able-clanDisplay
-   # also same reason why we don't have to use clanGUI
-   econf \
-   --enable-dyn \
-   --enable-clanNetwork \
-   $(use_enable x86 asm386) \
-   $(use_enable doc docs) \
-   $(use_enable opengl clanGL) \
-   $(use_enable sdl clanSDL) \
-   $(use_enable vorbis clanVorbis) \
-   $(use_enable mikmod clanMikMod) \
-   $(use_enable ipv6 getaddr) \
-   $(use_enable static-libs static)
-}
-
-src_install() {
-   default
-
-   if use doc ; then
-   dodir /usr/share/doc/${PF}/html
-   mv "${D}"/usr/share/doc/clanlib/* 
"${D}"/usr/share/doc/${PF}/html/ || die
-   rm -rf "${D}"/usr/share/doc/clanlib
-   cp -r Examples Resources "${D}"/usr/share/doc/${PF}/ || die
-   fi
-
-   find "${ED}" -name '*.la' -delete || die
-}

diff --git a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
deleted file mode 100644
index de31fc373c2..000
--- a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-MY_P=ClanLib-${PV}
-DESCRIPTION="Multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/";
-SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz";
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="ZLIB"
-SLOT="2.3"
-# Not big endian safe! #82779
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
-REQUIRED_USE="opengl? ( X )"
-
-BDEPEND="
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen dev-lang/perl )
-"
-RDEPEND="
-   sys-libs/zlib
-   X? (
-   app-arch/bzip2
-   media-libs/libpng:0
-   media-libs/freetype
-   media-libs/fontconfig
-   virtual/jpeg:0
-   x11-libs/libX11
-   opengl? ( virtual/opengl )
-   )
-   mikmod? (
-   media-libs/alsa-lib
-   media-libs/libmikmod
-   )
-   sqlite? ( dev-db/sqlite:3 )
-   sound? ( media-libs/alsa-lib )
-   vorbis? (
-   media-l

[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2021-10-21 Thread Ionen Wolkens
commit: b7a1b4c623aaaf3c601a97d7565a58a28a3b5dd5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Oct 22 00:47:55 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Oct 22 02:20:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a1b4c6

dev-games/clanlib: stabilize 2.3.7-r2 for amd64, x86

Even if glibc-2.34 won't be stabled anytime soon, still want
fixes (bug #811591) in stable before it's keyworded.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r2.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
index 5a2389c1c05..600c112305e 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="ZLIB"
 SLOT="2.3"
 # Not big endian safe! #82779
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
 REQUIRED_USE="opengl? ( X )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2021-10-21 Thread Ionen Wolkens
commit: 204e05856e9184802532800d41f8692fdfdb52ce
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Oct 22 00:45:40 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Oct 22 02:20:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=204e0585

dev-games/clanlib: stabilize 0.8.1-r2 for amd64, x86

Even if glibc-2.34 won't be stabled anytime soon, still want
fixes (bug #808707) in stable before it's keyworded.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
index a52b9730199..dc731f1467d 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/ClanLib-${PV}
 LICENSE="ZLIB"
 SLOT="0.8"
 # Not big endian safe! #82779
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
 
 # opengl keyword does not drop the GL/GLU requirement.



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/files/, dev-games/clanlib/

2021-10-21 Thread Ionen Wolkens
commit: cbc343591d3efc77a714e71275d7c72181720cb5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Oct 22 01:37:32 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Oct 22 02:20:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc34359

dev-games/clanlib: fix :2.3 build on x86 with USE=opengl

This likely been broken in stable for a long time, perhaps since
the switch to libglvnd (assuming it was tested and ever worked).

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r2.ebuild |  1 +
 .../clanlib/files/clanlib-2.3.7-32bit-opengl.patch| 19 +++
 2 files changed, 20 insertions(+)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r2.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
index b27100b9778..5a2389c1c05 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
"${FILESDIR}"/${P}-doc.patch
"${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
"${FILESDIR}"/${P}-glibc2.34.patch
+   "${FILESDIR}"/${P}-32bit-opengl.patch
 )
 
 DOCS=( CODING_STYLE CREDITS PATCHES README )

diff --git a/dev-games/clanlib/files/clanlib-2.3.7-32bit-opengl.patch 
b/dev-games/clanlib/files/clanlib-2.3.7-32bit-opengl.patch
new file mode 100644
index 000..73d5287c5dd
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-32bit-opengl.patch
@@ -0,0 +1,19 @@
+Patch taken from Fedora, removes redefinitions that conflicts on x86.
+--- a/Sources/API/GL/opengl_defines.h
 b/Sources/API/GL/opengl_defines.h
+@@ -69,6 +69,4 @@
+ typedef void GLvoid;
+ typedef char GLchar;
+-typedef ptrdiff_t GLintptr;
+-typedef ptrdiff_t GLsizeiptr;
+ typedef struct __CLsync *CLsync;
+ 
+--- a/Sources/API/GL1/opengl1_defines.h
 b/Sources/API/GL1/opengl1_defines.h
+@@ -65,6 +65,4 @@
+ typedef void GLvoid;
+ typedef char GLchar;
+-typedef ptrdiff_t GLintptr;
+-typedef ptrdiff_t GLsizeiptr;
+ 
+ #else



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/, dev-games/clanlib/files/

2021-10-07 Thread Ionen Wolkens
commit: 84ee86e1399efb7a39b33f1ad7e00e5978111d5a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Oct  8 04:29:12 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Oct  8 04:37:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84ee86e1

dev-games/clanlib: fix consumers when built against glibc-2.34

Code to avoid issues was pre-existing but not enabled on Linux.

Affected 0.8 and 2.3 slots, >=4.0 is no longer using this function.

Closes: https://bugs.gentoo.org/808707
Closes: https://bugs.gentoo.org/811591
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r2.ebuild  |  94 ++
 dev-games/clanlib/clanlib-2.3.7-r2.ebuild  | 107 +
 .../clanlib/files/clanlib-0.8.1-glibc2.34.patch|  17 
 .../clanlib/files/clanlib-2.3.7-glibc2.34.patch|  17 
 4 files changed, 235 insertions(+)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
new file mode 100644
index 000..a52b9730199
--- /dev/null
+++ b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/";
+SRC_URI="http://clanlib.org/download/releases-${PV:0:3}/ClanLib-${PV}.tgz";
+S="${WORKDIR}"/ClanLib-${PV}
+
+LICENSE="ZLIB"
+SLOT="0.8"
+# Not big endian safe! #82779
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
+
+# opengl keyword does not drop the GL/GLU requirement.
+# Autoconf files need to be fixed
+RDEPEND="
+   media-libs/alsa-lib
+   media-libs/libpng:0
+   virtual/jpeg:0
+   virtual/glu
+   virtual/opengl
+   x11-libs/libXi
+   x11-libs/libXmu
+   x11-libs/libXxf86vm
+   mikmod? ( media-libs/libmikmod )
+   sdl? (
+   media-libs/libsdl[X]
+   media-libs/sdl-gfx
+   )
+   vorbis? ( media-libs/libvorbis )
+"
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto
+"
+
+PATCHES=(
+   "${FILESDIR}/${P}-ndebug.patch"
+   "${FILESDIR}/${P}-gcc43.patch"
+   "${FILESDIR}/${P}-gcc44.patch"
+   "${FILESDIR}/${P}-gcc47.patch"
+   "${FILESDIR}/${P}-gcc6.patch"
+   "${FILESDIR}/${P}-llvm.patch"
+   "${FILESDIR}/${P}-libpng15.patch"
+   "${FILESDIR}/${P}-docbuilder.patch"
+   "${FILESDIR}/${P}-glibc2.34.patch"
+)
+
+DOCS=(
+   CODING_STYLE CREDITS NEWS PATCHES
+   README{,.anjuta,.distros,.kdevelop,.sdl,.upgrade} INSTALL.linux
+)
+
+src_prepare() {
+   default
+   # See #739358
+   sed -i -e "s:libdir=\${exec_prefix}/lib:libdir=@libdir@:g" \
+   pkgconfig/*.pc.in || die
+}
+
+src_configure() {
+   # clanSound only controls mikmod/vorbis so there's
+   # no need to pass --{en,dis}able-clanSound ...
+   # clanDisplay only controls X, SDL, OpenGL plugins
+   # so no need to pass --{en,dis}able-clanDisplay
+   # also same reason why we don't have to use clanGUI
+   econf \
+   --enable-dyn \
+   --enable-clanNetwork \
+   $(use_enable x86 asm386) \
+   $(use_enable doc docs) \
+   $(use_enable opengl clanGL) \
+   $(use_enable sdl clanSDL) \
+   $(use_enable vorbis clanVorbis) \
+   $(use_enable mikmod clanMikMod) \
+   $(use_enable ipv6 getaddr) \
+   $(use_enable static-libs static)
+}
+
+src_install() {
+   default
+
+   if use doc ; then
+   dodir /usr/share/doc/${PF}/html
+   mv "${D}"/usr/share/doc/clanlib/* 
"${D}"/usr/share/doc/${PF}/html/ || die
+   rm -rf "${D}"/usr/share/doc/clanlib
+   cp -r Examples Resources "${D}"/usr/share/doc/${PF}/ || die
+   fi
+
+   find "${ED}" -name '*.la' -delete || die
+}

diff --git a/dev-games/clanlib/clanlib-2.3.7-r2.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
new file mode 100644
index 000..b27100b9778
--- /dev/null
+++ b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_P=ClanLib-${PV}
+DESCRIPTION="Multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/";
+SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz";
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="2.3"
+# Not big endian safe! #82779
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
+REQUIRED_USE="opengl? ( X )"
+
+BDEPEND="
+   virtual/pkgconfig
+   doc? ( app-doc/doxygen dev-lang/perl )
+"
+RDEPEND="
+   sys-libs/zlib
+   X? (
+   app-arch/bzip2
+   media-libs/libpng:0
+   

[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2021-04-11 Thread James Le Cuirot
commit: a4cbb7e4d99d9c904521725d3ff217b1987a6c56
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Apr 11 08:36:23 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Apr 11 09:24:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4cbb7e4

dev-games/clanlib: remove unused flag-o-matic eclass

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: James Le Cuirot  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
index b0eac87e66d..58b7cf899bf 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools
 
 MY_P=ClanLib-${PV}
 DESCRIPTION="multi-platform game development library"



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2021-03-12 Thread Sam James
commit: db01ac92b2bd0d5415463fd8ed769dda67cb05d7
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 12 19:24:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 12 19:24:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db01ac92

dev-games/clanlib: drop 0.8.1, 2.3.7

Bug: https://bugs.gentoo.org/772824
Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1.ebuild | 76 --
 dev-games/clanlib/clanlib-2.3.7.ebuild | 98 --
 2 files changed, 174 deletions(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild 
b/dev-games/clanlib/clanlib-0.8.1.ebuild
deleted file mode 100644
index 7aa5d3df56e..000
--- a/dev-games/clanlib/clanlib-0.8.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils ltprune
-
-DESCRIPTION="multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/";
-SRC_URI="http://clanlib.org/download/releases-${PV:0:3}/ClanLib-${PV}.tgz";
-
-LICENSE="ZLIB"
-SLOT="0.8"
-KEYWORDS="amd64 x86" #not big endian safe #82779
-IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
-
-# opengl keyword does not drop the GL/GLU requirement.
-# Autoconf files need to be fixed
-RDEPEND="media-libs/libpng:0
-   virtual/jpeg:0
-   virtual/glu
-   virtual/opengl
-   sdl? (
-   media-libs/libsdl[X]
-   media-libs/sdl-gfx
-   )
-   x11-libs/libXi
-   x11-libs/libXmu
-   x11-libs/libXxf86vm
-   media-libs/alsa-lib
-   mikmod? ( media-libs/libmikmod )
-   vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto"
-
-S=${WORKDIR}/ClanLib-${PV}
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/${P}-ndebug.patch \
-   "${FILESDIR}"/${P}-gcc43.patch \
-   "${FILESDIR}"/${P}-gcc44.patch \
-   "${FILESDIR}"/${P}-gcc47.patch \
-   "${FILESDIR}"/${P}-gcc6.patch \
-   "${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_configure() {
-   #clanSound only controls mikmod/vorbis so there's
-   # no need to pass --{en,dis}able-clanSound ...
-   #clanDisplay only controls X, SDL, OpenGL plugins
-   # so no need to pass --{en,dis}able-clanDisplay
-   # also same reason why we don't have to use clanGUI
-   econf \
-   --enable-dyn \
-   --enable-clanNetwork \
-   $(use_enable x86 asm386) \
-   $(use_enable doc docs) \
-   $(use_enable opengl clanGL) \
-   $(use_enable sdl clanSDL) \
-   $(use_enable vorbis clanVorbis) \
-   $(use_enable mikmod clanMikMod) \
-   $(use_enable ipv6 getaddr) \
-   $(use_enable static-libs static)
-}
-
-src_install() {
-   DOCS="CODING_STYLE CREDITS NEWS PATCHES README* INSTALL.linux" \
-   default
-   if use doc ; then
-   dodir /usr/share/doc/${PF}/html
-   mv "${D}"/usr/share/doc/clanlib/* 
"${D}"/usr/share/doc/${PF}/html/ || die
-   rm -rf "${D}"/usr/share/doc/clanlib
-   cp -r Examples Resources "${D}"/usr/share/doc/${PF}/ || die
-   fi
-   prune_libtool_files
-}

diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild 
b/dev-games/clanlib/clanlib-2.3.7.ebuild
deleted file mode 100644
index 08584b0cf5d..000
--- a/dev-games/clanlib/clanlib-2.3.7.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils autotools-utils
-
-MY_P=ClanLib-${PV}
-
-DESCRIPTION="multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/";
-SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz";
-
-LICENSE="ZLIB"
-SLOT="2.3"
-KEYWORDS="amd64 x86" #not big endian safe #82779
-IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
-REQUIRED_USE="opengl? ( X )"
-
-RDEPEND="sys-libs/zlib
-   X? (
-   media-libs/libpng:0
-   virtual/jpeg:0
-   media-libs/freetype
-   media-libs/fontconfig
-   opengl? ( virtual/opengl )
-   app-arch/bzip2
-   x11-libs/libX11
-   )
-   sqlite? ( dev-db/sqlite:3 )
-   sound? ( media-libs/alsa-lib )
-   mikmod? (
-   media-libs/libmikmod
-   media-libs/alsa-lib
-   )
-   vorbis? (
-   media-libs/libogg
-   media-libs/libvorbis
-   media-libs/alsa-lib
-   )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-   "${FILESDIR}"/${P}-autotools.patch
-   "${FILESDIR}"/${P}-doc.patch
-   "${FILESDIR}"/${P}-freetype_pkgconfi

[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2021-03-12 Thread Sam James
commit: c123596779da9eb340a4dd7e524b88b09eb9f543
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 12 19:21:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 12 19:22:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1235967

dev-games/clanlib: Stabilize 0.8.1-r1 x86, #772824

Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
index d7a5360cea6..d5fb6234027 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/ClanLib-${PV}
 LICENSE="ZLIB"
 SLOT="0.8"
 # Not big endian safe! #82779
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
 
 # opengl keyword does not drop the GL/GLU requirement.



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2021-03-12 Thread Sam James
commit: 54e4a3378c329821f7b4d1633cf2797aeff8e2b6
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 12 19:21:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 12 19:22:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e4a337

dev-games/clanlib: Stabilize 2.3.7-r1 x86, #772824

Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
index 4e8fca74142..b0eac87e66d 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="ZLIB"
 SLOT="2.3"
 # Not big endian safe! #82779
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
 REQUIRED_USE="opengl? ( X )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2021-03-12 Thread Sam James
commit: f3b555b1305df4c44ba0d334b01b38a029282b73
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 12 18:57:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 12 18:57:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b555b1

dev-games/clanlib: Stabilize 0.8.1-r1 amd64, #772824

Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
index cae77b9cb15..d7a5360cea6 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/ClanLib-${PV}
 LICENSE="ZLIB"
 SLOT="0.8"
 # Not big endian safe! #82779
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
 
 # opengl keyword does not drop the GL/GLU requirement.



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2021-03-12 Thread Sam James
commit: 7e2d92d74538ebd865a3607708bdc205ea988c8e
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 12 18:57:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 12 18:57:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2d92d7

dev-games/clanlib: Stabilize 2.3.7-r1 amd64, #772824

Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
index 824f8a34c6d..4e8fca74142 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="ZLIB"
 SLOT="2.3"
 # Not big endian safe! #82779
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
 REQUIRED_USE="opengl? ( X )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/files/, dev-games/clanlib/

2021-02-25 Thread Sam James
commit: 09ab2a91be441be1e9b1a1b0e08cdb6f425bfd62
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Thu Feb 25 10:05:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 25 10:23:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ab2a91

dev-games/clanlib: Fix #735858

Fixes compilation with LLVM (#735858), fixes installing README files.
Closes: https://bugs.gentoo.org/735858
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Azamat H. Hackimov  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19644
Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r1.ebuild|  1 +
 dev-games/clanlib/files/clanlib-0.8.1-llvm.patch | 95 
 2 files changed, 96 insertions(+)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
index f5be5321769..cae77b9cb15 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
"${FILESDIR}/${P}-gcc44.patch"
"${FILESDIR}/${P}-gcc47.patch"
"${FILESDIR}/${P}-gcc6.patch"
+   "${FILESDIR}/${P}-llvm.patch"
"${FILESDIR}/${P}-libpng15.patch"
"${FILESDIR}/${P}-docbuilder.patch"
 )

diff --git a/dev-games/clanlib/files/clanlib-0.8.1-llvm.patch 
b/dev-games/clanlib/files/clanlib-0.8.1-llvm.patch
new file mode 100644
index 000..b1455149a32
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-llvm.patch
@@ -0,0 +1,95 @@
+diff --git a/Sources/Display/graphic_context.cpp 
b/Sources/Display/graphic_context.cpp
+index 42545ea..52220e2 100644
+--- a/Sources/Display/graphic_context.cpp
 b/Sources/Display/graphic_context.cpp
+@@ -237,18 +237,18 @@ void CL_GraphicContext::fill_triangle(
+   grad.bottom_left.get_alpha()/256.0};
+ */
+   unsigned char color_array[] = {
+-  grad.top_left.get_red(),
+-  grad.top_left.get_green(),
+-  grad.top_left.get_blue(),
+-  grad.top_left.get_alpha(),
+-  grad.top_right.get_red(),
+-  grad.top_right.get_green(),
+-  grad.top_right.get_blue(),
+-  grad.top_right.get_alpha(),
+-  grad.bottom_left.get_red(),
+-  grad.bottom_left.get_green(),
+-  grad.bottom_left.get_blue(),
+-  grad.bottom_left.get_alpha()};
++  static_cast(grad.top_left.get_red()),
++  static_cast(grad.top_left.get_green()),
++  static_cast(grad.top_left.get_blue()),
++  static_cast(grad.top_left.get_alpha()),
++  static_cast(grad.top_right.get_red()),
++  static_cast(grad.top_right.get_green()),
++  static_cast(grad.top_right.get_blue()),
++  static_cast(grad.top_right.get_alpha()),
++  static_cast(grad.bottom_left.get_red()),
++  static_cast(grad.bottom_left.get_green()),
++  static_cast(grad.bottom_left.get_blue()),
++  static_cast(grad.bottom_left.get_alpha())};
+ 
+   params.count = 1;
+   params.vertices = vertice_array;
+diff --git a/Sources/GL/graphic_context_opengl.cpp 
b/Sources/GL/graphic_context_opengl.cpp
+index 78bc87d..68da072 100644
+--- a/Sources/GL/graphic_context_opengl.cpp
 b/Sources/GL/graphic_context_opengl.cpp
+@@ -355,8 +355,8 @@ void CL_GraphicContext_OpenGL::draw_quad(const CL_Quad 
&quad, const CL_Color &co
+   state.blendfunc[3] = blend_one_minus_src_alpha;
+   state.fillmode = fillmode_line;
+ 
+-  double qx[4] = { quad.x1, quad.x2, quad.x3, quad.x4 };
+-  double qy[4] = { quad.y1, quad.y2, quad.y3, quad.y4 };
++  double qx[4] = { static_cast(quad.x1), 
static_cast(quad.x2), static_cast(quad.x3), 
static_cast(quad.x4) };
++  double qy[4] = { static_cast(quad.y1), 
static_cast(quad.y2), static_cast(quad.y3), 
static_cast(quad.y4) };
+   int tx[4] = { quad.x1, quad.x2, quad.x3, quad.x4 };
+   int ty[4] = { quad.y1, quad.y2, quad.y3, quad.y4 };
+ 
+@@ -380,8 +380,8 @@ void CL_GraphicContext_OpenGL::fill_quad(const CL_Quad 
&quad, const CL_Color &co
+   state.blendfunc[3] = blend_one_minus_src_alpha;
+   state.fillmode = fillmode_solid;
+ 
+-  double qx[4] = { quad.x1, quad.x2, quad.x3, quad.x4 };
+-  double qy[4] = { quad.y1, quad.y2, quad.y3, quad.y4 };
++  double qx[4] = { static_cast(quad.x1), 
static_cast(quad.x2), static_cast(quad.x3), 
static_cast(quad.x4) };
++  double qy[4] = { static_cast(quad.y1), 
static_cast(quad.y2), static_cast(quad.y3), 
static_cast(quad.y4) };
+   int tx[4] = { quad.x1, quad.x2, quad.x3, quad.x4 };
+   int ty[4] = { quad.y1, quad.y2, quad.y3, quad.y4 };
+ 
+diff --git a/Sources/SDL/graphic_context_sdl.cpp 
b/Sources/SDL/graphic_context_sdl.cpp
+index 8093e03..c15b399 100644
+--- a/Sources/SDL/graphic_context_sdl.cpp
 b/Sources/SDL/graphic_context_sdl.cpp
+@@ -410,7 +410,7 

[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2021-02-25 Thread Sam James
commit: 329f30619b03fd1792e8b8dec1c294f4808077c6
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 25 09:46:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 25 09:51:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329f3061

dev-games/clanlib: fix DOCS

Closes: https://bugs.gentoo.org/772869
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
index f7501c1a70c..f5be5321769 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
@@ -49,7 +49,7 @@ PATCHES=(
 
 DOCS=(
CODING_STYLE CREDITS NEWS PATCHES
-   README.{,anjuta,distros,kdevelop,sdl,upgrade} INSTALL.linux
+   README{,.anjuta,.distros,.kdevelop,.sdl,.upgrade} INSTALL.linux
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/files/, dev-games/clanlib/

2021-02-24 Thread Sam James
commit: 5a450f7cbe88f98d4ec320e60177cdd3800a937e
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 25 06:17:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 25 06:36:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a450f7c

dev-games/clanlib: port 2.3.7 to EAPI 7

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7-r1.ebuild  | 104 +
 .../clanlib/files/clanlib-2.3.7-autotools.patch|   8 +-
 dev-games/clanlib/files/clanlib-2.3.7-doc.patch|   4 +-
 .../files/clanlib-2.3.7-freetype_pkgconfig.patch   |   4 +-
 4 files changed, 112 insertions(+), 8 deletions(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild 
b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
new file mode 100644
index 000..824f8a34c6d
--- /dev/null
+++ b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_P=ClanLib-${PV}
+DESCRIPTION="multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/";
+SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz";
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="2.3"
+# Not big endian safe! #82779
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs 
vorbis X"
+REQUIRED_USE="opengl? ( X )"
+
+BDEPEND="
+   virtual/pkgconfig
+   doc? ( app-doc/doxygen dev-lang/perl )
+"
+RDEPEND="
+   sys-libs/zlib
+   X? (
+   app-arch/bzip2
+   media-libs/libpng:0
+   media-libs/freetype
+   media-libs/fontconfig
+   virtual/jpeg:0
+   x11-libs/libX11
+   opengl? ( virtual/opengl )
+   )
+   mikmod? (
+   media-libs/alsa-lib
+   media-libs/libmikmod
+   )
+   sqlite? ( dev-db/sqlite:3 )
+   sound? ( media-libs/alsa-lib )
+   vorbis? (
+   media-libs/alsa-lib
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-autotools.patch
+   "${FILESDIR}"/${P}-doc.patch
+   "${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
+)
+
+DOCS=( CODING_STYLE CREDITS PATCHES README )
+
+src_prepare() {
+   default
+
+   eautoreconf
+
+   ln -sf ../../../Sources/API 
Documentation/Utilities/ReferenceDocs/ClanLib || die
+}
+
+src_configure() {
+   # Add -DPACKAGE_BUGREPORT?
+   local myeconfargs=(
+   $(use_enable doc docs)
+   $(use_enable cpu_flags_x86_sse2 sse2)
+   $(use_enable opengl clanGL)
+   $(use_enable opengl clanGL1)
+   $(use_enable opengl clanGUI)
+   $(use_enable X clanDisplay)
+   $(use_enable vorbis clanVorbis)
+   $(use_enable mikmod clanMikMod)
+   $(use_enable sqlite clanSqlite)
+   $(use_enable ipv6 getaddr)
+   )
+
+   use sound \
+   || use vorbis \
+   || use mikmod \
+   || myeconfargs+=( --disable-clanSound )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   emake
+
+   use doc && emake html
+}
+
+# html files are keeped in a directory that is dependent on the SLOT
+# so to keep eventual bookmarks to the doc from version to version
+src_install() {
+   default
+
+   if use doc ; then
+   emake DESTDIR="${D}" install-html
+   dodoc -r Examples Resources
+   fi
+}

diff --git a/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch 
b/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch
index 97db79ac424..eccc7e29132 100644
--- a/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch
+++ b/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch
@@ -1,5 +1,5 @@
 Documentation/Reference/Makefile.am.old2012-09-25 10:39:25.973544935 
+0200
-+++ Documentation/Reference/Makefile.am2012-09-25 10:39:42.560554053 
+0200
+--- a/Documentation/Reference/Makefile.am
 b/Documentation/Reference/Makefile.am
 @@ -10,7 +10,7 @@
mkdir doxyoutput;
mkdir reftest
@@ -9,8 +9,8 @@
../Utilities/ReferenceDocs/ReferenceDocs
  
  install-html:
 configure.ac.old   2012-09-25 11:07:38.412537590 +0200
-+++ configure.ac   2012-09-25 11:09:41.133939131 +0200
+--- a/configure.ac
 b/configure.ac
 @@ -337,11 +337,9 @@
  
dnl  Optional linux/joystick.h

diff --git a/dev-games/clanlib/files/clanlib-2.3.7-doc.patch 
b/dev-games/clanlib/files/clanlib-2.3.7-doc.patch
index 627df26785b..d207f2df3cc 100644
--- a/dev-games/clanlib/files/clanlib-2.3.7-doc.patch
+++ b/dev-games/clanlib/files/clanlib-2.3.7-doc.patch
@@ -1,5 +1,5 @@
 Documentation/Utilities/ReferenceDocs/Makefile.old 2014-09-12 
20:06:52.970459560 

[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2021-02-24 Thread Sam James
commit: 770739c456e0528283591ff570e19955b43d3e65
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 25 05:46:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 25 06:36:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770739c4

dev-games/clanlib: minor touchups

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r1.ebuild | 44 +++
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
index 2f66605e5ae..f7501c1a70c 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
@@ -1,37 +1,41 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DESCRIPTION="multi-platform game development library"
+DESCRIPTION="Multi-platform game development library"
 HOMEPAGE="http://www.clanlib.org/";
 SRC_URI="http://clanlib.org/download/releases-${PV:0:3}/ClanLib-${PV}.tgz";
+S="${WORKDIR}"/ClanLib-${PV}
 
 LICENSE="ZLIB"
 SLOT="0.8"
-KEYWORDS="~amd64 ~x86" #not big endian safe #82779
+# Not big endian safe! #82779
+KEYWORDS="~amd64 ~x86"
 IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
 
 # opengl keyword does not drop the GL/GLU requirement.
 # Autoconf files need to be fixed
-RDEPEND="media-libs/libpng:0
+RDEPEND="
+   media-libs/alsa-lib
+   media-libs/libpng:0
virtual/jpeg:0
virtual/glu
virtual/opengl
-   sdl? (
-   media-libs/libsdl[X]
-   media-libs/sdl-gfx
-   )
x11-libs/libXi
x11-libs/libXmu
x11-libs/libXxf86vm
-   media-libs/alsa-lib
mikmod? ( media-libs/libmikmod )
-   vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto"
-
-S=${WORKDIR}/ClanLib-${PV}
+   sdl? (
+   media-libs/libsdl[X]
+   media-libs/sdl-gfx
+   )
+   vorbis? ( media-libs/libvorbis )
+"
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto
+"
 
 PATCHES=(
"${FILESDIR}/${P}-ndebug.patch"
@@ -42,7 +46,11 @@ PATCHES=(
"${FILESDIR}/${P}-libpng15.patch"
"${FILESDIR}/${P}-docbuilder.patch"
 )
-DOCS="CODING_STYLE CREDITS NEWS PATCHES README* INSTALL.linux"
+
+DOCS=(
+   CODING_STYLE CREDITS NEWS PATCHES
+   README.{,anjuta,distros,kdevelop,sdl,upgrade} INSTALL.linux
+)
 
 src_prepare() {
default
@@ -52,9 +60,9 @@ src_prepare() {
 }
 
 src_configure() {
-   #clanSound only controls mikmod/vorbis so there's
+   # clanSound only controls mikmod/vorbis so there's
# no need to pass --{en,dis}able-clanSound ...
-   #clanDisplay only controls X, SDL, OpenGL plugins
+   # clanDisplay only controls X, SDL, OpenGL plugins
# so no need to pass --{en,dis}able-clanDisplay
# also same reason why we don't have to use clanGUI
econf \
@@ -72,11 +80,13 @@ src_configure() {
 
 src_install() {
default
+
if use doc ; then
dodir /usr/share/doc/${PF}/html
mv "${D}"/usr/share/doc/clanlib/* 
"${D}"/usr/share/doc/${PF}/html/ || die
rm -rf "${D}"/usr/share/doc/clanlib
cp -r Examples Resources "${D}"/usr/share/doc/${PF}/ || die
fi
+
find "${ED}" -name '*.la' -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/files/, dev-games/clanlib/

2021-02-24 Thread Sam James
commit: ac1dfffc8f5c1360d1b107120555d9b43e92ba78
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Wed Sep  9 22:08:58 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 25 06:36:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1dfffc

dev-games/clanlib: fixes to 0.8.1 version

Fix pkg-config files (#739358), update ebuild to EAPI7, fix
documentation installation, unify patches for eapply's -p1 level, remove
deprecated eclasses.

Bug: https://bugs.gentoo.org/739358
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Azamat H. Hackimov  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17486
Signed-off-by: Sam James  gentoo.org>

 dev-games/clanlib/clanlib-0.8.1-r1.ebuild  | 82 ++
 .../clanlib/files/clanlib-0.8.1-docbuilder.patch   | 30 
 dev-games/clanlib/files/clanlib-0.8.1-gcc43.patch  |  8 +--
 .../clanlib/files/clanlib-0.8.1-libpng15.patch |  4 +-
 dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch |  4 +-
 5 files changed, 120 insertions(+), 8 deletions(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild 
b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
new file mode 100644
index 000..2f66605e5ae
--- /dev/null
+++ b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/";
+SRC_URI="http://clanlib.org/download/releases-${PV:0:3}/ClanLib-${PV}.tgz";
+
+LICENSE="ZLIB"
+SLOT="0.8"
+KEYWORDS="~amd64 ~x86" #not big endian safe #82779
+IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
+
+# opengl keyword does not drop the GL/GLU requirement.
+# Autoconf files need to be fixed
+RDEPEND="media-libs/libpng:0
+   virtual/jpeg:0
+   virtual/glu
+   virtual/opengl
+   sdl? (
+   media-libs/libsdl[X]
+   media-libs/sdl-gfx
+   )
+   x11-libs/libXi
+   x11-libs/libXmu
+   x11-libs/libXxf86vm
+   media-libs/alsa-lib
+   mikmod? ( media-libs/libmikmod )
+   vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"
+
+S=${WORKDIR}/ClanLib-${PV}
+
+PATCHES=(
+   "${FILESDIR}/${P}-ndebug.patch"
+   "${FILESDIR}/${P}-gcc43.patch"
+   "${FILESDIR}/${P}-gcc44.patch"
+   "${FILESDIR}/${P}-gcc47.patch"
+   "${FILESDIR}/${P}-gcc6.patch"
+   "${FILESDIR}/${P}-libpng15.patch"
+   "${FILESDIR}/${P}-docbuilder.patch"
+)
+DOCS="CODING_STYLE CREDITS NEWS PATCHES README* INSTALL.linux"
+
+src_prepare() {
+   default
+   # See #739358
+   sed -i -e "s:libdir=\${exec_prefix}/lib:libdir=@libdir@:g" \
+   pkgconfig/*.pc.in || die
+}
+
+src_configure() {
+   #clanSound only controls mikmod/vorbis so there's
+   # no need to pass --{en,dis}able-clanSound ...
+   #clanDisplay only controls X, SDL, OpenGL plugins
+   # so no need to pass --{en,dis}able-clanDisplay
+   # also same reason why we don't have to use clanGUI
+   econf \
+   --enable-dyn \
+   --enable-clanNetwork \
+   $(use_enable x86 asm386) \
+   $(use_enable doc docs) \
+   $(use_enable opengl clanGL) \
+   $(use_enable sdl clanSDL) \
+   $(use_enable vorbis clanVorbis) \
+   $(use_enable mikmod clanMikMod) \
+   $(use_enable ipv6 getaddr) \
+   $(use_enable static-libs static)
+}
+
+src_install() {
+   default
+   if use doc ; then
+   dodir /usr/share/doc/${PF}/html
+   mv "${D}"/usr/share/doc/clanlib/* 
"${D}"/usr/share/doc/${PF}/html/ || die
+   rm -rf "${D}"/usr/share/doc/clanlib
+   cp -r Examples Resources "${D}"/usr/share/doc/${PF}/ || die
+   fi
+   find "${ED}" -name '*.la' -delete || die
+}

diff --git a/dev-games/clanlib/files/clanlib-0.8.1-docbuilder.patch 
b/dev-games/clanlib/files/clanlib-0.8.1-docbuilder.patch
new file mode 100644
index 000..18752b9e0fb
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-docbuilder.patch
@@ -0,0 +1,30 @@
+diff --git a/Documentation/Utilities/webbuilder.pl.in 
b/Documentation/Utilities/webbuilder.pl.in
+index ea9de63..c000432 100644
+--- a/Documentation/Utilities/webbuilder.pl.in
 b/Documentation/Utilities/webbuilder.pl.in
+@@ -68,11 +68,7 @@ sub convert
+ sub print_head
+ {
+   my ($xml_head, $file) = @ARG;
+-  my $ml, $buffer;
+-
+-  # Don't know what this does, but Perceps does it:
+-  if ($*) { $ml=1; }
+-  else { $ml=0; }
++  my $buffer;
+   
+   # Read theme from disk and execute it:
+   if ( -e $file )
+@@ -93,11 +89,7 @@ sub print_head
+ sub print_body
+ {
+   my ($xml_body, $file) = @ARG;
+-  my $ml, $buffer;
+-
+-  # Don't know what this does, but Perceps does it:
+-  if 

[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/files/, dev-games/clanlib/

2021-01-10 Thread Lars Wendler
commit: d52adc47ea1c389ba5c38874fe0adb9896486bd5
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jan 11 07:38:16 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan 11 07:38:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52adc47

dev-games/clanlib: Use pkg-config to find freetype

Closes: https://bugs.gentoo.org/764902
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 dev-games/clanlib/clanlib-2.3.7.ebuild  |  3 ++-
 .../clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch| 13 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild 
b/dev-games/clanlib/clanlib-2.3.7.ebuild
index 994ee11d94c..08584b0cf5d 100644
--- a/dev-games/clanlib/clanlib-2.3.7.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -46,6 +46,7 @@ S=${WORKDIR}/${MY_P}
 PATCHES=(
"${FILESDIR}"/${P}-autotools.patch
"${FILESDIR}"/${P}-doc.patch
+   "${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
 )
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1

diff --git a/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch 
b/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch
new file mode 100644
index 000..47a1c89b240
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/764902
+
+--- ClanLib-2.3.7/configure.ac
 ClanLib-2.3.7/configure.ac
+@@ -342,7 +342,7 @@
+   echo "=="
+   CLANLIB_CHECK_LIB(png,  [`cat $srcdir/Setup/Tests/png.cpp`],  
clanDisplay, [ *** Cannot find png (See http://www.libpng.org ) (Try 
libpng12-dev or better) ], [-lz -lpng])
+   CLANLIB_CHECK_LIB(jpeg, [`cat $srcdir/Setup/Tests/jpeg.cpp`], 
clanDisplay, [ *** Cannot find jpeg (See http://www.ijg.org ) (Try 
libjpeg62-dev or better) ], [ -ljpeg])
+-  CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Tests/ttf.cpp`], 
clanDisplay, [ *** Cannot find ttf (freetype) (See 
http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], 
[`freetype-config --libs` ], [ `freetype-config --cflags`])
++  CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Tests/ttf.cpp`], 
clanDisplay, [ *** Cannot find ttf (freetype) (See 
http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], 
[`pkg-config --libs freetype2` ], [ `pkg-config --cflags freetype2`])
+ 
+   dnl  Optional linux/joystick.h
+   AC_CHECK_HEADERS(linux/joystick.h, linux_joystick=yes)



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/, dev-games/clanlib/files/

2018-06-25 Thread Lars Wendler
commit: 3f8084c90b78f2a067ab50bc7d922994f2597b3c
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jun 25 13:23:31 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jun 25 13:23:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f8084c9

dev-games/clanlib: Replaced freetype-config with pkg-config

Bug: https://bugs.gentoo.org/658424
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-games/clanlib/clanlib-4.0.0.ebuild | 25 +++-
 .../files/clanlib-4.0.0-freetype_pkgconfig.patch   | 27 ++
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/dev-games/clanlib/clanlib-4.0.0.ebuild 
b/dev-games/clanlib/clanlib-4.0.0.ebuild
index 310134a70f4..cc7115a3834 100644
--- a/dev-games/clanlib/clanlib-4.0.0.ebuild
+++ b/dev-games/clanlib/clanlib-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,10 +37,11 @@ DEPEND="${RDEPEND}
media-gfx/graphviz
)"
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-4.0.0-fix-build-system.patch
+   "${FILESDIR}"/${PN}-4.0.0-freetype_pkgconfig.patch #658424
 )
 
 src_prepare() {
@@ -49,15 +50,17 @@ src_prepare() {
 }
 
 src_configure() {
-   econf \
-   $(use_enable doc docs) \
-   $(use_enable cpu_flags_x86_sse2 sse2) \
-   $(use_enable opengl clanGL) \
-   $(use_enable opengl clanUI) \
-   $(use_enable X clanDisplay) \
-   $(use_enable sound clanSound) \
-   $(use_enable ipv6 getaddr) \
+   local myeconfargs=(
+   $(use_enable doc docs)
+   $(use_enable cpu_flags_x86_sse2 sse2)
+   $(use_enable opengl clanGL)
+   $(use_enable opengl clanUI)
+   $(use_enable X clanDisplay)
+   $(use_enable sound clanSound)
+   $(use_enable ipv6 getaddr)
$(use_enable static-libs static)
+   )
+   econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -72,5 +75,5 @@ src_install() {
use examples && dodoc -r Examples Resources
 
# package provides .pc files
-   find "${D}" -name '*.la' -delete || die
+   find "${ED}" -name '*.la' -delete || die
 }

diff --git a/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch 
b/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch
new file mode 100644
index 000..34759a8d89d
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch
@@ -0,0 +1,27 @@
+From af16d8a344b9bafc9131508fecfcdbfdc53cf100 Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Mon, 25 Jun 2018 15:14:31 +0200
+Subject: [PATCH] Use pkg-config to find freetype.
+
+As of freetype-2.9.1 the freetype-config file no longer gets installed
+by default.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6b9def916..c97e959f7 100644
+--- a/configure.ac
 b/configure.ac
+@@ -307,7 +307,7 @@ echo ""
+ if test "$enable_clanDisplay" != "no"; then
+   echo "Checking for clanDisplay stuff"
+   echo "=="
+-  CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Unix/Tests/ttf.cpp`], 
clanDisplay, [ *** Cannot find ttf (freetype) (See 
http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], 
[`freetype-config --libs` ], [ `freetype-config --cflags`])
++  CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Unix/Tests/ttf.cpp`], 
clanDisplay, [ *** Cannot find ttf (freetype) (See 
http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], 
[`pkg-config --libs freetype2` ], [ `pkg-config --cflags freetype2`])
+ 
+   dnl  Optional linux/joystick.h
+   AC_CHECK_HEADERS(linux/joystick.h, has_linux_joystick=yes)
+-- 
+2.18.0
+



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/, dev-games/clanlib/files/

2017-10-13 Thread Andreas Hüttel
commit: f928bd3c92fca93814668701654a174e52e2ae5a
Author: Peter Levine  gmail  com>
AuthorDate: Wed Oct 11 05:24:28 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Oct 13 19:27:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f928bd3c

dev-games/clanlib: Fix building with GCC-6

Closes: https://bugs.gentoo.org/596112
Closes: https://github.com/gentoo/gentoo/pull/5915
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 dev-games/clanlib/clanlib-0.8.1.ebuild   |  3 ++-
 dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch | 16 
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild 
b/dev-games/clanlib/clanlib-0.8.1.ebuild
index 0e13a37d97d..dbd437a41db 100644
--- a/dev-games/clanlib/clanlib-0.8.1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -40,6 +40,7 @@ src_prepare() {
"${FILESDIR}"/${P}-gcc43.patch \
"${FILESDIR}"/${P}-gcc44.patch \
"${FILESDIR}"/${P}-gcc47.patch \
+   "${FILESDIR}"/${P}-gcc6.patch \
"${FILESDIR}"/${P}-libpng15.patch
 }
 

diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch 
b/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch
new file mode 100644
index 000..95284c2de4c
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch
@@ -0,0 +1,16 @@
+Bug: https://bugs.gentoo.org/596112
+
+--- a/Sources/Core/IOData/Generic/datafile_inputprovider.h
 b/Sources/Core/IOData/Generic/datafile_inputprovider.h
+@@ -142,9 +142,9 @@
+   void insert(const std::string &resource_id, int data_pos, int 
data_size)
+   {
+   cache.insert(
+-  std::make_pair >(
++  std::pair >(
+   resource_id,
+-  std::make_pair(data_pos, data_size)));
++  std::pair(data_pos, data_size)));
+   }
+ 
+   private:



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/files/, dev-games/clanlib/

2017-01-07 Thread David Seifert
commit: f24bba3735c41f3ccb9818b000c038240425af8f
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jan  7 16:53:37 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan  7 19:12:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24bba37

dev-games/clanlib: Version bump to 4.0.0

* EAPI=6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-games/clanlib/Manifest |  1 +
 dev-games/clanlib/clanlib-4.0.0.ebuild | 77 ++
 .../files/clanlib-4.0.0-fix-build-system.patch | 25 +++
 3 files changed, 103 insertions(+)

diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 4fda43f..4d6f33c 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,2 +1,3 @@
 DIST ClanLib-0.8.1.tgz 7629019 SHA256 
094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495 SHA512 
277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
 WHIRLPOOL 
be486125f406a307676c4957f977b6ccc6bc2ce527a72fb4febcb3d1c7e2acdc4fc6706b66b75412184c3a0744c53e962011b0c3ac22958da5e987f0fccc9d87
 DIST ClanLib-2.3.7.tgz 26132425 SHA256 
d46127c08103f48d15936ceb9f95b3dfb1ff8ccba667cef1b3f8e639cb2601c2 SHA512 
73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
 WHIRLPOOL 
a6547d0bc8d254e887c427dfff63deb2b69790124da3db49d54cf853f8c834d44172a06e92ef7fc5222c8c81f903ab29f186f85da698dc085f4138d147ddad68
+DIST clanlib-4.0.0.tar.gz 7435551 SHA256 
9b35052308a2b933bba76596930ab550fc8cd1f80155fc62aa648a23c3f4406f SHA512 
e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe
 WHIRLPOOL 
b541c0dca233570f5c203269684de2a187391f35278722e81ca64b5f9fc3d61cb2f3cb615db6d4d7956369c04fbb9aea165a0ee5df0210b5bd50ab669d4fd691

diff --git a/dev-games/clanlib/clanlib-4.0.0.ebuild 
b/dev-games/clanlib/clanlib-4.0.0.ebuild
new file mode 100644
index ..7fa5f2d
--- /dev/null
+++ b/dev-games/clanlib/clanlib-4.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+MY_PN=ClanLib
+
+DESCRIPTION="Multi-platform game development library"
+HOMEPAGE="https://github.com/sphair/ClanLib";
+SRC_URI="https://github.com/sphair/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86" #not big endian safe #82779
+IUSE="cpu_flags_x86_sse2 doc examples ipv6 opengl sound static-libs X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="
+   sys-libs/zlib
+   X? (
+   media-libs/freetype:2
+   media-libs/fontconfig
+   x11-libs/libX11
+   opengl? (
+   virtual/opengl
+   x11-libs/libXrender
+   )
+   )
+   sound? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-lang/perl
+   media-gfx/graphviz
+   )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.0.0-fix-build-system.patch
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable doc docs) \
+   $(use_enable cpu_flags_x86_sse2 sse2) \
+   $(use_enable opengl clanGL) \
+   $(use_enable opengl clanUI) \
+   $(use_enable X clanDisplay) \
+   $(use_enable sound clanSound) \
+   $(use_enable ipv6 getaddr) \
+   $(use_enable static-libs static)
+}
+
+src_compile() {
+   default
+   use doc && emake html
+}
+
+src_install() {
+   default
+
+   use doc && emake DESTDIR="${D}" install-html
+   use examples && dodoc -r Examples Resources
+
+   # package provides .pc files
+   find "${D}" -name '*.la' -delete || die
+}

diff --git a/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch 
b/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch
new file mode 100644
index ..a3500e2
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch
@@ -0,0 +1,25 @@
+* Fix AM_CONDITIONAL to always be invoked
+* Install html files in proper --htmldir
+
+--- a/configure.ac
 b/configure.ac
+@@ -437,8 +437,8 @@
+   fi
+   
+   if test "$enable_clanSound" = "auto"; then enable_clanSound=yes; fi
+-  AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ fi
++AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ 
+ if test "$enable_clanNetwork" != "no"; then
+   echo "Checking for clanNetwork stuff"
+--- a/Documentation/Makefile.am
 b/Documentation/Makefile.am
+@@ -1,6 +1,6 @@
+ EXTRA_DIST = $(wildcart images/*.png)
+ 
+-HTML_PREFIX = $(datadir)/doc/@PACKAGE@-@L

[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2016-04-27 Thread Michael Sterrett
commit: 7b5f5fbc2ff8527758379a4a265c9d18134669ef
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Apr 28 03:25:26 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Apr 28 03:25:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b5f5fbc

dev-games/clanlib: libsdl needs the X use flag (bug #581394)

Package-Manager: portage-2.2.26

 dev-games/clanlib/clanlib-0.8.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild 
b/dev-games/clanlib/clanlib-0.8.1.ebuild
index febfca6..efa4b1e 100644
--- a/dev-games/clanlib/clanlib-0.8.1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ RDEPEND="media-libs/libpng:0
virtual/glu
virtual/opengl
sdl? (
-   media-libs/libsdl
+   media-libs/libsdl[X]
media-libs/sdl-gfx
)
x11-libs/libXi



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2016-01-02 Thread Michael Sterrett
commit: 3929a8de982aa32a38c7fc5da829fa622f1fd6dc
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sat Jan  2 20:49:26 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sat Jan  2 20:49:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3929a8de

dev-games/clanlib: fix dev-db/sqlite slot dep (bug 570652)

Package-Manager: portage-2.2.24

 dev-games/clanlib/clanlib-2.3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild 
b/dev-games/clanlib/clanlib-2.3.7.ebuild
index 0d4164f..1c717ac 100644
--- a/dev-games/clanlib/clanlib-2.3.7.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7.ebuild
@@ -27,7 +27,7 @@ RDEPEND="sys-libs/zlib
app-arch/bzip2
x11-libs/libX11
)
-   sqlite? ( dev-db/sqlite:0 )
+   sqlite? ( dev-db/sqlite:3 )
sound? ( media-libs/alsa-lib )
mikmod? (
media-libs/libmikmod



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2015-12-18 Thread Michael Sterrett
commit: 406b9eb1a38313d83ca0d75963c47d46e306758b
Author: Michael Sterrett  gentoo  org>
AuthorDate: Fri Dec 18 10:16:29 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Fri Dec 18 10:16:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406b9eb1

add slot deps

Package-Manager: portage-2.2.24

 dev-games/clanlib/clanlib-2.3.7.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild 
b/dev-games/clanlib/clanlib-2.3.7.ebuild
index f6a93d6..0d4164f 100644
--- a/dev-games/clanlib/clanlib-2.3.7.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7.ebuild
@@ -19,15 +19,15 @@ REQUIRED_USE="opengl? ( X )"
 
 RDEPEND="sys-libs/zlib
X? (
-   media-libs/libpng
-   virtual/jpeg
+   media-libs/libpng:0
+   virtual/jpeg:0
media-libs/freetype
media-libs/fontconfig
opengl? ( virtual/opengl )
app-arch/bzip2
x11-libs/libX11
)
-   sqlite? ( dev-db/sqlite )
+   sqlite? ( dev-db/sqlite:0 )
sound? ( media-libs/alsa-lib )
mikmod? (
media-libs/libmikmod



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2015-12-18 Thread Michael Sterrett
commit: a5c69a61bbe410fe5cc3ed16ccb5518dc9bc77fc
Author: Michael Sterrett  gentoo  org>
AuthorDate: Fri Dec 18 09:51:36 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Fri Dec 18 09:51:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c69a61

EAPI=5

Package-Manager: portage-2.2.24

 dev-games/clanlib/clanlib-2.3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild 
b/dev-games/clanlib/clanlib-2.3.7.ebuild
index 9d108de..f6a93d6 100644
--- a/dev-games/clanlib/clanlib-2.3.7.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 inherit flag-o-matic eutils autotools-utils
 
 MY_P=ClanLib-${PV}



[gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/

2015-12-17 Thread Michael Sterrett
commit: 06d79210573338c3260b1cb97f082a51ff92419d
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Dec 17 19:02:55 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Fri Dec 18 00:39:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06d79210

add slot dep for media-libs/libpng and virtual/jpeg

Package-Manager: portage-2.2.24

 dev-games/clanlib/clanlib-0.8.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild 
b/dev-games/clanlib/clanlib-0.8.1.ebuild
index ac7688f..febfca6 100644
--- a/dev-games/clanlib/clanlib-0.8.1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1.ebuild
@@ -16,8 +16,8 @@ IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
 
 # opengl keyword does not drop the GL/GLU requirement.
 # Autoconf files need to be fixed
-RDEPEND="media-libs/libpng
-   virtual/jpeg
+RDEPEND="media-libs/libpng:0
+   virtual/jpeg:0
virtual/glu
virtual/opengl
sdl? (