ver bump #30488

6 files changed, 71 insertions, 110 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index fd589f94736e..ff414b952c6f 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.5 2003/09/07 14:24:33 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.6 2003/10/07 00:04:35 vapier Exp $
+
+*clanlib-0.7.4 (06 Oct 2003)
+
+  06 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to fix #30488.
 
 *clanlib-0.7.3 (07 Sep 2003)
 
diff --git a/dev-games/clanlib/clanlib-0.7.3.ebuild b/dev-games/clanlib/clanlib-0.7.3.ebuild
deleted file mode 100644
index 8dff4b0d6824..000000000000
--- a/dev-games/clanlib/clanlib-0.7.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.3.ebuild,v 1.2 2003/09/08 01:25:34 msterret Exp $
-
-inherit flag-o-matic
-replace-flags -O? -O2
-
-DESCRIPTION="multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/"
-SRC_URI="http://www.clanlib.org/~sphair/download/ClanLib-${PV}-3.tar.bz2"
-
-LICENSE="LGPL-2"
-# 2003-09-07: karltk
-# NOTE! According to the ClanLib developers, 0.<odd> are always unstable,
-# so we must  slot major.minor.patch
-SLOT="0.7.3"
-KEYWORDS="~x86"
-IUSE="arts oss esd alsa png opengl truetype X oggvorbis mikmod jpeg directfb joystick"
-
-DEPEND=">=media-libs/hermes-1.3.2
-	media-libs/libpng
-	>=media-libs/jpeg-6b
-	|| (
-		opengl? ( virtual/opengl )
-		>=media-libs/libsdl-1.2.5
-	)
-	X? ( virtual/x11 )
-	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_compile() {
-	local myconf=""
-
-	use alsa || use oss || use esd || use arts \
-		&& myconf="${myconf} --enable-clanSound" \
-		|| myconf="${myconf} --disable-clanSound"
-	use opengl && myconf="${myconf} --enable-clanGL --disable-clanSDL" \
-		|| myconf="${myconf} --enable-clanSDL --disable-clanGL"
-
-	WANT_AUTOMAKE=1.6 ./autogen.sh
-
-	econf \
-		--libdir=/usr/lib/${P} \
-		--enable-network \
-		--enable-asm386 \
-		--enable-dyn \
-		--disable-clanVoice \
-		--disable-clanJavaScript \
-		--enable-clanDisplay \
-		--enable-clanNetwork \
-		--enable-clanGUI \
-		`use_enable X x11` \
-		`use_enable directfb` \
-		`use_enable oggvorbis clanVorbis` \
-		`use_enable mikmod clanMikMod` \
-		`use_enable joystick` \
-		--enable-vidmode \
-		--enable-getaddr \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodir /usr/share/doc/${PF}/html
-	mv ${D}/usr/share/doc/clanlib/* ${D}/usr/share/doc/${PF}/html
-	rm -rf ${D}/usr/share/doc/clanlib
-	mv ${D}/usr/include/{ClanLib,${PF}}
-	dodoc CODING_STYLE CREDITS NEWS PATCHES README* INSTALL.*
-	dosym /usr/include/${PF} /usr/include/ClanLib
-	dodir /usr/bin
-	echo ${FILESDIR}/clanlib-config-0.7.in | sed "s/@VERSION@/${PF}/" \
-		> ${D}/usr/bin/clanlib-config
-}
diff --git a/dev-games/clanlib/clanlib-0.7.4.ebuild b/dev-games/clanlib/clanlib-0.7.4.ebuild
new file mode 100644
index 000000000000..15091ca449bd
--- /dev/null
+++ b/dev-games/clanlib/clanlib-0.7.4.ebuild
@@ -0,0 +1,64 @@
+# 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.4.ebuild,v 1.1 2003/10/07 00:04:35 vapier Exp $
+
+inherit flag-o-matic
+replace-flags -O? -O2
+
+DESCRIPTION="multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://www.clanlib.org/~sphair/download/ClanLib-${PV}-1.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0.7"
+KEYWORDS="x86"
+IUSE="opengl X sdl oggvorbis doc mikmod clanVoice clanJavaScript ipv6"
+
+DEPEND=">=media-libs/hermes-1.3.2
+	media-libs/libpng
+	media-libs/jpeg
+	opengl? ( virtual/opengl )
+	sdl? ( media-libs/libsdl )
+	X? ( virtual/x11 )
+	mikmod? ( >=media-libs/libmikmod-3.1.9 )
+	oggvorbis? ( media-libs/libvorbis )"
+
+S=${WORKDIR}/ClanLib-${PV}
+
+src_compile() {
+	#clanSound only controls mikmod/vorbis so theres
+	# 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 dont have to use clanGUI
+	[ `use doc` ] || sed -i '/^SUBDIRS/s:Documentation::' Makefile.in
+	econf \
+		--libdir=/usr/lib/${P} \
+		`use_enable x86 asm386` \
+		`use_enable doc docs` \
+		--enable-dyn \
+		`use_enable clanVoice` \
+		`use_enable clanJavaScript` \
+		--enable-clanNetwork \
+		`use_enable opengl clanGL` \
+		`use_enable sdl clanSDL` \
+		`use_enable oggvorbis clanVorbis` \
+		`use_enable mikmod clanMikMod` \
+		`use_enable ipv6 getaddr` \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodir /usr/share/doc/${PF}/html
+	mv ${D}/usr/share/doc/clanlib/* ${D}/usr/share/doc/${PF}/html/
+	rm -rf ${D}/usr/share/doc/clanlib
+	mv ${D}/usr/include/{ClanLib-*/ClanLib,${P}}
+	rm -rf ${D}/usr/include/ClanLib-*
+	dodoc CODING_STYLE CREDITS NEWS PATCHES README*
+}
+
+pkg_postinst() {
+	clanlib-config ${PV}
+}
diff --git a/dev-games/clanlib/files/clanlib-config-0.7.in b/dev-games/clanlib/files/clanlib-config-0.7.in
deleted file mode 100644
index 114965a78e6a..000000000000
--- a/dev-games/clanlib/files/clanlib-config-0.7.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2003 Gentoo Technologies, Inc.
-# Copyright (c) 2003 Karl Trygve Kalleberg <karltk@gentoo.org>
-# 
-# Derived from vapier's clanlib-update
-
-VERSION=@VERSION@
-
-if [ ! "`ls /usr/lib/clanlib-* 2> /dev/null`" ] ; then
-	echo "No installed versions of ClanLib detected!"
-	exit 1
-fi
-
-showusage() {
-	echo "Usage: clanlib-config [options]"
-	echo "Options: "
-	echo "   [--libs]"
-	echo "   [--version]"
-}
-
-[ -z "${1}" ] && showusage
-
-case ${1} in
-	--lib-path)
-		echo /usr/lib/clanlib-${VERSION}
-		;;
-	--version)
-		echo ${VERSION}
diff --git a/dev-games/clanlib/files/digest-clanlib-0.7.3 b/dev-games/clanlib/files/digest-clanlib-0.7.3
deleted file mode 100644
index 093cf3ae0726..000000000000
--- a/dev-games/clanlib/files/digest-clanlib-0.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a15af474b631e7ba1eea4f3676b93335 ClanLib-0.7.3-3.tar.bz2 3383949
diff --git a/dev-games/clanlib/files/digest-clanlib-0.7.4 b/dev-games/clanlib/files/digest-clanlib-0.7.4
new file mode 100644
index 000000000000..c15eb95dc087
--- /dev/null
+++ b/dev-games/clanlib/files/digest-clanlib-0.7.4
@@ -0,0 +1 @@
+MD5 cf7aabf73590b4fedfa53907029de588 ClanLib-0.7.4-1.tar.bz2 3929151