Add py-gobject3-common which contains python version independent files

for py-gobject3. This allows python 2 and python 3 versions of py-gobject3
to be installed simultaneously.

13 files changed, 229 insertions, 51 deletions

diff --git a/devel/Makefile b/devel/Makefile
index fba57276e3b..2d9f60d942d 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1854 2014/02/10 13:36:34 wen Exp $
+# $NetBSD: Makefile,v 1.1855 2014/02/12 00:57:25 prlw1 Exp $
 #
 
 COMMENT=	Development utilities
@@ -1447,6 +1447,7 @@ SUBDIR+=	py-generate
 SUBDIR+=	py-gobject
 SUBDIR+=	py-gobject-shared
 SUBDIR+=	py-gobject3
+SUBDIR+=	py-gobject3-common
 SUBDIR+=	py-greenlet
 SUBDIR+=	py-h5py
 SUBDIR+=	py-hgtools
diff --git a/devel/py-gobject3-common/DESCR b/devel/py-gobject3-common/DESCR
new file mode 100644
index 00000000000..f0ad602babe
--- /dev/null
+++ b/devel/py-gobject3-common/DESCR
@@ -0,0 +1 @@
+Python version independent files for py-gobject3: GLib2 GObject bindings.
diff --git a/devel/py-gobject3-common/Makefile b/devel/py-gobject3-common/Makefile
new file mode 100644
index 00000000000..7a3aa48f7e7
--- /dev/null
+++ b/devel/py-gobject3-common/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2014/02/12 00:57:25 prlw1 Exp $
+
+.include "../../devel/py-gobject3/Makefile.common"
+
+PKGNAME=	py-gobject3-common-${VER}
+
+COMMENT=	Python version independent files for glib2 gobject bindings
+
+do-build:
+
+INSTALLATION_DIRS+=	include/pygobject-3.0 lib/pkgconfig
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/gi/_gobject/pygobject.h \
+		${DESTDIR}${PREFIX}/include/pygobject-3.0/pygobject.h
+	${INSTALL_SCRIPT} ${WRKSRC}/pygobject-3.0.pc \
+		${DESTDIR}${PREFIX}/lib/pkgconfig/pygobject-3.0.pc
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-gobject3-common/PLIST b/devel/py-gobject3-common/PLIST
new file mode 100644
index 00000000000..b658920b21a
--- /dev/null
+++ b/devel/py-gobject3-common/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2014/02/12 00:57:25 prlw1 Exp $
+include/pygobject-3.0/pygobject.h
+lib/pkgconfig/pygobject-3.0.pc
diff --git a/devel/py-gobject3-common/buildlink3.mk b/devel/py-gobject3-common/buildlink3.mk
new file mode 100644
index 00000000000..704b4a686b4
--- /dev/null
+++ b/devel/py-gobject3-common/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2014/02/12 00:57:25 prlw1 Exp $
+
+BUILDLINK_TREE+=	py-gobject3-common
+
+.if !defined(PY_GOBJECT3_COMMON_BUILDLINK3_MK)
+PY_GOBJECT3_COMMON_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.py-gobject3-common+=	py-gobject3-common>=3.10.2
+BUILDLINK_PKGSRCDIR.py-gobject3-common?=	../../devel/py-gobject3-common
+BUILDLINK_DEPMETHOD.py-gobject3-common?=	build
+
+.endif	# PY_GOBJECT3_COMMON_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-py-gobject3-common
diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile
index 0b2a55bad23..af90235b0bf 100644
--- a/devel/py-gobject3/Makefile
+++ b/devel/py-gobject3/Makefile
@@ -1,51 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2014/01/25 10:30:03 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2014/02/12 00:57:25 prlw1 Exp $
 
-DISTNAME=		pygobject-3.10.2
-PKGNAME=		${PYPKGPREFIX}-gobject3-3.10.2
-CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pygobject/${PKGVERSION_NOREV:R}/}
-EXTRACT_SUFX=		.tar.xz
+.include "Makefile.common"
 
-MAINTAINER=		prlw1@cam.ac.uk
-HOMEPAGE=		http://www.pygtk.org/
-COMMENT=		Python bindings for glib2 gobject
-LICENSE=		gnu-lgpl-v2.1
-
-USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=		c c99
-USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config gmake
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
-
-PYTHON_VERSIONS_INCOMPATIBLE=	26
-PYTHON_SELF_CONFLICT=		yes
+PKGNAME=		${PYPKGPREFIX}-gobject3-${VER}
+PKGREVISION=		1
 
