SLOT-ed version

6 files changed, 161 insertions, 12 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 0239dd56b0ca..06f5ba35703f 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-games/clanlib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.1 2003/07/13 03:13:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.2 2003/07/17 00:12:58 vapier Exp $
+
+*clanlib-0.7.2-r1 (16 Jul 2003)
+
+  16 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  SLOT-ed version #22594.
 
 *clanlib-0.7.2 (27 Jun 2003)
 
@@ -16,6 +21,11 @@
   29 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
   Version bump.
 
+*clanlib-0.6.5-r1 (16 Jul 2003)
+
+  16 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  SLOT-ed version #22594.
+
 *clanlib-0.6.5 (17 Apr 2003)
 
   29 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
@@ -29,6 +39,11 @@
   02 Okt 2002; Bart Verwilst <verwilst@gentoo.org> :
   New version
 
+*clanlib-0.5.4-r4 (16 Jul 2003)
+
+  16 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  SLOT-ed version #22594.
+
 *clanlib-0.5.4-r3 (14 Apr 2002)
 
   29 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
diff --git a/dev-games/clanlib/clanlib-0.6.5-r1.ebuild b/dev-games/clanlib/clanlib-0.6.5-r1.ebuild
new file mode 100644
index 000000000000..99468e850c8b
--- /dev/null
+++ b/dev-games/clanlib/clanlib-0.6.5-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5-r1.ebuild,v 1.1 2003/07/17 00:12:58 vapier Exp $
+
+inherit eutils flag-o-matic
+replace-flags -O? -O2
+
+DESCRIPTION="multi-platform game development library"
+SRC_URI="http://www.clanlib.org/download/files/ClanLib-${PV}-1.tar.gz"
+HOMEPAGE="http://www.clanlib.org/"
+
+KEYWORDS="~x86"
+SLOT="0.6"
+LICENSE="LGPL-2"
+IUSE="arts oss esd alsa png opengl truetype X oggvorbis mikmod jpeg directfb joystick"
+
+DEPEND=">=media-libs/hermes-1.3.2
+	X? ( virtual/x11 )
+	png? ( media-libs/libpng )
+	jpeg? ( >=media-libs/jpeg-6b )
+	mikmod? ( >=media-libs/libmikmod-3.1.9 )
+	truetype? ( >=media-libs/freetype-2.0 )
+	directfb? ( dev-libs/DirectFB )
+	oggvorbis? ( media-libs/libvorbis )"
+
+S=${WORKDIR}/ClanLib-${PV}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}.patch
+}
+
+src_compile() {
+	local myconf=""
+	use jpeg || myconf="${myconf} --enable-smalljpeg"
+	use alsa || use oss || use esd || use arts \
+		&& myconf="${myconf} --enable-clansound" \
+		|| myconf="${myconf} --disable-clansound"
+
+	./autogen.sh
+	
+	econf \
+		--libdir=/usr/lib/${P} \
+		--enable-network \
+		--enable-asm386 \
+		--enable-dyn \
+		`use_enable X x11` \
+		`use_enable directfb` \
+		`use_enable opengl` \
+		`use_enable oggvorbis vorbis` \
+		`use_enable png` \
+		`use_enable truetype ttf` \
+		`use_enable mikmod` \
+		`use_enable joystick` \
+		--enable-vidmode \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make install \
+		prefix=${D}/usr \
+		LIB_PREFIX=${D}/usr/lib/${P} \
+		|| die
+	mv ${D}/usr/include/{ClanLib,${P}}
+	dobin ${FILESDIR}/clanlib-config
+	dodoc BUGS CODING_STYLE HARDWARE NEWS PATCHES PORTING README* ROADMAP
+}
+
+pkg_postinst() {
+	clanlib-config ${PV}
+}
diff --git a/dev-games/clanlib/clanlib-0.7.2.ebuild b/dev-games/clanlib/clanlib-0.7.2-r1.ebuild
index 5f4cd63227f7..6c3ceefa50ad 100644
--- a/dev-games/clanlib/clanlib-0.7.2.ebuild
+++ b/dev-games/clanlib/clanlib-0.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.2.ebuild,v 1.1 2003/07/13 03:13:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.2-r1.ebuild,v 1.1 2003/07/17 00:12:58 vapier Exp $
 
 inherit flag-o-matic
 replace-flags -O? -O2
