commit: 3e73c1a3aac7e3b3920ddccdad90bd5793bd661b
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 8 09:27:49 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 09:29:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e73c1a3
x11-libs/gtk+: Remove gtk+-1.2* SLOT
Year 2000 called and wanted its toolkit back.
Gentoo-bug: 604862
Package-Manager: Portage-2.3.3, Repoman-2.3.1
profiles/package.mask | 4 +-
x11-libs/gtk+/Manifest | 2 -
x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch | 19 -
x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch | 696 ---------------------
.../gtk+/files/gtk+-1.2.10-automake-1.13.patch | 16 -
x11-libs/gtk+/files/gtk+-1.2.10-automake.patch | 126 ----
x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch | 13 -
x11-libs/gtk+/files/gtk+-1.2.10-m4.patch | 9 -
x11-libs/gtk+/gtk+-1.2.10-r13.ebuild | 102 ---
9 files changed, 2 insertions(+), 985 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index af908e3a1a..d13e214d75 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -435,8 +435,8 @@ dev-php/Savant3-Plugin-Form
# Mart Raudsepp <l...@gentoo.org> (06 Jan 2017)
# No releases of this API version since April 2001, abandoned
-# in favour of gtk+:2 for 14 years.
-# Masked for removal in 30 days. Bug 604862.
+# in favour of gtk+:2 for 14 years; bug 604862.
+# Removed at 2017-02-08, mask kept for longer display to users.
x11-libs/gtk+:1
# Robin H. Johnson <robb...@gentoo.org> (05 Jan 2017)
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index b5b480b605..86a1ca2b70 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,3 @@
-DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256
517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 SHA512
aaef9275ff6330a9fe1cbe1e40def181329d79cd33eb2b2ff5ae9cba5fa57e706716233ac7515f621d913f81343eb8244c6669e6411f7d50ca69187bf8d4fd86
WHIRLPOOL
2aacaa61e3291ff3c96a724e02a1fd250fa1574a69c730fa8635c28926c4134b780e9695e3aec3a6fd27b6e25848fcaee4075e17cd47bed2851bdcf311f19020
-DIST gtk+-1.2.10.tar.gz 2868322 SHA256
3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 SHA512
6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f
WHIRLPOOL
906a78c2e2664b1cbd70fb9e64ce6ca1155b2a59c169eab986f5b4b90e937f380a5d35e2e28eb56913b0fbdfb53abeca5ef6823f92a3ab3906cd4e9f7c595b15
DIST gtk+-2.24.31.tar.xz 12805344 SHA256
68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658 SHA512
75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
WHIRLPOOL
6f59d444b28910b0f4cd7d0d0bf04f8e442acd945205679c19e5adf7ca3f8e7406d4095e9ff9ca597882eb937a7551e19af63b6597e7b57c0babe5b061f9110e
DIST gtk+-3.20.9.tar.xz 17174872 SHA256
83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17 SHA512
5848403959f76633511009231c80a814cfe24a7ba07c9429704f432191e51b54d3e6621ce5b578f79999f21993920af3a45c8d03dad6ba03af5f9a342b32626e
WHIRLPOOL
7964b82dabf72b5d45a34565874ba02e0dda09b0f358f640ca0c602c3c7aa4618432829d047794f5f202424c34c837bbdc31ccb3c5457768e252f048afd30107
DIST gtk+-3.22.5.tar.xz 18250876 SHA256
693fa0ac643c59ccd51db99cabe476b4e0a41fd4f0c3c8b3e3ef38f94b2e7334 SHA512
f1969612a89c67fb0414843f3cc51ce91894c9fdfdf6b6e00472d761848b5b1be529d35f2da43c26d345e4b39e81980d2de53d16f194d96775ba21f3c6d0926c
WHIRLPOOL
6012dce8f5b55005124a2a51149505b368cf0e8d40dfa267dfe0f696227853d6b9e29f4e21d670449bdd850f4fda79242d60d95644e803143df29675439f6be1
diff --git a/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch
b/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch
deleted file mode 100644
index a3fd198b69..0000000000
--- a/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtk/gtkrc.c.~1.40.2.17.~ 2001-07-10 20:06:35.000000000 +0200
-+++ gtk/gtkrc.c 2003-03-05 16:56:10.000000000 +0100
-@@ -453,7 +453,7 @@
-
- if (!initted)
- {
-- char *locale = setlocale (LC_CTYPE, NULL);
-+ char *locale = g_strdup (setlocale (LC_CTYPE, NULL));
- char *p;
-
- initted = TRUE;
-@@ -558,6 +558,7 @@
-
- if (tmp) g_free (tmp);
- }
-+ g_free (locale);
- }
-
- i = 0;
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch
b/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch
deleted file mode 100644
index aa295f2578..0000000000
--- a/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch
+++ /dev/null
@@ -1,696 +0,0 @@
---- gtk+-1.2.10/acinclude.m4.orig 2006-05-24 23:23:51.000000000 -0700
-+++ gtk+-1.2.10/acinclude.m4 2006-05-24 23:23:19.000000000 -0700
-@@ -672,7 +672,7 @@
- AC_DEFINE(HAVE_STPCPY)
- fi
-
-- AM_LC_MESSAGES
-+ gt_LC_MESSAGES
- AM_GTK_WITH_NLS
-
- if test "x$CATOBJEXT" != "x"; then
---- gtk+-1.2.10/gtk.m4.orig 2006-05-24 23:32:00.000000000 -0700
-+++ gtk+-1.2.10/gtk.m4 2006-05-24 23:36:16.000000000 -0700
-@@ -1,6 +1,11 @@
- # Configure paths for GTK+
- # Owen Taylor 97-11-3
--
-+AC_DEFUN([GTK_AC_DIVERT_BEFORE_HELP],
-+[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
-+ [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
-+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
-+$1
-+AC_DIVERT_POP()])])])
- dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [,
MODULES]]]])
- dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
- dnl
---- gtk+-1.2.10/configure.in.orig 2006-05-25 05:45:06.000000000 -0700
-+++ gtk+-1.2.10/configure.in 2006-05-25 05:44:08.000000000 -0700
-@@ -1,6 +1,8 @@
-+builtin(include,gtk.m4)
-+
-+
- # Process this file with autoconf to produce a configure script.
- AC_INIT(gdk/gdktypes.h)
--
- # In the following, there are a the following variants
- # of GLib cflags and libs variables
- #
-@@ -12,12 +14,11 @@
- # glib_thread_cflags: cflags to store in gtk-config for gtk-config gthread
- # glib_thread_libs: libs to store in gtk-config for gtk-config gthread
-
-+AC_CANONICAL_TARGET
- # Save this value here, since automake will set cflags later
- cflags_set=${CFLAGS+set}
-
--dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
--dnl are available for $ac_help expansion (don't we all *love* autoconf?)
--AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
-+GTK_AC_DIVERT_BEFORE_HELP([
- #
- # Making releases:
- # GTK_MICRO_VERSION += 1;
-@@ -32,9 +33,8 @@
- GTK_MICRO_VERSION=10
- GTK_INTERFACE_AGE=1
- GTK_BINARY_AGE=10
--GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
--dnl
--AC_DIVERT_POP()dnl
-+GTK_VERSION="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION"
-+])
-
- AC_SUBST(GTK_MAJOR_VERSION)
- AC_SUBST(GTK_MINOR_VERSION)
-@@ -44,9 +44,9 @@
- AC_SUBST(GTK_VERSION)
-
- # libtool versioning
--LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
-+LT_RELEASE="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION"
- LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
--LT_REVISION=$GTK_INTERFACE_AGE
-+LT_REVISION="$GTK_INTERFACE_AGE"
- LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
- AC_SUBST(LT_RELEASE)
- AC_SUBST(LT_CURRENT)
-@@ -54,11 +54,8 @@
- AC_SUBST(LT_AGE)
-
- # For automake.
--VERSION=$GTK_VERSION
--PACKAGE=gtk+
--
--# Save this value here, since automake will set cflags later
--cflags_set=${CFLAGS+set}
-+VERSION="$GTK_VERSION"
-+PACKAGE="gtk+"
-
- dnl Initialize automake stuff
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-@@ -67,42 +64,40 @@
- AM_CONFIG_HEADER(config.h)
-
- dnl Initialize libtool
--AM_PROG_LIBTOOL
-+AC_PROG_LIBTOOL
-
- dnl Initialize maintainer mode
- AM_MAINTAINER_MODE
-
--AC_CANONICAL_HOST
--
- dnl figure debugging default, prior to $ac_help setup
--dnl
--AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
-+
-+GTK_AC_DIVERT_BEFORE_HELP([
- if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
-- debug_default=yes
-+ debug_default="yes"
- else
-- debug_default=minimum
-+ debug_default="minimum"
- fi
--AC_DIVERT_POP()dnl
--
-+])
- dnl declare --enable-* args and collect ac_help strings
--AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging
[default=$debug_default]],,enable_debug=$debug_default)
-+AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging
[default=$debug_default]],,
-+ [enable_debug="$debug_default"])
- AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if
available [default=yes]],
-- echo $enable_shm, enable_shm="yes")
--AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi
[default=no]],
-- , enable_ansi=no)
-+ [echo "$enable_shm"],[enable_shm="yes"])
-+AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi
[default=no]],,[enable_ansi="no"])
- AC_ARG_WITH(glib, [ --with-glib=DIR Use uninstalled copy of glib])
--AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]],
-- , enable_xim="yes")
--AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim
instantiate callback],
-- , enable_xim_inst="maybe")
--AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source
autogeneration rules],,enable_rebuilds=yes)
-+AC_ARG_ENABLE(xim, [ --enable-xim support XIM
[default=yes]],,[enable_xim="yes"])
-+AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim
instantiate callback],,
-+ [enable_xim_inst="maybe"])
-+AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source
autogeneration rules],,
-+ [enable_rebuilds="yes"])
- AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ])
--
- AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ])
--AC_ARG_WITH(native_locale, [ --with-native-locale=[yes/no] Use native locale
support [default=no]],,with_native_locale=no)
-+AC_ARG_WITH(native_locale, [ --with-native-locale=[yes/no] Use native locale
support [default=no]],,
-+ [with_native_locale="no"])
-+
-
- if test "x$enable_debug" = "xyes"; then
-- test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-+ test "$cflags_set" = "set" || CFLAGS="$CFLAGS -g"
- GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
- else
- if test "x$enable_debug" = "xno"; then
-@@ -113,16 +108,14 @@
- fi
-
- AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}")
--
- # Build time sanity check...
- AM_SANITY_CHECK
-
- # Checks for programs.
- AC_PROG_CC
- AC_ISC_POSIX
--AM_PROG_CC_STDC
-+AC_PROG_CC_STDC
- AC_PROG_INSTALL
--AC_PROG_MAKE_SET
-
- changequote(,)dnl
- if test "x$GCC" = "xyes"; then
-@@ -144,7 +137,6 @@
- fi
- fi
- changequote([,])dnl
--
- # Honor aclocal flags
- ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
-@@ -158,8 +150,7 @@
- AC_CHECK_PROG(INDENT, indent, indent)
-
- REBUILD=\#
--if test "x$enable_rebuilds" = "xyes" && \
-- test -n "$PERL" && \
-+if test "x$enable_rebuilds" = "xyes" && test -n "$PERL" && \
- $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
- test -n "$AWK" ; then
- REBUILD=
-@@ -194,55 +185,58 @@
-
- dnl Check for nl_langinfo and CODESET
- AC_MSG_CHECKING([for nl_langinfo (CODESET)])
--AC_TRY_COMPILE([#include <langinfo.h>],
-+AC_TRY_COMPILE([#include <langinfo.h>
-+ ],
- [char *codeset = nl_langinfo (CODESET);],
- AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)])
-- have_codeset=yes,
-- have_codeset=no)
-+ have_codeset="yes",
-+ have_codeset="no"
-+)
- AC_MSG_RESULT($have_codeset)
-
- dnl The DU4 header files don't provide library prototypes unless
- dnl -std1 is given to the native cc.
- AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
-
--gtk_save_LIBS=$LIBS
-+gtk_save_LIBS="$LIBS"
- LIBS="$LIBS -lm"
- AC_TRY_RUN([#include <math.h>
- int main (void) { return (log(1) != log(1.)); }],
- AC_MSG_RESULT(none needed),
-- gtk_save_CFLAGS=$CFLAGS
-+ [gtk_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -std1"
- AC_TRY_RUN([#include <math.h>
- int main (void) { return (log(1) != log(1.)); }],
- AC_MSG_RESULT(-std1),
- AC_MSG_RESULT()
-- CFLAGS=$gtk_save_CFLAGS
-- AC_MSG_WARN(
-- [No ANSI prototypes found in library. (-std1 didn't work.)]),
-- true
-- ),
-+ CFLAGS="$gtk_save_CFLAGS"
-+ AC_MSG_WARN([No ANSI prototypes found in library. (-std1 didn't work.)]),
-+ true)],
- AC_MSG_RESULT(none needed)
- )
--LIBS=$gtk_save_LIBS
-+LIBS="$gtk_save_LIBS"
-
- dnl NeXTStep cc seems to need this
- AC_MSG_CHECKING([for extra flags for POSIX compliance])
--AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
-+AC_TRY_COMPILE([#include <dirent.h>
-+ ],[DIR *dir;],
- AC_MSG_RESULT(none needed),
-- gtk_save_CFLAGS=$CFLAGS
-+ [gtk_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -posix"
-- AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
-+ AC_TRY_COMPILE([#include <dirent.h>
-+ ],[DIR *dir;],
- AC_MSG_RESULT(-posix),
- AC_MSG_RESULT()
-- CFLAGS=$gtk_save_CFLAGS
-- AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
-+ CFLAGS="$gtk_save_CFLAGS"
-+ AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])]))
-
--if test x$with_glib = xyes ; then
-- AC_MSG_ERROR([
--*** Directory must be specified for --with-glib])
-+
-+
-+if test "x$with_glib" = "xyes" ; then
-+ AC_MSG_ERROR([*** Directory must be specified for --with-glib])
- fi
-
--if test x$with_glib = x ; then
-+if test "x$with_glib" = "x" ; then
- # Look for separately installed glib
-
- AM_PATH_GLIB(1.2.8,,
-@@ -261,7 +255,7 @@
- else
- # Use uninstalled glib (assume they got the version right)
-
-- GLIB_CONFIG=$with_glib/glib-config
-+ GLIB_CONFIG="$with_glib/glib-config"
- if test -x $GLIB_CONFIG ; then
- :
- else
-@@ -277,9 +271,9 @@
- glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`
-
- # canonicalize relative paths
-- case $with_glib in
-+ case "$with_glib" in
- /*)
-- glib_dir=$with_glib
-+ glib_dir="$with_glib"
- ;;
- *)
- glib_dir="\$(top_builddir)/$with_glib"
-@@ -312,61 +306,56 @@
- saved_ldflags="$LDFLAGS"
-
- CFLAGS="$CFLAGS $X_CFLAGS"
--LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
-+LDFLAGS="$LDFLAGS $X_LDFLAGS"
-
- if test "x$no_x" = "xyes"; then
- AC_MSG_ERROR([
- *** X libraries or include files not found. Check 'config.log' for
- *** more details.])
- fi
--
- # Checks for libraries.
- # Check for the X11 library
--AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS",
-+AC_CHECK_LIB(X11,XOpenDisplay,
-+ x_libs="-lX11 $X_EXTRA_LIBS",
- AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]),
-- $X_EXTRA_LIBS)
--
-+ $X_EXTRA_LIBS
-+)
- if test "x$enable_shm" = "xyes"; then
- # Check for the Xext library (needed for XShm extention)
- AC_CHECK_LIB(Xext, XShmAttach,
- x_libs="-lXext $x_libs",
- # On AIX, it is in XextSam instead, but we still need -lXext
-- AC_CHECK_LIB(XextSam, XShmAttach,
-+ [AC_CHECK_LIB(XextSam, XShmAttach,
- x_libs="-lXextSam -lXext $x_libs",
-- no_xext_lib=yes, $x_libs),
-- $x_libs)
-+ no_xext_lib="yes",
-+ $x_libs
-+ )],
-+ $x_libs
-+ )
- fi
--
- # Check for shaped window extension
--
- AC_CHECK_LIB(Xext, XShapeCombineMask,
-- if test -z "`echo $x_libs | grep "\-lXext" 2> /dev/null`"; then
-+ if test -z "`echo $x_libs | grep \-lXext 2> /dev/null`"; then
- x_libs="-lXext $x_libs"
- fi
-- AC_DEFINE(HAVE_SHAPE_EXT),
-- ,
-- $x_libs)
--
-+ AC_DEFINE(HAVE_SHAPE_EXT),,
-+ $x_libs
-+)
- # Check for XConvertCase (X11R6 specific)
--
- AC_CHECK_LIB(X11, XConvertCase,
-- AC_DEFINE(HAVE_XCONVERTCASE),
-- ,
-- $x_libs)
--
-+ AC_DEFINE(HAVE_XCONVERTCASE),,
-+ $x_libs
-+)
- # Check for XIM support.
--
--AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
-- : ,
-+AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,,
- enable_xim_inst="no",
-- $x_libs)
--
-+ $x_libs
-+)
- # On Solaris, calling XRegisterIMInstantiateCallback seems to
- # cause an immediate segfault, so we disable it, unless
- # the user specifically forces it to be on.
--
--if test x$enable_xim_inst = xmaybe ; then
-- case host in
-+if test "x$enable_xim_inst" = "xmaybe" ; then
-+ case "$host" in
- *-*-solaris*)
- enable_xim_inst="no"
- ;;
-@@ -384,16 +373,15 @@
- fi
-
- x_cflags="$X_CFLAGS"
--x_ldflags="$X_LDFLAGS $X_LIBS"
-+x_ldflags="$X_LDFLAGS"
-
- # set up things for XInput
--
- if test "x$with_xinput" = "xgxi"; then
- AC_MSG_WARN([
- *** The generic XInput support has not been tested for several years
- *** and is not known to work with any currently available X servers])
- AC_DEFINE(XINPUT_GXI)
-- xinput_progs=gxid
-+ xinput_progs="gxid"
- x_libs="-lXi $x_libs"
- elif test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
- AC_DEFINE(XINPUT_XFREE)
-@@ -413,77 +401,72 @@
-
- if test "x$enable_shm" = "xyes"; then
- # Check for shared memory
-- AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes)
-- AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes)
-+ AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc="yes")
-+ AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm="yes")
-
- # Check for the X shared memory extension header file
- AC_MSG_CHECKING(X11/extensions/XShm.h)
- if test "x$no_xext_lib" = "xyes"; then
- AC_MSG_RESULT(no)
-- no_xshm=yes
-+ no_xshm="yes"
- else
- if test -f "$x_includes/X11/extensions/XShm.h"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_XSHM_H)
- else
- AC_MSG_RESULT(no)
-- no_xshm=yes
-+ no_xshm="yes"
- fi
- fi
- fi
--
- # Check if X_LOCALE definition is necessary
--
- AC_MSG_CHECKING(need -DX_LOCALE)
-
- AC_TRY_RUN([
- #include <stdio.h>
- #include <locale.h>
--
--int
--main ()
-+ int main ()
- {
- return setlocale (LC_ALL, "${with_locale}") == NULL;
- }],
--need_x_locale=no,
--need_x_locale=yes,
--need_x_locale=no)
-+ need_x_locale="no",
-+ need_x_locale="yes",
-+ need_x_locale="no"
-+)
- AC_MSG_RESULT($need_x_locale)
-
--use_native_locale=no
--if test $need_x_locale = yes; then
-+use_native_locale="no"
-+if test "$need_x_locale" = "yes"; then
- GTK_LOCALE_FLAGS="-DX_LOCALE"
- else
-- if test x$with_native_locale = xyes ; then
-+ if test "x$with_native_locale" = "xyes" ; then
- AC_MSG_CHECKING(functioning locale support)
-
-- AC_TRY_COMPILE([#include <stdlib.h>],[
-- char c;
-+ AC_TRY_COMPILE([#include <stdlib.h>],
-+ [char c;
- if (MB_CUR_MAX == 1) {
- wctomb(&c, 42);
-- }
-- ],use_native_locale=yes,)
--
-+ }],
-+ use_native_locale="yes"
-+ )
- AC_MSG_RESULT($use_native_locale)
- fi
- fi
-
--if test x$use_native_locale = xyes ; then
-+if test "x$use_native_locale" = "xyes" ; then
- AC_MSG_CHECKING(if sizeof(wchar_t) == 4)
-
-- AC_TRY_RUN([
-- #include <stdlib.h>
--
-- int
-- main ()
-+ AC_TRY_RUN([#include <stdlib.h>
-+ int main ()
- {
- return (sizeof(wchar_t) == 4) ? 0 : 1;
-- }],
-- ,use_native_locale=no,:)
-+ }],,
-+ use_native_locale="no"
-+ )
- AC_MSG_RESULT($use_native_locale)
- fi
-
--if test $use_native_locale = yes ; then
-+if test "$use_native_locale" = "yes" ; then
- AC_DEFINE(USE_NATIVE_LOCALE)
- fi
-
-@@ -502,13 +485,17 @@
-
- # Check if <sys/select.h> needs to be included for fd_set
- AC_MSG_CHECKING([for fd_set])
--AC_TRY_COMPILE([#include <sys/types.h>],
-- [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no)
--if test $gtk_ok = yes; then
-+AC_TRY_COMPILE([#include <sys/types.h>
-+ ],
-+ [fd_set readMask, writeMask;],
-+ gtk_ok="yes",
-+ gtk_ok="no"
-+)
-+if test "$gtk_ok" = "yes"; then
- AC_MSG_RESULT([yes, found in sys/types.h])
- else
-- AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
-- if test $gtk_ok = yes; then
-+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok="yes")
-+ if test "$gtk_ok" = "yes"; then
- AC_DEFINE(HAVE_SYS_SELECT_H)
- AC_MSG_RESULT([yes, found in sys/select.h])
- else
-@@ -520,30 +507,35 @@
- # Duplicate `widechar' tests from `glib'.
- # Check for wchar.h
- AC_MSG_CHECKING(for wchar.h)
--AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no)
--if test $gtk_ok = yes; then
-+AC_TRY_CPP([#include <wchar.h>
-+ ],
-+ gtk_ok="yes",
-+ gtk_ok="no"
-+)
-+if test "$gtk_ok" = "yes"; then
- AC_DEFINE(HAVE_WCHAR_H,1,[Define if wchar.h exists])
- fi
- AC_MSG_RESULT($gtk_ok)
-
- # Check for wctype.h (for iswalnum)
- AC_MSG_CHECKING(for wctype.h)
--AC_TRY_CPP([#include <wctype.h>], gtk_ok=yes, gtk_ok=no)
--if test $gtk_ok = yes; then
-+AC_TRY_CPP([#include <wctype.h>], gtk_ok="yes", gtk_ok="no")
-+if test "$gtk_ok" = "yes"; then
- AC_DEFINE(HAVE_WCTYPE_H,1,[Define if wctype.h exists])
- fi
- AC_MSG_RESULT($gtk_ok)
-
- # in Solaris 2.5, `iswalnum' is in -lw
- GDK_WLIBS=
--AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
-+AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS="-lw")])
-
- # The following is necessary for Linux libc-5.4.38
- oLIBS="$LIBS"
- LIBS="$LIBS $GDK_WLIBS"
- AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
--AC_TRY_LINK([#include <stdlib.h>],[
--#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
-+AC_TRY_LINK([#include <stdlib.h>
-+ ],
-+ [#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
- # ifdef HAVE_WCTYPE_H
- # include <wctype.h>
- # else
-@@ -554,11 +546,13 @@
- #else
- # define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
- #endif
--iswalnum((wchar_t) 0);
--], gtk_ok=yes, gtk_ok=no)
-+ iswalnum((wchar_t) 0);],
-+ gtk_ok="yes",
-+ gtk_ok="no"
-+)
- LIBS="$oLIBS"
-
--if test $gtk_ok = no; then
-+if test "$gtk_ok" = "no"; then
- AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Define if the wctype function is broken])
- GDK_WLIBS=
- fi
-@@ -580,5 +574,5 @@
- gtk/Makefile
- gtk/gtkfeatures.h
- gdk.pc
--gtk+.pc
--], [chmod +x gtk-config])
-+gtk+.pc],
-+[chmod +x gtk-config])
---- gtk+-1.2.10/gdk/Makefile.am.orig 2006-05-19 02:41:18.000000000 -0700
-+++ gtk+-1.2.10/gdk/Makefile.am 2006-05-19 02:11:54.000000000
-0700
-@@ -21,12 +21,11 @@
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) \
- -export-dynamic \
-- @GLIB_DEPLIBS@ \
- @x_ldflags@ \
-- @x_libs@ \
-- -lm \
- @STRIP_END@
-
-+libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm
-+
- #
- # setup source file variables
- #
-@@ -104,14 +103,13 @@
- EXTRA_PROGRAMS = gxid
- bin_PROGRAMS = @xinput_progs@
- LDADDS = @STRIP_BEGIN@ \
-- @x_ldflags@ \
- @x_libs@ \
- @GLIB_LIBS@ \
- -lm \
- @STRIP_END@
- gxid_SOURCES = gxid.c
- gxid_LDADD = $(LDADDS)
--
-+gxid_LDFLAGS = @x_ldflags@
-
- .PHONY: files
-
---- gtk+-1.2.10/gtk/Makefile.am.orig 2006-05-25 07:40:45.000000000 -0700
-+++ gtk+-1.2.10/gtk/Makefile.am 2006-05-25 07:43:20.000000000 -0700
-@@ -27,13 +27,15 @@
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) \
- -export-dynamic \
-- @GLIB_DEPLIBS@ \
- @x_ldflags@ \
-- @x_libs@ \
-- -lm \
- @STRIP_END@
--# $(top_builddir)/gdk/libgdk.la
--
-+libgtk_la_LIBADD = @STRIP_BEGIN@ \
-+ $(top_builddir)/gdk/libgdk.la \
-+ @x_libs@ \
-+ @GDK_WLIBS@ \
-+ @GLIB_LIBS@ \
-+ -lm \
-+ @STRIP_END@
-
- #
- # setup source file variables
-@@ -374,14 +376,17 @@
-
-
- gtkconfdir = $(sysconfdir)/gtk
--gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
-+# removed references to non-existent gtkrc files - tsh
-+gtkconf_DATA = \
-+ gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
- gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \
-- gtkrc.utf-8 gtkrc.iso-8859-2 \
-- gtkrc.iso-8859-3 gtkrc.iso-8859-5 gtkrc.iso-8859-7 \
-- gtkrc.iso-8859-9 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
-- gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \
-- gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
-- gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
-+ gtkrc.iso-8859-2 gtkrc.iso-8859-5 \
-+ gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
-+ gtkrc.iso-8859-15 gtkrc.zh_TW.big5 \
-+ gtkrc.zh_CN gtkrc.cp1251 gtkrc.cp1255 \
-+ gtkrc.ka_GE.georgianacademy \
-+ gtkrc.ka_GE.georgianps \
-+ gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii
-
- # We create a dummy theme for the default GTK+ theme
- install-data-local:
-@@ -428,7 +433,6 @@
- LDADDS = @STRIP_BEGIN@ \
- libgtk.la \
- $(top_builddir)/gdk/libgdk.la \
-- @x_ldflags@ \
- @x_libs@ \
- @GDK_WLIBS@ \
- @GLIB_LIBS@ \
-@@ -441,12 +445,20 @@
- testdnd_DEPENDENCIES = $(DEPS)
- simple_DEPENDENCIES = $(DEPS)
- #testthreads_DEPENDENCIES = $(DEPS)
-+
- testgtk_LDADD = $(LDADDS)
-+testgtk_LDFLAGS=@x_ldflags@
- testinput_LDADD = $(LDADDS)
-+testinput_LDFLAGS = @x_ldflags@
- testselection_LDADD = $(LDADDS)
-+testselection_LDFLAGS = @x_ldflags@
- testrgb_LDADD = $(LDADDS)
-+testrgb_LDFLAGS = @x_ldflags@
- testdnd_LDADD = $(LDADDS)
-+testdnd_LDFLAGS = @x_ldflags@
- simple_LDADD = $(LDADDS)
-+simple_LDFLAGS = @x_ldflags@
-+
- #testthreads_LDADD = $(LDADDS)
-
- .PHONY: files test test-debug
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch
b/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch
deleted file mode 100644
index 6df2032c1b..0000000000
--- a/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build failure with automake-1.13; fixed upstream in >=2.24.15 and >=3.0
-https://bugs.gentoo.org/467520
-
-diff --git a/configure.in b/configure.in
-index 27294c8..798a259 100644
---- a/configure.in
-+++ b/configure.in
-@@ -61,7 +61,7 @@ dnl Initialize automake stuff
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-
- # Specify a configuration file
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
-
- dnl Initialize libtool
- AC_PROG_LIBTOOL
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch
b/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch
deleted file mode 100644
index e7b4474618..0000000000
--- a/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- docs/Makefile.am
-+++ docs/Makefile.am
-@@ -166,7 +166,7 @@
- echo $$p; \
- done
-
--EXTRA_DIST += \
-+EXTRA_DIST = \
- Changes-1.2.txt \
- debugging.txt \
- developers.txt \
---- gdk/Makefile.am
-+++ gdk/Makefile.am
-@@ -30,7 +30,7 @@
- # setup source file variables
- #
- # GDK header files for public installation (non-generated)
--gdk_public_h_sources = @STRIP_BEGIN@ \
-+gdk_public_h_sources = \
- gdk.h \
- gdkcursors.h \
- gdkrgb.h \
-@@ -38,9 +38,8 @@
- gdkkeysyms.h \
- gdkprivate.h \
- gdktypes.h \
-- gdkx.h \
--@STRIP_END@
--gdk_c_sources = @STRIP_BEGIN@ \
-+ gdkx.h
-+gdk_c_sources = \
- gdk.c \
- gdkcc.c \
- gdkcolor.c \
-@@ -71,8 +70,7 @@
- MwmUtil.h \
- gxid_lib.h \
- gxid_proto.h \
-- gxid_lib.c \
--@STRIP_END@
-+ gxid_lib.c
-
- #
- # setup GDK sources and their dependancies
-@@ -79,10 +79,6 @@
- #
- libgdkinclude_HEADERS = $(gdk_public_h_sources)
- libgdk_la_SOURCES = $(gdk_c_sources)
--MAINTAINERCLEANFILES +=
--EXTRA_HEADERS +=
--EXTRA_DIST +=
--EXTRA_DIST +=
-
- #
- # rules to generate built sources
---- gtk/Makefile.am
-+++ gtk/Makefile.am
-@@ -41,7 +41,7 @@
- # setup source file variables
- #
- # GTK+ header files for public installation (non-generated)
--gtk_public_h_sources = @STRIP_BEGIN@ \
-+gtk_public_h_sources = \
- gtk.h \
- gtkaccelgroup.h \
- gtkaccellabel.h \
-@@ -150,13 +150,12 @@
- gtkvscrollbar.h \
- gtkvseparator.h \
- gtkwidget.h \
-- gtkwindow.h \
--@STRIP_END@
-+ gtkwindow.h
- # GTK+ header files that don't get installed
- gtk_private_h_sources = @STRIP_BEGIN@ \
- @STRIP_END@
- # GTK+ C sources to build the library from
--gtk_c_sources = @STRIP_BEGIN@ \
-+gtk_c_sources = \
- gtkaccelgroup.c \
- gtkaccellabel.c \
- gtkadjustment.c \
-@@ -264,8 +263,7 @@
- gtkwidget.c \
- gtkwindow.c \
- fnmatch.c \
-- fnmatch.h \
--@STRIP_END@
-+ fnmatch.h
- # we use our own built_sources variable rules to avoid automake's
- # BUILT_SOURCES oddities
- # we generate frequently rebuild files piggyback on a stamp file, so sources
-@@ -284,10 +282,9 @@
- gtk.defs \
- @STRIP_END@
- # built sources that get installed with the header files
--gtk_built_public_sources = @STRIP_BEGIN@ \
-+gtk_built_public_sources = \
- gtkmarshal.h \
-- gtktypebuiltins.h \
--@STRIP_END@
-+ gtktypebuiltins.h
- # non-header sources (headers should be specified in the above variables)
- # that don't serve as direct make target sources, i.e. they don't have
- # their own .lo rules and don't get publically installed
-@@ -313,9 +313,8 @@
- #
- libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources)
gtkfeatures.h
- libgtk_la_SOURCES = $(gtk_c_sources)
--MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources)
--EXTRA_HEADERS +=
--EXTRA_DIST += $(gtk_private_h_sources)
-+MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources)
-+EXTRA_DIST = $(gtk_private_h_sources)
- EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources)
$(gtk_extra_sources)
-
- #
-@@ -323,7 +322,7 @@
- #
- # setup autogeneration dependancies
- gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh
xgen-gmc
--CLEANFILES += $(gen_sources)
-+CLEANFILES = $(gen_sources)
- COPYING: $(gtk_built_public_sources) $(gtk_built_sources)
- $(OBJECTS): COPYING # this is our oldest-source-stamp
- # initial creation of the real stamp-* files
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch
b/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch
deleted file mode 100644
index 7846c17aad..0000000000
--- a/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-pull in string prototypes
-
---- gdk/gdkinputcommon.h
-+++ gdk/gdkinputcommon.h
-@@ -24,6 +24,8 @@
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-+#include <string.h>
-+
- #if defined(XINPUT_GXI) || defined(XINPUT_XFREE)
-
- /* Forward declarations */
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch
b/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch
deleted file mode 100644
index 37fb7c2630..0000000000
--- a/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix aclocal warnings:
-/usr/share/aclocal/gtk.m4:7: warning: underquoted definition of AM_PATH_GTK
---- gtk+-1.2.10/gtk.m4
-+++ gtk+-1.2.10/gtk.m4
-@@ -6,3 +6,3 @@
- dnl
--AC_DEFUN(AM_PATH_GTK,
-+AC_DEFUN([AM_PATH_GTK],
- [dnl
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild
b/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild
deleted file mode 100644
index e288100362..0000000000
--- a/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GNOME_TARBALL_SUFFIX="gz"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils flag-o-matic gnome2 toolchain-funcs multilib-minimal
-
-DESCRIPTION="The GIMP Toolkit"
-HOMEPAGE="http://www.gtk.org/";
-SRC_URI="${SRC_URI}
http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2";
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="nls debug"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko
lt nl nn no pl pt_BR pt ro ru sk sl sr sv tr uk vi"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
-
-RDEPEND=">=dev-libs/glib-1.2.10-r6:1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- >=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- nls? ( sys-devel/gettext dev-util/intltool )"
-
-MULTILIB_CHOST_TOOLS=(/usr/bin/gtk-config)
-
-src_prepare() {
- append-cflags -std=gnu89
- epatch "${FILESDIR}"/${P}-m4.patch
- epatch "${FILESDIR}"/${P}-automake.patch
- epatch "${FILESDIR}"/${P}-cleanup.patch
- epatch "${DISTDIR}"/gtk+-1.2.10-r8-gentoo.diff.bz2
- epatch "${FILESDIR}"/${PN}-1.2-locale_fix.patch
- epatch "${FILESDIR}"/${P}-as-needed.patch
- sed -i '/libtool.m4/,/AM_PROG_NM/d' acinclude.m4 #168198
- epatch "${FILESDIR}"/${P}-automake-1.13.patch #467520
- eautoreconf
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=
- use nls || myconf="${myconf} --disable-nls"
- strip-linguas ${MY_AVAILABLE_LINGUAS}
-
- if use debug ; then
- myconf="${myconf} --enable-debug=yes"
- else
- myconf="${myconf} --enable-debug=minimum"
- fi
-
- ECONF_SOURCE="${S}" \
- gnome2_src_configure \
- --disable-static \
- --sysconfdir="${EPREFIX}"/etc \
- --with-xinput=xfree \
- --with-x \
- ${myconf} \
- GLIB_CONFIG="/usr/bin/${CHOST}-glib-config"
-}
-
-multilib_src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
- docinto docs
- cd docs
- dodoc *.txt *.gif text/*
- dohtml -r html
-
- #install nice, clean-looking gtk+ style
- insinto /usr/share/themes/Gentoo/gtk
- doins "${FILESDIR}"/gtkrc
-}
-
-pkg_postinst() {
- if [[ -e /etc/X11/gtk/gtkrc ]] ; then
- ewarn "Older versions added /etc/X11/gtk/gtkrc which changed
settings for"
- ewarn "all themes it seems. Please remove it manually as it
will not due"
- ewarn "to /env protection."
- fi
-
- echo ""
- einfo "The old gtkrc is available through the new Gentoo gtk theme."
-}