-PKGCONFIG_OVERRIDE+=	pygobject-3.0.pc.in
-PY_PATCHPLIST=		yes
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
-CONFLICTS+=		${PYPKGPREFIX}-gtk2<2.8.4
-CONFLICTS+=		${PYPKGPREFIX}-gobject<2.28.6nb4
-
-# needed for tests only
-# https://bugzilla.gnome.org/show_bug.cgi?id=685094
-PYTHON_VERSIONED_DEPENDENCIES=	cairo:link
-.include "../../lang/python/versioned_dependencies.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
-TEST_TARGET=    check
-
-.include "../../lang/python/extension.mk"
-.include "../../lang/python/application.mk"
+COMMENT=		Python bindings for glib2 gobject
 
-# for the egg
-.if exists(${PYTHONBIN:Q})
-PLATFORM!=	${PYTHONBIN:Q} -c "import sys; from distutils import util; sys.stdout.write(util.get_platform())"
-PLIST_SUBST+=	PLATFORM=${PLATFORM:Q}
-.endif
+CONFIGURE_ARGS+=	--without-common
 
-BUILDLINK_API_DEPENDS.glib2=	glib2>=2.35.9
-.include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gobject-introspection=	gobject-introspection>=1.35.9
-.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/py-gobject3-common/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-gobject3/Makefile.common b/devel/py-gobject3/Makefile.common
new file mode 100644
index 00000000000..ce4a3205240
--- /dev/null
+++ b/devel/py-gobject3/Makefile.common
@@ -0,0 +1,54 @@
+# $NetBSD: Makefile.common,v 1.1 2014/02/12 00:57:25 prlw1 Exp $
+# used by devel/py-gobject3/Makefile
+# used by devel/py-gobject3-common/Makefile
+
+VER=			3.10.2
+DISTNAME=		pygobject-${VER}
+CATEGORIES=		devel gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pygobject/${PKGVERSION_NOREV:R}/}
+EXTRACT_SUFX=		.tar.xz
+
+MAINTAINER=		prlw1@cam.ac.uk
+HOMEPAGE=		https://wiki.gnome.org/action/show/Projects/PyGObject
+LICENSE=		gnu-lgpl-v2.1
+
+USE_PKGLOCALEDIR=	yes
+USE_LANGUAGES=		c c99
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config gmake
+GNU_CONFIGURE=		yes
+#CONFIGURE_ARGS+=	--disable-cairo
+CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
+
+DISTINFO_FILE=		${.CURDIR}/../../devel/py-gobject3/distinfo
+PATCHDIR=		${.CURDIR}/../../devel/py-gobject3/patches
+
+PYTHON_VERSIONS_INCOMPATIBLE=	26
+
+PKGCONFIG_OVERRIDE+=	pygobject-3.0.pc.in
+PY_PATCHPLIST=		yes
+PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
+CONFLICTS+=		${PYPKGPREFIX}-gtk2<2.8.4
+CONFLICTS+=		${PYPKGPREFIX}-gobject<2.28.6nb4
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=685094
+# https://bugzilla.gnome.org/show_bug.cgi?id=707196
+PYTHON_VERSIONED_DEPENDENCIES=  cairo:link
+.include "../../lang/python/versioned_dependencies.mk"
+.include "../../graphics/cairo-gobject/buildlink3.mk"
+TEST_TARGET=    check
+
+.include "../../lang/python/extension.mk"
+.include "../../lang/python/application.mk"
+
+# for the egg
+.if exists(${PYTHONBIN:Q})
+PLATFORM!=	${PYTHONBIN:Q} -c "import sys; from distutils import util; sys.stdout.write(util.get_platform())"
+PLIST_SUBST+=	PLATFORM=${PLATFORM:Q}
+.endif
+
+BUILDLINK_API_DEPENDS.glib2=	glib2>=2.35.9
+.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gobject-introspection=	gobject-introspection>=1.35.9
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/libffi/buildlink3.mk"
diff --git a/devel/py-gobject3/PLIST b/devel/py-gobject3/PLIST
index b379278d37c..6a6adfb171f 100644
--- a/devel/py-gobject3/PLIST
+++ b/devel/py-gobject3/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2013/12/09 23:12:31 prlw1 Exp $
-include/pygobject-3.0/pygobject.h
+@comment $NetBSD: PLIST,v 1.7 2014/02/12 00:57:25 prlw1 Exp $
 lib/libpyglib-gi-2.0-python${PYVERSSUFFIX}.la
-lib/pkgconfig/pygobject-3.0.pc
 ${PYSITELIB}/gi/__init__.py
 ${PYSITELIB}/gi/__init__.pyc
 ${PYSITELIB}/gi/__init__.pyo
diff --git a/devel/py-gobject3/buildlink3.mk b/devel/py-gobject3/buildlink3.mk
index 01d5ccfcbcf..4b888345616 100644
--- a/devel/py-gobject3/buildlink3.mk
+++ b/devel/py-gobject3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2012/10/08 21:15:03 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2014/02/12 00:57:25 prlw1 Exp $
 
 BUILDLINK_TREE+=	py-gobject3
 
@@ -12,6 +12,7 @@ BUILDLINK_ABI_DEPENDS.py-gobject3?=	${PYPKGPREFIX}-gobject3>=3.4.0
 BUILDLINK_PKGSRCDIR.py-gobject3?=	../../devel/py-gobject3
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/py-gobject3-common/buildlink3.mk"
 .endif	# PY_GOBJECT3_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-py-gobject3
diff --git a/devel/py-gobject3/distinfo b/devel/py-gobject3/distinfo
index 3d8a8c63d6d..ff061dfc4f7 100644
--- a/devel/py-gobject3/distinfo
+++ b/devel/py-gobject3/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.8 2013/12/09 23:12:31 prlw1 Exp $
+$NetBSD: distinfo,v 1.9 2014/02/12 00:57:25 prlw1 Exp $
 
 SHA1 (pygobject-3.10.2.tar.xz) = 693cc1cb692a8f21ff27d28eaa780f5e67cafb1a
 RMD160 (pygobject-3.10.2.tar.xz) = 96b8ecc9862750135ad4ea1278a5b1ce78e73c76
 Size (pygobject-3.10.2.tar.xz) = 672092 bytes
