gentoo resync : 16.06.2018

2 files changed, 0 insertions, 100 deletions

diff --git a/media-gfx/gliv/Manifest b/media-gfx/gliv/Manifest
index 8f4638a3fc63..9f16af674ad1 100644
--- a/media-gfx/gliv/Manifest
+++ b/media-gfx/gliv/Manifest
@@ -1,4 +1,3 @@
-AUX gliv-1.9.6-as-needed.patch 2864 BLAKE2B c0d8ceb61fc961d6a8a3e4ac9eeb7dc5b9d5f1a4d67909a8dcf809632260a389089ea245b52a097db2eedf66caf184132aee7627ef3c8a269533e5b0029669a0 SHA512 594614f5190f9401d7759c26676a43d6a60cc81ca73e79536f5b4969252189d6a45293069f8426ed5e5ffb5d5c8a3f7e103a6243de6d6f182a20331802d16d01
 AUX gliv-1.9.7-as-needed.patch 2374 BLAKE2B 2b8ee4ddd7c9c587ca7b592a8797dde3eea655e88367aadb03d4bcf0407a4d14008a09d79026d75d26d75c0eb079c786f1cdc7fd9e3511fb7b8561e05290eff0 SHA512 8923b579d87079cffec3db5e5f00cc35c3bd516f1a878bc4d0e916150617a4f06d5ba3604d44dd128110e4398de5ab26ee8eef1d85dac74b4122e589eb6ad19d
 AUX gliv-1.9.7-destdir.patch 914 BLAKE2B 78f14a26e60282c2afa7e768affe442c9123c2b5860690b427067d732b46aed745a3ebb51ecf5bd424b3ff7c9dd186666843a88a0330fa10c57d58890a3aade7 SHA512 1d83c62b470889260365a5ac24de591a8e817dd9d0d10d68cbf1a7ca27b544f44940b37f316956b5a4d79ce33eafb7c41a8c6cd6d943e35fba8e9fbfd1f0c9ed
 DIST gliv-1.9.7.tar.bz2 644305 BLAKE2B 9f31c9fbedff833966bf16366fc3ef73aae0dc190146fc42f67d9abfc426ebc0c496931f3c9ca14df0e9c4e18310d7d54603c13e4d4cc6d1cae93b84b8737235 SHA512 c2276bde4b13d0dc910062e8cdec8836d751ce25e5120f4fd7987c9ba5bd62844a71a5e92c1ccf766393b47f2ff95fc3298051d3729e38696fccc024be388c4e
diff --git a/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch b/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch
deleted file mode 100644
index 3128b99e4435..000000000000
--- a/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- gliv-1.9.6.orig/configure.ac	2005-09-21 23:05:57.000000000 +0200
-+++ gliv-1.9.6/configure.ac	2010-01-03 15:51:41.464539460 +0100
-@@ -16,18 +16,17 @@
- # Checks for programs.
- AC_PROG_CC
- AC_PROG_RANLIB
--
-+AC_USE_SYSTEM_EXTENSIONS
- 
- # Default CFLAGS.
--if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
--  CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
--fi
--CFLAGS="$CFLAGS -I${srcdir}/../lib"
-+#if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
-+#  CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
-+#fi
-+#CFLAGS="$CFLAGS -I${srcdir}/../lib"
- 
- # Checks for LFS flags, we may not handle big files, but it doesn't hurt.
- AC_SYS_LARGEFILE
- 
--
- AC_DEFUN([CHECK_MATH],
-          [OLD_CFLAGS="$CFLAGS"]
-          [CFLAGS="$CFLAGS -w"]
-@@ -127,35 +126,22 @@
- 
- # Checks for X.
- AC_PATH_XTRA
--CFLAGS="$X_CFLAGS $CFLAGS"
--LDFLAGS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $LDFLAGS"
- 
- # Checks for GtkGLExt.
- PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 0.7.0])
--CFLAGS="$GTKGLEXT_CFLAGS $CFLAGS"
--LDFLAGS="$GTKGLEXT_LIBS $LDFLAGS"
- GTKGL_VERSION="$($PKG_CONFIG --modversion gtkglext-1.0)"
- 
- # Checks for OpenGL.
--AC_TRY_LINK([#include "GL/gl.h"],
--            [glBegin(GL_QUADS);],
--            [ogl="yes"],
--            [ogl="no"])
--
-+AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],)
- if test "x$ogl" = "xno"; then
-  AC_MSG_NOTICE([maybe libGL requires libpthread...])
-- OLD_LDFLAGS="$LDFLAGS"
-- LDFLAGS="$LDFLAGS -lpthread"
-- AC_TRY_LINK([#include "GL/gl.h"],
--             [glBegin(GL_QUADS);],
--             [],
--             AC_MSG_ERROR([cannot use -lGL]))
-+ AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],[-lpthread])
- fi
- 
- # Checks for gtk.
- AM_PATH_GTK_2_0([2.6.0], [
-   CFLAGS="$GTK_CFLAGS $CFLAGS"
--  LDFLAGS="$GTK_LIBS $LDFLAGS"
-+  LIBS="$LIBS $GTK_LIBS"
-   GTK_VERSION="$($PKG_CONFIG --modversion gtk+-2.0)"
-  ], [exit 1], [gthread])
- 
-@@ -163,9 +149,6 @@
- ALL_LINGUAS=$(echo po/*.po | sed -e 's|\.po||g' -e 's|po/||g')
- AM_GNU_GETTEXT_VERSION
- AM_GNU_GETTEXT
--CFLAGS="$CFLAGS -I../${srcdir}/intl"
--LIBS="$LIBS $LIBINTL"
--
- 
- AC_CONFIG_FILES([
-  Makefile
---- gliv-1.9.6.orig/src/Makefile.am	2006-11-18 15:21:13.000000000 +0100
-+++ gliv-1.9.6/src/Makefile.am	2010-01-03 15:48:45.765539472 +0100
-@@ -64,6 +64,9 @@
- gliv_LDADD =        -L../lib -lreplacements
- endif
- 
-+gliv_CFLAGS = @GTKGLEXT_CFLAGS@
-+gliv_LDADD  = @GTKGLEXT_LIBS@
-+
- AM_CPPFLAGS = -I$(srcdir)/include -D_REENTRANT -D_THREAD_SAFE \
-               -DSYSCONFDIR=\"$(sysconfdir)\"
- 
---- gliv-1.9.6.orig/po/Makefile.in.in	2006-11-18 15:21:13.000000000 +0100
-+++ gliv-1.9.6/po/Makefile.in.in	2010-01-03 16:05:43.860539403 +0100
-@@ -29,7 +29,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
- mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
-