Revbump and remove old. Transition the C and python libraries to external packages and bump to EAPI 4.

(Portage version: 2.2.0_alpha20/cvs/Linux x86_64)

5 files changed, 67 insertions, 199 deletions

diff --git a/media-libs/libsfml/ChangeLog b/media-libs/libsfml/ChangeLog
index 2c63e1d1a0c3..bb37bfa5993a 100644
--- a/media-libs/libsfml/ChangeLog
+++ b/media-libs/libsfml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libsfml
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.2 2011/02/05 05:43:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.3 2011/02/07 10:43:52 radhermit Exp $
+
+*libsfml-1.6-r1 (07 Feb 2011)
+
+  07 Feb 2011; Tim Harder <radhermit@gentoo.org> -libsfml-1.6.ebuild,
+  +libsfml-1.6-r1.ebuild, -files/libsfml-1.6-csfml-destdir.patch, metadata.xml:
+  Revbump and remove old. Transition the C and python libraries to external
+  packages and bump to EAPI 4.
 
   05 Feb 2011; Tim Harder <radhermit@gentoo.org> libsfml-1.6.ebuild:
   Use capital letters and add acronym to DESCRIPTION.
diff --git a/media-libs/libsfml/files/libsfml-1.6-csfml-destdir.patch b/media-libs/libsfml/files/libsfml-1.6-csfml-destdir.patch
deleted file mode 100644
index cdf0c46215ae..000000000000
--- a/media-libs/libsfml/files/libsfml-1.6-csfml-destdir.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- SFML-1.6.orig/CSFML/src/SFML/Audio/Makefile
-+++ SFML-1.6/CSFML/src/SFML/Audio/Makefile
-@@ -20,4 +20,4 @@
- 	@rm -rf $(LIBNAME)

- 

- install:

--	@($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))

-+	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB))

---- SFML-1.6.orig/CSFML/src/SFML/Graphics/Makefile
-+++ SFML-1.6/CSFML/src/SFML/Graphics/Makefile
-@@ -20,4 +20,4 @@
- 	@rm -rf $(LIBNAME)

- 

- install:

--	@($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))

-+	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB))

---- SFML-1.6.orig/CSFML/src/SFML/Makefile
-+++ SFML-1.6/CSFML/src/SFML/Makefile
-@@ -1,15 +1,18 @@
- export CC         = gcc

- export CPP        = g++

--export CFLAGS     = -W -Wall -pedantic -fPIC -Wno-unused -I../.. -I../../../include -DNDEBUG -DCSFML_EXPORTS -O2

--export LDFLAGS    = -shared

-+export CFLAGS     += -W -Wall -pedantic -fPIC -Wno-unused -I../.. -I../../../include -DNDEBUG -DCSFML_EXPORTS

-+export LDFLAGS    += -shared

- export LIBPATH    = ../../../lib

- export VERSION    = 1.6

- export CP         = cp

- export LN         = ln

- export LNFLAGS    = -s -f

--export DESTDIR    = /usr/local

--export DESTLIBDIR = $(DESTDIR)/lib

--export DESTINCDIR = $(DESTDIR)/include

-+export DESTDIR    =

-+ifeq ($(origin prefix), undefined)

-+   export prefix = /usr/local

-+endif

-+export libdir     = $(prefix)/lib

-+export includedir = $(prefix)/include

- 

- all: csfml-system csfml-window csfml-network csfml-graphics csfml-audio

- 

-@@ -42,6 +45,6 @@
- 	@(cd ./System && $(MAKE) $@	&& cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)

- 

- install:

--	@(mkdir -p $(DESTLIBDIR))

--	@(mkdir -p $(DESTINCDIR))

--	@(cd ./System && $(MAKE) $@	&& cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTINCDIR))

-+	@(mkdir -p $(DESTDIR)/$(libdir))

-+	@(mkdir -p $(DESTDIR)/$(includedir))

-+	@(cd ./System && $(MAKE) $@	&& cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTDIR)/$(includedir))

---- SFML-1.6.orig/CSFML/src/SFML/Network/Makefile
-+++ SFML-1.6/CSFML/src/SFML/Network/Makefile
-@@ -20,4 +20,4 @@
- 	@rm -rf $(LIBNAME)

- 

- install:

--	@($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))

-+	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB))

---- SFML-1.6.orig/CSFML/src/SFML/System/Makefile
-+++ SFML-1.6/CSFML/src/SFML/System/Makefile
-@@ -20,4 +20,4 @@
- 	@rm -rf $(LIBNAME)

- 

- install:

--	@($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))

-+	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB))

---- SFML-1.6.orig/CSFML/src/SFML/Window/Makefile
-+++ SFML-1.6/CSFML/src/SFML/Window/Makefile
-@@ -20,4 +20,4 @@
- 	@rm -rf $(LIBNAME)

- 

- install:

--	@($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))

-+	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB))