+SHA1 (patch-Makefile.in) = 7c365f074b6f4a079cb7ca032c6c7db26116d538
+SHA1 (patch-configure) = f8f237b9c6ce942eb1c169a40489098b4bb6ecdf
+SHA1 (patch-gi___gobject_Makefile.in) = fb7dca31865e970044dfb15db99f83e7a2ddb7b6
diff --git a/devel/py-gobject3/patches/patch-Makefile.in b/devel/py-gobject3/patches/patch-Makefile.in
new file mode 100644
index 00000000000..791c89f40b8
--- /dev/null
+++ b/devel/py-gobject3/patches/patch-Makefile.in
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile.in,v 1.1 2014/02/12 00:57:25 prlw1 Exp $
+
+build: Add --without-common configure option for package maintainers
+https://bugzilla.gnome.org/show_bug.cgi?id=721646
+commit 15fdd827ce4bff847fb35c817c6ea2d3650eec00
+
+--- Makefile.in.orig	2013-12-12 00:22:35.000000000 +0000
++++ Makefile.in
+@@ -445,8 +445,8 @@ BUILT_EXTRA_DIST = \
+ 
+ 
+ # pkg-config files
+-pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = pygobject-$(PLATFORM_VERSION).pc
++@WITH_COMMON_TRUE@pkgconfigdir = $(libdir)/pkgconfig
++@WITH_COMMON_TRUE@pkgconfig_DATA = pygobject-$(PLATFORM_VERSION).pc
+ 
+ # python
+ pyexec_LTLIBRARIES = 
diff --git a/devel/py-gobject3/patches/patch-configure b/devel/py-gobject3/patches/patch-configure
new file mode 100644
index 00000000000..3c57235e73a
--- /dev/null
+++ b/devel/py-gobject3/patches/patch-configure
@@ -0,0 +1,69 @@
+$NetBSD: patch-configure,v 1.1 2014/02/12 00:57:25 prlw1 Exp $
+
+build: Add --without-common configure option for package maintainers
+https://bugzilla.gnome.org/show_bug.cgi?id=721646
+commit 15fdd827ce4bff847fb35c817c6ea2d3650eec00
+
+--- configure.orig	2013-12-12 00:22:35.000000000 +0000
++++ configure
+@@ -648,6 +648,8 @@ CODE_COVERAGE_ENABLED_TRUE
+ WARN_CFLAGS
+ INTROSPECTION_COMPILER
+ INTROSPECTION_SCANNER
++WITH_COMMON_FALSE
++WITH_COMMON_TRUE
+ ENABLE_CAIRO_FALSE
+ ENABLE_CAIRO_TRUE
+ PYCAIRO_LIBS
+@@ -828,6 +830,7 @@ enable_thread
+ enable_glibtest
+ with_ffi
+ enable_cairo
++with_common
+ enable_compile_warnings
+ enable_iso_c
+ enable_code_coverage
+@@ -1505,6 +1508,8 @@ Optional Packages:
+                           program name is given; if not given, searches for a
+                           few standard names such as "python3" or "python2"
+   --without-ffi           Disable libffi support
++  --without-common        For package maintainers: do not install Python
++                          version independent files
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -14294,6 +14299,23 @@ else
+ fi
+ 
+ 
++
++# Check whether --with-common was given.
++if test "${with_common+set}" = set; then :
++  withval=$with_common; with_common=$enableval
++else
++  with_common=yes
++fi
++
++ if test "$with_common" = "yes"; then
++  WITH_COMMON_TRUE=
++  WITH_COMMON_FALSE='#'
++else
++  WITH_COMMON_TRUE='#'
++  WITH_COMMON_FALSE=
++fi
++
++
+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ 
+@@ -14967,6 +14989,10 @@ if test -z "${ENABLE_CAIRO_TRUE}" && tes
+   as_fn_error $? "conditional \"ENABLE_CAIRO\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${WITH_COMMON_TRUE}" && test -z "${WITH_COMMON_FALSE}"; then
++  as_fn_error $? "conditional \"WITH_COMMON\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${CODE_COVERAGE_ENABLED_TRUE}" && test -z "${CODE_COVERAGE_ENABLED_FALSE}"; then
+   as_fn_error $? "conditional \"CODE_COVERAGE_ENABLED\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/devel/py-gobject3/patches/patch-gi___gobject_Makefile.in b/devel/py-gobject3/patches/patch-gi___gobject_Makefile.in
new file mode 100644
index 00000000000..a47009f7774
--- /dev/null
+++ b/devel/py-gobject3/patches/patch-gi___gobject_Makefile.in
@@ -0,0 +1,34 @@
+$NetBSD: patch-gi___gobject_Makefile.in,v 1.1 2014/02/12 00:57:25 prlw1 Exp $
+
+build: Add --without-common configure option for package maintainers
+https://bugzilla.gnome.org/show_bug.cgi?id=721646
+commit 15fdd827ce4bff847fb35c817c6ea2d3650eec00
+
+--- gi/_gobject/Makefile.in.orig	2013-12-12 00:22:35.000000000 +0000
++++ gi/_gobject/Makefile.in
+@@ -84,7 +84,7 @@ host_triplet = @host@
+ subdir = gi/_gobject
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ 	$(top_srcdir)/depcomp $(pygobject_PYTHON) \
+-	$(top_srcdir)/py-compile $(pkginclude_HEADERS)
++	$(top_srcdir)/py-compile $(am__pkginclude_HEADERS_DIST)
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
+ 	$(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/libtool.m4 \
+@@ -190,6 +190,7 @@ am__py_compile = PYTHON=$(PYTHON) $(SHEL
+ am__pep3147_tweak = \
+   sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|'
+ py_compile = $(top_srcdir)/py-compile
++am__pkginclude_HEADERS_DIST = pygobject.h
+ HEADERS = $(pkginclude_HEADERS)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+@@ -379,7 +380,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.7
+ PLATFORM_VERSION = 3.0
+-pkginclude_HEADERS = pygobject.h
++@WITH_COMMON_TRUE@pkginclude_HEADERS = pygobject.h
+ extension_cppflags = \
+ 	$(PYTHON_INCLUDES) \
+ 	-DPY_SSIZE_T_CLEAN