[arch-commits] Commit in networkmanager-l2tp/repos/community-x86_64 (2 files)

[Alexander Rødseth]

    Date: Friday, August 5, 2022 @ 15:00:47
  Author: arodseth
Revision: 1260321

archrelease: copy trunk to community-x86_64

Added:
  networkmanager-l2tp/repos/community-x86_64/PKGBUILD
    (from rev 1260320, networkmanager-l2tp/trunk/PKGBUILD)
Deleted:
  networkmanager-l2tp/repos/community-x86_64/PKGBUILD

----------+
 PKGBUILD |  107 +++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 65 insertions(+), 42 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-05 15:00:41 UTC (rev 1260320)
+++ PKGBUILD	2022-08-05 15:00:47 UTC (rev 1260321)
@@ -1,42 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Miles McLean <mills00013 at gmail.com>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Brad Pitcher <bradpitcher at gmail.com>
-# Contributor: Moritz Lipp <mlq at pwmt.org>
-
-pkgname=networkmanager-l2tp
-pkgver=1.20.4
-_pppver=2.4.9
-pkgrel=1
-pkgdesc='L2TP support for NetworkManager'
-arch=(x86_64)
-url='https://github.com/nm-l2tp/NetworkManager-l2tp'
-license=(GPL2)
-depends=(libnma ppp=$_pppver xl2tpd)
-makedepends=(intltool python)
-optdepends=('strongswan: IPSec support')
-source=("$pkgname-$pkgver.tar.gz"::"$url/archive/$pkgver.tar.gz")
-b2sums=('ccd4f0a15b9b47635d3f1798ef1b6778657c269c2499b630b35261be6279d6bbffddcd0bc4c6cf17f5d929c88e356376f143227dc3ae1f3c138a7f166e5b46bf')
-
-prepare() {
-  ln -sf NetworkManager-l2tp-$pkgver $pkgname
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-  ./configure \
-    --libexecdir=/usr/lib/NetworkManager \
-    --localstatedir=/var \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  make -C $pkgname DESTDIR="$pkgdir" install
-  install -Dm644 $pkgname/NEWS "$pkgdir/usr/share/doc/$pkgname/NEWS"
-}

Copied: networkmanager-l2tp/repos/community-x86_64/PKGBUILD (from rev 1260320, networkmanager-l2tp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-08-05 15:00:47 UTC (rev 1260321)
@@ -0,0 +1,65 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Miles McLean <mills00013 at gmail.com>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Brad Pitcher <bradpitcher at gmail.com>
+# Contributor: Moritz Lipp <mlq at pwmt.org>
+
+pkgbase=networkmanager-l2tp
+pkgname=(networkmanager-l2tp-gtk3 networkmanager-l2tp-gtk4)
+pkgver=1.20.4
+_pppver=2.4.9
+pkgrel=2
+pkgdesc='L2TP support for NetworkManager'
+arch=(x86_64)
+url='https://github.com/nm-l2tp/NetworkManager-l2tp'
+license=(GPL2)
+provides=(networkmanager-l2tp)
+replaces=(networkmanager-l2tp)
+conflicts=(networkmanager-l2tp)
+depends=(libnma ppp=$_pppver xl2tpd)
+makedepends=(gtk3 gtk4 intltool libnma-gtk4 python)
+optdepends=('strongswan: IPSec support')
+source=("$pkgname-$pkgver.tar.gz"::"$url/archive/$pkgver.tar.gz")
+b2sums=('ccd4f0a15b9b47635d3f1798ef1b6778657c269c2499b630b35261be6279d6bbffddcd0bc4c6cf17f5d929c88e356376f143227dc3ae1f3c138a7f166e5b46bf')
+
+prepare() {
+  ln -sf NetworkManager-l2tp-$pkgver $pkgbase
+  cp -r NetworkManager-l2tp-$pkgver $pkgbase-gtk4
+}
+
+build() {
+  export NOCONFIGURE=1
+  cd $pkgbase
+  ./autogen.sh
+  ./configure \
+    --libexecdir=/usr/lib/NetworkManager \
+    --localstatedir=/var \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
+    --without-gtk4
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+  cd ../$pkgbase-gtk4
+  ./autogen.sh
+  ./configure \
+    --libexecdir=/usr/lib/NetworkManager \
+    --localstatedir=/var \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
+    --with-gtk4
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package_networkmanager-l2tp-gtk3() {
+  make -C $pkgbase DESTDIR="$pkgdir" install
+  install -Dm644 $pkgbase/NEWS "$pkgdir/usr/share/doc/$pkgname/NEWS"
+}
+
+package_networkmanager-l2tp-gtk4() {
+  depends+=(gtk4 libnma-gtk4)
+  make -C $pkgbase-gtk4 DESTDIR="$pkgdir" install
+  install -Dm644 $pkgbase-gtk4/NEWS "$pkgdir/usr/share/doc/$pkgname/NEWS"
+}