New package: python-dbus-1.2.0 with 3.4 subpkg; replaces dbus-python;

revbump affected pkgs

srcpkgs/avahi-discover/template

@@ -6,7 +6,7 @@
 pkgname=avahi-discover
 version=0.6.31
 wrksrc="avahi-${version}"
-revision=14
+revision=15
 noarch=yes
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
@@ -25,10 +25,10 @@ homepage="http://www.avahi.org"
 distfiles="$homepage/download/avahi-$version.tar.gz"
 checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
 
-hostmakedepends="automake libtool pkg-config intltool pygtk-devel dbus-python"
+hostmakedepends="automake libtool pkg-config intltool pygtk-devel python-dbus"
 makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
- pygtk-devel dbus-python gtk+3-devel"
+ pygtk-devel python-dbus gtk+3-devel"
-depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils"
+depends="avahi>=$version python avahi-python>=$version python-dbus pygtk desktop-file-utils"
 pycompile_module="avahi_discover"
 
 # Package build options
@@ -104,7 +104,7 @@ avahi-python-utils_package() {
 }
 
 avahi-python_package() {
-	depends="python dbus-python"
+	depends="python python-dbus"
 	short_desc="Python utility package for Avahi"
 	noarch=yes
 	pycompile_module="avahi"

srcpkgs/avahi/template

@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.31
-revision=14
+revision=15
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
  --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl

srcpkgs/caribou/template

@@ -1,14 +1,14 @@
 # Template file for 'caribou'
 pkgname=caribou
 version=0.4.13
-revision=4
+revision=5
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module"
 hostmakedepends="pkg-config intltool gnome-doc-utils gobject-introspection"
 makedepends="vala-devel>=0.24 libxklavier-devel libgee08-devel python-gobject-devel
  clutter-devel gtk+3-devel libXtst-devel gir-freedesktop"
-depends="python-gobject pyatspi dbus-python gir-freedesktop at-spi2-atk
+depends="python-gobject pyatspi python-dbus gir-freedesktop at-spi2-atk
  desktop-file-utils"
 pycompile_module="$pkgname"
 short_desc="An alternative to the Gnome On-screen Keyboard"
@@ -21,7 +21,7 @@ checksum=953ba618621fda8a828d0d797fc916dbe35990dc01d7aa99d15e5e2241ee2782
 caribou-devel_package() {
 	lib32disabled=yes
 	depends="libXtst-devel libgee08-devel libxklavier-devel gtk+3-devel
-	 libxml2-devel caribou>=${version}_${revision}"
+	 libxml2-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

srcpkgs/dbus-python-devel

@@ -1 +0,0 @@
-dbus-python

srcpkgs/dbus-python/template

@@ -1,39 +0,0 @@
-# Template file for 'dbus-python'
-pkgname=dbus-python
-version=1.2.0
-revision=3
-lib32disabled=yes
-build_style=gnu-configure
-hostmakedepends="pkg-config python-devel"
-makedepends="glib-devel dbus-glib-devel python-devel"
-depends="python"
-pycompile_module="dbus"
-short_desc="D-Bus Python bindings"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="GPL-2, LGPL-2.1"
-homepage="http://www.freedesktop.org/wiki/Software/DBusBindings"
-distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
-checksum=e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df
-
-do_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		# create a python-config wrapper to fake --includes
-		install -m755 ${XBPS_SRCPKGDIR}/py2cairo/files/python-config ${wrksrc}
-		export PATH=${wrksrc}:$PATH
-	fi
-	env PYTHON=python ./configure ${configure_args}
-}
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/share/doc
-}
-
-dbus-python-devel_package() {
-	lib32disabled=yes
-	depends="python-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-	}
-}

srcpkgs/dbus-python3/template

@@ -1,23 +0,0 @@
-# Template file for 'dbus-python3'
-pkgname=dbus-python3
-version=1.2.0
-revision=3
-lib32disabled=yes
-wrksrc="${pkgname/3/}-${version}"
-build_style=gnu-configure
-configure_args="PYTHON=python3"
-hostmakedepends="pkg-config python3-devel"
-makedepends="glib-devel dbus-glib-devel python3-devel"
-depends="python3"
-short_desc="D-Bus Python bindings"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="GPL-2, LGPL-2.1"
-homepage="http://www.freedesktop.org/wiki/Software/DBusBindings"
-distfiles="http://dbus.freedesktop.org/releases/${pkgname/3/}/${pkgname/3/}-${version}.tar.gz"
-checksum=e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/share/doc
-	# Remove development files, provided by dbus-python-devel.
-	rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig
-}

srcpkgs/gajim/template

@@ -1,17 +1,17 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=0.15.3
+version=0.15.4
-revision=4
+revision=1
 noarch=yes
 build_style=gnu-configure
 configure_args="--enable-site-packages"
 hostmakedepends="intltool python"
