[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-libs/glib/files/, dev-libs/glib/

[Mart Raudsepp]

commit:     47a1711fdf384b78fcaab2daa43ab764b50cc364
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  8 09:35:05 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 09:40:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a1711f

dev-libs/glib: Remove ancient glib:1 SLOT

Gentoo-bug: 604966
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/glib/Manifest                             |  2 -
 .../glib/files/glib-1.2.10-automake-1.13.patch     | 23 -------
 dev-libs/glib/files/glib-1.2.10-automake.patch     | 29 --------
 .../glib/files/glib-1.2.10-configure-LANG.patch    | 44 ------------
 dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch    | 41 ------------
 dev-libs/glib/files/glib-1.2.10-m4.patch           |  9 ---
 dev-libs/glib/glib-1.2.10-r6.ebuild                | 78 ----------------------
 profiles/package.mask                              |  4 +-
 8 files changed, 2 insertions(+), 228 deletions(-)

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 1dc21db618..78729c7c8f 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,5 +1,3 @@
-DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
-DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
 DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
 DIST glib-2.48.2.tar.xz 6408644 SHA256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 SHA512 2eac104eb2207d0a6488992e48069a34b417f51e141364f281ab7b0953a6de88be177b1c694dd9464a856c9a5d8021e3cf0193a8d9c5aaf6ea11f1f9ff743c43 WHIRLPOOL cba211000d5597e93d01113e5f2b6736e47f4daa00935a53af182b3304fef9a1ac25f78995c7a53cc1234261433a1bbd1ec751c87b556845a15da720af5b971b
 DIST glib-2.50.2.tar.xz 7582312 SHA256 be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5 SHA512 63d7b5ece8d7d15b10e06ef10a8e0a4446f30a8d9c97daa3352ec00dfef622728bd42ed24cbf67e553166a0f9e29a3e3d024d1d085b9804fd67608db438b6771 WHIRLPOOL f7a005c0ad0edd0a9010aec60c4df907f79c45948b7bb583d70c378557c2a2f63383ebbaded9074b319a669bdf0532d78ce41a4f98d80d53a3a151a4a69be2a2

diff --git a/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch b/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch
deleted file mode 100644
index abca1ed8db..0000000000
--- a/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Replace macros deprecated in automake-1.13; fixed upstream in glib-2.36
-
-diff --git a/configure.in b/configure.in
-index e94cc77..d88d834 100644
---- a/configure.in
-+++ b/configure.in
-@@ -60,7 +60,7 @@ PACKAGE=glib
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
- 
- # Specify a configuration file
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
- AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
-@@ -151,7 +151,6 @@ AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}")
- 
- # Checks for programs.
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_PROG_INSTALL
- 
- changequote(,)dnl

diff --git a/dev-libs/glib/files/glib-1.2.10-automake.patch b/dev-libs/glib/files/glib-1.2.10-automake.patch
deleted file mode 100644
index c4f8fd3211..0000000000
--- a/dev-libs/glib/files/glib-1.2.10-automake.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-fix errors with newer automake:
-
-gmodule/Makefile.am:44: testgmodule_LDFLAGS must be set with `=' before using `+='
-
-Makefile.am:73: BUILT_SOURCES multiply defined in condition TRUE ...
-Makefile.am:11: ... `BUILT_SOURCES' previously defined here
-
---- Makefile.am
-+++ Makefile.am
-@@ -70,7 +70,7 @@
- 
- CONFIGURE_DEPENDENCIES = acglib.m4		
- 
--BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
-+BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h
- glibconfig.h: stamp-gc-h
- 	@:
- stamp-gc-h: config.status
---- gmodule/Makefile.am
-+++ gmodule/Makefile.am
-@@ -41,7 +41,7 @@
- libgplugin_b_la_LIBADD = @G_MODULE_LIBS@  $(libglib)
- 
- noinst_PROGRAMS = testgmodule
--testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
-+testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
- testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
- 
- .PHONY: files release

diff --git a/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch b/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch
deleted file mode 100644
index b5e9e82a74..0000000000
--- a/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/133679
-
---- configure
-+++ configure
-@@ -54,6 +54,19 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    unset $as_var
-+  fi
-+done
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.

diff --git a/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch b/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch
deleted file mode 100644
index 1b896484d2..0000000000
--- a/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- glib-1.2.10/gstrfuncs.c.orig	2001-02-27 07:00:22.000000000 +0100
-+++ glib-1.2.10/gstrfuncs.c	2004-03-01 13:19:49.531603760 +0100
-@@ -867,7 +867,7 @@
-                   /* beware of positional parameters
-                    */
-                 case '$':
--                  g_warning (G_GNUC_PRETTY_FUNCTION
-+                  g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
-                              "(): unable to handle positional parameters (%%n$)");
-                   len += 1024; /* try adding some safety padding */
-                   break;
-@@ -1034,7 +1034,7 @@
-                   /*          n   .   dddddddddddddddddddddddd   E   +-  eeee */
-                   conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
-                   if (spec.mod_extra_long)
--                    g_warning (G_GNUC_PRETTY_FUNCTION
-+                    g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
-                                "(): unable to handle long double, collecting double only");
- #ifdef HAVE_LONG_DOUBLE
- #error need to implement special handling for long double
-@@ -1077,7 +1077,7 @@
-                   conv_done = TRUE;
-                   if (spec.mod_long)
-                     {
--                      g_warning (G_GNUC_PRETTY_FUNCTION
-+                      g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
-                                  "(): unable to handle wide char strings");
-                       len += 1024; /* try adding some safety padding */
-                     }
-@@ -1108,9 +1108,8 @@
-                   conv_len += format - spec_start;
-                   break;
-                 default:
--                  g_warning (G_GNUC_PRETTY_FUNCTION
--                             "(): unable to handle `%c' while parsing format",
--                             c);
-+                  g_warning ("%s(): unable to handle `%c' while parsing format",
-+                             G_GNUC_PRETTY_FUNCTION, c);
-                   break;
-                 }
-               conv_done |= conv_len > 0;

