SLOT 0.6.x but leave 0.7.x alone #52509 / #44258

12 files changed, 34 insertions, 177 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 4f5b6ca7ac31..b9119bb3f788 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.18 2004/08/15 08:03:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.19 2004/08/15 08:51:46 vapier Exp $
+
+*clanlib-0.7.8-r1 (15 Aug 2004)
+
+  15 Aug 2004; Mike Frysinger <vapier@gentoo.org> +clanlib-0.7.8-r1.ebuild:
+  Install clanlib-0.6.x into a SLOT-ed dir but move 0.7.x back into normal
+  behavior #52509 / #44258.
+
+*clanlib-0.6.5-r2 (15 Aug 2004)
+
+  15 Aug 2004; Mike Frysinger <vapier@gentoo.org> +clanlib-0.6.5-r2.ebuild:
+  Install clanlib-0.6.x into a SLOT-ed dir but move 0.7.x back into normal
+  behavior #52509 / #44258.
 
   15 Aug 2004; Mike Frysinger <vapier@gentoo.org> files/0.6.5-gcc3.patch:
   Update gcc-3.x patch from ROCKLinux #51997 by Felix Riemann.
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 0b64b9f5680a..c557332fdd66 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dadd05d4d94dc7fc192b509e9f901b43 ChangeLog 4542
-MD5 6db51ae9750508e035d0fc055f0aae60 clanlib-0.6.5-r1.ebuild 1956
+MD5 d0fca2ea096285fc43b8f04dea9638cb ChangeLog 4968
+MD5 e1ae2faf6b79de721e3f1fe0a0a1fc10 clanlib-0.6.5-r2.ebuild 1925
 MD5 33ee8adc6546aef9881086d98bfadb79 metadata.xml 3010
-MD5 dd653517064b6d23aad878b2e04132fd clanlib-0.7.7.ebuild 2169
-MD5 1a36078fb24f7e68abfb2e13adf205ba clanlib-0.7.8.ebuild 2325
-MD5 940618fa67a1354533249defe3a89739 files/0.7.7-port.patch 305
+MD5 a39a317cf2fd380f566d2da54720ed85 clanlib-0.7.8-r1.ebuild 2129
 MD5 02bf4adb204b0118db91d903ab747440 files/0.6.5-gcc3.patch 3604
-MD5 940618fa67a1354533249defe3a89739 files/0.7.6-port.patch 305
-MD5 26dcf3921a83e1671ba72cd1ee82c6ed files/clanlib-config 580
-MD5 3e439d751339f684be1c709644d71a4d files/digest-clanlib-0.6.5-r1 68
-MD5 15f71a052d34aa42549c5ff3b6cf53ee files/0.7.7-gl-prototype.patch 569
-MD5 b9b3a8d6abbc0d37df1a96c3b1f3c3fc files/digest-clanlib-0.7.7 69
+MD5 3e439d751339f684be1c709644d71a4d files/digest-clanlib-0.6.5-r2 68
+MD5 96c4aa6ca05f84d43464c80d9e7565d9 files/digest-clanlib-0.7.8-r1 69
 MD5 940618fa67a1354533249defe3a89739 files/0.7.8-port.patch 305
-MD5 96c4aa6ca05f84d43464c80d9e7565d9 files/digest-clanlib-0.7.8 69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBHxjxHTu7gpaalycRApj4AKCJwDS6HPzOVWREgnvtIGDFmnIusQCg3yyW
-eoXTHu5wbUmA2eSmidMHLgA=
-=a2xk
+iD8DBQFBHyRxHTu7gpaalycRAoUsAJ9vsUUtjZzWFRHxOESVjvZx8sPqNgCdGb2B
+pOlmSikvjQNr4hq/188KA8A=
+=N4W4
 -----END PGP SIGNATURE-----
diff --git a/dev-games/clanlib/clanlib-0.6.5-r1.ebuild b/dev-games/clanlib/clanlib-0.6.5-r2.ebuild
index d7f28f29e6fb..a0493793f176 100644
--- a/dev-games/clanlib/clanlib-0.6.5-r1.ebuild
+++ b/dev-games/clanlib/clanlib-0.6.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.11 2004/06/24 22:09:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5-r2.ebuild,v 1.1 2004/08/15 08:51:46 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.clanlib.org/download/files/ClanLib-${PV}-1.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="x86 ppc sparc ~alpha ~amd64"
+KEYWORDS="x86 ppc sparc alpha amd64"
 IUSE="arts oss esd alsa png opengl truetype X oggvorbis mikmod jpeg directfb joystick"
 
 DEPEND=">=media-libs/hermes-1.3.2
