Version bump, remove old.

(Portage version: 2.1.9.46/cvs/Linux x86_64)

13 files changed, 344 insertions, 545 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 3a4475bc1f0d..2bbc84a28881 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.115 2011/04/03 14:00:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.116 2011/04/20 13:13:58 pacho Exp $
+
+*pygobject-2.28.4 (20 Apr 2011)
+
+  20 Apr 2011; Pacho Ramos <pacho@gentoo.org>
+  -files/pygobject-2.18.0-automake111.patch,
+  -files/pygobject-2.18.0-make_check.patch, -pygobject-2.20.0.ebuild,
+  -pygobject-2.20.0-r1.ebuild,
+  -files/pygobject-2.20.0-automagic-introspection.patch,
+  -files/pygobject-2.21.4-make_check.patch, -pygobject-2.21.5.ebuild,
+  -pygobject-2.26.0.ebuild,
+  +files/pygobject-2.28.3-disable-failing-tests.patch,
+  +files/pygobject-2.28.3-fix-codegen-location.patch,
+  +files/pygobject-2.28.3-make_check.patch,
+  +files/pygobject-2.28.3-support_multiple_python_versions.patch,
+  +pygobject-2.28.4.ebuild:
+  Version bump, remove old.
 
   03 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pygobject-2.26.0-r1.ebuild:
