X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.z3ntu.xyz (mail.z3ntu.xyz [128.199.32.197]) by lists.alpinelinux.org (Postfix) with ESMTP id 868215C4CE7 for ; Sat, 23 Sep 2017 19:15:25 +0000 (GMT) Received: from localhost.localdomain (80-110-82-104.cgn.dynamic.surfer.at [80.110.82.104]) by mail.z3ntu.xyz (Postfix) with ESMTPSA id 63F60C079F; Sat, 23 Sep 2017 19:15:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=z3ntu.xyz; s=z3ntu; t=1506194124; bh=Qzb9hTUuWC2As+/6ktF7M7RUbte7Q2273liVL0/sXKg=; h=From:To:Cc:Subject:Date; b=swkKZ0At4vNuidOsY/oHhz3q2nBXML5Vtgiarc/CPIUIBlB0J7rASlsuNiVtAN++y Ms7WFrgtj4Xum9NA5JHaSdz1ZqidvN8asAAdXRVRPtt7J9m7birxD36u4kxnn4+Nkm nU5PzJClkBTJ7KI5/pfEtSqGvp6cbX/6pV/3RQeo= From: Luca Weiss To: alpine-aports@lists.alpinelinux.org Cc: Luca Weiss Subject: [alpine-aports] [PATCH] main/py-dbus: update to include a python3 version Date: Sat, 23 Sep 2017 21:15:05 +0200 Message-Id: <20170923191505.9868-1-luca@z3ntu.xyz> X-Mailer: git-send-email 2.14.1 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: python2 -c "import dbus" python3 -c "import dbus" both work --- main/py-dbus/APKBUILD | 67 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 50 insertions(+), 17 deletions(-) diff --git a/main/py-dbus/APKBUILD b/main/py-dbus/APKBUILD index 5b507c7ca6..762dda689f 100644 --- a/main/py-dbus/APKBUILD +++ b/main/py-dbus/APKBUILD @@ -1,37 +1,70 @@ # Maintainer: Natanael Copa pkgname=py-dbus pkgver=1.2.0 -pkgrel=2 +pkgrel=0 pkgdesc="Python bindings for DBUS" url="http://www.freedesktop.org/wiki/Software/DBusBindings" arch="all" license="GPL LGPL" -depends="python2" -depends_dev="py-dbus" -makedepends="dbus-glib-dev python2-dev" -subpackages="$pkgname-dev $pkgname-doc" +depends="" +#depends_dev="py-dbus" +makedepends="dbus-glib-dev python2-dev python3-dev" +subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3 $pkgname-doc $pkgname-dev" source="http://dbus.freedesktop.org/releases/dbus-python/dbus-python-$pkgver.tar.gz" _builddir="$srcdir"/dbus-python-$pkgver prepare() { - cd "$_builddir" - update_config_sub || return 1 + local python; for python in python2 python3; do + cp -r "$_builddir" "$_builddir-$python" + cd "$_builddir-$python" + update_config_sub + done } -build() { - cd "$_builddir" - ./configure \ + +package() { + mkdir -p "$pkgdir" +} + +_py2() { + replaces="$pkgname" + _py python2 +} + +_py3() { + _py python3 +} + +_py() { + local python="$1" + pkgdesc="$pkgdesc (for $python)" + depends="$depends $python" + #install_if="$pkgname-$pkgver-r$pkgrel $python" + cd "$_builddir-$python" + PYTHON=$python ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - || return 1 - make || return 1 - make test || return 1 + --prefix=/usr + make + make test + make DESTDIR="$subpkgdir" install + rm -rf "$pkgdir"/docpkg "$pkgdir"/devpkg + mkdir -p "$pkgdir"/docpkg "$pkgdir"/devpkg + mv "$subpkgdir"/usr/share/doc "$pkgdir"/docpkg + mv "$subpkgdir"/usr/lib/pkgconfig "$pkgdir"/devpkg + mv "$subpkgdir"/usr/include "$pkgdir"/devpkg + rmdir "$subpkgdir"/usr/share } -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 +doc() { + mkdir -p "$subpkgdir"/usr/share/ + mv "$pkgdir"/docpkg/doc "$subpkgdir"/usr/share/doc +} + +dev() { + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/devpkg/pkgconfig "$subpkgdir"/usr/lib/ + mv "$pkgdir"/devpkg/include "$subpkgdir"/usr/ } md5sums="b09cd2d1a057cc432ce944de3fc06bf7 dbus-python-1.2.0.tar.gz" -- 2.14.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---