[arch-commits] Commit in weechat-matrix/repos/community-any (4 files)

[Jonas Witschel]

    Date: Wednesday, April 29, 2020 @ 21:14:00
  Author: diabonas
Revision: 622326

archrelease: copy trunk to community-any

Added:
  weechat-matrix/repos/community-any/PKGBUILD
    (from rev 622325, weechat-matrix/trunk/PKGBUILD)
  weechat-matrix/repos/community-any/weechat-matrix.install
    (from rev 622325, weechat-matrix/trunk/weechat-matrix.install)
Deleted:
  weechat-matrix/repos/community-any/PKGBUILD
  weechat-matrix/repos/community-any/weechat-matrix.install

------------------------+
 PKGBUILD               |  106 +++++++++++++++++++++++------------------------
 weechat-matrix.install |   27 ++++++-----
 2 files changed, 67 insertions(+), 66 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-29 21:13:53 UTC (rev 622325)
+++ PKGBUILD	2020-04-29 21:14:00 UTC (rev 622326)
@@ -1,53 +0,0 @@
-# Maintainer: Jonas Witschel <diabonas at archlinux.org>
-pkgname=weechat-matrix
-pkgver=0.2.0
-_tag=16d8e979166aec92cb55cd7e946e84606fffa8f4 # git show-ref "$pkgver"
-pkgrel=1
-pkgdesc='Weechat Matrix protocol script written in Python'
-arch=('any')
-url='https://github.com/poljar/weechat-matrix'
-license=('ISC')
-depends=('python-atomicwrites' 'python-attrs' 'python-future' 'python-logbook' 'python-matrix-nio'
-         'python-pygments' 'python-pyopenssl' 'python-webcolors')
-makedepends=('git' 'python-dephell')
-checkdepends=('python-hypothesis' 'python-pytest')
-optdepends=('python-aiohttp: matrix_sso_helper support'
-            'python-magic: matrix_upload support'
-            'python-requests: matrix_decrypt and matrix_upload support'
-            'ranger: default plumber for matrix_decrypt')
-install='weechat-matrix.install'
-source=("git+$url.git?signed#tag=$_tag")
-sha512sums=('SKIP')
-validpgpkeys=('689A3B5BC6560AB4C99A2A0581314DA807EF4E22') # Damir Jelić (poljar) <poljar at termina.org.uk>
-
-pkgver() {
-	cd "$pkgname"
-	git describe | sed 's/\([^-]*-\)g/r\1/;s/-/./g'
-}
-
-prepare() {
-	cd "$pkgname"
-	sed -ri 's|#!/usr/bin/env( -S)? python3|#!/usr/bin/python3|' contrib/*.py
-	dephell deps convert --from pyproject.toml --to setup.py
-}
-
-build() {
-	cd "$pkgname"
-	python setup.py build
-}
-
-check() {
-	cd "$pkgname"
-	python -m pytest
-}
-
-package() {
-	cd "$pkgname"
-	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-	install -Dm755 main.py "$pkgdir/usr/share/weechat/python/weechat-matrix.py"
-	for _script in matrix_decrypt matrix_sso_helper matrix_upload
-	do
-		install -Dm755 "contrib/$_script.py" "$pkgdir/usr/bin/$_script"
-	done
-	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
-}

Copied: weechat-matrix/repos/community-any/PKGBUILD (from rev 622325, weechat-matrix/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-29 21:14:00 UTC (rev 622326)
@@ -0,0 +1,53 @@
+# Maintainer: Jonas Witschel <diabonas at archlinux.org>
+pkgname=weechat-matrix
+pkgver=0.2.0
+_tag=16d8e979166aec92cb55cd7e946e84606fffa8f4 # git show-ref "$pkgver"
+pkgrel=2
+pkgdesc='Weechat Matrix protocol script written in Python'
+arch=('any')
+url='https://github.com/poljar/weechat-matrix'
+license=('ISC')
+depends=('python-atomicwrites' 'python-attrs' 'python-future' 'python-logbook' 'python-matrix-nio'
+         'python-pygments' 'python-pyopenssl' 'python-webcolors')
+makedepends=('git' 'python-dephell')
+checkdepends=('python-hypothesis' 'python-pytest')
+optdepends=('python-aiohttp: matrix_sso_helper support'
+            'python-magic: matrix_upload support'
+            'python-requests: matrix_decrypt and matrix_upload support'
+            'ranger: default plumber for matrix_decrypt')
+install='weechat-matrix.install'
+source=("git+$url.git?signed#tag=$_tag")
+sha512sums=('SKIP')
+validpgpkeys=('689A3B5BC6560AB4C99A2A0581314DA807EF4E22') # Damir Jelić (poljar) <poljar at termina.org.uk>
+
+pkgver() {
+	cd "$pkgname"
+	git describe | sed 's/\([^-]*-\)g/r\1/;s/-/./g'
+}
+
+prepare() {
+	cd "$pkgname"
+	sed -ri 's|#!/usr/bin/env( -S)? python3|#!/usr/bin/python3|' contrib/*.py
+	dephell deps convert --from pyproject.toml --to setup.py
+}
+
+build() {
+	cd "$pkgname"
+	python setup.py build
+}
+
+check() {
+	cd "$pkgname"
+	python -m pytest
+}
+
+package() {
+	cd "$pkgname"
+	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+	install -Dm755 main.py "$pkgdir/usr/share/weechat/python/weechat-matrix.py"
+	for _script in matrix_decrypt matrix_sso_helper matrix_upload
+	do
+		install -Dm755 "contrib/$_script.py" "$pkgdir/usr/bin/$_script"
+	done
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+}

Deleted: weechat-matrix.install
===================================================================
--- weechat-matrix.install	2020-04-29 21:13:53 UTC (rev 622325)
+++ weechat-matrix.install	2020-04-29 21:14:00 UTC (rev 622326)
@@ -1,13 +0,0 @@
-post_install() {
-	echo "To add this script to your WeeChat installation, please execute the following command:"
-	echo "ln -s /usr/share/weechat/python/weechat-matrix.py -t ~/.weechat/python"
-}
-
-post_upgrade() {
-	if [ "$2" = "0.1.0-1" ]
-	then
-		echo "The location of the script has changed, please update your symbolic links:"
-		echo "rm ~/.weechat/python/{matrix,matrix.py}"
-		echo "ln -s /usr/share/weechat/python/weechat-matrix.py -t ~/.weechat/python"
-	fi
-}

Copied: weechat-matrix/repos/community-any/weechat-matrix.install (from rev 622325, weechat-matrix/trunk/weechat-matrix.install)
===================================================================
--- weechat-matrix.install	                        (rev 0)
+++ weechat-matrix.install	2020-04-29 21:14:00 UTC (rev 622326)
@@ -0,0 +1,14 @@
+post_install() {
+	echo "To load this script, execute the following command in WeeChat:"
+	echo "/script load weechat-matrix.py"
+	echo "To load it automatically during WeeChat startup, use:"
+	echo "mkdir -p ~/.weechat/python/autoload"
+	echo "ln -s /usr/share/weechat/python/weechat-matrix.py -t ~/.weechat/python/autoload"
+}
+
+post_upgrade() {
+	if [ "$(vercmp "$2" 0.2.0-2)" -lt 0 ]
+	then
+		post_install
+	fi
+}