X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-vk0-f45.google.com (mail-vk0-f45.google.com [209.85.213.45]) by lists.alpinelinux.org (Postfix) with ESMTP id F00155C538D for ; Tue, 17 Jul 2018 14:01:27 +0000 (GMT) Received: by mail-vk0-f45.google.com with SMTP id b78-v6so608510vka.12 for ; Tue, 17 Jul 2018 07:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=3mGF99VRPZtaGVmKdy++pEiYajFPgrw36rDTOVS+YGw=; b=lqr490Wk/Tlpam2yjqdcn9u3WM42UbNQ/chsgSOGpX9mapmC/IYRL3uIaTn02PcLSz T4mprMZcfiza0WpFnEfsDEslDLWpBU8BFDgT5suFMVisk98AtrM3+y37LpgZhncWzLu8 kmpDmZxmvf6b6Pvp3kRPDIoyxZhWc4cJYWdPWpsh9wuMGqDZp8ew7mx+ivWRIKdP0Mgp M3t8mlARLLCkLyp5UXb2nre62E96njLzDYpuzSeHGODdinfLLQshB4CIz4cQbwT1HuHd f9OuF5orTyBRNocLo9toiJuGtqlxa+PA1cz/dCtaHIQ0yClaoCllZZ2gOJSz0G+Sk79r xW4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=3mGF99VRPZtaGVmKdy++pEiYajFPgrw36rDTOVS+YGw=; b=A3l1t1+swp5CfSsq2wvCNCnxjyIc6CkVRy4a9nZhzHrNDSLDIpxm+qNvQSkThJYLfi nNp5wEMjWP3+6FdjlepKddqDd8rAl0Nr8LQhMwOfb/vj/jF2KI7yKHWAT1Y9R3AcQwF6 gQP37AxnNo8Hy7mzfwgFa04Mtly/X+U6e631d9npZn7WW/eEGTpk9J3yanRmqjy+ouT1 bBTqu9wRdY7aUKZIRdpxcjxrphF9shexxuJiRkWRGbpQMgY0BKYYiZjWUnne+CskUFO8 SA2PcWnDRpe9nESz/eS8uJ8/eF33LkemrcuVwlkyj2ZR8L5JssrbjDzBTZBWA8c8uB1T XcDA== X-Gm-Message-State: AOUpUlEQCy+46e6plQZ3YKV2oe/qaXOHjXnLBCqJP7axMipFusR8VlfG 37w27yLubVjitloUWq0pGa20hKthwOvTPuRn7HM= X-Google-Smtp-Source: AAOMgpcPMGVgdWbRiDeISJSqAHov0xZvDIkFDpool0UHyz6gOx/xNjDWpoG/kouwBrkeZ5nxkRZ11okHaUQMuCuDuns= X-Received: by 2002:a1f:bd2:: with SMTP id 201-v6mr876173vkl.165.1531836059405; Tue, 17 Jul 2018 07:00:59 -0700 (PDT) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Received: by 2002:ab0:6152:0:0:0:0:0 with HTTP; Tue, 17 Jul 2018 07:00:55 -0700 (PDT) In-Reply-To: <20180424143143.11318-1-marian.buschsieweke@ovgu.de> References: <20180424143143.11318-1-marian.buschsieweke@ovgu.de> From: Leonardo Arena Date: Tue, 17 Jul 2018 16:00:55 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH] testing/py-qrcode: Update to version 6.0, added python3 To: Marian Buschsieweke Cc: alpine-aports Content-Type: multipart/alternative; boundary="0000000000002ecdde057132603e" --0000000000002ecdde057132603e Content-Type: text/plain; charset="UTF-8" Hi, sorry for the late review. it needs to be rebased against latest version. Thanks On Tue, Apr 24, 2018 at 4:31 PM, Marian Buschsieweke < marian.buschsieweke@ovgu.de> wrote: > - Subpackages py2-qrcode and py3-qrcode to support both python versions > - Subpackage py-qrcode-doc contains manpage for python2 and python3 > variants > - "/usr/bin/qr" is now only provided by "py3-qrcode" to allow installing > both > versions > --- > testing/py-qrcode/APKBUILD | 52 ++++++++++++++++++++++++++++++-------- > 1 file changed, 41 insertions(+), 11 deletions(-) > > diff --git a/testing/py-qrcode/APKBUILD b/testing/py-qrcode/APKBUILD > index 8ce97cfaf4..f4150e4175 100644 > --- a/testing/py-qrcode/APKBUILD > +++ b/testing/py-qrcode/APKBUILD > @@ -2,31 +2,61 @@ > # Maintainer: Fabian Affolter > pkgname=py-qrcode > _pkgname=qrcode > -pkgver=5.3 > +pkgver=6.0 > pkgrel=0 > pkgdesc="A QR code image generator" > url="https://github.com/lincolnloop/python-qrcode" > arch="noarch" > license="BSD" > -depends="python2 py-pillow" > -depends_dev="" > -makedepends="python2-dev py-setuptools" > +makedepends="python2-dev python3-dev py-setuptools" > +depends=" py2-${pkgname#py-} py3-${pkgname#py-}" > install="" > -subpackages="$pkgname-doc" > -source="$pkgname-$pkgver.tar.gz::https://github.com/ > lincolnloop/python-qrcode/archive/v5.3.tar.gz" > +subpackages="${pkgname}-doc py2-${pkgname#py-}:_py2 > py3-${pkgname#py-}:_py3" > +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_ > pkgname/$_pkgname-$pkgver.tar.gz" > +options="!check" > > -builddir="$srcdir"/python-qrcode-$pkgver > +builddir="$srcdir"/$_pkgname-$pkgver > > build() { > cd "$builddir" > python2 setup.py build || return 1 > + python3 setup.py build || return 1 > } > > package() { > cd "$builddir" > - python2 setup.py install --prefix=/usr --root="$pkgdir" || return 1 > + # Install only man page > + python2 setup.py install --prefix=/usr --root="$pkgdir/tmp" > + mkdir -p "$pkgdir/usr/share" > + mv "$pkgdir/tmp/usr/share/man" "$pkgdir/usr/share/" > + rm -rf "$pkgdir/tmp" > } > > -md5sums="81e3670f61bdf186ded61d6bafa847ec py-qrcode-5.3.tar.gz" > -sha256sums="933123de02a116303ccdf92d1d32c65f24bf8a69faf7ecde41bd8cf4f975ad87 > py-qrcode-5.3.tar.gz" > -sha512sums="9c25cadc4a5d82aabc754027373eb9700cbe4e3148fb84de1356df49dad0 > bfad0b86956d6e32c72448a2838f9815a029a0807c8f23f8dae042a44346c2654487 > py-qrcode-5.3.tar.gz" > +_py2() { > + depends="python2 py2-pillow" > + replaces="$pkgname" > + _py python2 > + rm -rf "$subpkgdir/usr/bin" > +} > + > +_py3() { > + depends="python3 py3-six py3-pillow" > + _py python3 > +} > + > +_py() { > + local python="$1" > + pkgdesc="$pkgdesc (for $python)" > + install_if="$pkgname=$pkgver-r$pkgrel $python" > + > + cd "$builddir" > + $python setup.py install --prefix=/usr --root="$subpkgdir" > + > + # Remove man pages > + rm -rf "$subpkgdir/usr/share/man" > + > + # /usr/share should no be empty, delete it (but fail if not) > + rmdir "$subpkgdir/usr/share" > +} > + > +sha512sums="c43f12fe6b12d244d19a994cfd20adbe3776bbda1459c9dbc6164b1c9e76 > 37f05e2acc1c2d29b82243024a4ea9b46c319a56acdf6d05e7b697bcd2c31c02102e > qrcode-6.0.tar.gz" > -- > 2.17.0 > > > > --- > Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org > Help: alpine-aports+help@lists.alpinelinux.org > --- > > --0000000000002ecdde057132603e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

