public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2-utils.eclass
@ 2012-04-08  2:29 Alexandre Rostovtsev (tetromino)
  0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2012-04-08  2:29 UTC (permalink / raw
  To: gentoo-commits

tetromino    12/04/08 02:29:44

  Modified:             ChangeLog gnome2-utils.eclass
  Log:
  Punt stale icon-theme.cache files and empty icon theme directories after theme uninstallation (bug #410495, thanks to Maxim Kammerer for reporting).

Revision  Changes    Path
1.207                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.207&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.207&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.206&r2=1.207

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- ChangeLog	7 Apr 2012 10:18:24 -0000	1.206
+++ ChangeLog	8 Apr 2012 02:29:44 -0000	1.207
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.206 2012/04/07 10:18:24 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.207 2012/04/08 02:29:44 tetromino Exp $
+
+  08 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gnome2-utils.eclass:
+  Punt stale icon-theme.cache files and empty icon theme directories after
+  theme uninstallation (bug #410495, thanks to Maxim Kammerer for reporting).
 
   07 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin.eclass:
   vdr-vdrmanager added for gettext handling



1.26                 eclass/gnome2-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.25&r2=1.26

Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome2-utils.eclass	14 Dec 2011 19:47:54 -0000	1.25
+++ gnome2-utils.eclass	8 Apr 2012 02:29:44 -0000	1.26
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.25 2011/12/14 19:47:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.26 2012/04/08 02:29:44 tetromino Exp $
 
 # @ECLASS: gnome2-utils.eclass
 # @MAINTAINER:
@@ -242,6 +242,14 @@
 
 				retval=2
 			fi
+		elif [[ $(ls "${EROOT}${dir}") = "icon-theme.cache" ]]; then
+			# Clear stale cache files after theme uninstallation
+			rm "${EROOT}${dir}/icon-theme.cache"
+		fi
+
+		if [[ -z $(ls "${EROOT}${dir}") ]]; then
+			# Clear empty theme directories after theme uninstallation
+			rmdir "${EROOT}${dir}"
 		fi
 	done
 






^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2-utils.eclass
@ 2012-06-21 15:10 Naohiro Aota (naota)
  0 siblings, 0 replies; 9+ messages in thread
From: Naohiro Aota (naota) @ 2012-06-21 15:10 UTC (permalink / raw
  To: gentoo-commits

naota       12/06/21 15:10:59

  Modified:             ChangeLog gnome2-utils.eclass
  Log:
  Add new function gnome2_query_immodules_gtk{2,3} to update immodules cache. #413529

Revision  Changes    Path
1.322                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.322&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.322&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.321&r2=1.322

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- ChangeLog	20 Jun 2012 09:26:50 -0000	1.321
+++ ChangeLog	21 Jun 2012 15:10:59 -0000	1.322
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.321 2012/06/20 09:26:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.322 2012/06/21 15:10:59 naota Exp $
+
+  21 Jun 2012; Naohiro Aota <naota@gentoo.org> gnome2-utils.eclass:
+  Add new function gnome2_query_immodules_gtk{2,3} to update immodules cache.
+  #413529
 
   20 Jun 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass:
   prune_libtool_files(): report .a removal only if it exists, and explain the



1.28                 eclass/gnome2-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.27&r2=1.28

Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome2-utils.eclass	2 May 2012 21:05:38 -0000	1.27
+++ gnome2-utils.eclass	21 Jun 2012 15:10:59 -0000	1.28
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.27 2012/05/02 21:05:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.28 2012/06/21 15:10:59 naota Exp $
 
 # @ECLASS: gnome2-utils.eclass
 # @MAINTAINER:
@@ -386,3 +386,41 @@
 	${updater} --allow-any-name "$@" "${EROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null
 	eend $?
 }
+
+# @FUNCTION: gnome2_query_immodules_gtk2
+# @USAGE: gnome2_query_immodules_gtk2
+# @DESCRIPTION:
+# Updates gtk2 immodules/gdk-pixbuf loaders listing.
+gnome2_query_immodules_gtk2() {
+	local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
+
+	local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
+	local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	local gtk_conf_dir=$(dirname "${gtk_conf}")
+
+	einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
+	einfo "-> ${gtk_conf}"
+
+	mkdir -p "${gtk_conf_dir}"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
+	if [ -z "${tmp_file}" ]; then
+		ewarn "gtk_query_immodules: cannot create temporary file"
+		return 1
+	fi
+
+	if ${query_exec} > "${tmp_file}"; then
+		cat "${tmp_file}" > "${gtk_conf}" || \
+			ewarn "Failed to write to ${gtk_conf}"
+	else
+		ewarn "Cannot update gtk.immodules, file generation failed"
+	fi
+	rm "${tmp_file}"
+}
+
+# @FUNCTION: gnome2_query_immodules_gtk3
+# @USAGE: gnome2_query_immodules_gtk3
+# @DESCRIPTION:
+# Updates gtk3 immodules/gdk-pixbuf loaders listing.
+gnome2_query_immodules_gtk3() {
+	"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+}






^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2-utils.eclass
@ 2012-10-27 22:24 Alexandre Rostovtsev (tetromino)
  0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2012-10-27 22:24 UTC (permalink / raw
  To: gentoo-commits

tetromino    12/10/27 22:24:10

  Modified:             ChangeLog gnome2-utils.eclass
  Log:
  Avoid sedding configure.ac in gnome2_disable_deprecation_warning to prevent accidental triggering of maintainer mode in some packages (bug #439602).

Revision  Changes    Path
1.471                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.471&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.471&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.470&r2=1.471

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- ChangeLog	27 Oct 2012 01:14:38 -0000	1.470
+++ ChangeLog	27 Oct 2012 22:24:10 -0000	1.471
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.470 2012/10/27 01:14:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.471 2012/10/27 22:24:10 tetromino Exp $
+
+  27 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gnome2-utils.eclass:
+  Avoid sedding configure.ac in gnome2_disable_deprecation_warning to prevent
+  accidental triggering of maintainer mode in some packages (bug #439602).
 
   27 Oct 2012; Mike Gilbert <floppym@gentoo.org> python-r1.eclass:
   Remove duplicate documentation for BUILD_DIR, PYTHON, and EPYTHON. This



1.31                 eclass/gnome2-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.30&r2=1.31

Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnome2-utils.eclass	23 Oct 2012 20:32:51 -0000	1.30
+++ gnome2-utils.eclass	27 Oct 2012 22:24:10 -0000	1.31
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.30 2012/10/23 20:32:51 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.31 2012/10/27 22:24:10 tetromino Exp $
 
 # @ECLASS: gnome2-utils.eclass
 # @MAINTAINER:
@@ -454,8 +454,10 @@
 		fi
 	done < <(find "${S}" -name "Makefile.in" \
 		-o -name "Makefile.am" -o -name "Makefile.decl" \
-		-o -name "configure.ac" -o -name "configure.in" \
 		| sort; echo configure)
+# TODO: sedding configure.ac can trigger maintainer mode; bug #439602
+#		-o -name "configure.ac" -o -name "configure.in" \
+#		| sort; echo configure)
 	eend ${retval}
 
 	for makefile in "${fails[@]}" ; do





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2-utils.eclass
@ 2013-09-15 19:29 Pacho Ramos (pacho)
  0 siblings, 0 replies; 9+ messages in thread
From: Pacho Ramos (pacho) @ 2013-09-15 19:29 UTC (permalink / raw
  To: gentoo-commits

pacho       13/09/15 19:29:11

  Modified:             ChangeLog gnome2-utils.eclass
  Log:
  Support gtk+-2.24.20 query immodules (#476100)

Revision  Changes    Path
1.965                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.965&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.965&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.964&r2=1.965

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.964
retrieving revision 1.965
diff -u -r1.964 -r1.965
--- ChangeLog	14 Sep 2013 19:00:10 -0000	1.964
+++ ChangeLog	15 Sep 2013 19:29:11 -0000	1.965
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.964 2013/09/14 19:00:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.965 2013/09/15 19:29:11 pacho Exp $
+
+  15 Sep 2013; Pacho Ramos <pacho@gentoo.org> gnome2-utils.eclass:
+  Support gtk+-2.24.20 query immodules (#476100)
 
   14 Sep 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
   Support EAPIs < 4 in einstalldocs properly.



1.33                 eclass/gnome2-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.32&r2=1.33

Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome2-utils.eclass	3 Sep 2013 21:54:38 -0000	1.32
+++ gnome2-utils.eclass	15 Sep 2013 19:29:11 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.32 2013/09/03 21:54:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.33 2013/09/15 19:29:11 pacho Exp $
 
 # @ECLASS: gnome2-utils.eclass
 # @MAINTAINER:
@@ -446,29 +446,33 @@
 # @DESCRIPTION:
 # Updates gtk2 immodules/gdk-pixbuf loaders listing.
 gnome2_query_immodules_gtk2() {
-	local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
-
-	local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
-	local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	local gtk_conf_dir=$(dirname "${gtk_conf}")
-
-	einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
-	einfo "-> ${gtk_conf}"
+	if has_version ">=x11-libs/gtk+-2.24.20:2"; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" --update-cache
+	else
+		local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
 
-	mkdir -p "${gtk_conf_dir}"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "gtk_query_immodules: cannot create temporary file"
-		return 1
-	fi
+		local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
+		local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+		local gtk_conf_dir=$(dirname "${gtk_conf}")
+
+		einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
+		einfo "-> ${gtk_conf}"
+
+		mkdir -p "${gtk_conf_dir}"
+		local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
+		if [ -z "${tmp_file}" ]; then
+			ewarn "gtk_query_immodules: cannot create temporary file"
+			return 1
+		fi
 
-	if ${query_exec} > "${tmp_file}"; then
-		cat "${tmp_file}" > "${gtk_conf}" || \
-			ewarn "Failed to write to ${gtk_conf}"
-	else
-		ewarn "Cannot update gtk.immodules, file generation failed"
+		if ${query_exec} > "${tmp_file}"; then
+			cat "${tmp_file}" > "${gtk_conf}" || \
+				ewarn "Failed to write to ${gtk_conf}"
+		else
+			ewarn "Cannot update gtk.immodules, file generation failed"
+		fi
+		rm "${tmp_file}"
 	fi
-	rm "${tmp_file}"
 }
 
 # @FUNCTION: gnome2_query_immodules_gtk3





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2-utils.eclass
@ 2014-02-09  8:30 Pacho Ramos (pacho)
  0 siblings, 0 replies; 9+ messages in thread
From: Pacho Ramos (pacho) @ 2014-02-09  8:30 UTC (permalink / raw
  To: gentoo-commits

pacho       14/02/09 08:30:23

  Modified:             ChangeLog gnome2-utils.eclass
  Log:
  Drop also values of DGSEAL_ENABLE (#500730)

Revision  Changes    Path
1.1140               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1140&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1140&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1139&r2=1.1140

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1139
retrieving revision 1.1140
diff -u -r1.1139 -r1.1140
--- ChangeLog	8 Feb 2014 00:56:30 -0000	1.1139
+++ ChangeLog	9 Feb 2014 08:30:23 -0000	1.1140
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1139 2014/02/08 00:56:30 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1140 2014/02/09 08:30:23 pacho Exp $
+
+  09 Feb 2014; Pacho Ramos <pacho@gentoo.org> gnome2-utils.eclass:
+  Drop also values of DGSEAL_ENABLE (#500730)
 
   06 Feb 2014; Michael Palimaka <kensington@gentoo.org> kde4-meta.eclass:
   Disable more bogus dependency checks wrt bug #494680.



1.34                 eclass/gnome2-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.33&r2=1.34

Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome2-utils.eclass	15 Sep 2013 19:29:11 -0000	1.33
+++ gnome2-utils.eclass	9 Feb 2014 08:30:23 -0000	1.34
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.33 2013/09/15 19:29:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.34 2014/02/09 08:30:23 pacho Exp $
 
 # @ECLASS: gnome2-utils.eclass
 # @MAINTAINER:
@@ -502,7 +502,7 @@
 
 		LC_ALL=C sed -r -i \
 			-e 's:-D[A-Z_]+_DISABLE_DEPRECATED:$(NULL):g' \
-			-e 's:-DGSEAL_ENABLE:$(NULL):g' \
+			-e 's:-DGSEAL_ENABLE+[A-Z_]:$(NULL):g' \
 			-i "${makefile}"
 
 		if [[ $? -ne 0 ]]; then





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2-utils.eclass
@ 2014-02-22  8:05 Pacho Ramos (pacho)
  0 siblings, 0 replies; 9+ messages in thread
From: Pacho Ramos (pacho) @ 2014-02-22  8:05 UTC (permalink / raw
  To: gentoo-commits

pacho       14/02/22 08:05:45

  Modified:             ChangeLog gnome2-utils.eclass
  Log:
  Be more friendly with SELinux (#499636 by Luis Ressel)

Revision  Changes    Path
1.1144               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1144&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1144&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1143&r2=1.1144

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1143
retrieving revision 1.1144
diff -u -r1.1143 -r1.1144
--- ChangeLog	21 Feb 2014 16:07:25 -0000	1.1143
+++ ChangeLog	22 Feb 2014 08:05:45 -0000	1.1144
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1143 2014/02/21 16:07:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1144 2014/02/22 08:05:45 pacho Exp $
+
+  22 Feb 2014; Pacho Ramos <pacho@gentoo.org> gnome2-utils.eclass:
+  Be more friendly with SELinux (#499636 by Luis Ressel)
 
   21 Feb 2014; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
   Make problems with man page installation nonfatal



1.35                 eclass/gnome2-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.34&r2=1.35

Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnome2-utils.eclass	9 Feb 2014 08:30:23 -0000	1.34
+++ gnome2-utils.eclass	22 Feb 2014 08:05:45 -0000	1.35
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.34 2014/02/09 08:30:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.35 2014/02/22 08:05:45 pacho Exp $
 
 # @ECLASS: gnome2-utils.eclass
 # @MAINTAINER:
@@ -436,7 +436,8 @@
 	local tmp_file=$(mktemp -t tmp.XXXXXXXXXX_gdkpixbuf)
 	${updater} 1> "${tmp_file}" &&
 	chmod 0644 "${tmp_file}" &&
-	mv -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" &&
+	rm "${tmp_file}" # don't replace this with mv, required for SELinux support
 	eend $?
 }
 





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2-utils.eclass
@ 2014-03-01 10:18 Michal Gorny (mgorny)
  0 siblings, 0 replies; 9+ messages in thread
From: Michal Gorny (mgorny) @ 2014-03-01 10:18 UTC (permalink / raw
  To: gentoo-commits

mgorny      14/03/01 10:18:35

  Modified:             ChangeLog gnome2-utils.eclass
  Log:
  Add multilib love for gnome2_gdk_pixbuf_update().

Revision  Changes    Path
1.1150               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1150&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1150&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1149&r2=1.1150

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1149
retrieving revision 1.1150
diff -u -r1.1149 -r1.1150
--- ChangeLog	27 Feb 2014 00:20:57 -0000	1.1149
+++ ChangeLog	1 Mar 2014 10:18:35 -0000	1.1150
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1149 2014/02/27 00:20:57 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1150 2014/03/01 10:18:35 mgorny Exp $
+
+  01 Mar 2014; Michał Górny <mgorny@gentoo.org> gnome2-utils.eclass:
+  Add multilib love for gnome2_gdk_pixbuf_update().
 
   27 Feb 2014; Christoph Junghans <ottxor@gentoo.org> unpacker.eclass:
   added lzip support (bug #501912)



1.36                 eclass/gnome2-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.35&r2=1.36

Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome2-utils.eclass	22 Feb 2014 08:05:45 -0000	1.35
+++ gnome2-utils.eclass	1 Mar 2014 10:18:35 -0000	1.36
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.35 2014/02/22 08:05:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.36 2014/03/01 10:18:35 mgorny Exp $
 
 # @ECLASS: gnome2-utils.eclass
 # @MAINTAINER:
@@ -52,12 +52,6 @@
 # Path to glib-compile-schemas
 : ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"}
 
-# @ECLASS-VARIABLE: GDK_PIXBUF_UPDATE_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to gdk-pixbuf-query-loaders
-: ${GDK_PIXBUF_UPDATE_BIN:="/usr/bin/gdk-pixbuf-query-loaders"}
-
 # @ECLASS-VARIABLE: GNOME2_ECLASS_SCHEMAS
 # @INTERNAL
 # @DEFAULT_UNSET
@@ -409,7 +403,7 @@
 gnome2_gdk_pixbuf_savelist() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
 	pushd "${ED}" 1>/dev/null
-	export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find "usr/$(get_libdir)/gdk-pixbuf-2.0" -type f 2>/dev/null)
+	export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null)
 	popd 1>/dev/null
 }
 
@@ -420,7 +414,11 @@
 # This function should be called from pkg_postinst and pkg_postrm.
 gnome2_gdk_pixbuf_update() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GDK_PIXBUF_UPDATE_BIN}"
+	local updater="${EROOT}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders"
+
+	if [[ ! -x ${updater} ]]; then
+		updater="${EROOT}/usr/bin/gdk-pixbuf-query-loaders"
+	fi
 
 	if [[ ! -x ${updater} ]]; then
 		debug-print "${updater} is not executable"





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2-utils.eclass
@ 2014-11-23 15:00 Michal Gorny (mgorny)
  0 siblings, 0 replies; 9+ messages in thread
From: Michal Gorny (mgorny) @ 2014-11-23 15:00 UTC (permalink / raw
  To: gentoo-commits

mgorny      14/11/23 15:00:44

  Modified:             ChangeLog gnome2-utils.eclass
  Log:
  Support multilib for gnome2_query_immodules_gtk3(), needed by x11-libs/gtk+:3.

Revision  Changes    Path
1.1440               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1440&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1440&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1439&r2=1.1440

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1439
retrieving revision 1.1440
diff -u -r1.1439 -r1.1440
--- ChangeLog	22 Nov 2014 18:24:17 -0000	1.1439
+++ ChangeLog	23 Nov 2014 15:00:44 -0000	1.1440
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1439 2014/11/22 18:24:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1440 2014/11/23 15:00:44 mgorny Exp $
+
+  23 Nov 2014; Michał Górny <mgorny@gentoo.org> gnome2-utils.eclass:
+  Support multilib for gnome2_query_immodules_gtk3(), needed by
+  x11-libs/gtk+:3.
 
   22 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass:
   Make calling perl-module_pkg_prerm trigger a real warning



1.37                 eclass/gnome2-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.36&r2=1.37

Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome2-utils.eclass	1 Mar 2014 10:18:35 -0000	1.36
+++ gnome2-utils.eclass	23 Nov 2014 15:00:44 -0000	1.37
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.36 2014/03/01 10:18:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.37 2014/11/23 15:00:44 mgorny Exp $
 
 # @ECLASS: gnome2-utils.eclass
 # @MAINTAINER:
@@ -479,7 +479,10 @@
 # @DESCRIPTION:
 # Updates gtk3 immodules/gdk-pixbuf loaders listing.
 gnome2_query_immodules_gtk3() {
-	"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0
+	[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0
+
+	"${updater}" --update-cache
 }
 
 # @FUNCTION: gnome2_disable_deprecation_warning





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2-utils.eclass
@ 2014-11-23 21:46 Michal Gorny (mgorny)
  0 siblings, 0 replies; 9+ messages in thread
From: Michal Gorny (mgorny) @ 2014-11-23 21:46 UTC (permalink / raw
  To: gentoo-commits

mgorny      14/11/23 21:46:29

  Modified:             ChangeLog gnome2-utils.eclass
  Log:
  Support multilib in gnome2_query_immodules_gtk2() as well.

Revision  Changes    Path
1.1444               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1444&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1444&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1443&r2=1.1444

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1443
retrieving revision 1.1444
diff -u -r1.1443 -r1.1444
--- ChangeLog	23 Nov 2014 19:56:53 -0000	1.1443
+++ ChangeLog	23 Nov 2014 21:46:29 -0000	1.1444
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1443 2014/11/23 19:56:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1444 2014/11/23 21:46:29 mgorny Exp $
+
+  23 Nov 2014; Michał Górny <mgorny@gentoo.org> gnome2-utils.eclass:
+  Support multilib in gnome2_query_immodules_gtk2() as well.
 
   23 Nov 2014; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
   Deprecate eapis 0 and 1 for gnome2.eclass (#530046)



1.38                 eclass/gnome2-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.37&r2=1.38

Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome2-utils.eclass	23 Nov 2014 15:00:44 -0000	1.37
+++ gnome2-utils.eclass	23 Nov 2014 21:46:29 -0000	1.38
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.37 2014/11/23 15:00:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.38 2014/11/23 21:46:29 mgorny Exp $
 
 # @ECLASS: gnome2-utils.eclass
 # @MAINTAINER:
@@ -439,39 +439,15 @@
 	eend $?
 }
 
-
 # @FUNCTION: gnome2_query_immodules_gtk2
 # @USAGE: gnome2_query_immodules_gtk2
 # @DESCRIPTION:
 # Updates gtk2 immodules/gdk-pixbuf loaders listing.
 gnome2_query_immodules_gtk2() {
-	if has_version ">=x11-libs/gtk+-2.24.20:2"; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" --update-cache
-	else
-		local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
-
-		local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
-		local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-		local gtk_conf_dir=$(dirname "${gtk_conf}")
-
-		einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
-		einfo "-> ${gtk_conf}"
-
-		mkdir -p "${gtk_conf_dir}"
-		local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
-		if [ -z "${tmp_file}" ]; then
-			ewarn "gtk_query_immodules: cannot create temporary file"
-			return 1
-		fi
+	local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0
+	[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0
 
-		if ${query_exec} > "${tmp_file}"; then
-			cat "${tmp_file}" > "${gtk_conf}" || \
-				ewarn "Failed to write to ${gtk_conf}"
-		else
-			ewarn "Cannot update gtk.immodules, file generation failed"
-		fi
-		rm "${tmp_file}"
-	fi
+	"${updater}" --update-cache
 }
 
 # @FUNCTION: gnome2_query_immodules_gtk3





^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2014-11-23 21:46 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-23 15:00 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2-utils.eclass Michal Gorny (mgorny)
  -- strict thread matches above, loose matches on Subject: below --
2014-11-23 21:46 Michal Gorny (mgorny)
2014-03-01 10:18 Michal Gorny (mgorny)
2014-02-22  8:05 Pacho Ramos (pacho)
2014-02-09  8:30 Pacho Ramos (pacho)
2013-09-15 19:29 Pacho Ramos (pacho)
2012-10-27 22:24 Alexandre Rostovtsev (tetromino)
2012-06-21 15:10 Naohiro Aota (naota)
2012-04-08  2:29 Alexandre Rostovtsev (tetromino)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox