Initial import for bug #258895. Ebuild by me.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

7 files changed, 471 insertions, 0 deletions

diff --git a/media-libs/libsfml/ChangeLog b/media-libs/libsfml/ChangeLog
new file mode 100644
index 000000000000..89180acc21ff
--- /dev/null
+++ b/media-libs/libsfml/ChangeLog
@@ -0,0 +1,12 @@
+# 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.1 2011/02/05 05:38:21 radhermit Exp $
+
+*libsfml-1.6 (05 Feb 2011)
+
+  05 Feb 2011; Tim Harder <radhermit@gentoo.org> +libsfml-1.6.ebuild,
+  +files/libsfml-1.6-csfml-destdir.patch,
+  +files/libsfml-1.6-deps-and-flags.patch, +files/libsfml-1.6-destdir.patch,
+  +metadata.xml:
+  Initial import for bug #258895. Ebuild by me.
+
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
new file mode 100644
index 000000000000..6bffafa53a15
--- /dev/null
+++ b/media-libs/libsfml/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libsfml-1.6-csfml-destdir.patch 3448 RMD160 f57d11efc47a4028711d2dad585e49c9145389e8 SHA1 d1f02ee375c366fcb639d2597ddf38a6ff652c20 SHA256 d2a36099f66b10638ade91a62801e4b7aab2e0b7a65ce08f3fa6b815fcdfa416
+AUX libsfml-1.6-deps-and-flags.patch 3546 RMD160 f1b2b9391d193a42e8d554936a45cc57143f1583 SHA1 53910669d105fd0d2fa8118e447b9ed87f74c849 SHA256 ae54446a78d96ec373dd8f28c7db7d8d64a87f90ae9d79d36ca14bec9ef7e813
+AUX libsfml-1.6-destdir.patch 3855 RMD160 a1152276e723dba9246e5fb252c3f5426266e21a SHA1 10e6d368db1c51c6ebc7378171efcc706138d992 SHA256 2f4343f60460bda2ad7b121e3e00a03b52c44366f488af1bfac7914019dc0094
+DIST SFML-1.6-c-sdk-linux-32.tar.gz 1070818 RMD160 77a954ddd3e87c380ecd2f464aaa8e31ea9816d8 SHA1 a1266484200e847bbd453960896bdf924e45477a SHA256 c186cc5f0c9e4eee8864143d8e5757849bc84689af43223996e1b289958c076e
+DIST SFML-1.6-python-sdk.zip 170889 RMD160 c5b458a7d05f452a21b09d35d62675f0a9d273d5 SHA1 8c0d68dd6f4a50e3130eadec6c4f0989a2d01cdf SHA256 1c6808bffb2e7346f6ca44e778245412427f21d59940dfd37088149e6557cd33
+DIST SFML-1.6-sdk-linux-32.tar.gz 12937755 RMD160 78058f4d24667b015c3e11421f0a0a01c49652b7 SHA1 85e3e0a73982678c2c0ab32275be7e365822d69c SHA256 b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8
+EBUILD libsfml-1.6.ebuild 2717 RMD160 0f0d6bcbe70958592f91b6c51126be5d22b15514 SHA1 2ee751914e6ce255d9ca6c76985c45a4ad6bb60a SHA256 66a344b2fdc0a68bfee3720bd990e1aaf14e13aca298a4ec310eb553db7b8c6d
+MISC ChangeLog 495 RMD160 14a3514280af812b804a9a6c06a294ae205a46ca SHA1 43a2e3910d482f84e3c8e7c730c12364fa374aed SHA256 edba93e90fc44ae0f3eb5ae9096ee7f2ef6b758c23f6083e2f9d4e35708b1d78
+MISC metadata.xml 772 RMD160 f2ee15c00303a2860d8aa864f6d085390aeeb818 SHA1 79b5eb6937fd2d65a0b9fdac792bfdf54994ba22 SHA256 73d08a8171eb4e274aafe4a9ecbd77422f36904caa50761e38115ef3cca1b3b1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNTOJWAAoJEEqz6FtPBkyj42UH/jHSVnJ7Ca7+3IIZ/9LO+0GM
+3UxBPIlOK1Xgorj0SKU6hNiGo0Iz+RSY80+BzckDtutwPnGZbUVVIhebL//8Yc8J
+EkpfXgSYHXi/0qQmqUbmPXigF10gDD8utmFO798JqnBDrJ7smpRzzZhHp+Wob9Yk
+2N94Q+PlUhuFGsPeEoCPZxamfYxwah0aL0Ax5H/ITVQjot2VK/ViHyno32Ylztrp
+X+Jk6pyZh3h2+kYFLOICHhXiy4fouPN5dtbDVR7b3njBj1wf5+VgM/luuz7NOPlK
+NZvCAONqn+AukX0mTZ/7HynEZCxQFhEfh862T+SCdkKUSLVXZubTxxe3GbqCO2c=
+=Lf4G
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libsfml/files/libsfml-1.6-csfml-destdir.patch b/media-libs/libsfml/files/libsfml-1.6-csfml-destdir.patch
new file mode 100644
index 000000000000..cdf0c46215ae
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-1.6-csfml-destdir.patch
@@ -0,0 +1,76 @@
+--- 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/files/libsfml-1.6-deps-and-flags.patch b/media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch
new file mode 100644
index 000000000000..8dcbff56bf83
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch
@@ -0,0 +1,109 @@
+--- SFML-1.6.orig/src/SFML/Audio/Makefile
++++ SFML-1.6/src/SFML/Audio/Makefile
+@@ -25,7 +25,7 @@
+ 	$(CPP) -o $@ -c $< $(CFLAGS)