sorry for the late revie= w.

it needs to be rebased against latest versi= on.

Thanks

On Tue, Apr 24, 2018 at 4:31 PM, Marian B= uschsieweke <marian.buschsieweke@ovgu.de> wrote:
=C2=A0- Subpackages py2-qrcode and py3-qrc= ode to support both python versions
=C2=A0- Subpackage py-qrcode-doc contains manpage for python2 and python3 v= ariants
=C2=A0- "/usr/bin/qr" is now only provided by "py3-qrcode&qu= ot; to allow installing both
=C2=A0 =C2=A0versions
---
=C2=A0testing/py-qrcode/APKBUILD | 52 ++++++++++++++++++++++++++++++--= ------
=C2=A01 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/testing/py-qrcode/APKBUILD b/testing/py-qrcode/APKBUILD
index 8ce97cfaf4..f4150e4175 100644
--- a/testing/py-qrcode/APKBUILD
+++ b/testing/py-qrcode/APKBUILD
@@ -2,31 +2,61 @@
=C2=A0# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
=C2=A0pkgname=3Dpy-qrcode
=C2=A0_pkgname=3Dqrcode
-pkgver=3D5.3
+pkgver=3D6.0
=C2=A0pkgrel=3D0
=C2=A0pkgdesc=3D"A QR code image generator"
=C2=A0url=3D"https://github.com/lincolnloop/py= thon-qrcode"
=C2=A0arch=3D"noarch"
=C2=A0license=3D"BSD"
-depends=3D"python2 py-pillow"
-depends_dev=3D""
-makedepends=3D"python2-dev py-setuptools"
+makedepends=3D"python2-dev python3-dev py-setuptools"
+depends=3D" py2-${pkgname#py-} py3-${pkgname#py-}"
=C2=A0install=3D""
-subpackages=3D"$pkgname-doc"
-source=3D"$pkgname-$pkgver.tar.gz::https://github.com/lincolnloop/python-qrcode/archive/= v5.3.tar.gz"
+subpackages=3D"${pkgname}-doc py2-${pkgname#py-}:_py2 py3-${pkgname#p= y-}:_py3"
+source=3D"https://files.pythonhosted.org/packages/source/${_pk= gname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+options=3D"!check"

