old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 6 insertions, 168 deletions

diff --git a/media-libs/glfw/ChangeLog b/media-libs/glfw/ChangeLog
index 819be47bbfcd..57a125275dba 100644
--- a/media-libs/glfw/ChangeLog
+++ b/media-libs/glfw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/glfw
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.24 2015/03/25 13:52:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.25 2015/03/26 17:40:41 mr_bones_ Exp $
+
+  26 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/glfw-2.6-dyn.patch, -files/glfw-2.6-ldflags.patch, -glfw-2.6.ebuild,
+  -glfw-3.0.4.ebuild:
+  old
 
   25 Mar 2015; Agostino Sarubbo <ago@gentoo.org> glfw-2.7.7.ebuild:
   Stable for x86, wrt bug #544088
diff --git a/media-libs/glfw/files/glfw-2.6-dyn.patch b/media-libs/glfw/files/glfw-2.6-dyn.patch
deleted file mode 100644
index d816f9f59536..000000000000
--- a/media-libs/glfw/files/glfw-2.6-dyn.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/x11/Makefile.x11.in.old	2007-11-11 07:56:34.000000000 +0100
-+++ lib/x11/Makefile.x11.in	2007-11-11 08:00:22.000000000 +0100
-@@ -8,7 +8,7 @@
- ##########################################################################
- # Default: Build GLFW static library
- ##########################################################################
--default: libglfw.a libglfw.so
-+default: libglfw.a libglfw.so.2.6
- 
- 
- ##########################################################################
-@@ -104,8 +104,8 @@
- ##########################################################################
- # Rule for building shared library
- ##########################################################################
--libglfw.so: $(SHARED_OBJS)
--	$(CC) $(LDFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS)
-+libglfw.so.2.6: $(SHARED_OBJS)
-+	$(CC) $(LDFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS) -Wl,-soname=$@
- 
- 
- ##########################################################################
diff --git a/media-libs/glfw/files/glfw-2.6-ldflags.patch b/media-libs/glfw/files/glfw-2.6-ldflags.patch
deleted file mode 100644
index 3fcebe503d71..000000000000
--- a/media-libs/glfw/files/glfw-2.6-ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- compile.sh.old	2010-09-13 13:51:19.000000000 +0200
-+++ compile.sh	2010-09-13 13:51:34.000000000 +0200
-@@ -85,7 +85,7 @@
- case "x`uname 2> /dev/null`" in
- xLinux)
-   CFLAGS="$CFLAGS -Dlinux"
--  LDFLAGS="-shared"
-+  LDFLAGS="${LDFLAGS} -shared"
-   echo " Linux" 1>&6
-   ;;
- xDarwin)
---- compile.sh.old	2010-09-13 13:58:07.000000000 +0200
-+++ compile.sh	2010-09-13 13:58:20.000000000 +0200
-@@ -65,7 +65,6 @@
- 
- CFLAGS=
- LFLAGS=
--LDFLAGS=
- INCS=
- LIBS="-lGL -lX11"
- 
diff --git a/media-libs/glfw/glfw-2.6.ebuild b/media-libs/glfw/glfw-2.6.ebuild
deleted file mode 100644
index 73c89b732f28..000000000000
--- a/media-libs/glfw/glfw-2.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.6.ebuild,v 1.9 2014/08/29 19:17:03 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="http://www.glfw.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-DEPEND="x11-libs/libXrandr
-	virtual/glu
-	virtual/opengl"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -i \
-		-e "s:\"docs/:\"/usr/share/doc/${PF}/pdf/:" \
-		readme.html \
-		|| die "sed failed"
-
-	# respect cflags
-	sed -i \
-		-e "/CFLAGS/s#-Os#${CFLAGS}#" \
-		compile.sh \
-		|| die "sed compile.sh failed"
-
-	epatch "${FILESDIR}/${P}"-dyn.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-
-	# respect cflags in linking command as well
-	sed -i \
-		-e "/^libglfw.so/{n;s/\$(CC)/\$(CC) ${CFLAGS}/;}" \
-		lib/x11/Makefile.x11.in \
-		|| die "sed Makefile.x11.in failed"
-}
-
-src_configure() {
-	sh ./compile.sh
-}
-
-src_compile() {
-	emake -C lib/x11 AR=$(tc-getAR) CC=$(tc-getCC) PREFIX=/usr -f Makefile.x11 default libglfw.pc || die "emake failed"
-}
-
-src_install() {
-	dolib.a lib/x11/libglfw.a || die "dolib.a failed"
-	dolib.so lib/x11/libglfw.so.2.6 || die "dolib.so failed"
-	dosym libglfw.so.2.6 /usr/$(get_libdir)/libglfw.so
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins lib/x11/libglfw.pc || die "doins failed"
-	insinto /usr/include/GL
-	doins include/GL/glfw.h || die "doins failed"
-	dohtml -r readme.html
-	insinto /usr/share/doc/${PF}/html/images
-	doins images/*
-	insinto /usr/share/doc/${PF}/pdf
-	doins docs/*.pdf
-
-	if use examples; then
-		local f
-		local MY_EXAMPLES="boing gears keytest listmodes mipmaps
-			mtbench mthello particles pong3d splitview
-			triangle wave"
-		local MY_PICS="mipmaps.tga pong3d_field.tga pong3d_instr.tga
-			pong3d_menu.tga pong3d_title.tga
-			pong3d_winner1.tga pong3d_winner2.tga"
-
-		insinto /usr/share/doc/${PF}/examples
-
-		doins examples/Makefile.x11
-		for f in $MY_EXAMPLES; do
-			doins examples/${f}.c
-		done
-		for f in $MY_PICS; do
-			doins examples/${f}
-		done
-
-		insopts -m0755
-		for f in $MY_EXAMPLES; do
-			doins examples/${f}
-		done
-	fi
-}
diff --git a/media-libs/glfw/glfw-3.0.4.ebuild b/media-libs/glfw/glfw-3.0.4.ebuild
deleted file mode 100644
index d4336c399607..000000000000
--- a/media-libs/glfw/glfw-3.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-3.0.4.ebuild,v 1.2 2015/03/22 21:10:59 mr_bones_ Exp $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="http://www.glfw.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="egl examples"
-
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXxf86vm
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	virtual/glu"
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use egl GLFW_USE_EGL)
-		$(cmake-utils_use examples GLFW_BUILD_EXAMPLES)
-		-DBUILD_SHARED_LIBS=1
-	"
-	cmake-utils_src_configure
-}