+ 

+ $(OBJVORBIS): %.o: %.c

+-	$(CC) -o $@ -c $< $(CFLAGSEXT)

++	$(CC) -o $@ -c $< $(CFLAGS)

+ 

+ .PHONY: clean mrproper

+ 

+--- SFML-1.6.orig/src/SFML/Graphics/GraphicsContext.hpp
++++ SFML-1.6/src/SFML/Graphics/GraphicsContext.hpp
+@@ -30,7 +30,7 @@
+ ////////////////////////////////////////////////////////////

+ #include <SFML/Config.hpp>

+ #include <SFML/System/NonCopyable.hpp>

+-#include <SFML/Graphics/GLEW/glew.h>

++#include <GL/glew.h>

+ #include <iostream>

+ #include <string>

+ 

+--- SFML-1.6.orig/src/SFML/Graphics/ImageLoader.cpp
++++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
+@@ -28,10 +28,10 @@
+ #include <SFML/Graphics/ImageLoader.hpp>

+ extern "C"

+ {

+-    #include <SFML/Graphics/libjpeg/jpeglib.h>

+-    #include <SFML/Graphics/libjpeg/jerror.h>

++    #include <jpeglib.h>

++    #include <jerror.h>

+ }

+-#include <SFML/Graphics/libpng/png.h>

++#include <png.h>

+ #include <SFML/Graphics/SOIL/SOIL.h>

+ #include <iostream>

+ 

+--- SFML-1.6.orig/src/SFML/Graphics/Makefile
++++ SFML-1.6/src/SFML/Graphics/Makefile
+@@ -1,15 +1,7 @@
+ SRC     = $(wildcard *.cpp)

