CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan 28 14:02:33 UTC 2022

Modified Files:
        pkgsrc/inputmethod/ibus: Makefile
        pkgsrc/inputmethod/ibus-anthy: Makefile
        pkgsrc/inputmethod/ibus-array: Makefile
        pkgsrc/inputmethod/ibus-python: Makefile
        pkgsrc/net/syncthing-gtk: Makefile

Log Message:
*: switch to python 2.7 version of py-gobject3


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/inputmethod/ibus/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/inputmethod/ibus-anthy/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/inputmethod/ibus-array/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/inputmethod/ibus-python/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/syncthing-gtk/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/ibus/Makefile
diff -u pkgsrc/inputmethod/ibus/Makefile:1.81 pkgsrc/inputmethod/ibus/Makefile:1.82
--- pkgsrc/inputmethod/ibus/Makefile:1.81       Wed Dec  8 16:02:14 2021
+++ pkgsrc/inputmethod/ibus/Makefile    Fri Jan 28 14:02:33 2022
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.81 2021/12/08 16:02:14 adam Exp $
+# $NetBSD: Makefile,v 1.82 2022/01/28 14:02:33 wiz Exp $
 
 PKGREVISION= 2
 .include "Makefile.common"
 
 COMMENT=       Intelligent Input Bus
 
-DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject32
 BUILD_DEPENDS+=        cldr-emoji-annotation>=37.0.13.0.0.2:../../textproc/cldr-emoji-annotation
 BUILD_DEPENDS+=        unicode-character-database>=13.0.0:../../textproc/unicode-character-database
 BUILD_DEPENDS+=        unicode-emoji>=13.1:../../textproc/unicode-emoji
 
+PYTHON_VERSIONS_ACCEPTED=      27
+
 GNU_CONFIGURE=                 yes
 USE_LIBTOOL=                   yes
 # XXX fails without GNU msgfmt

Index: pkgsrc/inputmethod/ibus-anthy/Makefile
diff -u pkgsrc/inputmethod/ibus-anthy/Makefile:1.26 pkgsrc/inputmethod/ibus-anthy/Makefile:1.27
--- pkgsrc/inputmethod/ibus-anthy/Makefile:1.26 Fri Jan 28 12:49:56 2022
+++ pkgsrc/inputmethod/ibus-anthy/Makefile      Fri Jan 28 14:02:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/01/28 12:49:56 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/01/28 14:02:33 wiz Exp $
 
 DISTNAME=      ibus-anthy-1.5.6
 PKGREVISION=   4
@@ -12,7 +12,7 @@ LICENSE=      gnu-gpl-v2
 
 DEPENDS+=      kasumi>=2.1:../../inputmethod/kasumi
 DEPENDS+=      ibus>=1.5.4:../../inputmethod/ibus
-DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject32
 
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes

Index: pkgsrc/inputmethod/ibus-array/Makefile
diff -u pkgsrc/inputmethod/ibus-array/Makefile:1.40 pkgsrc/inputmethod/ibus-array/Makefile:1.41
--- pkgsrc/inputmethod/ibus-array/Makefile:1.40 Wed Dec  8 16:05:13 2021
+++ pkgsrc/inputmethod/ibus-array/Makefile      Fri Jan 28 14:02:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2021/12/08 16:05:13 adam Exp $
+# $NetBSD: Makefile,v 1.41 2022/01/28 14:02:33 wiz Exp $
 
 DISTNAME=      ibus-array-0.1.0
 PKGREVISION=   20
@@ -11,7 +11,9 @@ HOMEPAGE=     https://code.google.com/archiv
 COMMENT=       Array 30 Input Method for iBus
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject32
+
+PYTHON_VERSIONS_ACCEPTED=      27
 
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes

Index: pkgsrc/inputmethod/ibus-python/Makefile
diff -u pkgsrc/inputmethod/ibus-python/Makefile:1.22 pkgsrc/inputmethod/ibus-python/Makefile:1.23
--- pkgsrc/inputmethod/ibus-python/Makefile:1.22        Wed Dec  8 16:05:15 2021
+++ pkgsrc/inputmethod/ibus-python/Makefile     Fri Jan 28 14:02:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/12/08 16:05:15 adam Exp $
+# $NetBSD: Makefile,v 1.23 2022/01/28 14:02:33 wiz Exp $
 
 PKGREVISION= 1
 .include "../../inputmethod/ibus/Makefile.common"
@@ -15,7 +15,7 @@ USE_TOOLS+=           pkg-config intltool msgfmt 
 GNU_CONFIGURE=         yes
 
 DEPENDS+=      ibus>=${PKGVERSION_NOREV}:../../inputmethod/ibus
-DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject32
 DEPENDS+=      ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
 
 PKGCONFIG_OVERRIDE+=   ibus-1.0.pc.in

Index: pkgsrc/net/syncthing-gtk/Makefile
diff -u pkgsrc/net/syncthing-gtk/Makefile:1.27 pkgsrc/net/syncthing-gtk/Makefile:1.28
--- pkgsrc/net/syncthing-gtk/Makefile:1.27      Fri Jan 14 15:01:36 2022
+++ pkgsrc/net/syncthing-gtk/Makefile   Fri Jan 28 14:02:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2022/01/14 15:01:36 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2022/01/28 14:02:33 wiz Exp $
 
 DISTNAME=      syncthing-gtk-0.9.4.4
 PKGREVISION=   4
@@ -15,9 +15,10 @@ DEPENDS+=    syncthing>=0.13.0:../../net/sy
 DEPENDS+=      glib-networking-[0-9]*:../../net/glib-networking # GIO GnuTLS support
 DEPENDS+=      psmisc-[0-9]*:../../sysutils/psmisc # for killall
 DEPENDS+=      ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
-DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject32
 
 PYTHON_VERSIONS_ACCEPTED=      27
+
 EGG_NAME=      ${DISTNAME:S/0/v0/:S/-/_/}
 
 REPLACE_PYTHON+=               *.py scripts/*.py syncthing_gtk/*.py