diff --git a/media-libs/libsfml/libsfml-1.6-r1.ebuild b/media-libs/libsfml/libsfml-1.6-r1.ebuild
new file mode 100644
index 000000000000..dc1aa7dd3ebc
--- /dev/null
+++ b/media-libs/libsfml/libsfml-1.6-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/libsfml-1.6-r1.ebuild,v 1.1 2011/02/07 10:43:52 radhermit Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="SFML-${PV}"
+DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
+HOMEPAGE="http://sfml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sfml/${MY_P}-sdk-linux-32.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples static-libs"
+
+DEPEND="media-libs/freetype:2
+	media-libs/glew
+	media-libs/libpng
+	media-libs/libsndfile
+	media-libs/mesa
+	media-libs/openal
+	sys-libs/zlib
+	virtual/jpeg
+	x11-libs/libX11
+	x11-libs/libXrandr"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	epatch "${FILESDIR}"/${P}-deps-and-flags.patch
+}
+
+src_compile() {
+	local myconf
+	use debug && myconf="$myconf DEBUGBUILD=yes"
+
+	emake $myconf CPP=$(tc-getCXX) CC=$(tc-getCC)
+	use static-libs && emake $myconf STATIC=yes CPP=$(tc-getCXX) CC=$(tc-getCC)
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix=/usr libdir=/usr/$(get_libdir) install
+
+	use static-libs && dolib.a lib/*.a
+	use doc && dohtml doc/html/*
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		for i in ftp opengl pong post-fx qt sockets sound sound_capture voip window wxwidgets X11 ; do
+			insinto /usr/share/doc/${PF}/examples/$i
+			doins samples/$i/*
+		done
+	fi
+}
diff --git a/media-libs/libsfml/libsfml-1.6.ebuild b/media-libs/libsfml/libsfml-1.6.ebuild
deleted file mode 100644
index 517b73dcc03c..000000000000
--- a/media-libs/libsfml/libsfml-1.6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/libsfml-1.6.ebuild,v 1.2 2011/02/05 05:43:54 radhermit Exp $
-
-EAPI=3
-PYTHON_DEPEND="python? 2:2.6 3"
-PYTHON_MODNAME="PySFML"
-
-inherit eutils multilib toolchain-funcs distutils
-
-MY_P="SFML-${PV}"
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="http://sfml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sfml/${MY_P}-sdk-linux-32.tar.gz
-	csfml? ( mirror://sourceforge/sfml/${MY_P}-c-sdk-linux-32.tar.gz )
-	python? ( mirror://sourceforge/sfml/${MY_P}-python-sdk.zip )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="csfml debug doc examples python static-libs"
-
-DEPEND="media-libs/freetype:2
-	media-libs/glew
-	media-libs/libpng
-	media-libs/libsndfile
-	media-libs/mesa
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/libX11
-	x11-libs/libXrandr"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.patch
-	epatch "${FILESDIR}"/${P}-deps-and-flags.patch
-	if use csfml ; then
-		epatch "${FILESDIR}"/${P}-csfml-destdir.patch
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	if use debug ; then
-		myconf="$myconf DEBUGBUILD=yes"
-	fi
-
-	emake $myconf CPP=$(tc-getCXX) CC=$(tc-getCC) || die "emake failed"
-
-	if use static-libs ; then
-		emake $myconf STATIC=yes CPP=$(tc-getCXX) CC=$(tc-getCC) || die "emake failed"
-	fi
-
-	if use csfml ; then
-		cd "${S}/CSFML"
-		emake CPP=$(tc-getCXX) || die "emake failed"
-	fi
-
-	if use python ; then
-		cd "${S}/python"
-		distutils_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix=/usr libdir=/usr/$(get_libdir) install || die "emake install failed"
-
-	if use csfml ; then
-		pushd "${S}/CSFML" >/dev/null
-		emake DESTDIR="${D}" prefix=/usr libdir=/usr/$(get_libdir) install || die "emake install failed"
-		popd >/dev/null
-	fi
-
-	if use python ; then
-		pushd "${S}/python" >/dev/null
-		distutils_src_install
-		popd >/dev/null
-	fi
-
-	if use static-libs ; then
-		dolib.a lib/*.a || die "dolib.a failed"
-	fi
-
-	if use doc ; then
-		dohtml doc/html/*
-		if use csfml ; then
-			docinto csfml/html
-			dohtml CSFML/doc/html/*
-		fi
-		if use python ; then
-			docinto python/html
-			dohtml python/doc/*
-		fi
-	fi
-
-	if use examples ; then
-		for i in ftp opengl pong post-fx qt sockets sound sound_capture voip window wxwidgets X11 ; do
-			insinto /usr/share/doc/${PF}/examples/$i
-			doins samples/$i/* || die "doins failed"
-		done
-
-		if use python ; then
-			insinto /usr/share/doc/${PF}/python/examples
-			doins -r python/samples/* || die "doins failed"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/media-libs/libsfml/metadata.xml b/media-libs/libsfml/metadata.xml
index 17d82b933cc5..767661ef4332 100644
--- a/media-libs/libsfml/metadata.xml
+++ b/media-libs/libsfml/metadata.xml
@@ -14,7 +14,4 @@
 	as a fully-featured multimedia library for building games or interactive
 	programs.
 	</longdescription>
-	<use>
-		<flag name="csfml">Build the C libraries for SFML</flag>
-	</use>
 </pkgmetadata>