Split up py-dbus and py-gobject3 into a -common and a python 2 and 3 port.

Submitted by:	Gustau Perez
Obtained from:	gnome devel repo.

19 files changed, 398 insertions, 118 deletions

diff --git a/devel/Makefile b/devel/Makefile
index b6cbd52d1291..33038d6061c0 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -3998,10 +3998,14 @@
     SUBDIR += py-zope.traversing
     SUBDIR += py-zope.viewlet
     SUBDIR += py_static_check
+    SUBDIR += py3-dbus
+    SUBDIR += py3-gobject3
     SUBDIR += pybaz
     SUBDIR += pybugz
     SUBDIR += pychecker
     SUBDIR += pycount
+    SUBDIR += pydbus-common
+    SUBDIR += pygobject3-common
     SUBDIR += pylint
     SUBDIR += pymacs
     SUBDIR += pyobfuscate
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index dc315374f031..e7260a041e25 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -1,51 +1,17 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/devel/py-dbus/Makefile 17268 2013-04-01 05:13:11Z marcus $
+#   $MCom: ports/trunk/devel/py-dbus/Makefile 19571 2014-04-25 18:12:46Z kwm $
 
-PORTNAME=	dbus
-PORTVERSION=	1.1.1
-CATEGORIES=	devel gnome python
-MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-python/
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-python-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Python bindings for the D-BUS messaging system
-
-LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
-
-USES=		gettext pathfix pkgconfig gmake
-USE_PYTHON=	2
-USE_AUTOTOOLS=	libtool
-CPPFLAGS+=	-I${PYTHON_INCLUDEDIR}
-CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
-		--disable-api-docs
+PORTREVISION=	1
 
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
-
-OPTIONS_DEFINE=HTMLDOCS
-HTMLDOCS_DESC=	build html documentation
-
-.include <bsd.port.options.mk>
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=
 
-.if ${PORT_OPTIONS:MHTMLDOCS}
-BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
-PLIST_SUB+=	HTML=""
-.else
-CONFIGURE_ARGS+=--disable-html-docs
-PLIST_SUB+=	HTML="@comment "
-.endif
+COMMENT=	Python2 bindings for the D-BUS messaging system
 
-post-patch:
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \
-		s|PYTHON install-nodist_docDATA|PYTHON|g' \
-			${WRKSRC}/Makefile.in
-.endif
+SLAVE_PORT=	python2
 