+-SRCGLEW = $(wildcard ./GLEW/*.c)

+-SRCJPEG = $(wildcard ./libjpeg/*.c)

+-SRCPNG  = $(wildcard ./libpng/*.c)

+ SRCSOIL = $(wildcard ./SOIL/*.c)

+-SRCZLIB = $(wildcard ./zlib/*.c)

+ OBJ     = $(SRC:.cpp=.o)

+-OBJGLEW = $(SRCGLEW:.c=.o)

+-OBJJPEG = $(SRCJPEG:.c=.o)

+-OBJPNG  = $(SRCPNG:.c=.o)

+ OBJSOIL = $(SRCSOIL:.c=.o)

+-OBJZLIB = $(SRCZLIB:.c=.o)

+ 

+ ifeq ($(STATIC), yes)

+     LIB     = libsfml-graphics-s.a

+@@ -23,22 +15,22 @@
+ 

+ all: $(LIB)

+ 

+-libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)

+-	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)

++libsfml-graphics-s.a: $(OBJ) $(OBJSOIL)

++	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJSOIL)

+ 

+-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)

+-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL

++libsfml-graphics.so: $(OBJ) $(OBJSOIL)

++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJSOIL) -lGLEW -ljpeg -lpng -lz -lfreetype -lX11 -lGL

+ 

+ $(OBJ): %.o: %.cpp

+ 	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2

+ 

+-$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c

+-	$(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG

++$(OBJSOIL): %.o: %.c

++	$(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG

+ 

+ .PHONY: clean mrproper

+ 

+ clean:

+-	@rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)

++	@rm -rf $(OBJ) $(OBJSOIL)

+ 

+ mrproper: clean

+ 	@rm -rf $(LIBNAME)

+--- SFML-1.6.orig/src/SFML/Makefile
++++ SFML-1.6/src/SFML/Makefile
+@@ -4,7 +4,7 @@
+ ifeq ($(DEBUGBUILD), yes)

+     DEBUGFLAGS = -g -DDEBUG

+ else

+-    DEBUGFLAGS = -O2 -DNDEBUG

++    DEBUGFLAGS = -DNDEBUG

+ endif

+ 

+ ifeq ($(STATIC), no)

+@@ -17,9 +17,8 @@
+ 

+ export CC         = gcc

+ export CPP        = g++

+-export CFLAGS     = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)

+-export CFLAGSEXT  = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)

+-export LDFLAGS    = $(LINKFLAGS)

++export CFLAGS     += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)

++export LDFLAGS    += $(LINKFLAGS)

+ export LIBPATH    = ../../../lib

+ export VERSION    = 1.6

+ export CP         = cp

diff --git a/media-libs/libsfml/files/libsfml-1.6-destdir.patch b/media-libs/libsfml/files/libsfml-1.6-destdir.patch
new file mode 100644
index 000000000000..33a6f91bb6b6
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-1.6-destdir.patch
@@ -0,0 +1,112 @@
+--- SFML-1.6.orig/src/SFML/Audio/Makefile
++++ SFML-1.6/src/SFML/Audio/Makefile
+@@ -10,7 +10,7 @@
+ else

+     LIB     = libsfml-audio.so

+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)

+-    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)

++    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)

+ endif

+ 

+ all: $(LIB)

+@@ -36,4 +36,4 @@
+ 	@rm -rf $(LIBNAME)

+ 

+ install:

+-	@($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))

++	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))

+--- SFML-1.6.orig/src/SFML/Graphics/Makefile
++++ SFML-1.6/src/SFML/Graphics/Makefile
+@@ -18,7 +18,7 @@
+ else

+     LIB     = libsfml-graphics.so

+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)

+-    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)

++    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)

+ endif

+ 

+ all: $(LIB)

+@@ -44,4 +44,4 @@
+ 	@rm -rf $(LIBNAME)

+ 

+ install:

+-	@($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))

++	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))

+--- SFML-1.6.orig/src/SFML/Makefile
++++ SFML-1.6/src/SFML/Makefile
+@@ -28,8 +28,11 @@
+ export AR         = ar

+ export ARFLAGS    = rcs

+-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: sfml-system sfml-window sfml-network sfml-graphics sfml-audio

+ 

+@@ -62,6 +66,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/src/SFML/Network/Makefile
++++ SFML-1.6/src/SFML/Network/Makefile
+@@ -8,7 +8,7 @@
+ else

+     LIB     = libsfml-network.so

+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)

+-    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)

++    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)

+ endif

+ 

+ all: $(LIB)

+@@ -31,4 +31,4 @@
+ 	@rm -rf $(LIBNAME)

+ 

+ install:

+-	@($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))

++	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))

+--- SFML-1.6.orig/src/SFML/System/Makefile
++++ SFML-1.6/src/SFML/System/Makefile
+@@ -8,7 +8,7 @@
+ else

+     LIB     = libsfml-system.so

+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)

+-    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)

++    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)

+ endif

+ 

+ all: $(LIB)

+@@ -31,4 +31,4 @@
+ 	@rm -rf $(LIBNAME)

+ 

+ install:

+-	@($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))

++	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))

+--- SFML-1.6.orig/src/SFML/Window/Makefile
++++ SFML-1.6/src/SFML/Window/Makefile
+@@ -9,7 +9,7 @@
+ else

+     LIB     = libsfml-window.so

+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)

+-    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)

++    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)

+ endif

+ 

+ all: $(LIB)

+@@ -32,4 +32,4 @@
+ 	@rm -rf $(LIBNAME)

+ 

+ install:

+-	@($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))

++	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))

diff --git a/media-libs/libsfml/libsfml-1.6.ebuild b/media-libs/libsfml/libsfml-1.6.ebuild
new file mode 100644
index 000000000000..be76bde6bb20
--- /dev/null
+++ b/media-libs/libsfml/libsfml-1.6.ebuild
@@ -0,0 +1,119 @@
+# 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.1 2011/02/05 05:38:21 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"
+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
new file mode 100644
index 000000000000..17d82b933cc5
--- /dev/null
+++ b/media-libs/libsfml/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<longdescription lang="en">
+	The Simple and Fast Multimedia Library (SFML) is a portable and easy to use
+	multimedia API written in C++. You can see it as a modern, object-oriented
+	alternative to SDL. SFML is composed of several packages to suit your needs.
+	You can use SFML as a minimal windowing system to interface with OpenGL, or
+	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>