@@ -9,10 +9,10 @@ DESCRIPTION="multi-platform game development library"
 SRC_URI="http://www.clanlib.org/~sphair/download/ClanLib-${PV}-1.tar.bz2"
 HOMEPAGE="http://www.clanlib.org/"
 
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="LGPL-2"
-IUSE="arts oss esd alsa png opengl truetype X oggvorbis mikmod jpeg directfb"
+SLOT="0.7"
+KEYWORDS="~x86"
+IUSE="arts oss esd alsa png opengl truetype X oggvorbis mikmod jpeg directfb joystick"
 
 DEPEND=">=media-libs/hermes-1.3.2
 	X? ( virtual/x11 )
@@ -26,19 +26,16 @@ DEPEND=">=media-libs/hermes-1.3.2
 S=${WORKDIR}/ClanLib-${PV}
 
 src_compile() {
-	local myconf="`use_enable jpeg`"
-
+	local myconf=""
 	use jpeg || myconf="${myconf} --enable-smalljpeg"
-
 	use alsa || use oss || use esd || use arts \
 		&& myconf="${myconf} --enable-clansound" \
 		|| myconf="${myconf} --disable-clansound"
 
 	WANT_AUTOMAKE=1.6 ./autogen.sh
-	
+
 	econf \
-		--host=${CHOST} \
-		--prefix=/usr \
+		--libdir=/usr/lib/${P} \
 		--enable-network \
 		--enable-asm386 \
 		--enable-dyn \
@@ -57,5 +54,13 @@ src_compile() {
 }
 
 src_install() {
-	make prefix=${D}/usr install || die
+	make DESTDIR=${D} install || die
+	mv ${D}/usr/include/{ClanLib,${P}}
+	dobin ${FILESDIR}/clanlib-config
+	dodoc BUGS CODING_STYLE CREDITS NEWS PATCHES PORTING README*
+	dohtml -r Documentation/*
+}
+
+pkg_postinst() {
+	clanlib-config ${PV}
 }
diff --git a/dev-games/clanlib/files/clanlib-0.6.5.patch b/dev-games/clanlib/files/clanlib-0.6.5.patch
index 7c14a25cbc84..cb991e4c5dd2 100644
--- a/dev-games/clanlib/files/clanlib-0.6.5.patch
+++ b/dev-games/clanlib/files/clanlib-0.6.5.patch
@@ -9,3 +9,32 @@
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
  #include <X11/cursorfont.h>
+--- ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp.orig	2003-07-16 11:08:22.000000000 -0400
++++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp	2003-07-16 11:08:47.000000000 -0400
+@@ -104,7 +104,7 @@
+ 
+ unsigned int CL_Target_DirectFB::get_width() const
+ {
+-  unsigned int width = 0;
++  int width = 0;
+ 
+   surface->GetSize (surface, &width, NULL);
+ 
+@@ -113,7 +113,7 @@
+ 
+ unsigned int CL_Target_DirectFB::get_height() const
+ {
+-  unsigned int height = 0;
++  int height = 0;
+ 
+   surface->GetSize (surface, NULL, &height);
+ 
+@@ -263,7 +263,7 @@
+ 
+ void CL_Target_DirectFB::Clear (float r, float g, float b, float a)
+ {
+-  unsigned int width, height;
++  int width, height;
+ 
+   surface->GetSize (surface, &width, &height);
+ 
diff --git a/dev-games/clanlib/files/clanlib-config b/dev-games/clanlib/files/clanlib-config
new file mode 100644
index 000000000000..b30a8e29515d
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-config
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+if [ ! "`ls /usr/lib/clanlib-* 2> /dev/null`" ] ; then
+	echo "No installed versions of ClanLib detected!"
+	exit 1
+fi
+
+showusage() {
+	echo "USAGE: clanlib-update <version to use>"
+	echo -n "  versions currently installed:"
+	for d in /usr/lib/clanlib-* ; do
+		d=`basename ${d}`
+		echo -n " ${d:8}"
+	done
+	echo
+	exit 1
+}
+
+[ -z "${1}" ] && showusage
+[ ! -d "/usr/lib/clanlib-${1}" ] && showusage
+
+for lib in /usr/lib/clanlib-${1}/* ; do
+	b=`basename ${lib}`
+	ln -sf ${lib} /usr/lib/${b}
+done
+rm -f /usr/include/ClanLib
+ln -sf /usr/include/clanlib-${1} /usr/include/ClanLib
diff --git a/dev-games/clanlib/files/digest-clanlib-0.7.2 b/dev-games/clanlib/files/digest-clanlib-0.7.2-r1
index f658027165c2..f658027165c2 100644
--- a/dev-games/clanlib/files/digest-clanlib-0.7.2
+++ b/dev-games/clanlib/files/digest-clanlib-0.7.2-r1