-makedepends="dbus-python pygtk-devel python-openssl python-sqlite"
+makedepends="python-dbus pygtk-devel python-openssl python-sqlite"
 depends="${makedepends/-devel/}"
 pycompile_module="gajim"
 short_desc="Full featured Jabber/XMPP client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://www.gajim.org"
 license="GPL-3"
-distfiles="https://gajim.org/downloads/0.15/gajim-$version.tar.bz2"
+distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.bz2"
 checksum=4848e98b25b523e28014528a8b89289bf987d5ce9419dd78ccff74a35aa583f4

srcpkgs/gnome-music/template

@@ -1,20 +1,17 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
 version=3.12.2.1
-revision=2
+revision=3
 lib32disabled=yes
 build_style=gnu-configure
+configure_args="PYTHON=python3.4"
 hostmakedepends="pkg-config intltool itstool gobject-introspection"
-makedepends="python3.4-devel python-gobject-devel>=3.12 dbus-python3>=1.2.0
+makedepends="python3.4-devel python-gobject-devel>=3.12 python3.4-dbus>=1.2.0
  grilo-devel gnome-desktop-devel>=3.12"
-depends="python3.4-gobject dbus-python3 desktop-file-utils"
+depends="python3.4-gobject python3.4-dbus desktop-file-utils"
 short_desc="GNOME music playing application"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Apps/Music"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/3.12/$pkgname-$version.tar.xz"
 checksum=9f0c99283853f054e3c5b4ad15df1e8fe3ac07bc046ac0f019ef0600ca969fef
-
-do_configure() {
-	env PYTHON=python3.4 ./configure ${configure_args}
-}

srcpkgs/hamster-applet/template

@@ -1,12 +1,13 @@
 # Template file for 'hamster-applet'
 pkgname=hamster-applet
 version=2.91.2
-revision=6
+revision=7
-noarch="yes"
+noarch=yes
 build_style=waf
 hostmakedepends="pkg-config intltool gnome-doc-utils docbook2x"
-makedepends="python-devel glib-devel dbus-glib-devel gnome-control-center-devel notify-python dbus-python python-sqlite python-xdg"
+makedepends="python-devel glib-devel dbus-glib-devel gnome-control-center-devel
-depends="dbus-python notify-python pygtk python-xdg python-gconf python-sqlite"
+ notify-python python-dbus python-sqlite python-xdg"
+depends="python-dbus notify-python pygtk python-xdg python-gconf python-sqlite"
 pycompile_module="hamster"
 short_desc="Time tracking application for individuals"
 maintainer="Juan RP <xtraeme@gmail.com>"

srcpkgs/python-dbus-devel

@@ -0,0 +1 @@
+python-dbus

srcpkgs/python-dbus/template

@@ -0,0 +1,79 @@
+# Template file for 'python-dbus'
+pkgname=python-dbus
+version=1.2.0
+revision=4
+lib32disabled=yes
+wrksrc="dbus-python-${version}"
+build_style=gnu-configure
+hostmakedepends="pkg-config python-devel python3.4-devel"
+makedepends="glib-devel dbus-glib-devel ${hostmakedepends/pkg-config/}"
+depends="python"
+replaces="dbus-python>=0"
+pycompile_module="dbus"
+short_desc="D-Bus Python2 bindings"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, LGPL-2.1"
+homepage="http://www.freedesktop.org/wiki/Software/DBusBindings"
+distfiles="http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz"
+checksum=e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df
+
+do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		ln -s ${wrksrc}/.xbps/bin/python-config ${wrksrc}
+	fi
+
+	# python2
+	mkdir ${wrksrc}/build-python2
+	cd ${wrksrc}/build-python2
+	env PYTHON=python ../configure ${configure_args}
+
+	# python3.4
+	mkdir ${wrksrc}/build-python3.4
+	cd ${wrksrc}/build-python3.4
+	env PYTHON=python3.4 ../configure ${configure_args}
+}
+
+do_build() {
+	# python2
+	cd ${wrksrc}/build-python2
+	make ${makejobs}
+
+	# python3.4
+	cd ${wrksrc}/build-python3.4
+	make ${makejobs}
+}
+
+do_install() {
+	# python2
+	cd ${wrksrc}/build-python2
+	make DESTDIR=${DESTDIR} install
+
+	# python3.4
+	cd ${wrksrc}/build-python3.4
+	make DESTDIR=${DESTDIR} install
+}
+
+python3.4-dbus_package() {
+	lib32disabled=yes
+	depends="python3.4"
+	replaces="dbus-python3>=0"
+	short_desc="${short_desc/Python2/Python3.4}"
+	pkg_install() {
+		vmkdir usr/lib
+		mv ${DESTDIR}/usr/lib/python3.4 ${PKGDESTDIR}/usr/lib
+	}
+}
+
+python-dbus-devel_package() {
+	lib32disabled=yes
+	depends="python-devel python3.4-devel
+		python-dbus>=${version}_${revision}
+		python3.4-dbus>=${version}_${revision}"
+	replaces="dbus-python-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+	}
+}