@@ -40,10 +40,9 @@ src_compile() {
 		&& myconf="${myconf} --enable-clansound" \
 		|| myconf="${myconf} --disable-clansound"
 
-	./autogen.sh
-
 	econf \
 		--libdir=/usr/lib/${P} \
+		--includedir=/usr/include/${P} \
 		--enable-network \
 		`use_enable x86 asm386` \
 		--enable-dyn \
@@ -65,14 +64,10 @@ src_install() {
 	make install \
 		prefix=${D}/usr \
 		LIB_PREFIX=${D}/usr/lib/${P} \
+		INC_PREFIX=${D}/usr/include/${P} \
 		|| die "make install failed"
-	mv ${D}/usr/include/{ClanLib,${P}}
-	dobin ${FILESDIR}/clanlib-config \
-		|| die "dobin failed"
-	dodoc BUGS CODING_STYLE HARDWARE NEWS PATCHES PORTING README* ROADMAP INSTALL.linux \
-		|| die "dodoc failed"
-}
+	dodoc BUGS CODING_STYLE HARDWARE NEWS PATCHES PORTING README* ROADMAP INSTALL.linux
 
-pkg_postinst() {
-	clanlib-config ${PV}
+	dodir /etc/env.d
+	echo "LDPATH=/usr/lib/${P}" > ${D}/etc/env.d/91clanlib-${PV}
 }
diff --git a/dev-games/clanlib/clanlib-0.7.7.ebuild b/dev-games/clanlib/clanlib-0.7.7.ebuild
deleted file mode 100644
index 25e9abac199a..000000000000
--- a/dev-games/clanlib/clanlib-0.7.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.7.ebuild,v 1.10 2004/06/29 18:17:50 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-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 ppc sparc ~alpha"
-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 )
-	>=sys-apps/sed-4"
-
-S=${WORKDIR}/ClanLib-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	find . -name .cvsignore -exec rm -f \{\} \;
-	epatch ${FILESDIR}/${PV}-port.patch
-	epatch ${FILESDIR}/${PV}-gl-prototype.patch
-}
-
-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
-	if use doc ; then
-		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
-		cp -r Examples ${D}/usr/share/doc/${PF}/
-	fi
-	mv ${D}/usr/include/{ClanLib-*/ClanLib,${P}}
-	rm -rf ${D}/usr/include/ClanLib-*
-	dobin ${FILESDIR}/clanlib-config
-	dodoc CODING_STYLE CREDITS NEWS PATCHES README* INSTALL.linux
-}
-
-pkg_postinst() {
-	clanlib-config ${PV}
-}
diff --git a/dev-games/clanlib/clanlib-0.7.8.ebuild b/dev-games/clanlib/clanlib-0.7.8-r1.ebuild
index 61742f047714..f39c6369f383 100644
--- a/dev-games/clanlib/clanlib-0.7.8.ebuild
+++ b/dev-games/clanlib/clanlib-0.7.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.8.ebuild,v 1.3 2004/06/24 22:09:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.8-r1.ebuild,v 1.1 2004/08/15 08:51:46 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.clanlib.org/~sphair/download/ClanLib-${PV}-1.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0.7"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ppc sparc alpha amd64"
 IUSE="opengl X sdl oggvorbis doc mikmod clanVoice clanJavaScript ipv6"
 
 RDEPEND=">=media-libs/hermes-1.3.2
@@ -29,12 +29,13 @@ S="${WORKDIR}/ClanLib-${PV}"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	find . -name .cvsignore -exec rm -f \{\} \;
+	find . -name .cvsignore -exec rm -f '{}' \;
 	epatch "${FILESDIR}/${PV}-port.patch"
 	if ! use doc ; then
 		sed -i \
-			-e '/^SUBDIRS/s:Documentation::' Makefile.in \
-				|| die "sed Makefile.in failed"
+			-e '/^SUBDIRS/s:Documentation::' \
+			Makefile.in \
+			|| die "sed Makefile.in failed"
 	fi
 }
 
