[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2020-02-29 Thread Mart Raudsepp 
commit: 0af2edab5cb973d98e612c98f7145c721fa1aa19
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Feb 29 20:47:49 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Feb 29 20:48:04 2020 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0af2edab

dev-libs/glib: drop epunt-cxx

makes no sense with meson and this live ebuild needs a huge sync
with in-tree version, but fix the global scope inherit failure
at least for now.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-libs/glib/glib-.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-libs/glib/glib-.ebuild b/dev-libs/glib/glib-.ebuild
index e5bfef19..a34029ba 100644
--- a/dev-libs/glib/glib-.ebuild
+++ b/dev-libs/glib/glib-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 )
 # Completely useless with or without USE static-libs, people need to use 
pkg-config
 GNOME2_LA_PUNT="yes"
 
-inherit bash-completion-r1 epunt-cxx flag-o-matic gnome-meson libtool 
linux-info \
+inherit bash-completion-r1 flag-o-matic gnome-meson libtool linux-info \
multilib multilib-minimal pax-utils python-r1 toolchain-funcs 
versionator virtualx
 
 if [[ ${PV} =  ]]; then
@@ -142,8 +142,6 @@ src_prepare() {
-i glib/Makefile.{am,in} || die
 
gnome-meson_src_prepare
-
-   epunt_cxx
 }
 
 multilib_src_configure() {

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/

2018-08-20 Thread Mart Raudsepp 
commit: bb6944d17f7fff869982b57c67a89c45257cb2d0
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Aug 20 08:30:31 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Aug 20 08:30:31 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=bb6944d1

dev-libs/glib: remove old; 2.56.2 available in main tree

2.56.2 in main tree has split glib-utils - use that.
 remains as an example for initial meson conversion, but it
collides with glib-utils from main tree and needs ebuild sync
and updates

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 .../files/glib-2.40.0-external-gdbus-codegen.patch |  95 ---
 ...54.3-external-gdbus-codegen-for-autotools.patch | 116 
 ...56.1-external-gdbus-codegen-for-autotools.patch |  86 --
 dev-libs/glib/glib-2.54.3-r2.ebuild| 302 -
 dev-libs/glib/glib-2.54.3-r4.ebuild| 301 
 dev-libs/glib/glib-2.56.1-r1.ebuild| 300 
 6 files changed, 1200 deletions(-)

diff --git a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch 
b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
deleted file mode 100644
index 50a9370e..
--- a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a01e58d..59d4527 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -367,14 +367,14 @@ AC_SUBST(PERL_PATH)
- # option to specify python interpreter to use; this just sets $PYTHON, so that
- # we will fallback to reading $PYTHON if --with-python is not given, and
- # python.m4 will get the expected input
--AC_ARG_WITH(python,
--AS_HELP_STRING([--with-python=PATH],
--   [Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as "python3" or "python2"]),
--[PYTHON="$withval"], [])
--if test x"$PYTHON" = xyes; then
--  AC_MSG_ERROR([--with-python option requires a path or program argument])
--fi
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AC_ARG_WITH(python,
-+# AS_HELP_STRING([--with-python=PATH],
-+#[Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as "python3" or "python2"]),
-+# [PYTHON="$withval"], [])
-+# if test x"$PYTHON" = xyes; then
-+#   AC_MSG_ERROR([--with-python option requires a path or program argument])
-+# fi
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
- 
- 
- dnl ***
-@@ -3580,7 +3580,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 47fdd38..c7eb136 100644
 a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -157,8 +157,7 @@ man_MANS +=\
-   glib-compile-resources.1\
-   gsettings.1 \
-   gresource.1 \
--  gdbus.1 \
--  gdbus-codegen.1
-+  gdbus.1
- 
- XSLTPROC_FLAGS = \
- --nonet \
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index e993e2f..025ad94 100644
 a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
- 
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
- 
- if OS_UNIX
- SUBDIRS += xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 2c54e59..3cd3c5a 100644
 a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -437,10 +437,8 @@ gnotification_SOURCES= 
$(gdbus_sessionbus_sources) gnotifica
- 
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile 
$(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--  $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--  UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--  $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile
-+  $(AM_V_GEN) gdbus-codegen \
-   --interface-prefix org.project. \
-   --generate-c-code gdbus-test-codegen-generated \
-   --c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am 
b/gio/tests/gdbus-object-manager-example/Makefile.am
-index d6d1412..62ef706 100644
 a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
-

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/

2018-06-24 Thread Sobhan Mohammadpour 
commit: d07dc3eec37ee1ce3a2e5b047f2e067dffab6ebd
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Sun Jun 24 14:04:18 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Sun Jun 24 14:04:18 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d07dc3ee

dev-libs/glib: import the fixes from the main tree

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 ...56.1-external-gdbus-codegen-for-autotools.patch | 83 +-
 .../{glib-2.56.1.ebuild => glib-2.56.1-r1.ebuild}  | 29 
 2 files changed, 32 insertions(+), 80 deletions(-)

diff --git 
a/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch 
b/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch
index 7e73f748..a27966e0 100644
--- a/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch
+++ b/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch
@@ -1,44 +1,21 @@
-From db0a3301203e0c62db274bde8ac20cbfbb71889f Mon Sep 17 00:00:00 2001
+From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001
 From: Sobhan Mohammadpour 
 Date: Fri, 23 Feb 2018 15:27:33 +0330
-Subject: [PATCH 2/2] glib-2.54.3-external-gdbus-codegen-for-autotools
+Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools
 
 ---
- configure.ac| 17 -
- docs/reference/gio/Makefile.am  |  1 -
- gio/Makefile.am | 12 
- gio/tests/Makefile.am   |  6 ++
- .../gdbus-object-manager-example/Makefile.am|  6 ++
- 5 files changed, 16 insertions(+), 26 deletions(-)
+ configure.ac   |  1 -
+ docs/reference/gio/Makefile.am |  1 -
+ gio/Makefile.am|  2 +-
+ gio/tests/Makefile.am  |  6 ++
+ gio/tests/gdbus-object-manager-example/Makefile.am |  6 ++
+ 5 files changed, 5 insertions(+), 11 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 2013d198e..7d2d686c5 100644
+index 0457c90..07166c9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -360,14 +360,14 @@ AC_CHECK_PROGS(PERL, [perl5 perl])
- # option to specify python interpreter to use; this just sets $PYTHON, so that
- # we will fallback to reading $PYTHON if --with-python is not given, and
- # python.m4 will get the expected input
--AC_ARG_WITH(python,
--AS_HELP_STRING([--with-python=PATH],
--   [Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as "python3" or "python2"]),
--[PYTHON="$withval"], [])
--if test x"$PYTHON" = xyes; then
--  AC_MSG_ERROR([--with-python option requires a path or program argument])
--fi
--AM_PATH_PYTHON(2.7,,PYTHON="python2.7")
-+#AC_ARG_WITH(python,
-+#AS_HELP_STRING([--with-python=PATH],
-+#   [Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as "python3" or "python2"]),
-+#[PYTHON="$withval"], [])
-+#if test x"$PYTHON" = xyes; then
-+#  AC_MSG_ERROR([--with-python option requires a path or program argument])
-+#fi
-+#AM_PATH_PYTHON(2.7,,PYTHON="python2.7")
- 
- 
- dnl ***
-@@ -3567,7 +3567,6 @@ gobject/glib-mkenums
+@@ -3469,7 +3469,6 @@ gobject/glib-mkenums
  gobject/tests/Makefile
  gthread/Makefile
  gio/Makefile
@@ -47,10 +24,10 @@ index 2013d198e..7d2d686c5 100644
  gio/gnetworking.h
  gio/xdgmime/Makefile
 diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index e04ab6843..3a518af02 100644
+index 5741a3e..d38e768 100644
 --- a/docs/reference/gio/Makefile.am
 +++ b/docs/reference/gio/Makefile.am
-@@ -178,7 +178,6 @@ man_MANS +=\
+@@ -177,7 +177,6 @@ man_MANS +=\
gsettings.1 \
gresource.1 \
gdbus.1 \
@@ -59,7 +36,7 @@ index e04ab6843..3a518af02 100644
$(NULL)
  
 diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 67b7fa966..334c6e32d 100644
+index b2db995..53d7162 100644
 --- a/gio/Makefile.am
 +++ b/gio/Makefile.am
 @@ -1,6 +1,6 @@
@@ -69,36 +46,12 @@ index 67b7fa966..334c6e32d 100644
 +SUBDIRS = 
  
  if OS_UNIX
- SUBDIRS += xdgmime
-@@ -101,10 +101,8 @@ GDBUS_PYTHON_DEPS =   
\
-   $(builddir)/gdbus-2.0/codegen/config.py \
-   $(srcdir)/gdbus-2.0/codegen/utils.py
- 
--gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml 
$(GDBUS_PYTHON_DEPS)
--  $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--  UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--  $(PYTHON)

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2018-06-24 Thread Sobhan Mohammadpour 
commit: d99c50d938c8b6e8ff083eb1895d80ad2829820c
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Sun Jun 24 13:14:35 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Sun Jun 24 13:14:35 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d99c50d9

Revert "dev-libs/glib: bump"

This reverts commit d2a6fd4a2c7dcae1e11ebfa4a2d3a028abb2ac6d.

 .../{glib-2.56.1-r1.ebuild => glib-2.56.1.ebuild}  | 32 +++---
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev-libs/glib/glib-2.56.1-r1.ebuild 
b/dev-libs/glib/glib-2.56.1.ebuild
similarity index 91%
rename from dev-libs/glib/glib-2.56.1-r1.ebuild
rename to dev-libs/glib/glib-2.56.1.ebuild
index 04ed5b91..06c64dfa 100644
--- a/dev-libs/glib/glib-2.56.1-r1.ebuild
+++ b/dev-libs/glib/glib-2.56.1.ebuild
@@ -6,26 +6,26 @@
 # then to be think very closely.
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 )
 # Completely useless with or without USE static-libs, people need to use
 # pkg-config
 GNOME2_LA_PUNT="yes"
 
 inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool 
linux-info \
-   multilib multilib-minimal pax-utils python-single-r1 toolchain-funcs 
versionator virtualx
+   multilib multilib-minimal pax-utils python-r1 toolchain-funcs 
versionator virtualx
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="https://www.gtk.org/;
-SRC_URI="${SRC_URI} 
+SRC_URI="${SRC_URI}
https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test 
utils xattr"
 REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
+   utils? ( ${PYTHON_REQUIRED_USE} )
test? ( ${PYTHON_REQUIRED_USE} )
-" # test dep left here and elsewhere to not forget, as global python 
requirement is supposed to be temporary until a split package is made with meson
+"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
@@ -44,9 +44,9 @@ RDEPEND="
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-   ${PYTHON_DEPS}
utils? (
-   >=dev-util/gdbus-codegen-${PV}
+   ${PYTHON_DEPS}
+   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
virtual/libelf:0=
)
 "
@@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
test? (
sys-devel/gdb
${PYTHON_DEPS}
-   >=dev-util/gdbus-codegen-${PV}
+   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
>=sys-apps/dbus-1.2.14 )
!https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4
rm "${ED}usr/bin/gtester-report"
rm "${ED}usr/share/man/man1/gtester-report.1"
fi

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2018-06-24 Thread Sobhan Mohammadpour 
commit: d2a6fd4a2c7dcae1e11ebfa4a2d3a028abb2ac6d
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Sun Jun 24 13:04:45 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Sun Jun 24 13:05:12 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d2a6fd4a

dev-libs/glib: bump

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 .../{glib-2.56.1.ebuild => glib-2.56.1-r1.ebuild}  | 32 +++---
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev-libs/glib/glib-2.56.1.ebuild 
b/dev-libs/glib/glib-2.56.1-r1.ebuild
similarity index 91%
rename from dev-libs/glib/glib-2.56.1.ebuild
rename to dev-libs/glib/glib-2.56.1-r1.ebuild
index 06c64dfa..04ed5b91 100644
--- a/dev-libs/glib/glib-2.56.1.ebuild
+++ b/dev-libs/glib/glib-2.56.1-r1.ebuild
@@ -6,26 +6,26 @@
 # then to be think very closely.
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 # Completely useless with or without USE static-libs, people need to use
 # pkg-config
 GNOME2_LA_PUNT="yes"
 
 inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool 
linux-info \
-   multilib multilib-minimal pax-utils python-r1 toolchain-funcs 
versionator virtualx
+   multilib multilib-minimal pax-utils python-single-r1 toolchain-funcs 
versionator virtualx
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="https://www.gtk.org/;
-SRC_URI="${SRC_URI}
+SRC_URI="${SRC_URI} 
https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test 
utils xattr"
 REQUIRED_USE="
-   utils? ( ${PYTHON_REQUIRED_USE} )
+   ${PYTHON_REQUIRED_USE}
test? ( ${PYTHON_REQUIRED_USE} )
-"
+" # test dep left here and elsewhere to not forget, as global python 
requirement is supposed to be temporary until a split package is made with meson
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
@@ -44,9 +44,9 @@ RDEPEND="
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+   ${PYTHON_DEPS}
utils? (
-   ${PYTHON_DEPS}
-   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+   >=dev-util/gdbus-codegen-${PV}
virtual/libelf:0=
)
 "
@@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
test? (
sys-devel/gdb
${PYTHON_DEPS}
-   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+   >=dev-util/gdbus-codegen-${PV}
>=sys-apps/dbus-1.2.14 )
!https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4
rm "${ED}usr/bin/gtester-report"
rm "${ED}usr/share/man/man1/gtester-report.1"
fi

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/, dev-libs/glib/files/

2018-04-14 Thread Remi Cardona 
commit: eafd62380dc5ea6dae3b12fc691a6cf563975e07
Author: Rémi Cardona  gentoo  org>
AuthorDate: Sat Apr 14 10:17:02 2018 +
Commit: Remi Cardona  gentoo  org>
CommitDate: Sat Apr 14 10:17:02 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=eafd6238

dev-libs/glib: bump to 2.56.1

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Manifest-Sign-Key: 0xE0663D48103108F8

 ...56.1-external-gdbus-codegen-for-autotools.patch | 133 +
 dev-libs/glib/glib-2.56.1.ebuild   | 301 +
 2 files changed, 434 insertions(+)

diff --git 
a/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch 
b/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch
new file mode 100644
index ..7e73f748
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch
@@ -0,0 +1,133 @@
+From db0a3301203e0c62db274bde8ac20cbfbb71889f Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour 
+Date: Fri, 23 Feb 2018 15:27:33 +0330
+Subject: [PATCH 2/2] glib-2.54.3-external-gdbus-codegen-for-autotools
+
+---
+ configure.ac| 17 -
+ docs/reference/gio/Makefile.am  |  1 -
+ gio/Makefile.am | 12 
+ gio/tests/Makefile.am   |  6 ++
+ .../gdbus-object-manager-example/Makefile.am|  6 ++
+ 5 files changed, 16 insertions(+), 26 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2013d198e..7d2d686c5 100644
+--- a/configure.ac
 b/configure.ac
+@@ -360,14 +360,14 @@ AC_CHECK_PROGS(PERL, [perl5 perl])
+ # option to specify python interpreter to use; this just sets $PYTHON, so that
+ # we will fallback to reading $PYTHON if --with-python is not given, and
+ # python.m4 will get the expected input
+-AC_ARG_WITH(python,
+-AS_HELP_STRING([--with-python=PATH],
+-   [Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as "python3" or "python2"]),
+-[PYTHON="$withval"], [])
+-if test x"$PYTHON" = xyes; then
+-  AC_MSG_ERROR([--with-python option requires a path or program argument])
+-fi
+-AM_PATH_PYTHON(2.7,,PYTHON="python2.7")
++#AC_ARG_WITH(python,
++#AS_HELP_STRING([--with-python=PATH],
++#   [Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as "python3" or "python2"]),
++#[PYTHON="$withval"], [])
++#if test x"$PYTHON" = xyes; then
++#  AC_MSG_ERROR([--with-python option requires a path or program argument])
++#fi
++#AM_PATH_PYTHON(2.7,,PYTHON="python2.7")
+ 
+ 
+ dnl ***
+@@ -3567,7 +3567,6 @@ gobject/glib-mkenums
+ gobject/tests/Makefile
+ gthread/Makefile
+ gio/Makefile
+-gio/gdbus-2.0/codegen/Makefile
+ gio/gdbus-2.0/codegen/config.py
+ gio/gnetworking.h
+ gio/xdgmime/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index e04ab6843..3a518af02 100644
+--- a/docs/reference/gio/Makefile.am
 b/docs/reference/gio/Makefile.am
+@@ -178,7 +178,6 @@ man_MANS +=\
+   gsettings.1 \
+   gresource.1 \
+   gdbus.1 \
+-  gdbus-codegen.1 \
+   gio.1   \
+   $(NULL)
+ 
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 67b7fa966..334c6e32d 100644
+--- a/gio/Makefile.am
 b/gio/Makefile.am
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
+ 
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS = 
+ 
+ if OS_UNIX
+ SUBDIRS += xdgmime
+@@ -101,10 +101,8 @@ GDBUS_PYTHON_DEPS =   
\
+   $(builddir)/gdbus-2.0/codegen/config.py \
+   $(srcdir)/gdbus-2.0/codegen/utils.py
+ 
+-gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml 
$(GDBUS_PYTHON_DEPS)
+-  $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-  UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-  $(PYTHON) $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in \
++gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml
++  $(AM_V_GEN) gdbus-codegen \
+   --interface-prefix org. \
+   --generate-c-code gdbus-daemon-generated \
+   --c-namespace _G \
+@@ -375,9 +373,7 @@ portal_interfaces = \
+ EXTRA_DIST += $(portal_interfaces)
+ 
+ $(xdp_dbus_built_sources) : $(portal_interfaces)
+-  $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir)   \
+-  UNINSTALLED_GLIB_BUILDDIR=$(top_builddir)   \
+-  $(PYTHON) $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in  \
++  $(AM_V_GEN) gdbus-codegen   \
+   --interface-prefix

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2018-03-03 Thread Sobhan Mohammadpour 
commit: e3970bc37ba3c14ec3817beb5bf7c1951ce84132
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Sat Mar  3 19:54:58 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Sat Mar  3 19:54:58 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e3970bc3

dev-libs/glib: fix @PYTHON@ not found

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 dev-libs/glib/{glib-2.54.3-r3.ebuild => glib-2.54.3-r4.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-libs/glib/glib-2.54.3-r3.ebuild 
b/dev-libs/glib/glib-2.54.3-r4.ebuild
similarity index 99%
rename from dev-libs/glib/glib-2.54.3-r3.ebuild
rename to dev-libs/glib/glib-2.54.3-r4.ebuild
index 7c1b378c..db057e34 100644
--- a/dev-libs/glib/glib-2.54.3-r3.ebuild
+++ b/dev-libs/glib/glib-2.54.3-r4.ebuild
@@ -125,7 +125,8 @@ src_prepare() {
# arg, but that would mean a build dep on python when USE=utils.
sed -e '/${PYTHON}/d' \
-i glib/Makefile.{am,in} || die
-
+   sed -e 's:@PYTHON@:python:' \
+   -i gobject/glib-{genmarshal.in,mkenums.in} || die
# Also needed to prevent cross-compile failures, see bug #267603
eautoreconf

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/, dev-libs/glib/files/

2018-02-23 Thread Sobhan Mohammadpour 
commit: ee2c88b33e53671fce098e5cc4c96374a09e7991
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Fri Feb 23 12:00:00 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Fri Feb 23 12:00:00 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ee2c88b3

dev-libs/glib: add an autotools based build

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 ...54.3-external-gdbus-codegen-for-autotools.patch | 116 
 dev-libs/glib/glib-2.54.3-r3.ebuild| 300 +
 2 files changed, 416 insertions(+)

diff --git 
a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen-for-autotools.patch 
b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen-for-autotools.patch
new file mode 100644
index ..45025b65
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen-for-autotools.patch
@@ -0,0 +1,116 @@
+From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour 
+Date: Fri, 23 Feb 2018 15:27:33 +0330
+Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools
+
+---
+ configure.ac   | 17 -
+ docs/reference/gio/Makefile.am |  1 -
+ gio/Makefile.am|  2 +-
+ gio/tests/Makefile.am  |  6 ++
+ gio/tests/gdbus-object-manager-example/Makefile.am |  8 +++-
+ 5 files changed, 14 insertions(+), 20 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0457c90..07166c9 100644
+--- a/configure.ac
 b/configure.ac
+@@ -382,14 +382,14 @@ AC_SUBST(PERL_PATH)
+ # option to specify python interpreter to use; this just sets $PYTHON, so that
+ # we will fallback to reading $PYTHON if --with-python is not given, and
+ # python.m4 will get the expected input
+-AC_ARG_WITH(python,
+-AS_HELP_STRING([--with-python=PATH],
+-   [Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as "python3" or "python2"]),
+-[PYTHON="$withval"], [])
+-if test x"$PYTHON" = xyes; then
+-  AC_MSG_ERROR([--with-python option requires a path or program argument])
+-fi
+-AM_PATH_PYTHON(2.7,,PYTHON="python2.7")
++#AC_ARG_WITH(python,
++#AS_HELP_STRING([--with-python=PATH],
++#   [Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as "python3" or "python2"]),
++#[PYTHON="$withval"], [])
++#if test x"$PYTHON" = xyes; then
++#  AC_MSG_ERROR([--with-python option requires a path or program argument])
++#fi
++#AM_PATH_PYTHON(2.7,,PYTHON="python2.7")
+ 
+ 
+ dnl ***
+@@ -3469,7 +3469,6 @@ gobject/glib-mkenums
+ gobject/tests/Makefile
+ gthread/Makefile
+ gio/Makefile
+-gio/gdbus-2.0/codegen/Makefile
+ gio/gdbus-2.0/codegen/config.py
+ gio/gnetworking.h
+ gio/xdgmime/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 5741a3e..d38e768 100644
+--- a/docs/reference/gio/Makefile.am
 b/docs/reference/gio/Makefile.am
+@@ -177,7 +177,6 @@ man_MANS +=\
+   gsettings.1 \
+   gresource.1 \
+   gdbus.1 \
+-  gdbus-codegen.1 \
+   gio.1   \
+   $(NULL)
+ 
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index b2db995..53d7162 100644
+--- a/gio/Makefile.am
 b/gio/Makefile.am
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
+ 
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS = 
+ 
+ if OS_UNIX
+ if !OS_COCOA
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index acc1da4..7c51eab 100644
+--- a/gio/tests/Makefile.am
 b/gio/tests/Makefile.am
+@@ -460,10 +460,8 @@ gnotification_SOURCES= 
$(gdbus_sessionbus_sources) gnotifica
+ 
+ BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
+ gdbus-test-codegen.o: gdbus-test-codegen-generated.h
+-gdbus-test-codegen-generated.h: test-codegen.xml Makefile 
$(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-  $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-  UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-  $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++gdbus-test-codegen-generated.h: test-codegen.xml Makefile
++  $(AM_V_GEN) gdbus-codegen \
+   --interface-prefix org.project. \
+   --generate-c-code gdbus-test-codegen-generated \
+   --c-generate-object-manager \
+diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am 
b/gio/tests/gdbus-object-manager-example/Makefile.am
+index 1d0464c..f390dca 100644
+--- a/gio/tests/gdbus-object-manager-example/Makefile.am

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2018-02-16 Thread Sobhan Mohammadpour 
commit: 4bddcb0718a7f70007fcd3cf75e4f7e91b4bb4b7
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Fri Feb 16 16:00:24 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Fri Feb 16 16:00:24 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4bddcb07

dev-libs/glib: remove old

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 dev-libs/glib/glib-2.54.3-r1.ebuild | 301 
 1 file changed, 301 deletions(-)

diff --git a/dev-libs/glib/glib-2.54.3-r1.ebuild 
b/dev-libs/glib/glib-2.54.3-r1.ebuild
deleted file mode 100644
index 4e5804f4..
--- a/dev-libs/glib/glib-2.54.3-r1.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# Completely useless with or without USE static-libs, people need to use 
pkg-config
-GNOME2_LA_PUNT="yes"
-
-inherit bash-completion-r1 epunt-cxx flag-o-matic gnome-meson libtool 
linux-info \
-   multilib multilib-minimal pax-utils python-r1 toolchain-funcs 
versionator virtualx
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/;
-SRC_URI="${SRC_URI}
-   https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test 
utils xattr"
-REQUIRED_USE="
-   utils? ( ${PYTHON_REQUIRED_USE} )
-   test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-# Added util-linux multilib dependency to have libmount support (which
-# is always turned on on linux systems, unless explicitly disabled, but
-# this ebuild does not do that anyway) (bug #599586)
-
-RDEPEND="
-   !=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
-   >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-   >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-   >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-   >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-   kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
-   selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-   xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-   fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-   utils? (
-   ${PYTHON_DEPS}
-   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-   virtual/libelf:0=
-   )
-"
-DEPEND="${RDEPEND}
-   app-text/docbook-xml-dtd:4.1.2
-   >=dev-libs/libxslt-1.0
-   >=sys-devel/gettext-0.11
-   >=dev-util/gtk-doc-am-1.20
-   systemtap? ( >=dev-util/systemtap-1.3 )
-   test? (
-   sys-devel/gdb
-   ${PYTHON_DEPS}
-   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-   >=sys-apps/dbus-1.2.14 )
-   !https://bugzilla.gnome.org/show_bug.cgi?id=722604
-   sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-   sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-   ewarn "Tests for search-utils have been skipped"
-   sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
-   else
-   # Don't build tests, also prevents extra deps, bug #512022
-   sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-   fi
-
-   # gdbus-codegen is a separate package
-   eapply "${FILESDIR}"/${PN}-2.54.2-external-codegen.patch
-
-   # Leave python shebang alone - handled by python_replicate_script
-   # We could call python_setup and give configure a valid --with-python
-   # arg, but that would mean a build dep on python when USE=utils.
-   sed -e '/${PYTHON}/d' \
-   -i glib/Makefile.{am,in} || die
-
-   gnome-meson_src_prepare
-
-   epunt_cxx
-}
-
-multilib_src_configure() {
-   # TODO is this still relevent?
-   # Avoid circular depend with dev-util/pkgconfig and
-   # native builds (cross-compiles won't need pkg-config
-   # in the target ROOT to work here)
-   if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& 
/dev/null; then
-   if has_version sys-apps/dbus; then
-   export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 
-I/usr/$(get_libdir)/dbus-1.0/include"
-   export DBUS1_LIBS="-ldbus-1"
-   fi
-   export LIBFFI_CFLAGS="-I$(echo 
/usr/$(get_libdir)/libffi-*/include)"
-   export LIBFFI_LIBS="-lffi"
-   export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2018-02-16 Thread Sobhan Mohammadpour 
commit: 52ed682456af3f1d46fa35e52289887261027be9
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Fri Feb 16 16:10:58 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Fri Feb 16 16:10:58 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=52ed6824

dev-libs/glib: remove gnome-meson_use

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 dev-libs/glib/glib-.ebuild | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/dev-libs/glib/glib-.ebuild b/dev-libs/glib/glib-.ebuild
index c0953b57..b5718a7d 100644
--- a/dev-libs/glib/glib-.ebuild
+++ b/dev-libs/glib/glib-.ebuild
@@ -18,16 +18,16 @@ if [[ ${PV} =  ]]; then
 fi
 
 DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/;
+HOMEPAGE="https://www.gtk.org/;
 SRC_URI="${SRC_URI}
-   http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
+   https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
 
 if [[ ${PV} =  ]]; then
EGIT_REPO_URI="https://git.gnome.org/browse/${GNOME_ORG_MODULE};
-   SRC_URI=""
+   
SRC_URI="https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
 fi
 
-LICENSE="LGPL-2+"
+LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test 
utils xattr"
 REQUIRED_USE="
@@ -94,6 +94,10 @@ pkg_setup() {
fi
 }
 
+src_unpack() {
+   git-r3_src_unpack
+   default
+}
 src_prepare() {
# Prevent build failure in stage3 where pkgconfig is not available, bug 
#481056
mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
@@ -186,8 +190,8 @@ multilib_src_configure() {
gnome-meson_src_configure \
${myconf} \
-Denable-libmount=$(usex kernel_linux yes no) \
-   $(gnome-meson_use systemtap dtrace) \
-   $(gnome-meson_use systemtap) \
+   $(meson_use systemtap enable-dtrace) \
+   $(meson_use systemtap enable-systemtap) \
-Dwith-pcre=system \
-Dwith-docs=no \
-Dwith-man=yes
@@ -226,8 +230,8 @@ multilib_src_test() {
virtx meson_src_test
 }
 
-# FIXME completentiondir
 multilib_src_install() {
+   chmod +x glib-gettextize || die
gnome-meson_src_install completiondir="$(get_bashcompdir)"
keepdir /usr/$(get_libdir)/gio/modules
 }
@@ -281,7 +285,7 @@ pkg_preinst() {
 
 pkg_postinst() {
# force (re)generation of gschemas.compiled
-   gnome-meson_GNOME2_ECLASS_GLIB_SCHEMAS="force"
+   GNOME2_ECLASS_GLIB_SCHEMAS="force"
 
gnome-meson_pkg_postinst

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2018-02-16 Thread Sobhan Mohammadpour 
commit: 9782b57b5f5363960784efad0afb0b2927a76870
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Fri Feb 16 15:50:02 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Fri Feb 16 15:50:02 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9782b57b

dev-libs/glib: remove not working ebuild

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 dev-libs/glib/glib-2.54.2.ebuild| 304 
 dev-libs/glib/glib-2.54.3-r1.ebuild |   2 +-
 2 files changed, 1 insertion(+), 305 deletions(-)

diff --git a/dev-libs/glib/glib-2.54.2.ebuild b/dev-libs/glib/glib-2.54.2.ebuild
deleted file mode 100644
index 257cbe2c..
--- a/dev-libs/glib/glib-2.54.2.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT="yes"
-
-inherit bash-completion-r1 epunt-cxx flag-o-matic gnome-meson libtool 
linux-info \
-   multilib multilib-minimal pax-utils python-r1 toolchain-funcs 
versionator virtualx
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/;
-SRC_URI="${SRC_URI}
-   https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test 
utils xattr"
-REQUIRED_USE="
-   utils? ( ${PYTHON_REQUIRED_USE} )
-   test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux"
-
-# Added util-linux multilib dependency to have libmount support (which
-# is always turned on on linux systems, unless explicitly disabled, but
-# this ebuild does not do that anyway) (bug #599586)
-
-RDEPEND="
-   !=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
-   >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-   >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-   >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-   >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-   kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
-   selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-   xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-   fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-   utils? (
-   ${PYTHON_DEPS}
-   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-   virtual/libelf:0=
-   )
-"
-DEPEND="${RDEPEND}
-   app-text/docbook-xml-dtd:4.1.2
-   >=dev-libs/libxslt-1.0
-   >=sys-devel/gettext-0.11
-   >=dev-util/gtk-doc-am-1.20
-   systemtap? ( >=dev-util/systemtap-1.3 )
-   test? (
-   sys-devel/gdb
-   ${PYTHON_DEPS}
-   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-   >=sys-apps/dbus-1.2.14 )
-   !https://bugzilla.gnome.org/show_bug.cgi?id=722604
-   sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-   sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-   ewarn "Tests for search-utils have been skipped"
-   sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
-   else
-   # Don't build tests, also prevents extra deps, bug #512022
-   sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-   fi
-
-   # gdbus-codegen is a separate package
-   eapply "${FILESDIR}"/${PN}-2.54.2-external-codegen.patch
-
-   # Leave python shebang alone - handled by python_replicate_script
-   # We could call python_setup and give configure a valid --with-python
-   # arg, but that would mean a build dep on python when USE=utils.
-   sed -e '/${PYTHON}/d' \
-   -i glib/Makefile.{am,in} || die
-
-   gnome-meson_src_prepare
-
-   epunt_cxx
-}
-
-multilib_src_configure() {
-   # TODO is this still relevent?
-   # Avoid circular depend with dev-util/pkgconfig and
-   # native builds (cross-compiles won't need pkg-config
-   # in the target ROOT to work here)
-   if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& 
/dev/null; then
-   if has_version sys-apps/dbus; then
-   export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 
-I/usr/$(get_libdir)/dbus-1.0/include"
-   export DBUS1_LIBS="-ldbus-1"
-   fi
-   export LIBFFI_CFLAGS="-I$(echo 
/usr/$(get_libdir)/libffi-*/include)"
-   export

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2018-02-16 Thread Sobhan Mohammadpour 
commit: b042efe67bc4e29868802b2c9aa429a25124a65f
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Fri Feb 16 15:58:58 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Fri Feb 16 15:59:21 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b042efe6

dev-libs/glib: general fixes

remove gnome-meson and some useless FIXME

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 dev-libs/glib/glib-2.54.3-r1.ebuild| 7 ++-
 dev-libs/glib/{glib-2.54.3-r1.ebuild => glib-2.54.3-r2.ebuild} | 8 +++-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/dev-libs/glib/glib-2.54.3-r1.ebuild 
b/dev-libs/glib/glib-2.54.3-r1.ebuild
index 3f54b53e..4e5804f4 100644
--- a/dev-libs/glib/glib-2.54.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.54.3-r1.ebuild
@@ -167,8 +167,6 @@ multilib_src_configure() {
# FIXME multilib automagic for libelf
# FIXME set systemtap/tapse/static-lib install dir and test it.
# FIXME no selinux, fam, xattr for now.
-   # FIXME is this still valid.
-   # libelf used only by the gresource bin ??
# FIXME enable docs if possible.
 
use static-libs && myconf="-Ddefault_library='static'"
@@ -177,8 +175,8 @@ multilib_src_configure() {
gnome-meson_src_configure \
${myconf} \
-Denable-libmount=$(usex kernel_linux yes no) \
-   $(gnome-meson_use systemtap dtrace) \
-   $(gnome-meson_use systemtap) \
+   $(meson_use systemtap enable-dtrace) \
+   $(meson_use systemtap enable-systemtap) \
-Dwith-pcre=system \
-Dwith-docs=no \
-Dwith-man=yes
@@ -217,7 +215,6 @@ multilib_src_test() {
virtx meson_src_test
 }
 
-# FIXME completentiondir
 multilib_src_install() {
chmod +x glib-gettextize || die
gnome-meson_src_install completiondir="$(get_bashcompdir)"

diff --git a/dev-libs/glib/glib-2.54.3-r1.ebuild 
b/dev-libs/glib/glib-2.54.3-r2.ebuild
similarity index 98%
copy from dev-libs/glib/glib-2.54.3-r1.ebuild
copy to dev-libs/glib/glib-2.54.3-r2.ebuild
index 3f54b53e..8f25e3c9 100644
--- a/dev-libs/glib/glib-2.54.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.54.3-r2.ebuild
@@ -18,6 +18,7 @@ HOMEPAGE="https://www.gtk.org/;
 SRC_URI="${SRC_URI}
https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
 
+
 LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test 
utils xattr"
@@ -167,8 +168,6 @@ multilib_src_configure() {
# FIXME multilib automagic for libelf
# FIXME set systemtap/tapse/static-lib install dir and test it.
# FIXME no selinux, fam, xattr for now.
-   # FIXME is this still valid.
-   # libelf used only by the gresource bin ??
# FIXME enable docs if possible.
 
use static-libs && myconf="-Ddefault_library='static'"
@@ -177,8 +176,8 @@ multilib_src_configure() {
gnome-meson_src_configure \
${myconf} \
-Denable-libmount=$(usex kernel_linux yes no) \
-   $(gnome-meson_use systemtap dtrace) \
-   $(gnome-meson_use systemtap) \
+   $(meson_use systemtap enable-dtrace) \
+   $(meson_use systemtap enable-systemtap) \
-Dwith-pcre=system \
-Dwith-docs=no \
-Dwith-man=yes
@@ -217,7 +216,6 @@ multilib_src_test() {
virtx meson_src_test
 }
 
-# FIXME completentiondir
 multilib_src_install() {
chmod +x glib-gettextize || die
gnome-meson_src_install completiondir="$(get_bashcompdir)"

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2018-01-30 Thread Sobhan Mohammadpour 
commit: 6dee304b2a08faf8670e796b89a252c411e663b3
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Tue Jan 30 10:14:29 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Tue Jan 30 10:14:29 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6dee304b

dev-libs/glib: chmod +x glib-gettextize and fix an invalid command

Package-Manager: Portage-2.3.21, Repoman-2.3.6
RepoMan-Options: --force
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 dev-libs/glib/{glib-2.54.3.ebuild => glib-2.54.3-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-libs/glib/glib-2.54.3.ebuild 
b/dev-libs/glib/glib-2.54.3-r1.ebuild
similarity index 99%
rename from dev-libs/glib/glib-2.54.3.ebuild
rename to dev-libs/glib/glib-2.54.3-r1.ebuild
index 3179d90e..cfa92591 100644
--- a/dev-libs/glib/glib-2.54.3.ebuild
+++ b/dev-libs/glib/glib-2.54.3-r1.ebuild
@@ -219,6 +219,7 @@ multilib_src_test() {
 
 # FIXME completentiondir
 multilib_src_install() {
+   chmod +x glib-gettextize || die
gnome-meson_src_install completiondir="$(get_bashcompdir)"
keepdir /usr/$(get_libdir)/gio/modules
 }
@@ -272,7 +273,7 @@ pkg_preinst() {
 
 pkg_postinst() {
# force (re)generation of gschemas.compiled
-   gnome-meson_GNOME2_ECLASS_GLIB_SCHEMAS="force"
+   GNOME2_ECLASS_GLIB_SCHEMAS="force"
 
gnome-meson_pkg_postinst

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2018-01-14 Thread Dennis Lamm 
commit: 89984cb53ee47c5a5416ce75ba48c238c381c1f8
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sun Jan 14 15:02:51 2018 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sun Jan 14 15:02:51 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=89984cb5

dev-libs/glib: version bump

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-libs/glib/glib-2.54.2.ebuild   |   2 +-
 .../{glib-2.54.2.ebuild => glib-2.54.3.ebuild} |   5 +-
 dev-libs/glib/glib-.ebuild | 255 +++--
 3 files changed, 141 insertions(+), 121 deletions(-)

diff --git a/dev-libs/glib/glib-2.54.2.ebuild b/dev-libs/glib/glib-2.54.2.ebuild
index 46a5e3ee..257cbe2c 100644
--- a/dev-libs/glib/glib-2.54.2.ebuild
+++ b/dev-libs/glib/glib-2.54.2.ebuild
@@ -273,7 +273,7 @@ pkg_preinst() {
 
 pkg_postinst() {
# force (re)generation of gschemas.compiled
-   gnome-meson_ECLASS_GLIB_SCHEMAS="force"
+   gnome-meson_GNOME2_ECLASS_GLIB_SCHEMAS="force"
 
gnome-meson_pkg_postinst
 

diff --git a/dev-libs/glib/glib-2.54.2.ebuild b/dev-libs/glib/glib-2.54.3.ebuild
similarity index 99%
copy from dev-libs/glib/glib-2.54.2.ebuild
copy to dev-libs/glib/glib-2.54.3.ebuild
index 46a5e3ee..3179d90e 100644
--- a/dev-libs/glib/glib-2.54.2.ebuild
+++ b/dev-libs/glib/glib-2.54.3.ebuild
@@ -7,8 +7,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
+# Completely useless with or without USE static-libs, people need to use 
pkg-config
 GNOME2_LA_PUNT="yes"
 
 inherit bash-completion-r1 epunt-cxx flag-o-matic gnome-meson libtool 
linux-info \
@@ -273,7 +272,7 @@ pkg_preinst() {
 
 pkg_postinst() {
# force (re)generation of gschemas.compiled
-   gnome-meson_ECLASS_GLIB_SCHEMAS="force"
+   gnome-meson_GNOME2_ECLASS_GLIB_SCHEMAS="force"
 
gnome-meson_pkg_postinst
 

diff --git a/dev-libs/glib/glib-.ebuild b/dev-libs/glib/glib-.ebuild
index bb0f63b6..c0953b57 100644
--- a/dev-libs/glib/glib-.ebuild
+++ b/dev-libs/glib/glib-.ebuild
@@ -5,20 +5,16 @@
 # adding new dependencies end up making stage3 to grow. Every addition needs
 # then to be think very closely.
 
-EAPI="5"
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
-# Building with --disable-debug highly unrecommended.  It will build glib in
-# an unusable form as it disables some commonly used API.  Please do not
-# convert this to the use_enable form, as it results in a broken build.
-GCONF_DEBUG="yes"
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
+# Completely useless with or without USE static-libs, people need to use 
pkg-config
 GNOME2_LA_PUNT="yes"
 
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic
multilib \
-   pax-utils python-r1 toolchain-funcs versionator virtualx linux-info 
multilib-minimal
+inherit bash-completion-r1 epunt-cxx flag-o-matic gnome-meson libtool 
linux-info \
+   multilib multilib-minimal pax-utils python-r1 toolchain-funcs 
versionator virtualx
+
 if [[ ${PV} =  ]]; then
-   inherit gnome2-live
+   inherit git-r3
 fi
 
 DESCRIPTION="The GLib library of C routines"
@@ -26,40 +22,40 @@ HOMEPAGE="http://www.gtk.org/;
 SRC_URI="${SRC_URI}
http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
 
+if [[ ${PV} =  ]]; then
+   EGIT_REPO_URI="https://git.gnome.org/browse/${GNOME_ORG_MODULE};
+   SRC_URI=""
+fi
+
 LICENSE="LGPL-2+"
 SLOT="2"
-IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils 
xattr"
+IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test 
utils xattr"
 REQUIRED_USE="
utils? ( ${PYTHON_REQUIRED_USE} )
test? ( ${PYTHON_REQUIRED_USE} )
 "
+
 if [[ ${PV} =  ]]; then
-   IUSE="${IUSE} doc"
KEYWORDS=""
 else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
!=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+   >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+   kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
utils? (
${PYTHON_DEPS}
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-   || (
-

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/

2018-01-13 Thread Dennis Lamm 
commit: dd9a33b703c1793d35afbec32007a1db0e7f8b2d
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sat Jan 13 08:59:37 2018 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sat Jan 13 08:59:37 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=dd9a33b7

dev-libs/glib: reverted deletion (done by mistake)

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-libs/glib/files/gengiotypefuncs.py | 45 ++
 1 file changed, 45 insertions(+)

diff --git a/dev-libs/glib/files/gengiotypefuncs.py 
b/dev-libs/glib/files/gengiotypefuncs.py
new file mode 100755
index ..9732d789
--- /dev/null
+++ b/dev-libs/glib/files/gengiotypefuncs.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import sys
+import re
+import os
+
+debug = os.getenv('GIO_GENTYPEFUNCS_DEBUG') is not None
+
+out_file = sys.argv[1]
+in_files = sys.argv[2:]
+
+funcs = []
+
+
+if debug: print ('Output file: ', out_file)
+
+if debug: print (len(in_files), 'input files')
+
+for filename in in_files:
+  if debug: print ('Input file: ', filename)
+  with open(filename, "r") as f:
+for line in f:
+  line = line.rstrip('\n').rstrip('\r')
+  # print line
+  match = re.search(r'\bg_[a-zA-Z0-9_]*_get_type\b', line)
+  if match:
+func = match.group(0)
+if not func in funcs:
+  funcs.append(func)
+  if debug: print ('Found ', func)
+
+file_output = 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n'
+
+funcs = sorted(funcs)
+
+for f in funcs:
+  if f not in ['g_io_extension_get_type', 'g_settings_backend_get_type']:
+file_output += '*tp++ = {0} ();\n'.format(f)
+
+if debug: print (len(funcs), 'functions')
+
+ofile = open(out_file, "w")
+ofile.write(file_output)
+ofile.close()

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/, dev-libs/glib/files/

2018-01-12 Thread Dennis Lamm 
commit: fd1977984d7b5512cec651884ab5463edea947b1
Author: Dennis Lamm  gentoo  org>
AuthorDate: Fri Jan 12 10:44:19 2018 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Fri Jan 12 10:44:19 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=fd197798

dev-libs/glib: drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-libs/glib/files/gengiotypefuncs.py |  45 ---
 .../files/glib-2.34.0-testsuite-skip-thread4.patch |  44 ---
 .../files/glib-2.54.1-external-gdbus-codegen.patch |  93 ---
 dev-libs/glib/glib-2.46.0-r1.ebuild| 270 --
 dev-libs/glib/glib-2.54.1.ebuild   | 302 -
 dev-libs/glib/glib-2.54.2.ebuild   |   4 +-
 dev-libs/glib/glib-.ebuild |   8 +-
 dev-libs/glib/metadata.xml |  46 ++--
 8 files changed, 30 insertions(+), 782 deletions(-)

diff --git a/dev-libs/glib/files/gengiotypefuncs.py 
b/dev-libs/glib/files/gengiotypefuncs.py
deleted file mode 100755
index 9732d789..
--- a/dev-libs/glib/files/gengiotypefuncs.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import sys
-import re
-import os
-
-debug = os.getenv('GIO_GENTYPEFUNCS_DEBUG') is not None
-
-out_file = sys.argv[1]
-in_files = sys.argv[2:]
-
-funcs = []
-
-
-if debug: print ('Output file: ', out_file)
-
-if debug: print (len(in_files), 'input files')
-
-for filename in in_files:
-  if debug: print ('Input file: ', filename)
-  with open(filename, "r") as f:
-for line in f:
-  line = line.rstrip('\n').rstrip('\r')
-  # print line
-  match = re.search(r'\bg_[a-zA-Z0-9_]*_get_type\b', line)
-  if match:
-func = match.group(0)
-if not func in funcs:
-  funcs.append(func)
-  if debug: print ('Found ', func)
-
-file_output = 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n'
-
-funcs = sorted(funcs)
-
-for f in funcs:
-  if f not in ['g_io_extension_get_type', 'g_settings_backend_get_type']:
-file_output += '*tp++ = {0} ();\n'.format(f)
-
-if debug: print (len(funcs), 'functions')
-
-ofile = open(out_file, "w")
-ofile.write(file_output)
-ofile.close()

diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch 
b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
deleted file mode 100644
index 584b56f4..
--- a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4881b5d303512208b55f5bf78b91cd6a85e5034c Mon Sep 17 00:00:00 2001
-From: Priit Laes 
-Date: Tue, 3 Jul 2012 11:21:56 +0300
-Subject: [PATCH 2/4] Gentoo: skip over thread/thread4 test failure
-
-https://bugzilla.gnome.org/show_bug.cgi?id=679306

- glib/tests/thread.c | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/glib/tests/thread.c b/glib/tests/thread.c
-index 539782e..179ec06 100644
 a/glib/tests/thread.c
-+++ b/glib/tests/thread.c
-@@ -124,6 +124,8 @@ test_thread3 (void)
-   g_assert_cmpint (GPOINTER_TO_INT(result), ==, 9);
- }
- 
-+#if 0
-+// https://bugzilla.gnome.org/show_bug.cgi?id=679306
- /* test that thread creation fails as expected,
-  * by setting RLIMIT_NPROC ridiculously low
-  */
-@@ -158,6 +160,7 @@ test_thread4 (void)
- g_error ("resetting RLIMIT_NPROC failed: %s\n", g_strerror (ret));
- #endif
- }
-+#endif
- 
- static void
- test_thread5 (void)
-@@ -203,7 +206,9 @@ main (int argc, char *argv[])
-   g_test_add_func ("/thread/thread1", test_thread1);
-   g_test_add_func ("/thread/thread2", test_thread2);
-   g_test_add_func ("/thread/thread3", test_thread3);
-+#if 0
-   g_test_add_func ("/thread/thread4", test_thread4);
-+#endif
-   g_test_add_func ("/thread/thread5", test_thread5);
-   g_test_add_func ("/thread/thread6", test_thread6);
- 
--- 
-1.8.3.2
-

diff --git a/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch 
b/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch
deleted file mode 100644
index 162d7fa7..
--- a/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 9cd151075..2b907f66b 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -372,14 +372,14 @@ AC_SUBST(REBUILD)
- # option to specify python interpreter to use; this just sets $PYTHON, so that
- # we will fallback to reading $PYTHON if --with-python is not given, and
- # python.m4 will get the expected input
--AC_ARG_WITH(python,
--AS_HELP_STRING([--with-python=PATH],
--   [Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as "python3" or "python2"]),
--[PYTHON="$withval"], [])
--if test x"$PYTHON" = xyes; then
--  AC_MSG_ERROR([--with-python option requires a path or program argument])
--fi
--AM_PATH_PYTHON(2.7,,PYTHON="python2.7")
-+# AC_ARG_WITH(python,
-+#

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/

2018-01-02 Thread Sobhan Mohammadpour 
commit: c7531c44e7b7be5ee795894aa6de15c182ef0f15
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Tue Jan  2 15:16:57 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Tue Jan  2 15:16:57 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=c7531c44

dev-libs/glib: add 2.54.1

used ebuild and patch from 
https://github.com/mattst88/gentoo/tree/gnome/dev-libs/glib
fixed the ebuild

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --force
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 .../files/glib-2.54.1-external-gdbus-codegen.patch |  93 +++
 dev-libs/glib/glib-2.54.1.ebuild   | 302 +
 2 files changed, 395 insertions(+)

diff --git a/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch 
b/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch
new file mode 100644
index ..162d7fa7
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch
@@ -0,0 +1,93 @@
+diff --git a/configure.ac b/configure.ac
+index 9cd151075..2b907f66b 100644
+--- a/configure.ac
 b/configure.ac
+@@ -372,14 +372,14 @@ AC_SUBST(REBUILD)
+ # option to specify python interpreter to use; this just sets $PYTHON, so that
+ # we will fallback to reading $PYTHON if --with-python is not given, and
+ # python.m4 will get the expected input
+-AC_ARG_WITH(python,
+-AS_HELP_STRING([--with-python=PATH],
+-   [Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as "python3" or "python2"]),
+-[PYTHON="$withval"], [])
+-if test x"$PYTHON" = xyes; then
+-  AC_MSG_ERROR([--with-python option requires a path or program argument])
+-fi
+-AM_PATH_PYTHON(2.7,,PYTHON="python2.7")
++# AC_ARG_WITH(python,
++# AS_HELP_STRING([--with-python=PATH],
++#[Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as "python3" or "python2"]),
++# [PYTHON="$withval"], [])
++# if test x"$PYTHON" = xyes; then
++#   AC_MSG_ERROR([--with-python option requires a path or program argument])
++# fi
++# AM_PATH_PYTHON(2.7,,PYTHON="python2.7")
+ 
+ 
+ dnl ***
+@@ -3475,7 +3475,6 @@ gobject/glib-mkenums
+ gobject/tests/Makefile
+ gthread/Makefile
+ gio/Makefile
+-gio/gdbus-2.0/codegen/Makefile
+ gio/gdbus-2.0/codegen/config.py
+ gio/gnetworking.h
+ gio/xdgmime/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 5741a3edc..d38e768ff 100644
+--- a/docs/reference/gio/Makefile.am
 b/docs/reference/gio/Makefile.am
+@@ -177,7 +177,6 @@ man_MANS +=\
+   gsettings.1 \
+   gresource.1 \
+   gdbus.1 \
+-  gdbus-codegen.1 \
+   gio.1   \
+   $(NULL)
+ 
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 1ffe0cc6f..bfd7b535e 100644
+--- a/gio/Makefile.am
 b/gio/Makefile.am
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
+ 
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS =
+ 
+ if OS_UNIX
+ SUBDIRS += xdgmime
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 4e269dc26..0bcc16899 100644
+--- a/gio/tests/Makefile.am
 b/gio/tests/Makefile.am
+@@ -461,10 +461,8 @@ gnotification_SOURCES= 
$(gdbus_sessionbus_sources) gnotifica
+ 
+ BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
+ gdbus-test-codegen.o: gdbus-test-codegen-generated.h
+-gdbus-test-codegen-generated.h: test-codegen.xml Makefile 
$(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-  $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-  UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-  $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++gdbus-test-codegen-generated.h: test-codegen.xml Makefile
++  $(AM_V_GEN) gdbus-codegen \
+   --interface-prefix org.project. \
+   --generate-c-code gdbus-test-codegen-generated \
+   --c-generate-object-manager \
+diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am 
b/gio/tests/gdbus-object-manager-example/Makefile.am
+index 1d0464c5c..b0ce60ca7 100644
+--- a/gio/tests/gdbus-object-manager-example/Makefile.am
 b/gio/tests/gdbus-object-manager-example/Makefile.am
+@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
+   
gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml
   \
+   $(NULL)
+ 
+-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile 
$(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-  $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-  UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-  $(PYTHON)

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/

2017-12-18 Thread Sobhan Mohammadpour 
commit: 14aadaaa2a8eaf806d3cdaf4708855fca846ab04
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Mon Dec 18 13:50:10 2017 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Mon Dec 18 13:50:10 2017 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=14aadaaa

dev-libs/glib: Bump to 2.54.2

Bump to 2.54.2. this ebuild uses meson, fam, xattr, selinux,
systemtap need checking.

Package-Manager: Portage-2.3.18, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 dev-libs/glib/files/gengiotypefuncs.py |  45 +++
 .../glib/files/glib-2.54.2-external-codegen.patch  | 101 +++
 dev-libs/glib/glib-2.54.2.ebuild   | 304 +
 3 files changed, 450 insertions(+)

diff --git a/dev-libs/glib/files/gengiotypefuncs.py 
b/dev-libs/glib/files/gengiotypefuncs.py
new file mode 100755
index ..9732d789
--- /dev/null
+++ b/dev-libs/glib/files/gengiotypefuncs.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import sys
+import re
+import os
+
+debug = os.getenv('GIO_GENTYPEFUNCS_DEBUG') is not None
+
+out_file = sys.argv[1]
+in_files = sys.argv[2:]
+
+funcs = []
+
+
+if debug: print ('Output file: ', out_file)
+
+if debug: print (len(in_files), 'input files')
+
+for filename in in_files:
+  if debug: print ('Input file: ', filename)
+  with open(filename, "r") as f:
+for line in f:
+  line = line.rstrip('\n').rstrip('\r')
+  # print line
+  match = re.search(r'\bg_[a-zA-Z0-9_]*_get_type\b', line)
+  if match:
+func = match.group(0)
+if not func in funcs:
+  funcs.append(func)
+  if debug: print ('Found ', func)
+
+file_output = 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n'
+
+funcs = sorted(funcs)
+
+for f in funcs:
+  if f not in ['g_io_extension_get_type', 'g_settings_backend_get_type']:
+file_output += '*tp++ = {0} ();\n'.format(f)
+
+if debug: print (len(funcs), 'functions')
+
+ofile = open(out_file, "w")
+ofile.write(file_output)
+ofile.close()

diff --git a/dev-libs/glib/files/glib-2.54.2-external-codegen.patch 
b/dev-libs/glib/files/glib-2.54.2-external-codegen.patch
new file mode 100644
index ..3c654216
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.54.2-external-codegen.patch
@@ -0,0 +1,101 @@
+From d4a7cb8d053daab95b8d250af6b21c81bc860777 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour 
+Date: Sat, 16 Dec 2017 21:30:22 +0330
+Subject: [PATCH] glib-2.54.2 external codegen
+
+---
+ docs/reference/gio/meson.build | 4 +---
+ gio/meson.build| 6 +++---
+ gio/tests/gdbus-object-manager-example/meson.build | 2 +-
+ gio/tests/meson.build  | 2 +-
+ 4 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
+index 7f04677..71b5e0c 100644
+--- a/docs/reference/gio/meson.build
 b/docs/reference/gio/meson.build
+@@ -121,7 +121,6 @@ if get_option('with-docs') != 'no'
+   'gsettings.xml',
+   'gresource.xml',
+   'gdbus.xml',
+-  'gdbus-codegen.xml',
+ ],
+ expand_content_files : [
+   'overview.xml',
+@@ -129,7 +128,6 @@ if get_option('with-docs') != 'no'
+   'migrating-gnome-vfs.xml',
+   'migrating-gconf.xml',
+   'migrating-gdbus.xml',
+-  'gdbus-codegen.xml',
+ ],
+ html_assets : [
+   'gvfs-overview.png',
+@@ -149,7 +147,7 @@ endif
+ if get_option('with-man') != 'no' and xsltproc.found()
+   manpages = ['gapplication', 'gio-querymodules', 'glib-compile-schemas',
+   'glib-compile-resources', 'gsettings', 'gresource', 'gdbus',
+-  'gio', 'gdbus-codegen']
++  'gio']
+   foreach page : manpages
+ custom_target(page + '-man',
+   input: page + '.xml',
+diff --git a/gio/meson.build b/gio/meson.build
+index 3252636..3c566ed 100644
+--- a/gio/meson.build
 b/gio/meson.build
+@@ -165,7 +165,7 @@ gdbus_sources = [
+ ]
+ 
+ # Generate gdbus-codegen
+-subdir('gdbus-2.0/codegen')
++#subdir('gdbus-2.0/codegen')
+ 
+ # Generate xdp-dbus.{c,h}
+ xdp_dbus_generated = custom_target('xdp-dbus',
+@@ -174,7 +174,7 @@ xdp_dbus_generated = custom_target('xdp-dbus',
+  'org.freedesktop.portal.NetworkMonitor.xml',
+  'org.freedesktop.portal.ProxyResolver.xml'],
+ output : ['xdp-dbus.h', 'xdp-dbus.c'],
+-command : [python, gdbus_codegen,
++command : [find_program('gdbus-codegen'),
+'--interface-prefix', 'org.freedesktop.portal.',
+'--output-directory', '@OUTDIR@',
+'--generate-c-code', 'xdp-dbus',
+@@ -193,7 +193,7 @@ xdp_dbus_generated = custom_target('xdp-dbus',
+ gdbus_daemon_generated = custom_target('gdbus-daemon-generated',
+ input : ['dbus-daemon.xml'],
+ output : ['gdbus-daemon-generated.h', 'gdbus-daemon-generated.c'],
+-command : [python, gdbus_codegen,
++command :

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2015-10-10 Thread Alexandre Rostovtsev 
commit: e2673ffa4a653dddadec904d6f48baa1fa4c9d0c
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Sun Oct 11 00:04:46 2015 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Sun Oct 11 00:11:08 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e2673ffa

dev-libs/glib: pull in elfutils only when USE=utils

It's only used by /usr/bin/gresource, which is a debugging utility.

Gentoo-Bug: 542816
Reported-by: Nikoli

 .../{glib-2.46.0.ebuild => glib-2.46.0-r1.ebuild}  | 20 +--
 dev-libs/glib/glib-.ebuild | 41 --
 dev-libs/glib/metadata.xml | 11 +-
 3 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/dev-libs/glib/glib-2.46.0.ebuild 
b/dev-libs/glib/glib-2.46.0-r1.ebuild
similarity index 96%
rename from dev-libs/glib/glib-2.46.0.ebuild
rename to dev-libs/glib/glib-2.46.0-r1.ebuild
index d91e744..9534f7a 100644
--- a/dev-libs/glib/glib-2.46.0.ebuild
+++ b/dev-libs/glib/glib-2.46.0-r1.ebuild
@@ -39,17 +39,18 @@ RDEPEND="
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-   || (
-   >=dev-libs/elfutils-0.142
-   >=dev-libs/libelf-0.8.12
-   >=sys-freebsd/freebsd-lib-9.2_rc1
-   )
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
utils? (
${PYTHON_DEPS}
-   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+   || (
+   >=dev-libs/elfutils-0.142
+   >=dev-libs/libelf-0.8.12
+   >=sys-freebsd/freebsd-lib-9.2_rc1
+   )
+   )
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
@@ -188,11 +189,9 @@ multilib_src_configure() {
*)myconf="${myconf} --with-threads=posix" ;;
esac
 
-   # Only used by the gresource bin
-   multilib_is_native_abi || myconf="${myconf} --disable-libelf"
-
# FIXME: Always use internal libpcre, bug #254659
-   # (maybe consider going back to system lib
+   # (maybe consider going back to system lib)
+   # libelf used only by the gresource bin
ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
$(use_enable xattr) \
$(use_enable fam) \
@@ -200,6 +199,7 @@ multilib_src_configure() {
$(use_enable static-libs static) \
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
+   $(multilib_native_use_enable utils libelf) \
--disable-compile-warnings \
--enable-man \
--with-pcre=internal \

diff --git a/dev-libs/glib/glib-.ebuild b/dev-libs/glib/glib-.ebuild
index a322b93..330eb7f 100644
--- a/dev-libs/glib/glib-.ebuild
+++ b/dev-libs/glib/glib-.ebuild
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 # Building with --disable-debug highly unrecommended.  It will build glib in
@@ -12,7 +16,8 @@ GCONF_DEBUG="yes"
 # pkg-config
 GNOME2_LA_PUNT="yes"
 
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic 
gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx 
linux-info multilib-minimal
+inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic
multilib \
+   pax-utils python-r1 toolchain-funcs versionator virtualx linux-info 
multilib-minimal
 if [[ ${PV} =  ]]; then
inherit gnome2-live
 fi
@@ -41,17 +46,18 @@ RDEPEND="
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-   || (
-   >=dev-libs/elfutils-0.142
-   >=dev-libs/libelf-0.8.12
-   >=sys-freebsd/freebsd-lib-9.2_rc1
-   )
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
utils? (
${PYTHON_DEPS}
-   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+   >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+   || (
+   >=dev-libs/elfutils-0.142
+

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2015-09-21 Thread Remi Cardona 
commit: 24f3a5811c0f81392c05d9b8e3d9f42e2aa2627e
Author: Rémi Cardona  gentoo  org>
AuthorDate: Mon Sep 21 21:54:25 2015 +
Commit: Remi Cardona  gentoo  org>
CommitDate: Mon Sep 21 21:54:25 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=24f3a581

dev-libs/glib: bump to 2.46.0

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 901AB08A

 dev-libs/glib/{glib-2.45.7.ebuild => glib-2.46.0.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-libs/glib/glib-2.45.7.ebuild b/dev-libs/glib/glib-2.46.0.ebuild
similarity index 100%
rename from dev-libs/glib/glib-2.45.7.ebuild
rename to dev-libs/glib/glib-2.46.0.ebuild

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2015-09-13 Thread Ole Reifschneider 
commit: 70662c04eab4a1eaefa79f78ff8a0b11d6ecb5d4
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Sep 13 19:34:33 2015 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Sun Sep 13 19:34:33 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=70662c04

dev-libs/glib: Bump version to 2.45.7

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42

 .../glib/{glib-.ebuild => glib-2.45.7.ebuild}  | 59 +++---
 dev-libs/glib/glib-.ebuild |  5 +-
 2 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/dev-libs/glib/glib-.ebuild b/dev-libs/glib/glib-2.45.7.ebuild
similarity index 84%
copy from dev-libs/glib/glib-.ebuild
copy to dev-libs/glib/glib-2.45.7.ebuild
index 6b68359..d91e744 100644
--- a/dev-libs/glib/glib-.ebuild
+++ b/dev-libs/glib/glib-2.45.7.ebuild
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 # Building with --disable-debug highly unrecommended.  It will build glib in
@@ -12,10 +16,8 @@ GCONF_DEBUG="yes"
 # pkg-config
 GNOME2_LA_PUNT="yes"
 
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic 
gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx 
linux-info multilib-minimal
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
+inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic
multilib \
+   pax-utils python-r1 toolchain-funcs versionator virtualx linux-info 
multilib-minimal
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/;
@@ -24,17 +26,13 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2+"
 SLOT="2"
-IUSE="fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils 
xattr"
 REQUIRED_USE="
utils? ( ${PYTHON_REQUIRED_USE} )
test? ( ${PYTHON_REQUIRED_USE} )
 "
-if [[ ${PV} =  ]]; then
-   IUSE="${IUSE} doc"
-   KEYWORDS=""
-else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux"
-fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux"
 
 RDEPEND="
!=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
>=sys-apps/dbus-1.2.14 )
-   !

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2015-06-09 Thread Gilles Dartiguelongue 
commit: d92e14836793769df3506e3d48a2bd82e91e19f0
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Mon Jun  8 21:47:08 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Mon Jun  8 21:47:08 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d92e1483

dev-libs/glib: moved to gentoo-x86

 dev-libs/glib/glib-2.44.1.ebuild | 270 ---
 1 file changed, 270 deletions(-)

diff --git a/dev-libs/glib/glib-2.44.1.ebuild b/dev-libs/glib/glib-2.44.1.ebuild
deleted file mode 100644
index 4d1f964..000
--- a/dev-libs/glib/glib-2.44.1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.42.2.ebuild,v 1.6 
2015/03/29 10:14:34 jer Exp $
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-# Building with --disable-debug highly unrecommended.  It will build glib in
-# an unusable form as it disables some commonly used API.  Please do not
-# convert this to the use_enable form, as it results in a broken build.
-GCONF_DEBUG=yes
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT=yes
-
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic
multilib \
-   pax-utils python-r1 toolchain-funcs versionator virtualx linux-info 
multilib-minimal
-
-DESCRIPTION=The GLib library of C routines
-HOMEPAGE=http://www.gtk.org/;
-SRC_URI=${SRC_URI}
-   http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
-
-LICENSE=LGPL-2+
-SLOT=2
-IUSE=dbus fam kernel_linux +mime selinux static-libs systemtap test utils 
xattr
-REQUIRED_USE=
-   utils? ( ${PYTHON_REQUIRED_USE} )
-   test? ( ${PYTHON_REQUIRED_USE} )
-
-
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux
-
-RDEPEND=
-   !dev-util/gdbus-codegen-${PV}
-   =virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-   =virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-   =sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-   || (
-   =dev-libs/elfutils-0.142
-   =dev-libs/libelf-0.8.12
-   =sys-freebsd/freebsd-lib-9.2_rc1
-   )
-   selinux? ( =sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-   xattr? ( =sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-   fam? ( =virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-   utils? (
-   ${PYTHON_DEPS}
-   =dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
-   abi_x86_32? (
-   !=app-emulation/emul-linux-x86-baselibs-20130224-r9
-   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-   )
-
-DEPEND=${RDEPEND}
-   app-text/docbook-xml-dtd:4.1.2
-   =dev-libs/libxslt-1.0
-   =sys-devel/gettext-0.11
-   =dev-util/gtk-doc-am-1.20
-   systemtap? ( =dev-util/systemtap-1.3 )
-   test? (
-   sys-devel/gdb
-   ${PYTHON_DEPS}
-   =dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-   =sys-apps/dbus-1.2.14 )
-   !dev-util/gtk-doc-1.15-r2
-
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
-PDEPEND=!gnome-base/gvfs-1.6.4-r990
-   dbus? ( gnome-base/dconf )
-   mime? ( x11-misc/shared-mime-info )
-
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-# Earlier versions of gvfs do not work with glib
-
-pkg_setup() {
-   if use kernel_linux ; then
-   CONFIG_CHECK=~INOTIFY_USER
-   if use test; then
-   CONFIG_CHECK=~IPV6
-   WARNING_IPV6=Your kernel needs IPV6 support for 
running some tests, skipping them.
-   export IPV6_DISABLED=yes
-   fi
-   linux-info_pkg_setup
-   fi
-}
-
-src_prepare() {
-   # Prevent build failure in stage3 where pkgconfig is not available, bug 
#481056
-   mv -f ${WORKDIR}/pkg-config-*/pkg.m4 ${S}/m4macros/ || die
-
-   if use test; then
-   # Disable tests requiring dev-util/desktop-file-utils when not 
installed, bug #286629, upstream bug #629163
-   if ! has_version dev-util/desktop-file-utils ; then
-   ewarn Some tests will be skipped due 
dev-util/desktop-file-utils not being present on your system,
-   ewarn think on installing it to get these tests run.
-   sed -i -e /appinfo\/associations/d 
gio/tests/appinfo.c || die
-   sed -i -e

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/, dev-libs/glib/files/

2015-06-09 Thread Gilles Dartiguelongue 
commit: 06ecfcba3535fabeec3e0062f59ebc4c863c7f0f
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Mon Jun  8 21:53:09 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Mon Jun  8 21:53:09 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=06ecfcba

dev-libs/glib: WIP

 dev-libs/glib/files/glib-2.12.12-fbsd.patch | 35 -
 dev-libs/glib/glib-.ebuild  |  5 -
 2 files changed, 40 deletions(-)

diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch 
b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
deleted file mode 100644
index 5aca695..000
--- a/dev-libs/glib/files/glib-2.12.12-fbsd.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From deeb71226d4ab465d48805d899ec88eb836a6966 Mon Sep 17 00:00:00 2001
-From: Daniel Gryniewicz d...@gentoo.org
-Date: Sun, 24 Nov 2013 19:46:13 +0100
-Subject: [PATCH 1/4] Fix gmodule issue on FreeBSD
-
-Gentoo bug #184301, Gnome bug #107626.

- gmodule/gmodule-dl.c | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
-index a606f17..57fc41b 100644
 a/gmodule/gmodule-dl.c
-+++ b/gmodule/gmodule-dl.c
-@@ -107,6 +107,7 @@ _g_module_open (const gchar *file_name,
- static gpointer
- _g_module_self (void)
- {
-+#ifndef __FreeBSD__
-   gpointer handle;
-   
-   /* to query symbols from the program itself, special link options
-@@ -122,6 +123,9 @@ _g_module_self (void)
- g_module_set_error (fetch_dlerror (TRUE));
-   
-   return handle;
-+#else
-+  return RTLD_DEFAULT;
-+#endif
- }
- 
- static void
--- 
-1.8.3.2
-

diff --git a/dev-libs/glib/glib-.ebuild b/dev-libs/glib/glib-.ebuild
index 3e26c7b..7b04ea7 100644
--- a/dev-libs/glib/glib-.ebuild
+++ b/dev-libs/glib/glib-.ebuild
@@ -110,11 +110,6 @@ src_prepare() {
# Prevent build failure in stage3 where pkgconfig is not available, bug 
#481056
mv -f ${WORKDIR}/pkg-config-*/pkg.m4 ${S}/m4macros/ || die
 
-   # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
-   # Upstream doesn't even know if this is needed, looks like openBSD
-   # people is not needing it
-   #epatch ${FILESDIR}/${PN}-2.12.12-fbsd.patch
-
if use test; then
# Do not try to remove files on live filesystem, upstream bug 
#619274
sed 's:^\(.*/desktop-app-info/delete.*\):/*\1*/:' \

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2015-05-17 Thread Gilles Dartiguelongue 
commit: 850b52dc6ba4361746dfe2fd4f32bb82f2af5ce2
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun May 17 15:34:44 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun May 17 15:34:44 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=850b52dc

dev-libs/glib: fix repoman warning

 dev-libs/glib/glib-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-libs/glib/glib-.ebuild b/dev-libs/glib/glib-.ebuild
index d77c425..3e26c7b 100644
--- a/dev-libs/glib/glib-.ebuild
+++ b/dev-libs/glib/glib-.ebuild
@@ -36,7 +36,6 @@ else
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux
 fi
 
-
 RDEPEND=
!dev-util/gdbus-codegen-${PV}
=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2015-05-14 Thread Gilles Dartiguelongue 
commit: 99eede5c4880d6931ced9b8bfe8accfb0a53a69f
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Thu May 14 10:42:03 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Thu May 14 10:42:03 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=99eede5c

dev-libs/glib: 2.44.0 → 2.44.1

 dev-libs/glib/{glib-2.44.0.ebuild = glib-2.44.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-libs/glib/glib-2.44.0.ebuild b/dev-libs/glib/glib-2.44.1.ebuild
similarity index 100%
rename from dev-libs/glib/glib-2.44.0.ebuild
rename to dev-libs/glib/glib-2.44.1.ebuild

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2015-04-18 Thread Ole Reifschneider 
commit: 9b3413e5fc675e26e3f6d3a31425cf5a94e3604e
Author: Ole Reifschneider tranquility AT gentoo DOT org
AuthorDate: Thu Apr 16 19:37:16 2015 +
Commit: Ole Reifschneider tranquility AT gentoo DOT org
CommitDate: Sat Apr 18 08:49:23 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9b3413e5

Add dev-libs/glib-2.44.0

Package-Manager: portage-2.2.14
Manifest-Sign-Key: 7E8B4D42

 dev-libs/glib/glib-2.44.0.ebuild | 270 +++
 1 file changed, 270 insertions(+)

diff --git a/dev-libs/glib/glib-2.44.0.ebuild b/dev-libs/glib/glib-2.44.0.ebuild
new file mode 100644
index 000..4d1f964
--- /dev/null
+++ b/dev-libs/glib/glib-2.44.0.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.42.2.ebuild,v 1.6 
2015/03/29 10:14:34 jer Exp $
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+# Building with --disable-debug highly unrecommended.  It will build glib in
+# an unusable form as it disables some commonly used API.  Please do not
+# convert this to the use_enable form, as it results in a broken build.
+GCONF_DEBUG=yes
+# Completely useless with or without USE static-libs, people need to use
+# pkg-config
+GNOME2_LA_PUNT=yes
+
+inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic
multilib \
+   pax-utils python-r1 toolchain-funcs versionator virtualx linux-info 
multilib-minimal
+
+DESCRIPTION=The GLib library of C routines
+HOMEPAGE=http://www.gtk.org/;
+SRC_URI=${SRC_URI}
+   http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
+
+LICENSE=LGPL-2+
+SLOT=2
+IUSE=dbus fam kernel_linux +mime selinux static-libs systemtap test utils 
xattr
+REQUIRED_USE=
+   utils? ( ${PYTHON_REQUIRED_USE} )
+   test? ( ${PYTHON_REQUIRED_USE} )
+
+
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux
+
+RDEPEND=
+   !dev-util/gdbus-codegen-${PV}
+   =virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+   =virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+   =sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+   || (
+   =dev-libs/elfutils-0.142
+   =dev-libs/libelf-0.8.12
+   =sys-freebsd/freebsd-lib-9.2_rc1
+   )
+   selinux? ( =sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+   xattr? ( =sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+   fam? ( =virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+   utils? (
+   ${PYTHON_DEPS}
+   =dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+   abi_x86_32? (
+   !=app-emulation/emul-linux-x86-baselibs-20130224-r9
+   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+   )
+
+DEPEND=${RDEPEND}
+   app-text/docbook-xml-dtd:4.1.2
+   =dev-libs/libxslt-1.0
+   =sys-devel/gettext-0.11
+   =dev-util/gtk-doc-am-1.20
+   systemtap? ( =dev-util/systemtap-1.3 )
+   test? (
+   sys-devel/gdb
+   ${PYTHON_DEPS}
+   =dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+   =sys-apps/dbus-1.2.14 )
+   !dev-util/gtk-doc-1.15-r2
+
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
+PDEPEND=!gnome-base/gvfs-1.6.4-r990
+   dbus? ( gnome-base/dconf )
+   mime? ( x11-misc/shared-mime-info )
+
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+# Earlier versions of gvfs do not work with glib
+
+pkg_setup() {
+   if use kernel_linux ; then
+   CONFIG_CHECK=~INOTIFY_USER
+   if use test; then
+   CONFIG_CHECK=~IPV6
+   WARNING_IPV6=Your kernel needs IPV6 support for 
running some tests, skipping them.
+   export IPV6_DISABLED=yes
+   fi
+   linux-info_pkg_setup
+   fi
+}
+
+src_prepare() {
+   # Prevent build failure in stage3 where pkgconfig is not available, bug 
#481056
+   mv -f ${WORKDIR}/pkg-config-*/pkg.m4 ${S}/m4macros/ || die
+
+   if use test; then
+   # Disable tests requiring dev-util/desktop-file-utils when not 
installed, bug #286629, upstream bug #629163
+   if ! has_version dev-util/desktop-file-utils ; then
+   ewarn Some tests will be skipped due 
dev-util/desktop-file-utils not being present on your system,
+   ewarn think on installing it to get these tests run.
+   sed -i -e /appinfo\/associations/d

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2014-12-14 Thread Gilles Dartiguelongue 
commit: a8a04bf74f655d88a646ffd07bb6cca98c6a7fc1
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Dec 14 22:37:49 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Dec 14 22:45:40 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a8a04bf7

dev-libs/glib: moved to gentoo-x86

---
 dev-libs/glib/glib-2.42.1.ebuild | 273 ---
 dev-libs/glib/glib-.ebuild   |   2 +-
 2 files changed, 1 insertion(+), 274 deletions(-)

diff --git a/dev-libs/glib/glib-2.42.1.ebuild b/dev-libs/glib/glib-2.42.1.ebuild
deleted file mode 100644
index fbaa8d3..000
--- a/dev-libs/glib/glib-2.42.1.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-# Building with --disable-debug highly unrecommended.  It will build glib in
-# an unusable form as it disables some commonly used API.  Please do not
-# convert this to the use_enable form, as it results in a broken build.
-GCONF_DEBUG=yes
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT=yes
-
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic
multilib \
-   pax-utils python-r1 toolchain-funcs versionator virtualx linux-info 
multilib-minimal
-
-DESCRIPTION=The GLib library of C routines
-HOMEPAGE=http://www.gtk.org/;
-SRC_URI=${SRC_URI}
-   http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz; # 
pkg.m4 for eautoreconf
-
-LICENSE=LGPL-2+
-SLOT=2
-IUSE=fam kernel_linux +mime selinux static-libs systemtap test utils xattr
-REQUIRED_USE=
-   utils? ( ${PYTHON_REQUIRED_USE} )
-   test? ( ${PYTHON_REQUIRED_USE} )
-
-
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux
-
-RDEPEND=
-   !dev-util/gdbus-codegen-${PV}
-   =virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-   =virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-   =sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-   || (
-   =dev-libs/elfutils-0.142
-   =dev-libs/libelf-0.8.12
-   =sys-freebsd/freebsd-lib-9.2_rc1
-   )
-   selinux? ( =sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-   xattr? ( =sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-   fam? ( =virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-   utils? (
-   ${PYTHON_DEPS}
-   =dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
-   abi_x86_32? (
-   !=app-emulation/emul-linux-x86-baselibs-20130224-r9
-   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-   )
-
-DEPEND=${RDEPEND}
-   app-text/docbook-xml-dtd:4.1.2
-   =dev-libs/libxslt-1.0
-   =sys-devel/gettext-0.11
-   =dev-util/gtk-doc-am-1.20
-   systemtap? ( =dev-util/systemtap-1.3 )
-   test? (
-   sys-devel/gdb
-   ${PYTHON_DEPS}
-   =dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-   =sys-apps/dbus-1.2.14 )
-   !dev-util/gtk-doc-1.15-r2
-
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
-PDEPEND=!gnome-base/gvfs-1.6.4-r990
-   mime? ( x11-misc/shared-mime-info )
-
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-pkg_setup() {
-   if use kernel_linux ; then
-   CONFIG_CHECK=~INOTIFY_USER
-   if use test; then
-   CONFIG_CHECK=~IPV6
-   WARNING_IPV6=Your kernel needs IPV6 support for 
running some tests, skipping them.
-   export IPV6_DISABLED=yes
-   fi
-   linux-info_pkg_setup
-   fi
-}
-
-src_prepare() {
-   # Prevent build failure in stage3 where pkgconfig is not available, bug 
#481056
-   mv -f ${WORKDIR}/pkg-config-*/pkg.m4 ${S}/m4macros/ || die
-
-   # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
-   # Upstream doesn't even know if this is needed, looks like openBSD
-   # people is not needing it
-   #epatch ${FILESDIR}/${PN}-2.12.12-fbsd.patch
-
-   if use test; then
-   # Do not try to remove files on live filesystem, upstream bug 
#619274
-   sed 's:^\(.*/desktop-app-info/delete.*\):/*\1*/:' \
-   -i ${S}/gio/tests/desktop-app-info.c || die sed 
failed
-
-   # Disable tests requiring dev-util/desktop-file-utils when not 
installed, bug #286629, upstream bug #629163
-   if ! has_version dev-util/desktop-file-utils ; then
-   ewarn Some tests will be skipped due 
dev-util/desktop-file-utils not being present on your system,
-

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/

2014-11-24 Thread Gilles Dartiguelongue 
commit: a627fb15ac6fde1b87c5d4fc50452045b7c01b8a
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Mon Nov 24 19:27:21 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Mon Nov 24 19:27:21 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a627fb15

dev-libs/glib: 2.42.0 → 2.42.1

---
 dev-libs/glib/{glib-2.42.0.ebuild = glib-2.42.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-libs/glib/glib-2.42.0.ebuild b/dev-libs/glib/glib-2.42.1.ebuild
similarity index 100%
rename from dev-libs/glib/glib-2.42.0.ebuild
rename to dev-libs/glib/glib-2.42.1.ebuild

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/

2014-04-15 Thread Gilles Dartiguelongue 
commit: a73aef3bfd56434bbc405d8c45dc4b2c67a84478
Author: Mike Auty ikelos AT gentoo DOT org
AuthorDate: Sun Apr  6 13:09:15 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Tue Apr 15 20:58:59 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a73aef3b

dev-libs/glib: 2.38.2-r1 → 2.40.0

Bump glib to 2.40.0, remove two 2.38 patches that were backported from 
2.39/2.40 and fix the external-gdbus-codegen patch to work on 2.40.0. No other 
ebuild/dependency changes.

---
 dev-libs/glib/files/glib-2.38.2-configure.patch|  24 ++
 dev-libs/glib/files/glib-2.38.2-sigaction.patch|  23 ++
 .../files/glib-2.40.0-external-gdbus-codegen.patch |  95 
 dev-libs/glib/glib-2.40.0.ebuild   | 269 +
 4 files changed, 411 insertions(+)

diff --git a/dev-libs/glib/files/glib-2.38.2-configure.patch 
b/dev-libs/glib/files/glib-2.38.2-configure.patch
new file mode 100644
index 000..8f08ca0
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.38.2-configure.patch
@@ -0,0 +1,24 @@
+From 838b49ead77c35d94fa16d48a6d7271bab082a71 Mon Sep 17 00:00:00 2001
+From: Patrick Welche pr...@cam.ac.uk
+Date: Thu, 07 Nov 2013 10:58:46 +
+Subject: configure: test(1) uses = to test for string equality
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711600
+---
+(limited to 'm4macros/glibtests.m4')
+
+diff --git a/m4macros/glibtests.m4 b/m4macros/glibtests.m4
+index 27e9024..7d5920a 100644
+--- a/m4macros/glibtests.m4
 b/m4macros/glibtests.m4
+@@ -21,7 +21,7 @@ AC_DEFUN([GLIB_TESTS],
+   *) AC_MSG_ERROR([bad value ${enableval} for 
--enable-always-build-tests]) ;;
+  esac])
+   AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test 
$ENABLE_ALWAYS_BUILD_TESTS = 1)
+-  if test $ENABLE_INSTALLED_TESTS == 1; then
++  if test $ENABLE_INSTALLED_TESTS = 1; then
+ AC_SUBST(installed_test_metadir, 
[${datadir}/installed-tests/]AC_PACKAGE_NAME)
+ AC_SUBST(installed_testdir, 
[${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
+   fi
+--
+cgit v0.9.2

diff --git a/dev-libs/glib/files/glib-2.38.2-sigaction.patch 
b/dev-libs/glib/files/glib-2.38.2-sigaction.patch
new file mode 100644
index 000..f87e224
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.38.2-sigaction.patch
@@ -0,0 +1,23 @@
+From 81d0ebe29ccd852e969acda7394969e3f13eb136 Mon Sep 17 00:00:00 2001
+From: Stef Walter st...@gnome.org
+Date: Thu, 31 Oct 2013 11:43:14 +0100
+Subject: [PATCH] gmain: Fix use of uninitialized memory in sigaction structure
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711754
+
+
+diff --git a/glib/gmain.c b/glib/gmain.c
+index 9c37bb2..608c1a5 100644
+--- a/glib/gmain.c
 b/glib/gmain.c
+@@ -4978,6 +4978,7 @@ unref_unix_signal_handler_unlocked (int signum)
+   if (unix_signal_refcount[signum] == 0)
+ {
+   struct sigaction action;
++  memset (action, 0, sizeof (action));
+   action.sa_handler = SIG_DFL;
+   sigemptyset (action.sa_mask);
+   sigaction (signum, action, NULL);
+--
+Gitg
+

diff --git a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch 
b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
new file mode 100644
index 000..50a9370
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
@@ -0,0 +1,95 @@
+diff --git a/configure.ac b/configure.ac
+index a01e58d..59d4527 100644
+--- a/configure.ac
 b/configure.ac
+@@ -367,14 +367,14 @@ AC_SUBST(PERL_PATH)
+ # option to specify python interpreter to use; this just sets $PYTHON, so that
+ # we will fallback to reading $PYTHON if --with-python is not given, and
+ # python.m4 will get the expected input
+-AC_ARG_WITH(python,
+-AS_HELP_STRING([--with-python=PATH],
+-   [Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as python3 or python2]),
+-[PYTHON=$withval], [])
+-if test x$PYTHON = xyes; then
+-  AC_MSG_ERROR([--with-python option requires a path or program argument])
+-fi
+-AM_PATH_PYTHON(2.5,,PYTHON=/usr/bin/env python2.5)
++# AC_ARG_WITH(python,
++# AS_HELP_STRING([--with-python=PATH],
++#[Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as python3 or python2]),
++# [PYTHON=$withval], [])
++# if test x$PYTHON = xyes; then
++#   AC_MSG_ERROR([--with-python option requires a path or program argument])
++# fi
++# AM_PATH_PYTHON(2.5,,PYTHON=/usr/bin/env python2.5)
+ 
+ 
+ dnl ***
+@@ -3580,7 +3580,6 @@ gobject/glib-mkenums
+ gobject/tests/Makefile
+ gthread/Makefile
+ gio/Makefile
+-gio/gdbus-2.0/codegen/Makefile
+ gio/gdbus-2.0/codegen/config.py
+ gio/gnetworking.h
+ gio/xdgmime/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 47fdd38..c7eb136 100644

[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/

2014-04-15 Thread Gilles Dartiguelongue 
commit: 6a71ca5f6badd289042d2480c6744e5852728416
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sat Apr 12 22:25:34 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Tue Apr 15 20:59:00 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6a71ca5f

dev-libs/glib: QAed

---
 .../files/glib-2.37.x-external-gdbus-codegen.patch | 111 -
 dev-libs/glib/files/glib-2.38.2-configure.patch|  24 -
 dev-libs/glib/files/glib-2.38.2-sigaction.patch|  23 -
 dev-libs/glib/glib-2.40.0.ebuild   |   6 +-
 dev-libs/glib/glib-.ebuild |   6 +-
 5 files changed, 6 insertions(+), 164 deletions(-)

diff --git a/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch 
b/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
deleted file mode 100644
index f87c146..000
--- a/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 81f037771e2992834961cb5db08aece53a02b8ae Mon Sep 17 00:00:00 2001
-From: Priit Laes pl...@plaes.org
-Date: Thu, 28 Feb 2013 08:28:01 +0200
-Subject: [PATCH 3/4] Split out gdbus codegen
-

- configure.ac   | 17 -
- docs/reference/gio/Makefile.am |  3 +--
- gio/Makefile.am|  2 +-
- gio/tests/Makefile.am  |  6 ++
- gio/tests/gdbus-object-manager-example/Makefile.am |  6 ++
- 5 files changed, 14 insertions(+), 20 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 797cb92..907c534 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -378,14 +378,14 @@ AC_SUBST(PERL_PATH)
- # option to specify python interpreter to use; this just sets $PYTHON, so that
- # we will fallback to reading $PYTHON if --with-python is not given, and
- # python.m4 will get the expected input
--AC_ARG_WITH(python,
--AS_HELP_STRING([--with-python=PATH],
--   [Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as python3 or python2]),
--[PYTHON=$withval], [])
--if test x$PYTHON = xyes; then
--  AC_MSG_ERROR([--with-python option requires a path or program argument])
--fi
--AM_PATH_PYTHON(2.5,,PYTHON=/usr/bin/env python2.5)
-+# AC_ARG_WITH(python,
-+# AS_HELP_STRING([--with-python=PATH],
-+#[Path to Python interpreter; searches $PATH if 
only a program name is given; if not given, searches for a few standard names 
such as python3 or python2]),
-+# [PYTHON=$withval], [])
-+# if test x$PYTHON = xyes; then
-+#   AC_MSG_ERROR([--with-python option requires a path or program argument])
-+# fi
-+# AM_PATH_PYTHON(2.5,,PYTHON=/usr/bin/env python2.5)
- 
- 
- dnl ***
-@@ -3784,7 +3784,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 112626b..8ddcdbc 100644
 a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -151,8 +151,7 @@ man_MANS +=\
-   glib-compile-resources.1\
-   gsettings.1 \
-   gresource.1 \
--  gdbus.1 \
--  gdbus-codegen.1
-+  gdbus.1
- 
- XSLTPROC_FLAGS = \
- --nonet \
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 717419f..808b5dd 100644
 a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
- 
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
- 
- if OS_UNIX
- SUBDIRS += xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 7224124..5c8baaa 100644
 a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -359,10 +359,8 @@ gmenumodel_SOURCES   = 
$(gdbus_sessionbus_sources) gmenumode
- nodist_gdbus_test_codegen_SOURCES= gdbus-test-codegen-generated.c 
gdbus-test-codegen-generated.h
- 
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: 
test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--  $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--  UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--  $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: 
test-codegen.xml Makefile
-+  $(AM_V_GEN) gdbus-codegen \
-   --interface-prefix org.project. \
-   --generate-c-code gdbus-test-codegen-generated \
-   --c-generate-object-manager \
-diff --git