srcpkgs/python-efl/template

@@ -4,8 +4,8 @@ version=1.9.0
 revision=1
 build_style=python-module
 hostmakedepends="pkg-config python-devel"
-makedepends="efl-devel>=${version} elementary-devel>=${version} dbus-python-devel"
+makedepends="efl-devel>=${version} elementary-devel>=${version} python-dbus-devel"
-depends="dbus-python"
+depends="python-dbus"
 pycompile_modules="evas efl edje emotion ecore elementary e_dbus"
 for f in evas ecore edje elementary e_dbus; do
 	replaces+="python-${f}>=0 python-${f}-devel>=0 "

srcpkgs/python3.4-dbus

@@ -0,0 +1 @@
+python-dbus

srcpkgs/system-config-printer/template

@@ -1,16 +1,16 @@
 # Template file for 'system-config-printer'
 pkgname=system-config-printer
 version=1.4.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-udev-rules"
 make_build_args="udevhelperdir=/usr/lib/udev"
 make_install_args="udevhelperdir=/usr/lib/udev udevrulesdir=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config intltool xmlto desktop-file-utils"
 makedepends="gtk+3-devel cups-devel libusb-devel systemd-devel
- pycups dbus-python notify-python pycurl pysmbc python-gobject gir-freedesktop
+ pycups python-dbus notify-python pycurl pysmbc python-gobject gir-freedesktop
  gnome-keyring"
-depends="python pycups dbus-python notify-python pycurl pysmbc python-gobject
+depends="python pycups python-dbus notify-python pycurl pysmbc python-gobject
  gir-freedesktop gnome-keyring"
 pycompile_module="cupshelpers"
 pycompile_dirs="/usr/share/system-config-printer"

srcpkgs/telepathy-python/template

@@ -1,11 +1,11 @@
 # Template file for 'telepathy-python'
 pkgname=telepathy-python
 version=0.15.19
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="python libxslt"
-makedepends="python dbus-python"
+makedepends="python python-dbus"
-depends="python dbus-python"
+depends="${makedepends}"
 noarch="yes"
 pycompile_module="telepathy"
 short_desc="Python libraries for use in Telepathy clients and connection managers"

srcpkgs/wicd/template

@@ -1,11 +1,11 @@
 # Template file for 'wicd'
 pkgname=wicd
 version=1.7.2.4
-revision=5
+revision=6
 noarch=yes
-makedepends="dhcpcd wpa_supplicant wireless_tools ethtool dbus-glib dbus-python
+makedepends="dhcpcd wpa_supplicant wireless_tools ethtool dbus-glib python-dbus
  rfkill python-gobject2 python-urwid>=0.9.9 python-setuptools python-babel"
-depends="dbus-glib dhcpcd ethtool net-tools dbus-python python-gobject2 python-urwid
+depends="dbus-glib dhcpcd ethtool net-tools python-dbus python-gobject2 python-urwid
  rfkill wireless_tools wpa_supplicant"
 pycompile_module="wicd"
 pycompile_dirs="usr/lib/wicd usr/share/wicd"

srcpkgs/zeitgeist/template

@@ -1,7 +1,7 @@
 # Template file for 'zeitgeist'
 pkgname=zeitgeist
 version=0.9.14
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-fts --enable-datahub"
 hostmakedepends="pkg-config intltool"
@@ -9,7 +9,7 @@ makedepends="
  python-rdflib json-glib-devel>=0.16.2 gtk+3-devel telepathy-glib-devel
  python-gobject-devel>=3.10 vala-devel dbus-devel sqlite-devel raptor
  xapian-core-devel"
-depends="python>=2.7<3 dbus-python python-gobject>=3.10"
+depends="python>=2.7<3 python-dbus python-gobject>=3.10"
 pycompile_module="zeitgeist"
 short_desc="logs the users’ activities and events"
 maintainer="Juan RP <xtraeme@gmail.com>"

srcpkgs/zeroinstall-injector/template

@@ -1,11 +1,11 @@
 # Template file for 'zeroinstall-injector'
 pkgname=zeroinstall-injector
 version=2.3.3
-revision=2
+revision=3
 noarch=yes
 wrksrc="0install-${version}"
 build_style=python-module
-makedepends="python gnupg dbus-python pygtk desktop-file-utils hicolor-icon-theme xdg-utils"
+makedepends="python gnupg python-dbus pygtk desktop-file-utils hicolor-icon-theme xdg-utils"
 depends="${makedepends}"
 pycompile_module="zeroinstall"
 short_desc="A cross-distribution software installation system"