@@ -45,7 +46,6 @@ src_compile() {
 	# so no need to pass --{en,dis}able-clanDisplay
 	# also same reason why we don't have to use clanGUI
 	econf \
-		--libdir="/usr/lib/${P}" \
 		--enable-dyn \
 		--enable-clanNetwork \
 		--disable-dependency-tracking \
@@ -70,12 +70,5 @@ src_install() {
 		rm -rf "${D}/usr/share/doc/clanlib"
 		cp -r Examples "${D}/usr/share/doc/${PF}/"
 	fi
-	mv "${D}"/usr/include/{ClanLib-*/ClanLib,"${P}"}
-	rm -rf "${D}/usr/include/ClanLib-"*
-	dobin "${FILESDIR}/clanlib-config"
 	dodoc CODING_STYLE CREDITS NEWS PATCHES README* INSTALL.linux
 }
-
-pkg_postinst() {
-	clanlib-config "${PV}"
-}
diff --git a/dev-games/clanlib/files/0.7.6-port.patch b/dev-games/clanlib/files/0.7.6-port.patch
deleted file mode 100644
index a1da63f81147..000000000000
--- a/dev-games/clanlib/files/0.7.6-port.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/Network/Socket/ip_address_getsock.h.orig	2003-11-15 17:33:34.075094400 -0500
-+++ Sources/Network/Socket/ip_address_getsock.h	2003-11-15 17:33:39.688241072 -0500
-@@ -105,7 +105,7 @@
- 	unsigned int ip;
- 
- 	// IP port in host byte order.
--	unsigned short port;
-+	unsigned int port;
- };
- 
- #endif
diff --git a/dev-games/clanlib/files/0.7.7-gl-prototype.patch b/dev-games/clanlib/files/0.7.7-gl-prototype.patch
deleted file mode 100644
index 636e6a72d6cf..000000000000
--- a/dev-games/clanlib/files/0.7.7-gl-prototype.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/GL/opengl_state_generic.cpp.orig	2004-01-19 03:27:03.151761520 -0500
-+++ Sources/GL/opengl_state_generic.cpp	2004-01-19 03:27:22.483822600 -0500
-@@ -518,7 +518,7 @@
- 	functions->drawElements = &glDrawElements;
- 	functions->drawPixels = &glDrawPixels;
- 	functions->edgeFlag = &glEdgeFlag;
--	functions->edgeFlagPointer = &glEdgeFlagPointer;
-+	functions->edgeFlagPointer = (CL_GLFunctions::ptr_glEdgeFlagPointer) &glEdgeFlagPointer;
- 	functions->edgeFlagv = &glEdgeFlagv;
- 	functions->enable = &glEnable;
- 	functions->enableClientState = &glEnableClientState;
diff --git a/dev-games/clanlib/files/0.7.7-port.patch b/dev-games/clanlib/files/0.7.7-port.patch
deleted file mode 100644
index a1da63f81147..000000000000
--- a/dev-games/clanlib/files/0.7.7-port.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/Network/Socket/ip_address_getsock.h.orig	2003-11-15 17:33:34.075094400 -0500
-+++ Sources/Network/Socket/ip_address_getsock.h	2003-11-15 17:33:39.688241072 -0500
-@@ -105,7 +105,7 @@
- 	unsigned int ip;
- 
- 	// IP port in host byte order.
--	unsigned short port;
-+	unsigned int port;
- };
- 
- #endif
diff --git a/dev-games/clanlib/files/clanlib-config b/dev-games/clanlib/files/clanlib-config
deleted file mode 100644
index b30a8e29515d..000000000000
--- a/dev-games/clanlib/files/clanlib-config
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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.6.5-r1 b/dev-games/clanlib/files/digest-clanlib-0.6.5-r2
index 18fff14c418e..18fff14c418e 100644
--- a/dev-games/clanlib/files/digest-clanlib-0.6.5-r1
+++ b/dev-games/clanlib/files/digest-clanlib-0.6.5-r2
diff --git a/dev-games/clanlib/files/digest-clanlib-0.7.7 b/dev-games/clanlib/files/digest-clanlib-0.7.7
deleted file mode 100644
index b58980a45c30..000000000000
--- a/dev-games/clanlib/files/digest-clanlib-0.7.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f46a681e70e9d8849a572458abae8ca ClanLib-0.7.7-1.tar.bz2 4670490
diff --git a/dev-games/clanlib/files/digest-clanlib-0.7.8 b/dev-games/clanlib/files/digest-clanlib-0.7.8-r1
index e274dd29062d..e274dd29062d 100644
--- a/dev-games/clanlib/files/digest-clanlib-0.7.8
+++ b/dev-games/clanlib/files/digest-clanlib-0.7.8-r1