diff --git a/dev-libs/glib/files/glib-1.2.10-m4.patch b/dev-libs/glib/files/glib-1.2.10-m4.patch
deleted file mode 100644
index f57ecf7c11..0000000000
--- a/dev-libs/glib/files/glib-1.2.10-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix aclocal warning:
-/usr/share/aclocal/glib.m4:8: warning: underquoted definition of AM_PATH_GLIB
---- glib-1.2.10/glib.m4
-+++ glib-1.2.10/glib.m4
-@@ -7,3 +7,3 @@
- dnl
--AC_DEFUN(AM_PATH_GLIB,
-+AC_DEFUN([AM_PATH_GLIB],
- [dnl 

diff --git a/dev-libs/glib/glib-1.2.10-r6.ebuild b/dev-libs/glib/glib-1.2.10-r6.ebuild
deleted file mode 100644
index d82e55da23..0000000000
--- a/dev-libs/glib/glib-1.2.10-r6.ebuild
+++ /dev/null
@@ -1,78 +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 gnome2 libtool flag-o-matic portability multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	 mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="hardened static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-MULTILIB_CHOST_TOOLS=(/usr/bin/glib-config)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automake.patch
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679
-
-	# Allow glib to build with gcc-3.4.x #47047
-	epatch "${FILESDIR}"/${P}-gcc34-fix.patch
-
-	# Fix for -Wl,--as-needed (bug #133818)
-	epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2
-
-	# build failure with automake-1.13
-	epatch "${FILESDIR}/${P}-automake-1.13.patch"
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-	sed -i "/libglib_la_LDFLAGS/i libglib_la_LIBADD = $(dlopen_lib)" Makefile.am || die
-
-	rm -f acinclude.m4 #168198
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-	elibtoolize
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# Bug 48839: pam fails to build on ia64
-	# The problem is that it attempts to link a shared object against
-	# libglib.a; this library needs to be built with -fPIC.  Since
-	# this package doesn't contain any significant binaries, build the
-	# whole thing with -fPIC (23 Apr 2004 agriffis)
-	append-flags -fPIC
-	append-cflags -std=gnu89
-
-	ECONF_SOURCE="${S}" \
-	gnome2_src_configure \
-		--with-threads=posix \
-		--enable-debug=yes \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-
-	chmod 755 "${ED}"/usr/$(get_libdir)/libgmodule-1.2.so.* || die
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dohtml -r docs
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index d13e214d75..bcd6972367 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -421,8 +421,8 @@ app-admin/amazon-ec2-init
 
 # Mart Raudsepp <leio@g.o> (07 Jan 2017)
 # No releases of this API version since March 2001, abandoned
-# in favour of glib:2 for 14 years.
-# Marked for removal in 30 days. Bug 604966.
+# in favour of glib:2 for 14 years; bug 604966.
+# Removed at 2017-02-08, mask kept for longer display to users.
 dev-libs/glib:1
 
 # Michael Orlitzky <mjo@g.o> (06 Jan 2017)