-builddir=3D"$srcdir"/python-qrcode-$pkgver
+builddir=3D"$srcdir"/$_pkgname-$pkgver

=C2=A0build() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 cd "$builddir"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 python2 setup.py build || return 1
+=C2=A0 =C2=A0 =C2=A0 =C2=A0python3 setup.py build || return 1
=C2=A0}

=C2=A0package() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 cd "$builddir"
-=C2=A0 =C2=A0 =C2=A0 =C2=A0python2 setup.py install --prefix=3D/usr --root= =3D"$pkgdir" || return 1
+=C2=A0 =C2=A0 =C2=A0 =C2=A0# Install only man page
+=C2=A0 =C2=A0 =C2=A0 =C2=A0python2 setup.py install --prefix=3D/usr --root= =3D"$pkgdir/tmp"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$pkgdir/usr/share"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir/tmp/usr/share/man" "= $pkgdir/usr/share/"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0rm -rf "$pkgdir/tmp"
=C2=A0}

-md5sums=3D"81e3670f61bdf186ded61d6bafa847ec=C2=A0 py-qrcode= -5.3.tar.gz"
-sha256sums=3D"933123de02a116303ccdf92d1d32c65f24bf8a69faf7e= cde41bd8cf4f975ad87=C2=A0 py-qrcode-5.3.tar.gz"
-sha512sums=3D"9c25cadc4a5d82aabc754027373eb9700cbe4e3148fb8= 4de1356df49dad0bfad0b86956d6e32c72448a2838f9815a029a0807c8f23f8da= e042a44346c2654487=C2=A0 py-qrcode-5.3.tar.gz"
+_py2() {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"python2 py2-pillow"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0replaces=3D"$pkgname"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0_py python2
+=C2=A0 =C2=A0 =C2=A0 =C2=A0rm -rf "$subpkgdir/usr/bin"
+}
+
+_py3() {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"python3 py3-six py3-pillow"= ;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0_py python3
+}
+
+_py() {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0local python=3D"$1"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"$pkgdesc (for $python)" +=C2=A0 =C2=A0 =C2=A0 =C2=A0install_if=3D"$pkgname=3D$pkgver-r$pk= grel $python"
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$builddir"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0$python setup.py install --prefix=3D/usr --root= =3D"$subpkgdir"
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0# Remove man pages
+=C2=A0 =C2=A0 =C2=A0 =C2=A0rm -rf "$subpkgdir/usr/share/man"
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0# /usr/share should no be empty, delete it (but= fail if not)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0rmdir "$subpkgdir/usr/share"
+}
+
+sha512sums=3D"c43f12fe6b12d244d19a994cfd20adbe3776bbda1459c= 9dbc6164b1c9e7637f05e2acc1c2d29b82243024a4ea9b46c319a56acdf6d05e7= b697bcd2c31c02102e=C2=A0 qrcode-6.0.tar.gz"
--
2.17.0



---
Unsubscribe:=C2=A0 alpine-aports+unsubscribe@lists.alpinelinux.org
Help:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0alpine-aports+help@lists.alpinelinux.org=
---


--0000000000002ecdde057132603e-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---