-post-install:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR} && \
-		${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
+MASTERDIR=	${.CURDIR}/../../devel/pydbus-common
+PLIST=		${.CURDIR}/pkg-plist
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/py-dbus/pkg-plist b/devel/py-dbus/pkg-plist
index bad475c45cf2..8040393818bc 100644
--- a/devel/py-dbus/pkg-plist
+++ b/devel/py-dbus/pkg-plist
@@ -1,9 +1,4 @@
-include/dbus-1.0/dbus/dbus-python.h
-%%PYTHON_SITELIBDIR%%/_dbus_bindings.a
-%%PYTHON_SITELIBDIR%%/_dbus_bindings.la
 %%PYTHON_SITELIBDIR%%/_dbus_bindings.so
-%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.a
-%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.la
 %%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.so
 %%PYTHON_SITELIBDIR%%/dbus/__init__.py
 %%PYTHON_SITELIBDIR%%/dbus/__init__.pyc
@@ -62,26 +57,5 @@ include/dbus-1.0/dbus/dbus-python.h
 %%PYTHON_SITELIBDIR%%/dbus/types.py
 %%PYTHON_SITELIBDIR%%/dbus/types.pyc
 %%PYTHON_SITELIBDIR%%/dbus/types.pyo
-libdata/pkgconfig/dbus-python.pc
-%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt
-%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html
-%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt
-%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/HACKING.html
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/NEWS.html
-%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.txt
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/README.html
-%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/TODO.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt
-%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-async-client.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-client.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-service.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-signal-emitter.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-signal-recipient.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/list-system-services.py
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/dbus/mainloop
 @dirrm %%PYTHON_SITELIBDIR%%/dbus
diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile
index 227a7b7f9683..802a82e98804 100644
--- a/devel/py-gobject3/Makefile
+++ b/devel/py-gobject3/Makefile
@@ -1,47 +1,17 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/devel/py-gobject3/Makefile 17268 2013-04-01 05:13:11Z marcus $
+#   $MCom: ports/trunk/devel/py-gobject3/Makefile 19571 2014-04-25 18:12:46Z kwm $
+
+PORTREVISION=	1
 
-PORTNAME=	gobject
-PORTVERSION=	3.8.1
-CATEGORIES=	devel python
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	3
-DISTNAME=	pygobject-${PORTVERSION}
-DIST_SUBDIR=	gnome3
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Python bindings for GObject
-
-LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-
-USE_XZ=		yes
-USES=		gmake pathfix pkgconfig
-USE_GNOME=	glib20 introspection
-USE_PYTHON=	2
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-# this port doesn't work with py-gobject < 2.28.6_2, clungle below
-CONFLICTS=	py*-gtk-0* py*-gobject-2.*.[0-6] py*-gobject-2.*.[7-9] \
-		py*-gobject-2.*.6_1
-
-PLIST_SUB=	PYTHON_VER="${PYTHON_VER}" ARCH=${ARCH} UNAME_R=${UNAME_R} \
-		VERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
+COMMENT=	Python 2 bindings for GObject
 
-UNAME_R!=	${UNAME} -r
+SLAVE_PORT=	python2
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|SUBDIRS = examples gi tests|SUBDIRS = examples gi|g' \
-		${WRKSRC}/Makefile.in
+MASTERDIR=	${.CURDIR}/../../devel/pygobject3-common
+PLIST=		${.CURDIR}/pkg-plist
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/py-gobject3/pkg-plist b/devel/py-gobject3/pkg-plist
index 8b8029063517..9d4f0a3fd090 100644
--- a/devel/py-gobject3/pkg-plist
+++ b/devel/py-gobject3/pkg-plist
@@ -1,18 +1,14 @@
-include/pygobject-3.0/pygobject.h
-lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.la
-lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so
-lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so.0
+lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.so
+lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.so.0
+lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.so.0.0.0
 %%PYTHON_SITELIBDIR%%/gi/__init__.py
 %%PYTHON_SITELIBDIR%%/gi/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gi/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gi/_gi.la
 %%PYTHON_SITELIBDIR%%/gi/_gi.so
-%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.la
 %%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so
 %%PYTHON_SITELIBDIR%%/gi/_glib/__init__.py
 %%PYTHON_SITELIBDIR%%/gi/_glib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gi/_glib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gi/_glib/_glib.la
 %%PYTHON_SITELIBDIR%%/gi/_glib/_glib.so
 %%PYTHON_SITELIBDIR%%/gi/_glib/option.py
 %%PYTHON_SITELIBDIR%%/gi/_glib/option.pyc
@@ -20,7 +16,6 @@ lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py
 %%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gi/_gobject/_gobject.la
 %%PYTHON_SITELIBDIR%%/gi/_gobject/_gobject.so
 %%PYTHON_SITELIBDIR%%/gi/_gobject/constants.py
 %%PYTHON_SITELIBDIR%%/gi/_gobject/constants.pyc
@@ -73,7 +68,7 @@ lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/gi/types.py
 %%PYTHON_SITELIBDIR%%/gi/types.pyc
 %%PYTHON_SITELIBDIR%%/gi/types.pyo
-%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-pypython%%PYTHON_VER%%-freebsd-%%UNAME_R%%-%%ARCH%%.egg-info
+%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VERSION%%-freebsd-%%UNAME_R%%-%%ARCH%%.egg-info
 %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py
 %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyo
@@ -83,11 +78,9 @@ lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py
 %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyc
 %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyo
-libdata/pkgconfig/pygobject-3.0.pc
 @dirrm %%PYTHON_SITELIBDIR%%/pygtkcompat
 @dirrm %%PYTHON_SITELIBDIR%%/gi/repository
 @dirrm %%PYTHON_SITELIBDIR%%/gi/overrides
 @dirrm %%PYTHON_SITELIBDIR%%/gi/_gobject
 @dirrm %%PYTHON_SITELIBDIR%%/gi/_glib
 @dirrm %%PYTHON_SITELIBDIR%%/gi
-@dirrmtry include/pygobject-3.0
diff --git a/devel/py3-dbus/Makefile b/devel/py3-dbus/Makefile
new file mode 100644
index 000000000000..5a2b34ffa200
--- /dev/null
+++ b/devel/py3-dbus/Makefile
@@ -0,0 +1,17 @@
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
+# $FreeBSD$
+#   $MCom: ports/trunk/devel/py3-dbus/Makefile 19571 2014-04-25 18:12:46Z kwm $
+
+PORTREVISION=	0
+
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=
+
+COMMENT=	Python3 bindings for the D-BUS messaging system
+
+SLAVE_PORT=	python3
+
+MASTERDIR=	${.CURDIR}/../../devel/pydbus-common
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-dbus/distinfo b/devel/py3-dbus/distinfo
new file mode 100644
index 000000000000..30a68e423361
--- /dev/null
+++ b/devel/py3-dbus/distinfo
@@ -0,0 +1,2 @@
+SHA256 (dbus-python-1.1.1.tar.gz) = 8917ca4fb8f4d693aee18d200cbad166b2c938dfb88c03bb4ab3d90a7c915e88
+SIZE (dbus-python-1.1.1.tar.gz) = 596476
diff --git a/devel/py3-dbus/pkg-descr b/devel/py3-dbus/pkg-descr
new file mode 100644
index 000000000000..39ce5c24ee2b
--- /dev/null
+++ b/devel/py3-dbus/pkg-descr
@@ -0,0 +1,3 @@
+Python bindings for the D-BUS interprocess messaging system.
+
+WWW: http://dbus.freedesktop.org/doc/dbus-python/
diff --git a/devel/py3-dbus/pkg-plist b/devel/py3-dbus/pkg-plist
new file mode 100644
index 000000000000..cc463c798944
--- /dev/null
+++ b/devel/py3-dbus/pkg-plist
@@ -0,0 +1,58 @@
+%%PYTHON_SITELIBDIR%%/_dbus_bindings.so
+%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.so
+%%PYTHON_SITELIBDIR%%/dbus/__init__.py
+%%PYTHON_SITELIBDIR%%/dbus/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_compat.py
+%%PYTHON_SITELIBDIR%%/dbus/_compat.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_compat.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.py
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.py
+%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_version.py
+%%PYTHON_SITELIBDIR%%/dbus/_version.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_version.pyo
+%%PYTHON_SITELIBDIR%%/dbus/bus.py
+%%PYTHON_SITELIBDIR%%/dbus/bus.pyc
+%%PYTHON_SITELIBDIR%%/dbus/bus.pyo
+%%PYTHON_SITELIBDIR%%/dbus/connection.py
+%%PYTHON_SITELIBDIR%%/dbus/connection.pyc
+%%PYTHON_SITELIBDIR%%/dbus/connection.pyo
+%%PYTHON_SITELIBDIR%%/dbus/decorators.py
+%%PYTHON_SITELIBDIR%%/dbus/decorators.pyc
+%%PYTHON_SITELIBDIR%%/dbus/decorators.pyo
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.py
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/dbus/gi_service.py
+%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyc
+%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyo
+%%PYTHON_SITELIBDIR%%/dbus/glib.py
+%%PYTHON_SITELIBDIR%%/dbus/glib.pyc
+%%PYTHON_SITELIBDIR%%/dbus/glib.pyo
+%%PYTHON_SITELIBDIR%%/dbus/lowlevel.py
+%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyc
+%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyo
+%%PYTHON_SITELIBDIR%%/dbus/proxies.py
+%%PYTHON_SITELIBDIR%%/dbus/proxies.pyc
+%%PYTHON_SITELIBDIR%%/dbus/proxies.pyo
+%%PYTHON_SITELIBDIR%%/dbus/server.py
+%%PYTHON_SITELIBDIR%%/dbus/server.pyc
+%%PYTHON_SITELIBDIR%%/dbus/server.pyo
+%%PYTHON_SITELIBDIR%%/dbus/service.py
+%%PYTHON_SITELIBDIR%%/dbus/service.pyc
+%%PYTHON_SITELIBDIR%%/dbus/service.pyo
+%%PYTHON_SITELIBDIR%%/dbus/types.py
+%%PYTHON_SITELIBDIR%%/dbus/types.pyc
+%%PYTHON_SITELIBDIR%%/dbus/types.pyo
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.py
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.py
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyc
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/dbus/mainloop
+@dirrm %%PYTHON_SITELIBDIR%%/dbus
diff --git a/devel/py3-gobject3/Makefile b/devel/py3-gobject3/Makefile
new file mode 100644
index 000000000000..fec69306edec
--- /dev/null
+++ b/devel/py3-gobject3/Makefile
@@ -0,0 +1,17 @@
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
+# $FreeBSD$
+#   $MCom: ports/trunk/devel/py3-gobject3/Makefile 19571 2014-04-25 18:12:46Z kwm $
+
+PORTREVISION=	1
+
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	3
+
+COMMENT=	Python 3 bindings for GObject
+
+SLAVE_PORT=	python3
+
+MASTERDIR=	${.CURDIR}/../../devel/pygobject3-common
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-gobject3/pkg-plist b/devel/py3-gobject3/pkg-plist
new file mode 100644
index 000000000000..9d4f0a3fd090
--- /dev/null
+++ b/devel/py3-gobject3/pkg-plist
@@ -0,0 +1,86 @@
+lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.so
+lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.so.0
+lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.so.0.0.0
+%%PYTHON_SITELIBDIR%%/gi/__init__.py
+%%PYTHON_SITELIBDIR%%/gi/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gi/_gi.so
+%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so
+%%PYTHON_SITELIBDIR%%/gi/_glib/__init__.py
+%%PYTHON_SITELIBDIR%%/gi/_glib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gi/_glib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gi/_glib/_glib.so
+%%PYTHON_SITELIBDIR%%/gi/_glib/option.py
+%%PYTHON_SITELIBDIR%%/gi/_glib/option.pyc
+%%PYTHON_SITELIBDIR%%/gi/_glib/option.pyo
+%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py
+%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gi/_gobject/_gobject.so
+%%PYTHON_SITELIBDIR%%/gi/_gobject/constants.py
+%%PYTHON_SITELIBDIR%%/gi/_gobject/constants.pyc
+%%PYTHON_SITELIBDIR%%/gi/_gobject/constants.pyo
+%%PYTHON_SITELIBDIR%%/gi/_gobject/propertyhelper.py
+%%PYTHON_SITELIBDIR%%/gi/_gobject/propertyhelper.pyc
+%%PYTHON_SITELIBDIR%%/gi/_gobject/propertyhelper.pyo
+%%PYTHON_SITELIBDIR%%/gi/_gobject/signalhelper.py
+%%PYTHON_SITELIBDIR%%/gi/_gobject/signalhelper.pyc
+%%PYTHON_SITELIBDIR%%/gi/_gobject/signalhelper.pyo
+%%PYTHON_SITELIBDIR%%/gi/importer.py
+%%PYTHON_SITELIBDIR%%/gi/importer.pyc
+%%PYTHON_SITELIBDIR%%/gi/importer.pyo
+%%PYTHON_SITELIBDIR%%/gi/module.py
+%%PYTHON_SITELIBDIR%%/gi/module.pyc
+%%PYTHON_SITELIBDIR%%/gi/module.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py
+%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py
+%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.py
+%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py
+%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py
+%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py
+%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyo
+%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py
+%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.pyc
+%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.pyo
+%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py
+%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gi/types.py
+%%PYTHON_SITELIBDIR%%/gi/types.pyc
+%%PYTHON_SITELIBDIR%%/gi/types.pyo
+%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VERSION%%-freebsd-%%UNAME_R%%-%%ARCH%%.egg-info
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py
+%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.pyc
+%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.pyo
+%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py
+%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyc
+%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/pygtkcompat
+@dirrm %%PYTHON_SITELIBDIR%%/gi/repository
+@dirrm %%PYTHON_SITELIBDIR%%/gi/overrides
+@dirrm %%PYTHON_SITELIBDIR%%/gi/_gobject
+@dirrm %%PYTHON_SITELIBDIR%%/gi/_glib
+@dirrm %%PYTHON_SITELIBDIR%%/gi
diff --git a/devel/pydbus-common/Makefile b/devel/pydbus-common/Makefile
new file mode 100644
index 000000000000..9144fa16ba08
--- /dev/null
+++ b/devel/pydbus-common/Makefile
@@ -0,0 +1,85 @@
+# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
+# $FreeBSD$
+#   $MCom: ports/trunk/devel/pydbus-common/Makefile 19685 2014-05-25 13:11:28Z kwm $
+
+PORTNAME=	dbus
+PORTVERSION=	1.1.1
+PORTREVISION?=	4
+CATEGORIES=	devel gnome python
+MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-python/
+PKGNAMEPREFIX?=	py
+PKGNAMESUFFIX?=	-common
+DISTNAME=	dbus-python-${PORTVERSION}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT?=	Common files for the Python bindings for the D-BUS messaging system
+
+BUILD_DEPENDS=	dbus-glib>=0:${PORTSDIR}/devel/dbus-glib
+
+SLAVE_PORT?=	no
+
+USES=		gettext gmake libtool pathfix pkgconfig
+GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${PYTHON_INCLUDEDIR}
+CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
+		--disable-api-docs
+INSTALL_TARGET=	install-strip
+
+.if ${SLAVE_PORT} == no
+USE_PYTHON_BUILD=	2
+
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
+
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	HTMLDOCS
+HTMLDOCS_DESC=	build html documentation
+HTMLDOCS_CONFIGURE_OFF=	--disable-html-docs
+HTMLDOCS_BUILD_DEPENDS=	rst2html:${PORTSDIR}/textproc/py-docutils
+
+.include <bsd.port.options.mk>
+
+post-patch:
+.if ! ${PORT_OPTIONS:MDOCS}
+	@${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \
+		s|PYTHON install-nodist_docDATA|PYTHON|g' \
+			${WRKSRC}/Makefile.in
+.endif
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/
+	${INSTALL_DATA} ${WRKSRC}/include/dbus-python.h \
+		${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/dbus-python.h
+	${INSTALL_DATA} ${WRKSRC}/dbus-python.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
+
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR} && \
+		${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
+
+	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
+		${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR} && \
+		${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} && \
+		${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
+
+.if ${PORT_OPTIONS:MHTMLDOCS}
+	${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR} && \
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
+.endif
+.else # slave is defined
+LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+RUN_DEPENDS+=	pydbus-common>=0:${PORTSDIR}/devel/pydbus-common
+USE_LDCONFIG=	yes
+.if ${SLAVE_PORT} == python2
+USE_PYTHON=	2
+.endif
+.if ${SLAVE_PORT} == python3
+USE_PYTHON=	3
+.endif
+
+post-install:
+	@${RM} -rf ${STAGEDIR}${PREFIX}/include/dbus-1.0 \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
+	@${RM} -fr ${STAGEDIR}/${DOCSDIR}
+.endif # end of slaving block
+
+.include <bsd.port.mk>
diff --git a/devel/pydbus-common/distinfo b/devel/pydbus-common/distinfo
new file mode 100644
index 000000000000..30a68e423361
--- /dev/null
+++ b/devel/pydbus-common/distinfo
@@ -0,0 +1,2 @@
+SHA256 (dbus-python-1.1.1.tar.gz) = 8917ca4fb8f4d693aee18d200cbad166b2c938dfb88c03bb4ab3d90a7c915e88
+SIZE (dbus-python-1.1.1.tar.gz) = 596476
diff --git a/devel/pydbus-common/pkg-descr b/devel/pydbus-common/pkg-descr
new file mode 100644
index 000000000000..39ce5c24ee2b
--- /dev/null
+++ b/devel/pydbus-common/pkg-descr
@@ -0,0 +1,3 @@
+Python bindings for the D-BUS interprocess messaging system.
+
+WWW: http://dbus.freedesktop.org/doc/dbus-python/
diff --git a/devel/pydbus-common/pkg-plist b/devel/pydbus-common/pkg-plist
new file mode 100644
index 000000000000..a9a3e023927f
--- /dev/null
+++ b/devel/pydbus-common/pkg-plist
@@ -0,0 +1,24 @@
+include/dbus-1.0/dbus/dbus-python.h
+libdata/pkgconfig/dbus-python.pc
+%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt
+%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html
+%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt
+%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/HACKING.html
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/NEWS.html
+%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.txt
+%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt
+%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-async-client.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-client.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-service.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-signal-emitter.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-signal-recipient.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/list-system-services.py
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry include/dbus-1.0/dbus
+@dirrmtry include/dbus-1.0
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
new file mode 100644
index 000000000000..c6f8457f6be7
--- /dev/null
+++ b/devel/pygobject3-common/Makefile
@@ -0,0 +1,73 @@
+# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
+# $FreeBSD$
+#   $MCom: ports/trunk/devel/pygobject3-common/Makefile 19685 2014-05-25 13:11:28Z kwm $
+
+PORTNAME=	gobject
+PORTVERSION=	3.8.1
+PORTREVISION?=	0
+CATEGORIES=	devel python
+MASTER_SITES=	GNOME
+MASTER_SITE_SUBDIR=	sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+PKGNAMEPREFIX?=	py
+PKGNAMESUFFIX?=	3-common
+DISTNAME=	pygobject-${PORTVERSION}
+DIST_SUBDIR=	gnome3
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Common files for the Python bindings for GObject
+
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+SLAVE_PORT?=	no
+
+USES=		gmake libtool pathfix pkgconfig tar:xz
+GNU_CONFIGURE=	yes
+
+# this port doesn't work with py-gobject < 2.28.6_2, clungle below
+CONFLICTS=	py*-gtk-0* py*-gobject-2.*.[0-6] py*-gobject-2.*.[7-9] \
+		py*-gobject-2.*.6_1
+
+PLIST_SUB=	ARCH=${ARCH} UNAME_R=${UNAME_R} VERSION=${PORTVERSION}
+
+.if ${SLAVE_PORT} == no
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+USE_PYTHON_BUILD=	2
+USE_GNOME=	glib20:build introspection:build
+NO_BUILD=	yes
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/pygobject-3.0/
+	${INSTALL_DATA} ${WRKSRC}/gi/_gobject/pygobject.h \
+		${STAGEDIR}${PREFIX}/include/pygobject-3.0/pygobject.h
+	${INSTALL_DATA} ${WRKSRC}/pygobject-3.0.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc
+.else 
+USE_GNOME+=	glib20 introspection
+LIB_DEPENDS+=	libffi.so:${PORTSDIR}/devel/libffi
+RUN_DEPENDS+=	pygobject3-common>=0:${PORTSDIR}/devel/pygobject3-common
+
+.if ${SLAVE_PORT} == python2
+USE_PYTHON=	2
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+.endif
+
+.if ${SLAVE_PORT} == python3
+USE_PYTHON=	3
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo
+PLIST_SUB+=	PYTVER=${PYTHON_VER:S/.//}
+.endif
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gi/*.so
+	@${RM} -rf ${STAGEDIR}${PREFIX}/include/pygobject-3.0 \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc
+.endif
+
+.include <bsd.port.pre.mk>
+
+UNAME_R!=	${UNAME} -r
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-gobject3/distinfo b/devel/pygobject3-common/distinfo
index 9b1d53617552..9b1d53617552 100644
--- a/devel/py-gobject3/distinfo
+++ b/devel/pygobject3-common/distinfo
diff --git a/devel/py-gobject3/pkg-descr b/devel/pygobject3-common/pkg-descr
index eded7fcd4d05..eded7fcd4d05 100644
--- a/devel/py-gobject3/pkg-descr
+++ b/devel/pygobject3-common/pkg-descr
diff --git a/devel/pygobject3-common/pkg-plist b/devel/pygobject3-common/pkg-plist
new file mode 100644
index 000000000000..39dca2f2bad2
--- /dev/null
+++ b/devel/pygobject3-common/pkg-plist
@@ -0,0 +1,3 @@
+include/pygobject-3.0/pygobject.h
+libdata/pkgconfig/pygobject-3.0.pc
+@dirrm include/pygobject-3.0