media-libs/libsfml: clean old

Package-Manager: portage-2.2.26

diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 5542da57d3e56e07f684e3ca46eb3da0d4cf11cd..7c8b38c7fe9a0e8b7eff6d06ce016592d29531cd 100644 (file)
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,2 +1 @@
-DIST SFML-1.6-sdk-linux-32.tar.gz 12937755 SHA256 b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8 SHA512 518121bf05ab8b1f4ad917eaca72951ff870e992f79e2b3da94baad762e7de63ce331cf4cade172e285015fb6fec501e25039c633be2f7b77d77b171dc29cb0a WHIRLPOOL fee6692123c394b4d67d1937756315daf7386bf8d0292bbeb94ba7db53552010e8f92187496ce9b72f6aad4922e5ea5da191ddaf9baf0f96a7b741a1d1d17f2e
 DIST libsfml-2.3.2.tar.gz 22203359 SHA256 55e7c864938e03ceb7d6d05c66f8e0dc886e632805d0ae17c222da317ba14e4c SHA512 db491b57595d567e6ce47d081fd6292bff924678fe0a61243f2dfa23df187d2c58f3bd91ea13447e49bec5f888777f338bfa461aec86d9328710623d73aeb424 WHIRLPOOL acef2cc6775ee16151cf5809e78ede2e10f5a5ae51d5d90851a17f8b73b4f599e4eb11bc16bca1db53db507906936f149a38a5670e8a81797ac5a5165d9adc83

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
deleted file mode 100644 (file)
index bd24ce5..0000000
--- a/media-libs/libsfml/files/libsfml-1.6-deps-and-flags.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- SFML-1.6/src/SFML/Audio/Makefile
-+++ SFML-1.6/src/SFML/Audio/Makefile
-@@ -25,7 +25,7 @@
-       $(CPP) -o $@ -c $< $(CFLAGS)\r
- \r
- $(OBJVORBIS): %.o: %.c\r
--      $(CC) -o $@ -c $< $(CFLAGSEXT)\r
-+      $(CC) -o $@ -c $< $(CFLAGS)\r
- \r
- .PHONY: clean mrproper\r
- \r
---- SFML-1.6/src/SFML/Graphics/GraphicsContext.hpp
-+++ SFML-1.6/src/SFML/Graphics/GraphicsContext.hpp
-@@ -30,7 +30,7 @@
- ////////////////////////////////////////////////////////////\r
- #include <SFML/Config.hpp>\r
- #include <SFML/System/NonCopyable.hpp>\r
--#include <SFML/Graphics/GLEW/glew.h>\r
-+#include <GL/glew.h>\r
- #include <iostream>\r
- #include <string>\r
- \r
---- SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
-+++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
-@@ -28,11 +28,12 @@
- #include <SFML/Graphics/ImageLoader.hpp>\r
- extern "C"\r
- {\r
--    #include <SFML/Graphics/libjpeg/jpeglib.h>\r
--    #include <SFML/Graphics/libjpeg/jerror.h>\r
-+    #include <jpeglib.h>\r
-+    #include <jerror.h>\r
- }\r
--#include <SFML/Graphics/libpng/png.h>\r
- #include <SFML/Graphics/SOIL/SOIL.h>\r
-+#include <png.h>\r
-+#include <string.h>\r
- #include <iostream>\r
- \r
- \r
---- SFML-1.6/src/SFML/Graphics/Makefile
-+++ SFML-1.6/src/SFML/Graphics/Makefile
-@@ -1,15 +1,7 @@
- SRC     = $(wildcard *.cpp)\r
--SRCGLEW = $(wildcard ./GLEW/*.c)\r
--SRCJPEG = $(wildcard ./libjpeg/*.c)\r
--SRCPNG  = $(wildcard ./libpng/*.c)\r
- SRCSOIL = $(wildcard ./SOIL/*.c)\r
--SRCZLIB = $(wildcard ./zlib/*.c)\r
- OBJ     = $(SRC:.cpp=.o)\r
--OBJGLEW = $(SRCGLEW:.c=.o)\r
--OBJJPEG = $(SRCJPEG:.c=.o)\r
--OBJPNG  = $(SRCPNG:.c=.o)\r
- OBJSOIL = $(SRCSOIL:.c=.o)\r
--OBJZLIB = $(SRCZLIB:.c=.o)\r
- \r
- ifeq ($(STATIC), yes)\r
-     LIB     = libsfml-graphics-s.a\r
-@@ -23,22 +15,22 @@
- \r
- all: $(LIB)\r
- \r
--libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)\r
--      $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)\r
-+libsfml-graphics-s.a: $(OBJ) $(OBJSOIL)\r
-+      $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJSOIL)\r
- \r
--libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)\r
--      $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL\r
-+libsfml-graphics.so: $(OBJ) $(OBJSOIL)\r
-+      $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJSOIL) -lGLEW -ljpeg -lpng -lz -lfreetype -lX11 -lGL\r
- \r
- $(OBJ): %.o: %.cpp\r
-       $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2\r
- \r
--$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c\r
--      $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG\r
-+$(OBJSOIL): %.o: %.c\r
-+      $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG\r
- \r
- .PHONY: clean mrproper\r
- \r
- clean:\r
--      @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)\r
-+      @rm -rf $(OBJ) $(OBJSOIL)\r
- \r
- mrproper: clean\r
-       @rm -rf $(LIBNAME)\r
---- SFML-1.6/src/SFML/Makefile
-+++ SFML-1.6/src/SFML/Makefile
-@@ -4,7 +4,7 @@
- ifeq ($(DEBUGBUILD), yes)\r
-     DEBUGFLAGS = -g -DDEBUG\r
- else\r
--    DEBUGFLAGS = -O2 -DNDEBUG\r
-+    DEBUGFLAGS = -DNDEBUG\r
- endif\r
- \r
- ifeq ($(STATIC), no)\r
-@@ -17,9 +17,8 @@
- \r
- export CC         = gcc\r
- export CPP        = g++\r
--export CFLAGS     = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)\r
--export CFLAGSEXT  = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)\r
--export LDFLAGS    = $(LINKFLAGS)\r
-+export CFLAGS     += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)\r
-+export LDFLAGS    += $(LINKFLAGS)\r
- export LIBPATH    = ../../../lib\r
- export VERSION    = 1.6\r
- export CP         = cp\r

diff --git a/media-libs/libsfml/files/libsfml-1.6-destdir.patch b/media-libs/libsfml/files/libsfml-1.6-destdir.patch
deleted file mode 100644 (file)
index 33a6f91..0000000
--- a/media-libs/libsfml/files/libsfml-1.6-destdir.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- SFML-1.6.orig/src/SFML/Audio/Makefile
-+++ SFML-1.6/src/SFML/Audio/Makefile
-@@ -10,7 +10,7 @@
- else\r
-     LIB     = libsfml-audio.so\r
-     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)\r
--    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)\r
-+    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)\r
- endif\r
- \r
- all: $(LIB)\r
-@@ -36,4 +36,4 @@
-       @rm -rf $(LIBNAME)\r
- \r
- install:\r
--      @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))\r
-+      @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))\r
---- SFML-1.6.orig/src/SFML/Graphics/Makefile
-+++ SFML-1.6/src/SFML/Graphics/Makefile
-@@ -18,7 +18,7 @@
- else\r
-     LIB     = libsfml-graphics.so\r
-     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)\r
--    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)\r
-+    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)\r
- endif\r
- \r
- all: $(LIB)\r
-@@ -44,4 +44,4 @@
-       @rm -rf $(LIBNAME)\r
- \r
- install:\r
--      @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))\r
-+      @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))\r
---- SFML-1.6.orig/src/SFML/Makefile
-+++ SFML-1.6/src/SFML/Makefile
-@@ -28,8 +28,11 @@
- export AR         = ar\r
- export ARFLAGS    = rcs\r
--export DESTDIR    = /usr/local\r
--export DESTLIBDIR = $(DESTDIR)/lib\r
--export DESTINCDIR = $(DESTDIR)/include\r
-+export DESTDIR    =\r
-+ifeq ($(origin prefix), undefined)\r
-+      export prefix = /usr/local\r
-+endif\r
-+export libdir     = $(prefix)/lib\r
-+export includedir = $(prefix)/include\r
- \r
- all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio\r
- \r
-@@ -62,6 +66,6 @@
-       @(cd ./System && $(MAKE) $@     && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)\r
- \r
- install:\r
--      @(mkdir -p $(DESTLIBDIR))\r
--      @(mkdir -p $(DESTINCDIR))\r
--      @(cd ./System && $(MAKE) $@     && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTINCDIR)/)\r
-+      @(mkdir -p $(DESTDIR)/$(libdir))\r
-+      @(mkdir -p $(DESTDIR)/$(includedir))\r
-+      @(cd ./System && $(MAKE) $@     && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTDIR)/$(includedir)/)\r
---- SFML-1.6.orig/src/SFML/Network/Makefile
-+++ SFML-1.6/src/SFML/Network/Makefile
-@@ -8,7 +8,7 @@
- else\r
-     LIB     = libsfml-network.so\r
-     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)\r
--    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)\r
-+    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)\r
- endif\r
- \r
- all: $(LIB)\r
-@@ -31,4 +31,4 @@
-       @rm -rf $(LIBNAME)\r
- \r
- install:\r
--      @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))\r
-+      @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))\r
---- SFML-1.6.orig/src/SFML/System/Makefile
-+++ SFML-1.6/src/SFML/System/Makefile
-@@ -8,7 +8,7 @@
- else\r
-     LIB     = libsfml-system.so\r
-     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)\r
--    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)\r
-+    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)\r
- endif\r
- \r
- all: $(LIB)\r
-@@ -31,4 +31,4 @@
-       @rm -rf $(LIBNAME)\r
- \r
- install:\r
--      @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))\r
-+      @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))\r
---- SFML-1.6.orig/src/SFML/Window/Makefile
-+++ SFML-1.6/src/SFML/Window/Makefile
-@@ -9,7 +9,7 @@
- else\r
-     LIB     = libsfml-window.so\r
-     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)\r
--    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)\r
-+    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)\r
- endif\r
- \r
- all: $(LIB)\r
-@@ -32,4 +32,4 @@
-       @rm -rf $(LIBNAME)\r
- \r
- install:\r
--      @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))\r
-+      @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))\r

diff --git a/media-libs/libsfml/files/libsfml-1.6-gcc46.patch b/media-libs/libsfml/files/libsfml-1.6-gcc46.patch
deleted file mode 100644 (file)
index 9b31d1b..0000000
--- a/media-libs/libsfml/files/libsfml-1.6-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SFML-1.6.old/include/SFML/System/Resource.hpp
-+++ SFML-1.6/include/SFML/System/Resource.hpp
-@@ -29,7 +29,7 @@
- // Headers\r
- ////////////////////////////////////////////////////////////\r
- #include <set>\r
--\r
-+#include <cstddef>\r
- \r
- namespace sf\r
- {\r

diff --git a/media-libs/libsfml/files/libsfml-1.6-gcc47.patch b/media-libs/libsfml/files/libsfml-1.6-gcc47.patch
deleted file mode 100644 (file)
index 8608cf5..0000000
--- a/media-libs/libsfml/files/libsfml-1.6-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SFML-1.6/src/SFML/Window/Linux/Joystick.cpp
-+++ SFML-1.6/src/SFML/Window/Linux/Joystick.cpp
-@@ -27,7 +27,7 @@
- ////////////////////////////////////////////////////////////\r
- #include <SFML/Window/Joystick.hpp>\r
- #include <sstream>\r
--\r
-+#include <unistd.h>\r
- \r
- namespace sf\r
- {\r

diff --git a/media-libs/libsfml/files/libsfml-1.6-libpng15.patch b/media-libs/libsfml/files/libsfml-1.6-libpng15.patch
deleted file mode 100644 (file)
index 46be00e..0000000
--- a/media-libs/libsfml/files/libsfml-1.6-libpng15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/SFML/Graphics/ImageLoader.cpp
-+++ src/SFML/Graphics/ImageLoader.cpp
-@@ -44,7 +44,7 @@
-     void PngErrorHandler(png_structp Png, png_const_charp Message)\r
-     {\r
-         std::cerr << "Failed to write PNG image. Reason : " << Message << std::endl;\r
--        longjmp(Png->jmpbuf, 1);\r
-+        longjmp(png_jmpbuf(Png), 1);\r
-     }\r
- }\r
- \r
-@@ -289,7 +289,7 @@
-     }\r
- \r
-     // For proper error handling...\r
--    if (setjmp(Png->jmpbuf))\r
-+    if (setjmp(png_jmpbuf(Png)))\r
-     {\r
-         png_destroy_write_struct(&Png, &PngInfo);\r
-         return false;\r

diff --git a/media-libs/libsfml/libsfml-1.6-r1.ebuild b/media-libs/libsfml/libsfml-1.6-r1.ebuild
deleted file mode 100644 (file)
index fc3cfb6..0000000
--- a/media-libs/libsfml/libsfml-1.6-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="SFML-${PV}"
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="http://www.sfml-dev.org/"
-SRC_URI="mirror://sourceforge/sfml/${MY_P}-sdk-linux-32.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples static-libs"
-
-DEPEND="media-libs/freetype:2
-       media-libs/glew
-       >=media-libs/libpng-1.4
-       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 \
-               "${FILESDIR}"/${P}-deps-and-flags.patch \
-               "${FILESDIR}"/${P}-gcc46.patch \
-               "${FILESDIR}"/${P}-gcc47.patch \
-               "${FILESDIR}"/${P}-libpng15.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
-               local i
-               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
-}