diff --git a/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch b/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch
deleted file mode 100644
index 9e57bb7f5601..000000000000
--- a/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Fix build failure due to automake 1.11.
-# defsgen.py was installed twice
-# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=279813
---- a/codegen/Makefile.am
-+++ b/codegen/Makefile.am
-@@ -18,7 +18,6 @@
- 	docextract_to_xml.py \
- 	docgen.py \
- 	h2def.py \
--	defsgen.py \
- 	createdefs.py \
- 	mergedefs.py \
- 	missingdefs.py \
diff --git a/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch b/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch
deleted file mode 100644
index f351092b2f80..000000000000
--- a/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- tests/Makefile.am
-+++ tests/Makefile.am
-@@ -11,7 +11,7 @@
- 	test-thread.h \
- 	test-unknown.h
- 
--noinst_LTLIBRARIES = testhelper.la
-+check_LTLIBRARIES = testhelper.la
- linked_LIBS = testhelper.la
- 
- testhelper_la_LDFLAGS = -module -avoid-version
-@@ -47,6 +47,7 @@
- 	   cp $(top_srcdir)/gobject/*.py $(top_builddir)/gobject; \
- 	   cp $(top_srcdir)/gio/*.py $(top_builddir)/gio; \
- 	fi
-+	$(LN_S) .libs/testhelper.so testhelper.so
- 	@$(PYTHON) $(srcdir)/runtests.py $(top_builddir) $(top_srcdir)
- 	@if test "$(top_builddir)" != "$(top_srcdir)"; then \
- 	   rm -f $(top_builddir)/glib/*.py; \
-@@ -58,8 +59,5 @@
- 	@rm -fr $(top_builddir)/gio/*.pyc
- 
- 
--all: $(LTLIBRARIES:.la=.so)
- clean-local:
--	rm -f $(LTLIBRARIES:.la=.so)
--.la.so:
--	$(LN_S) .libs/$@ $@ || true
-+	rm -f .libs/testhelper.so
---- tests/runtests.py
-+++ tests/runtests.py
-@@ -6,6 +6,9 @@
- 
- import common
- 
-+# Some tests fail with translated messages.
-+os.environ["LC_ALL"] = "C"
-+
- program = None
- if len(sys.argv) == 3:
-     buildDir = sys.argv[1]
---- tests/test_gio.py
-+++ tests/test_gio.py
-@@ -386,9 +386,10 @@
- 
-     def testQueryWritableNamespaces(self):
-         infolist = self.file.query_writable_namespaces()
--        for info in infolist:
--            if info.name == "xattr":
--                self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING)
-+        if infolist:
-+            for info in infolist:
-+                if info.name == "xattr":
-+                    self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING)
- 
-     def testSetAttribute(self):
-         self._f.write("testing attributes")
diff --git a/dev-python/pygobject/files/pygobject-2.20.0-automagic-introspection.patch b/dev-python/pygobject/files/pygobject-2.20.0-automagic-introspection.patch
deleted file mode 100644
index 0d50925683e9..000000000000
--- a/dev-python/pygobject/files/pygobject-2.20.0-automagic-introspection.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -201,8 +201,15 @@
- fi
- 
- dnl gobject_introspection
--PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, gobject-introspection-1.0 >= gobject_introspection_required_version,
--	have_gobject_introspection=true, have_gobject_introspection=false)
-+AC_ARG_ENABLE(introspection,
-+  AC_HELP_STRING([--enable-introspection], [Use introspection information]),
-+  enable_introspection=$enableval,
-+  enable_introspection=yes)
-+have_gobject_introspection=false
-+if test "$enable_introspection" = yes; then
-+    PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, gobject-introspection-1.0 >= gobject_introspection_required_version,
-+        have_gobject_introspection=true, have_gobject_introspection=false)
-+fi
- AC_SUBST(GOBJECT_INTROSPECTION_CFLAGS)
- AC_SUBST(GOBJECT_INTROSPECTION_LIBS)
- AM_CONDITIONAL(BUILD_GOBJECT_INTROSPECTION, $have_gobject_introspection)
diff --git a/dev-python/pygobject/files/pygobject-2.21.4-make_check.patch b/dev-python/pygobject/files/pygobject-2.21.4-make_check.patch
deleted file mode 100644
index 0d8e93c84677..000000000000
--- a/dev-python/pygobject/files/pygobject-2.21.4-make_check.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -12,7 +12,7 @@ EXTRA_DIST = \
- 	test-thread.h \
- 	test-unknown.h
- 
--noinst_LTLIBRARIES = testhelper.la
-+check_LTLIBRARIES = testhelper.la
- linked_LIBS = testhelper.la
- 
- testhelper_la_LDFLAGS = -module -avoid-version
-@@ -46,13 +46,11 @@ endif
- testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
- 	$(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
- 
--check-local: $(LTLIBRARIES:.la=.so)
-+check-local: $(check_LTLIBRARIES:.la=.so)
- 	$(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py $(top_builddir) $(tests)
- 
--all: $(LTLIBRARIES:.la=.so)
--
- clean-local:
--	rm -f $(LTLIBRARIES:.la=.so)
-+	rm -f $(check_LTLIBRARIES:.la=.so)
- 
- .la.so:
- 	$(LN_S) .libs/$@ $@ || true
---- a/tests/runtests.py
-+++ b/tests/runtests.py
-@@ -6,6 +6,9 @@ import unittest
- 
- import common
- 
-+# Some tests fail with translated messages.
-+os.environ["LC_ALL"] = "C"
-+
- program = None
- if len(sys.argv) < 2:
-     raise ValueError('Need at least 2 parameters: runtests.py <build-dir> '
---- a/tests/test_gio.py
-+++ b/tests/test_gio.py
-@@ -410,9 +410,10 @@ class TestFile(unittest.TestCase):
- 
-     def testQueryWritableNamespaces(self):
-         infolist = self.file.query_writable_namespaces()
--        for info in infolist:
--            if info.name == "xattr":
--                self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING)
-+        if infolist:
-+            for info in infolist:
-+                if info.name == "xattr":
-+                    self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING)
- 
-     def testSetAttribute(self):
-         self._f.write("testing attributes")
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-disable-failing-tests.patch b/dev-python/pygobject/files/pygobject-2.28.3-disable-failing-tests.patch
new file mode 100644
index 000000000000..86a66ddffbc1
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.3-disable-failing-tests.patch
@@ -0,0 +1,55 @@
+From df94ec3795c1efaf3eab9207c957e3ea5744971b Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 8 Apr 2011 16:23:37 +0200
+Subject: [PATCH 4/4] Disable tests that fail
+
+---
+ tests/test_gio.py       |    4 ++--
+ tests/test_overrides.py |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_gio.py b/tests/test_gio.py
+index e14eddf..9c645f5 100644
+--- a/tests/test_gio.py
++++ b/tests/test_gio.py
+@@ -1007,7 +1007,7 @@ class TestVfs(unittest.TestCase):
+ class TestVolume(unittest.TestCase):
+     def setUp(self):
+         self.monitor = gio.volume_monitor_get()
+-    
++"""    
+     def testVolumeEnumerate(self):
+         volumes = self.monitor.get_volumes()
+         self.failUnless(isinstance(volumes, list))
+@@ -1018,7 +1018,7 @@ class TestVolume(unittest.TestCase):
+                 for id in ids:
+                     if id is not None:
+                         self.failUnless(isinstance(id, str))
+-
++"""
+ class TestFileInputStream(unittest.TestCase):
+     def setUp(self):
+         self._f = open("file.txt", "w+")
+diff --git a/tests/test_overrides.py b/tests/test_overrides.py
+index 3421c3a..9de1a7f 100644
+--- a/tests/test_overrides.py
++++ b/tests/test_overrides.py
+@@ -322,13 +322,13 @@ class TestPango(unittest.TestCase):
+         desc = Pango.FontDescription('monospace')
+         self.assertEquals(desc.get_family(), 'monospace')
+         self.assertEquals(desc.get_variant(), Pango.Variant.NORMAL)
+-
++"""
+     def test_layout(self):
+         self.assertRaises(TypeError, Pango.Layout)
+         context = Pango.Context()
+         layout = Pango.Layout(context)
+         self.assertEquals(layout.get_context(), context)
+-
++"""
+ class TestGdk(unittest.TestCase):
+ 
+     def test_constructor(self):
+-- 
+1.7.4.1
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch b/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch
new file mode 100644
index 000000000000..44440a526b81
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch
@@ -0,0 +1,64 @@
+From b3e852d29bfd1e90f7e0da409fd0ae36cc01675a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 8 Apr 2011 15:36:35 +0200
+Subject: [PATCH 1/3] Move codegen to a non-private directory
+
+---
+ codegen/Makefile.am              |    2 +-
+ codegen/pygobject-codegen-2.0.in |    3 ++-
+ pygobject-2.0.pc.in              |    3 ++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/codegen/Makefile.am b/codegen/Makefile.am
+index f9886eb..d714ff2 100644
+--- a/codegen/Makefile.am
++++ b/codegen/Makefile.am
+@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0
+ 
+ bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION)
+ 
+-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
++codegendir = $(pyexecdir)/gtk-2.0/codegen
+ 
+ codegen_SCRIPTS = \
+ 	code-coverage.py \
+diff --git a/codegen/pygobject-codegen-2.0.in b/codegen/pygobject-codegen-2.0.in
+index c5c912e..c04451b 100644
+--- a/codegen/pygobject-codegen-2.0.in
++++ b/codegen/pygobject-codegen-2.0.in
+@@ -1,9 +1,10 @@
+ #!/bin/sh
+ 
+ prefix=@prefix@
++exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=@pyexecdir@/gtk-2.0/codegen
+ 
+ PYTHONPATH=$codegendir
+ export PYTHONPATH
+diff --git a/pygobject-2.0.pc.in b/pygobject-2.0.pc.in
+index a47b685..0d1a811 100644
+--- a/pygobject-2.0.pc.in
++++ b/pygobject-2.0.pc.in
+@@ -4,6 +4,7 @@ includedir=@includedir@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+ libdir=@libdir@
++pyexecdir=@pyexecdir@
+ 
+ # you can use the --variable=pygtkincludedir argument to
+ # pkg-config to get this value.  You might want to use this to
+@@ -12,7 +13,7 @@ pygtkincludedir=${includedir}/pygtk-2.0
+ fixxref=${datadir}/pygobject/xsl/fixxref.py
+ pygdocs=${datadir}/gtk-doc/html/pygobject
+ defsdir=${datadir}/pygobject/2.0/defs
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=${pyexecdir}/gtk-2.0/codegen
+ overridesdir=@pyexecdir@/gi/overrides
+ 
+ Name: PyGObject
+-- 
+1.7.4.1
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch b/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
new file mode 100644
index 000000000000..45c04b96780e
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
@@ -0,0 +1,76 @@
+From b5c4b8b97a1ccb9a4c63ab726ea9c84d81ef51ca Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 5 Nov 2010 23:39:08 +0100
+Subject: [PATCH 2/3] Do not build tests unless needed
+
+---
+ tests/Makefile.am |   12 +++++-------
+ tests/runtests.py |    2 ++
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index bad15f0..5b0859a 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,7 +1,7 @@
+ CLEANFILES =
+-noinst_LTLIBRARIES = 
++check_LTLIBRARIES = 
+ if ENABLE_INTROSPECTION
+-noinst_LTLIBRARIES += libregress.la libgimarshallingtests.la
++check_LTLIBRARIES += libregress.la libgimarshallingtests.la
+ 
+ nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
+ libregress_la_CFLAGS = $(GIO_CFLAGS) $(PYCAIRO_CFLAGS)
+@@ -46,7 +46,7 @@ gschemas.compiled: org.gnome.test.gschema.xml
+ CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib gschemas.compiled
+ endif
+ 
+-noinst_LTLIBRARIES += testhelper.la
++check_LTLIBRARIES += testhelper.la
+ 
+ testhelper_la_CFLAGS = -I$(top_srcdir)/gobject -I$(top_srcdir)/glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
+ testhelper_la_LDFLAGS = -module -avoid-version
+@@ -66,8 +66,6 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
+ 	test -L $@ || $(LN_S) .libs/$@ $@
+ 
+ 
+-all: $(LTLIBRARIES:.la=.so)
+-
+ TEST_FILES_STATIC = \
+ 	test_gobject.py \
+ 	test_interface.py \
+@@ -109,7 +107,7 @@ EXTRA_DIST = \
+ EXTRA_DIST += $(TEST_FILES_STATIC) $(TEST_FILES_GI) $(TEST_FILES_GIO)
+ 
+ clean-local:
+-	rm -f $(LTLIBRARIES:.la=.so) file.txt~
++	rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
+ 
+ DBUS_LAUNCH=$(shell which dbus-launch)
+ RUN_TESTS_ENV_VARS= \
+@@ -121,7 +119,7 @@ RUN_TESTS_ENV_VARS= \
+ RUN_TESTS_LAUNCH=$(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py
+ 
+ # run tests in separately to avoid loading static and introspection bindings in the same process
+-check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
++check-local: $(check_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
+ 	TEST_FILES="$(TEST_FILES_STATIC)" $(RUN_TESTS_LAUNCH)
+ 	TEST_FILES="$(TEST_FILES_GI)" $(RUN_TESTS_LAUNCH)
+ if BUILD_GIO
+diff --git a/tests/runtests.py b/tests/runtests.py
+index 2bb8637..4107bcf 100644
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -6,6 +6,8 @@ import sys
+ 
+ import unittest
+ 
++# Some tests fail with translated messages.
++os.environ["LC_ALL"] = "C"
+ 
+ # force untranslated messages, as we check for them in some tests
+ os.environ['LC_MESSAGES'] = 'C'
+-- 
+1.7.4.1
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
new file mode 100644
index 000000000000..65d881a43d2a
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
@@ -0,0 +1,103 @@
+From 2f75378f3c56f245cabdcd2c52b561dbb878db2d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 8 Apr 2011 15:43:39 +0200
+Subject: [PATCH 3/3] Enable support to build against multiple version of python
+
+---
+ codegen/pygobject-codegen-2.0.in |    2 +-
+ gi/Makefile.am                   |    2 +-
+ gio/Makefile.am                  |    2 +-
+ glib/Makefile.am                 |   10 +++++-----
+ gobject/Makefile.am              |    2 +-
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/codegen/pygobject-codegen-2.0.in b/codegen/pygobject-codegen-2.0.in
+index c04451b..194e5ba 100644
+--- a/codegen/pygobject-codegen-2.0.in
++++ b/codegen/pygobject-codegen-2.0.in
+@@ -4,7 +4,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-codegendir=@pyexecdir@/gtk-2.0/codegen
++codegendir=$(@PYTHON@ -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, prefix='@exec_prefix@')")/gtk-2.0/codegen
+ 
+ PYTHONPATH=$codegendir
+ export PYTHONPATH
+diff --git a/gi/Makefile.am b/gi/Makefile.am
+index 31f6c79..8690522 100644
+--- a/gi/Makefile.am
++++ b/gi/Makefile.am
+@@ -25,7 +25,7 @@ _gi_la_LDFLAGS = \
+ 	-export-symbols-regex "init_gi|PyInit__gi"
+ _gi_la_LIBADD = \
+ 	$(GI_LIBS) \
+-	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
++	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _gi_la_SOURCES = \
+ 	pygi-repository.c \
+ 	pygi-repository.h \
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 6b3eb57..00e1c54 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -67,7 +67,7 @@ EXTRA_DIST += $(GIO_DEFS) $(GIO_OVERRIDES)
+ gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
+ _gio_la_CFLAGS = $(GIO_CFLAGS)
+ _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
+-_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
++_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _gio_la_SOURCES = \
+ 	giomodule.c \
+ 	pygio-utils.c \
+diff --git a/glib/Makefile.am b/glib/Makefile.am
+index e210318..df39687 100644
+--- a/glib/Makefile.am
++++ b/glib/Makefile.am
+@@ -4,7 +4,7 @@ INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
+ pkgincludedir = $(includedir)/pygtk-2.0
+ pkginclude_HEADERS = pyglib.h
+ 
+-lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la
++lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ 
+ pkgpyexecdir = $(pyexecdir)
+ 
+@@ -19,9 +19,9 @@ if PLATFORM_WIN32
+ common_ldflags += -no-undefined
+ endif
+ 
+-libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
+-libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
+-libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = 	\
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS)
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = 	\
+ 	pyglib.c		\
+ 	pyglib.h		\
+ 	pyglib-private.h 	\
+@@ -29,7 +29,7 @@ libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = 	\
+ 
+ _glib_la_CFLAGS = $(GLIB_CFLAGS)
+ _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
+-_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la
++_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _glib_la_SOURCES = 	 	\
+ 	glibmodule.c	 	\
+ 	pygiochannel.c 	 	\
+diff --git a/gobject/Makefile.am b/gobject/Makefile.am
+index 7208329..3f9ad8e 100644
+--- a/gobject/Makefile.am
++++ b/gobject/Makefile.am
+@@ -35,7 +35,7 @@ _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_gobject|PyInit__
+ _gobject_la_LIBADD = \
+ 	$(GLIB_LIBS) \
+ 	$(FFI_LIBS) \
+-	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
++	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _gobject_la_SOURCES =           \
+         gobjectmodule.c         \
+         pygboxed.c              \
+-- 
+1.7.4.1
+
diff --git a/dev-python/pygobject/pygobject-2.20.0-r1.ebuild b/dev-python/pygobject/pygobject-2.20.0-r1.ebuild
deleted file mode 100644
index 8bd280e9789b..000000000000
--- a/dev-python/pygobject/pygobject-2.20.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.20.0-r1.ebuild,v 1.3 2011/01/17 18:09:36 arfrever Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit alternatives autotools gnome2 python virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples libffi test"
-
-# FIXME: add introspection support
-RDEPEND=">=dev-libs/glib-2.20
-	!<dev-python/pygtk-2.13
-	libffi? ( virtual/libffi )"
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
-	test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc )
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		--disable-introspection
-		$(use_enable doc docs)
-		$(use_with libffi ffi)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix FHS compliance, see upstream bug #535524
-	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
-
-	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}/${PN}-2.18.0-make_check.patch"
-
-	# Support installation for multiple Python versions
-	epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch"
-
-	# Fix compilation with distcc, bug #299680
-	epatch "${FILESDIR}/${PN}-2.20.0-tmpdir-makefile.patch"
-
-	# Fix automagic introspection, not needed 2.21 onwards
-	epatch "${FILESDIR}/${P}-automagic-introspection.patch"
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	eautoreconf
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		if has ${PYTHON_ABI} 2.4 2.5; then
-			einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6."
-			return 0
-		fi
-
-		Xemake check
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	[[ -z ${ED} ]] && local ED="${D}"
-	installation() {
-		gnome2_src_install
-		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
-		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
-	}
-	python_execute_function -s installation
-
-	python_clean_installation_image
-
-	if use examples; then
-		insinto /usr/share/doc/${P}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	create_symlinks() {
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-
-	python_mod_optimize gtk-2.0 pygtk.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup gtk-2.0 pygtk.py
-
-	create_symlinks() {
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-}
diff --git a/dev-python/pygobject/pygobject-2.20.0.ebuild b/dev-python/pygobject/pygobject-2.20.0.ebuild
deleted file mode 100644
index c5439ca55c14..000000000000
--- a/dev-python/pygobject/pygobject-2.20.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.20.0.ebuild,v 1.16 2011/01/17 18:09:36 arfrever Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit alternatives autotools gnome2 python virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples libffi test"
-
-# FIXME: add introspection support
-RDEPEND=">=dev-libs/glib-2.20
-	!<dev-python/pygtk-2.13
-	libffi? ( virtual/libffi )"
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
-	test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc )
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		$(use_enable doc docs)
-		$(use_with libffi ffi)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix FHS compliance, see upstream bug #535524
-	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
-
-	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}/${PN}-2.18.0-make_check.patch"
-
-	# Support installation for multiple Python versions
-	epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch"
-
-	# Fix compilation with distcc, bug #299680
-	epatch "${FILESDIR}/${PN}-2.20.0-tmpdir-makefile.patch"
-
-	# needed to build on a libtool-1 system, bug #255542
-	rm m4/lt* m4/libtool.m4 ltmain.sh
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	eautoreconf
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		if has ${PYTHON_ABI} 2.4 2.5; then
-			einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6."
-			return 0
-		fi
-
-		Xemake check
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	[[ -z ${ED} ]] && local ED="${D}"
-	installation() {
-		gnome2_src_install
-		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
-		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
-	}
-	python_execute_function -s installation
-
-	python_clean_installation_image
-
-	if use examples; then
-		insinto /usr/share/doc/${P}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	create_symlinks() {
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-
-	python_mod_optimize gtk-2.0 pygtk.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup gtk-2.0 pygtk.py
-
-	create_symlinks() {
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-}
diff --git a/dev-python/pygobject/pygobject-2.21.5.ebuild b/dev-python/pygobject/pygobject-2.21.5.ebuild
deleted file mode 100644
index 7e22daab7115..000000000000
--- a/dev-python/pygobject/pygobject-2.21.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.21.5.ebuild,v 1.2 2011/01/17 18:09:36 arfrever Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit alternatives autotools gnome2 python virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +introspection libffi test"
-
-RDEPEND=">=dev-libs/glib-2.22.4:2
-	!<dev-python/pygtk-2.13
-	introspection? (
-		>=dev-libs/gobject-introspection-0.9.1
-		>=dev-python/pycairo-1.0.2 )
-	libffi? ( virtual/libffi )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		>=app-text/docbook-xsl-stylesheets-1.70.1 )
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc )
-	>=dev-util/pkgconfig-0.12"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		$(use_enable doc docs)
-		$(use_enable introspection)
-		$(use_with libffi ffi)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix FHS compliance, see upstream bug #535524
-	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
-
-	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}/${PN}-2.21.4-make_check.patch"
-
-	# Support installation for multiple Python versions
-	epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch"
-
-	# introspection related tests seem broken
-	sed -e '/if ENABLE_INTROSPECTION/,/endif/ d' \
-		-i tests/Makefile.am || die "sed failed"
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	eautoreconf
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		if has ${PYTHON_ABI} 2.4 2.5; then
-			einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6."
-			return 0
-		fi
-
-		Xemake check PYTHON=$(PYTHON -a)
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	[[ -z ${ED} ]] && local ED="${D}"
-	installation() {
-		gnome2_src_install
-		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
-		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
-	}
-	python_execute_function -s installation
-
-	python_clean_installation_image
-
-	if use examples; then
-		insinto /usr/share/doc/${P}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	create_symlinks() {
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-
-	python_mod_optimize gtk-2.0 pygtk.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup gtk-2.0 pygtk.py
-
-	create_symlinks() {
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-}
diff --git a/dev-python/pygobject/pygobject-2.26.0.ebuild b/dev-python/pygobject/pygobject-2.28.4.ebuild
index 33c671369161..5549a7032cd2 100644
--- a/dev-python/pygobject/pygobject-2.26.0.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.4.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.26.0.ebuild,v 1.2 2011/01/17 18:09:36 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.4.ebuild,v 1.1 2011/04/20 13:13:58 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
 SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
+PYTHON_DEPEND="2:2.6"
+# FIXME: Supports Python 3, but needs pycairo-3 support too
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
 
+# XXX: Is the alternatives stuff needed anymore?
 inherit alternatives autotools gnome2 python virtualx
 
 DESCRIPTION="GLib's GObject library bindings for Python"
@@ -16,15 +18,14 @@ HOMEPAGE="http://www.pygtk.org/"
 LICENSE="LGPL-2.1"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc cairo examples +introspection libffi test"
+IUSE="doc +cairo examples +introspection libffi test"
 
-RDEPEND=">=dev-libs/glib-2.22.4:2
-	!<dev-python/pygtk-2.13
+COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
 	introspection? (
-		>=dev-libs/gobject-introspection-0.9.5
-		cairo? ( >=dev-python/pycairo-1.0.2 ) )
+		>=dev-libs/gobject-introspection-0.10.2
+		cairo? ( >=dev-python/pycairo-1.2.0 ) )
 	libffi? ( virtual/libffi )"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	doc? (
 		dev-libs/libxslt
 		>=app-text/docbook-xsl-stylesheets-1.70.1 )
@@ -32,6 +33,8 @@ DEPEND="${RDEPEND}
 		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc )
 	>=dev-util/pkgconfig-0.12"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog* NEWS README"
@@ -47,20 +50,19 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# Fix FHS compliance, see upstream bug #535524
-	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
+	epatch "${FILESDIR}/${PN}-2.28.3-fix-codegen-location.patch"
 
 	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}/${PN}-2.26.0-make_check.patch"
+	epatch "${FILESDIR}/${PN}-2.28.3-make_check.patch"
 
-	# Support installation for multiple Python versions
-	epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch"
+	# Support installation for multiple Python versions, upstream bug #648292
+	epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
 
-	# Disable non-working tests
-	epatch "${FILESDIR}/${PN}-2.26.0-disable-non-working-tests.patch"
+	# Disable tests that fail
+	epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
 
 	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
+	ln -sfn $(type -P true) py-compile
 
 	eautoreconf
 
@@ -75,15 +77,11 @@ src_compile() {
 	python_execute_function -d -s
 }
 
+# FIXME: With python multiple ABI support, tests return 1 even when they pass
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 
 	testing() {
-		if has ${PYTHON_ABI} 2.4 2.5; then
-			einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6."
-			return 0
-		fi
-
 		XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
 		Xemake check PYTHON=$(PYTHON -a)
 	}
@@ -101,6 +99,10 @@ src_install() {
 
 	python_clean_installation_image
 
+	sed "s:/usr/bin/python:/usr/bin/python2:" \
+		-i "${ED}"/usr/bin/pygobject-codegen-2.0 \
+		|| die "Fix usage of python interpreter"
+
 	if use examples; then
 		insinto /usr/share/doc/${P}
 		doins -r examples || die "doins failed"
@@ -109,8 +111,8 @@ src_install() {
 
 pkg_postinst() {
 	create_symlinks() {
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
 	}
 	python_execute_function create_symlinks
 
@@ -121,8 +123,8 @@ pkg_postrm() {
 	python_mod_cleanup gtk-2.0 pygtk.py
 
 	create_symlinks() {
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
 	}
 	python_execute_function create_symlinks
 }