[arch-commits] Commit in deluge/trunk (4 files)

[Jan Steffens]

    Date: Tuesday, June 18, 2019 @ 14:14:43
  Author: heftig
Revision: 356389

2.0.3-1

Modified:
  deluge/trunk/PKGBUILD
Deleted:
  deluge/trunk/deluge-web.service
  deluge/trunk/deluged.service
  deluge/trunk/untag-build.patch

--------------------+
 PKGBUILD           |   89 ++++++++++++++++++++++++++++++++++-----------------
 deluge-web.service |   10 -----
 deluged.service    |   11 ------
 untag-build.patch  |   10 -----
 4 files changed, 60 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-18 13:57:27 UTC (rev 356388)
+++ PKGBUILD	2019-06-18 14:14:43 UTC (rev 356389)
@@ -3,54 +3,85 @@
 # Contributor: Hugo Doria <hugo at archlinux.org>
 
 pkgname=deluge
-pkgver=1.3.15+18+ge050905b2
+pkgver=2.0.3
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server model"
 arch=(any)
 url="https://deluge-torrent.org/"
 license=(GPL3)
-depends=(python2-xdg libtorrent-rasterbar python2-twisted python2-pyopenssl
-         python2-chardet python2-setuptools)
-makedepends=(intltool pygtk librsvg python2-mako git)
-optdepends=('python2-notify: libnotify notifications'
-            'python2-pygame: audible notifications'
-            'python2-libappindicator: appindicator notifications'
-            'pygtk: needed for gtk ui'
-            'librsvg: needed for gtk ui'
-            'python2-mako: needed for web ui')
-_commit=e050905b291f4d9b417270e38f2aa04366057919  # 1.3-stable
-source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
-        untag-build.patch
-        deluged.service deluge-web.service)
-sha256sums=('SKIP'
-            'fbd17f13765f5560bab01a81a42aff0f2f757a4a6fa29379ae31d95b9721e4f2'
-            '58a451bb6cf4fe6ff78a4fb71d51c5910340a2de032ff435c3c7365015ab538f'
-            'c3f2d6ad5bc9de5ffd9973d92badbe04a9ecf12c0c575e13d505a96add03275a')
+depends=(
+  # Follows DEPENDS.md
+  'python-twisted>=17.1' python-service-identity python-idna
+  'openssl>=1.0.1'
+  python-pyopenssl
+  'python-rencode>=1.0.2'
+  python-xdg
+  xdg-utils
+  python-six
+  'python-zope-interface>=4.4.2' 
+  python-chardet 
+  python-setproctitle 
+  python-pillow
+  python-dbus
+  python-distro
+  'libtorrent-rasterbar>=1.1.1'
+  python-geoip
+  python-mako
+)
+makedepends=(
+  python-setuptools
+  intltool
+  gtk3
+  python-gobject
+  python-cairo
+  librsvg
+  libappindicator-gtk3
+  #python-pygame
+  libnotify
+  git
+)
+optdepends=(
+  'gtk3: gtk ui'
+  'python-gobject: gtk ui'
+  'python-cairo: gtk ui'
+  'librsvg: gtk ui'
+  'libappindicator-gtk3: appindicator notifications'
+  #'python-pygame: audible notifications'
+  'libnotify: desktop notifications'
+)
+_commit=b711cd258ae3001d5f1aa69617c22a2d258b1c06  # tags/deluge-2.0.3^0
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
+sha256sums=('SKIP')
 
-prepare() {
+pkgver() {
   cd $pkgname
-  patch -Np1 -i ../untag-build.patch
-  sed -i '1s/python$/&2/' \
-    deluge/ui/Win32IconImagePlugin.py \
-    deluge/ui/web/gen_gettext.py
+  git describe | sed 's/^deluge-//;s/-/+/g'
 }
 
-pkgver() {
+prepare() {
   cd $pkgname
-  git describe | sed 's/^deluge-//;s/-/+/g'
 }
 
 build() {
   cd $pkgname
-  python2 setup.py build
+  python setup.py build
 }
 
 package() {
   cd $pkgname
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-  install -Dt "$pkgdir/usr/lib/systemd/system" -m644 ../*.service
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+
+  install -Dt "$pkgdir/usr/lib/systemd/system" \
+    -m644 packaging/systemd/*.service
+  install -Dt "$pkgdir/usr/lib/systemd/system/deluged.service.d" \
+    -m644 packaging/systemd/user.conf
+  install -Dt "$pkgdir/usr/lib/systemd/system/deluge-web.service.d" \
+    -m644 packaging/systemd/user.conf
+
   echo 'u deluge - "Deluge BitTorrent daemon" /srv/deluge' |
     install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  echo 'd /srv/deluge 0775 deluge deluge' |
+  echo 'd /srv/deluge 0770 deluge deluge' |
     install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }
+
+# vim:set sw=2 et:

Deleted: deluge-web.service
===================================================================
--- deluge-web.service	2019-06-18 13:57:27 UTC (rev 356388)
+++ deluge-web.service	2019-06-18 14:14:43 UTC (rev 356389)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Deluge WebUI
-After=deluged.service
-
-[Service]
-User=deluge
-ExecStart=/usr/bin/deluge-web
-
-[Install]
-WantedBy=multi-user.target

Deleted: deluged.service
===================================================================
--- deluged.service	2019-06-18 13:57:27 UTC (rev 356388)
+++ deluged.service	2019-06-18 14:14:43 UTC (rev 356389)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Deluge Daemon
-After=network.target
-
-[Service]
-User=deluge
-ExecStart=/usr/bin/deluged -d
-UMask=0002
-
-[Install]
-WantedBy=multi-user.target

Deleted: untag-build.patch
===================================================================
--- untag-build.patch	2019-06-18 13:57:27 UTC (rev 356388)
+++ untag-build.patch	2019-06-18 14:14:43 UTC (rev 356389)
@@ -1,10 +0,0 @@
-diff --git i/setup.cfg w/setup.cfg
-index 2dfe955fdbcb5f63..8d568e8ce4785fbb 100644
---- i/setup.cfg
-+++ w/setup.cfg
-@@ -1,5 +1,4 @@
- [egg_info]
--tag_build = -dev
- tag_svn_revision = false
- 
- [build_docs]