diff options
84 files changed, 227 insertions, 112 deletions
diff --git a/user/ae_fonts/APKBUILD b/user/ae_fonts/APKBUILD index c5f66b6ab..19535f00f 100644 --- a/user/ae_fonts/APKBUILD +++ b/user/ae_fonts/APKBUILD @@ -18,9 +18,9 @@ package() { cd "$builddir" local _fontdir for _fontdir in AAHS AGA FS Kasr MCS Shmookh; do - pushd $_fontdir + cd $_fontdir install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf - popd + cd "$OLDPWD" done } diff --git a/user/boost/APKBUILD b/user/boost/APKBUILD index ffd7e867e..2a8a89786 100644 --- a/user/boost/APKBUILD +++ b/user/boost/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=boost pkgver=1.69.0 -_pkgver="${pkgver//./_}" +_pkgver=$(printf '%s' "$pkgver" | tr . _) pkgrel=0 pkgdesc="Free peer-reviewed portable C++ source libraries" url="https://www.boost.org/" diff --git a/user/cgit/APKBUILD b/user/cgit/APKBUILD index abd773d44..eda8e62b4 100644 --- a/user/cgit/APKBUILD +++ b/user/cgit/APKBUILD @@ -30,7 +30,7 @@ prepare() { cd "$builddir" # check that upstream git ver corresponds with ours - local _ver=$(awk -F'[ \t]*=[ \t]*' '/^GIT_VER/ { print $2 }' Makefile) + local _ver="$(awk -F'[ \t]*=[ \t]*' '/^GIT_VER/ { print $2 }' Makefile)" if [ "$_ver" != "$_gitver" ]; then error "Please set _gitver in APKBUILD to $_ver" return 1 diff --git a/user/chrony/APKBUILD b/user/chrony/APKBUILD index 46516b598..3132b5f33 100644 --- a/user/chrony/APKBUILD +++ b/user/chrony/APKBUILD @@ -5,7 +5,6 @@ pkgname=chrony pkgver=3.5 pkgrel=0 -_ver=${pkgver/_/-} pkgdesc="NTP client and server programs" url="https://chrony.tuxfamily.org" pkgusers="$pkgname" @@ -17,7 +16,7 @@ depends="" makedepends="asciidoctor libcap-dev libedit-dev texinfo" checkdepends="bash" subpackages="$pkgname-doc $pkgname-openrc" -source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz +source="https://download.tuxfamily.org/$pkgname/$pkgname-$pkgver.tar.gz fix-tests.patch max_resolve_interval.patch chronyd.confd @@ -26,7 +25,6 @@ source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz chrony.conf timepps.h " -builddir="$srcdir/$pkgname-$_ver" prepare() { default_prepare diff --git a/user/clang/APKBUILD b/user/clang/APKBUILD index e5ed50d06..bd24476b8 100644 --- a/user/clang/APKBUILD +++ b/user/clang/APKBUILD @@ -47,7 +47,7 @@ build() { make clang-tblgen # too memory hungry - if [ -z "$JOBS" -o $JOBS -gt 32 ]; then + if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then make -j32 else make @@ -71,13 +71,13 @@ package() { mkdir -p "$pkgdir"/usr/lib/llvm$_llvmver/bin mkdir -p "$pkgdir"/usr/lib/llvm$_llvmver/lib for _dir in bin lib; do - pushd "$pkgdir"/usr/$_dir + cd "$pkgdir"/usr/$_dir for _file in *; do [ -f $_file ] || continue ln -s "../../../$_dir/$_file" \ "$pkgdir"/usr/lib/llvm$_llvmver/$_dir/$_file done - popd + cd "$OLDPWD" done # needed for at least Qt Creator diff --git a/user/dialog/APKBUILD b/user/dialog/APKBUILD index 6e0547a1f..c2a85db1f 100644 --- a/user/dialog/APKBUILD +++ b/user/dialog/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dialog -_realver=1.3-20190211 -pkgver=${_realver/-/.} +pkgver=1.3.20190211 +_realver="${pkgver%.*}-${pkgver##*.}" pkgrel=0 pkgdesc="Script interpreter providing curses widgets" url="https://invisible-island.net/dialog/dialog.html" @@ -13,7 +13,7 @@ depends="" makedepends="ncurses-dev" subpackages="$pkgname-doc" source="https://invisible-mirror.net/archives/dialog/dialog-$_realver.tgz" -builddir="$srcdir"/$pkgname-$_realver +builddir="$srcdir/$pkgname-$_realver" build() { ./configure \ diff --git a/user/fftw/APKBUILD b/user/fftw/APKBUILD index 31a334f88..1deca3ed1 100644 --- a/user/fftw/APKBUILD +++ b/user/fftw/APKBUILD @@ -1,7 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: pkgname=fftw -pkgver=3.3.8 +pkgver=3.3.6p2 +_pkgver=$(printf '%s' "$pkgver" | sed 's/p/-pl/') pkgrel=0 pkgdesc="Fastest fourier transform in the west" url="http://www.fftw.org/" @@ -12,9 +13,8 @@ makedepends="texinfo" # order of the libs split functions are important because of lib naming subpackages="$pkgname-dev $pkgname-doc $pkgname-single-libs:single $pkgname-long-double-libs:long_double $pkgname-double-libs:double" -srcpkgver=${pkgver//p/-pl} -source="http://www.fftw.org/$pkgname-$srcpkgver.tar.gz" -builddir="$srcdir/$pkgname-$srcpkgver" +source="http://www.fftw.org/$pkgname-$_pkgver.tar.gz" +builddir="$srcdir/$pkgname-$_pkgver" _precision="single double long-double" diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index 8a9a805e1..b9d51af8c 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -157,7 +157,7 @@ build() { --with-system-zlib \ $extra_flags # too memory hungry - if [ -z "$JOBS" -o $JOBS -gt 16 ]; then + if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then make -j16 else make @@ -177,7 +177,7 @@ package() { local png for png in ../browser/branding/official/default*.png; do - local i=${_png%.png} + local i="${_png%.png}" i=${i##*/default} install -D -m644 "$png" \ "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD index 78d9b6fdd..627abf2ec 100644 --- a/user/gnutls/APKBUILD +++ b/user/gnutls/APKBUILD @@ -62,7 +62,8 @@ package() { dane() { pkgdesc="$pkgdesc (DNS DANE support library)" - mkdir -p "$subpkgdir"/usr/{bin,lib} + mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/bin/danetool "$subpkgdir"/usr/bin/ mv "$pkgdir"/usr/lib/libgnutls-dane* "$subpkgdir"/usr/lib/ } diff --git a/user/graphite2/APKBUILD b/user/graphite2/APKBUILD index 33ff919e7..6ad455474 100644 --- a/user/graphite2/APKBUILD +++ b/user/graphite2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=graphite2 -_realname=${pkgname/2/} +_realname=${pkgname%2} pkgver=1.3.13 pkgrel=0 pkgdesc="Text processing engine for complex languages" @@ -17,7 +17,7 @@ subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/silnrsi/$_realname/archive/$pkgver.tar.gz graphite2-1.2.0-cmakepath.patch " -builddir="$srcdir"/$_realname-$pkgver +builddir="$srcdir/$_realname-$pkgver" build() { cd "$builddir" diff --git a/user/intlfonts/APKBUILD b/user/intlfonts/APKBUILD index 8459dd241..35f39ccb6 100644 --- a/user/intlfonts/APKBUILD +++ b/user/intlfonts/APKBUILD @@ -34,7 +34,8 @@ package() { make DESTDIR="$pkgdir" install mv "$pkgdir"/usr/share/fonts/X11/misc/TrueType \ "$pkgdir"/usr/share/fonts/X11/TTF - rm "$pkgdir"/usr/share/fonts/X11/misc/fonts.{alias,dir} + rm "$pkgdir"/usr/share/fonts/X11/misc/fonts.alias + rm "$pkgdir"/usr/share/fonts/X11/misc/fonts.dir # font-daewoo-misc rm "$pkgdir"/usr/share/fonts/X11/misc/hanglg16.pcf.gz diff --git a/user/ipaexfont/APKBUILD b/user/ipaexfont/APKBUILD index dfbbc3436..f76922b9a 100644 --- a/user/ipaexfont/APKBUILD +++ b/user/ipaexfont/APKBUILD @@ -2,6 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ipaexfont pkgver=004.01 +_pkgver="${pkgver%.*}${pkgver#*.}" pkgrel=0 pkgdesc="Standard Japanese typefaces" url="https://ipafont.ipa.go.jp/" @@ -11,8 +12,8 @@ license="IPA" depends="fontconfig" makedepends="" subpackages="" -source="https://oscdl.ipa.go.jp/IPAexfont/IPAexfont${pkgver/./}.zip" -builddir="$srcdir/IPAexfont${pkgver/./}" +source="https://oscdl.ipa.go.jp/IPAexfont/IPAexfont$_pkgver.zip" +builddir="$srcdir/IPAexfont$_pkgver" package() { cd "$builddir" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index ae31b0430..26afe3227 100644 --- a/user/kate/APKBUILD +++ b/user/kate/APKBUILD @@ -71,7 +71,7 @@ kwrite_doc() { pkgdesc="Simple GUI text editor (documentation)" install_if="docs kwrite=$pkgver-r$pkgrel" for _langpath in "$pkgdir"/usr/share/doc/HTML/*; do - local _sublangpath=${_langpath/"$pkgdir"/"$subpkgdir"} + local _sublangpath="$subpkgdir/${_langpath#"$pkgdir"}" if [ -d "$_langpath"/kwrite ]; then mkdir -p "$_sublangpath" mv "$_langpath"/kwrite "$_sublangpath"/ @@ -84,7 +84,7 @@ kwrite_lang() { pkgdesc="Simple GUI text editor (translations)" for _langpath in "$pkgdir"/usr/share/locale/*/LC_MESSAGES; do - local _sublangpath=${_langpath/"$pkgdir"/"$subpkgdir"} + local _sublangpath="$subpkgdir/${_langpath#"$pkgdir"}" if [ -f "$_langpath"/kwrite.mo ]; then mkdir -p "$_sublangpath" mv "$_langpath"/kwrite.mo "$_sublangpath"/ diff --git a/user/libcdio-paranoia/APKBUILD b/user/libcdio-paranoia/APKBUILD index 9fc9a08b1..befa3a20d 100644 --- a/user/libcdio-paranoia/APKBUILD +++ b/user/libcdio-paranoia/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libcdio-paranoia pkgver=0.94_p1 -_pkgver="10.2+${pkgver/_p/+}" +_pkgver="10.2+${pkgver%_p*}+${pkgver#*_p}" pkgrel=1 pkgdesc="CD paranoia on top of libcdio" url="https://www.gnu.org/software/libcdio/" diff --git a/user/libdbusmenu-qt/APKBUILD b/user/libdbusmenu-qt/APKBUILD index 8b95777ca..b91995d28 100644 --- a/user/libdbusmenu-qt/APKBUILD +++ b/user/libdbusmenu-qt/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libdbusmenu-qt pkgver=0.9.3.16.04.20160218 -_realver=${pkgver/.16.04/+16.04} +_realver="${pkgver%.*.*.*}+${pkgver#*.*.*.}" pkgrel=0 pkgdesc="library to export QMenu over DBusMenu protocol" url="https://launchpad.net/libdbusmenu-qt/" @@ -14,8 +14,8 @@ depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake doxygen" subpackages="$pkgname-dev $pkgname-doc" -source="https://launchpad.net/ubuntu/+archive/primary/+files/"$pkgname"_"$_realver".orig.tar.gz" -builddir="$srcdir"/$pkgname-$_realver +source="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${_realver}.orig.tar.gz" +builddir="$srcdir/$pkgname-$_realver" prepare() { cd "$builddir" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index aff1202d7..2934d5713 100644 --- a/user/libkdegames/APKBUILD +++ b/user/libkdegames/APKBUILD @@ -49,7 +49,12 @@ package() { # https://bugs.kde.org/show_bug.cgi?id=402220 # Qt doesn't care: # https://bugreports.qt.io/browse/QTBUG-72779 - rm -r "$pkgdir"/usr/share/carddecks/svg-{ancient-egyptians,future,jolly-royal,konqi-modern,standard,xskat-french} + cd "$pkgdir"/usr/share/carddecks + local i; for i in ancient-egyptians future jolly-royal \ + konqi-modern standard xskat-french + do + rm -r "svg-$i" + done } carddecks() { diff --git a/user/libnl3/APKBUILD b/user/libnl3/APKBUILD index 58dc88d4e..f5a2e5668 100644 --- a/user/libnl3/APKBUILD +++ b/user/libnl3/APKBUILD @@ -1,6 +1,7 @@ # Maintainer: pkgname=libnl3 pkgver=3.2.28 +_pkgver=$(printf '%s' "$pkgver" | tr . _) pkgrel=2 pkgdesc="Library for applications dealing with netlink sockets" url="http://www.infradead.org/~tgr/libnl/" @@ -10,8 +11,8 @@ depends="" makedepends="linux-headers flex bison" checkdepends="check-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-cli" -source="https://github.com/thom311/libnl/releases/download/libnl${pkgver//./_}/libnl-$pkgver.tar.gz" -builddir="$srcdir"/libnl-$pkgver +source="https://github.com/thom311/libnl/releases/download/libnl$_pkgver/libnl-$pkgver.tar.gz" +builddir="$srcdir/libnl-$pkgver" build() { cd "$builddir" diff --git a/user/libtheora/APKBUILD b/user/libtheora/APKBUILD index 2dd25afa7..618f413b9 100644 --- a/user/libtheora/APKBUILD +++ b/user/libtheora/APKBUILD @@ -30,7 +30,9 @@ prepare() { } build() { - CFLAGS="${CFLAGS/-Os/-O3}" CPPFLAGS="${CPPFLAGS/-Os/-O3}" ./configure \ + CFLAGS="$(printf '%s' "$CFLAGS" | sed 's/-Os/-O3/')" \ + CPPFLAGS="$(printf '%s' "$CPPFLAGS" | sed 's/-Os/-O3/')" \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ diff --git a/user/libtommath/APKBUILD b/user/libtommath/APKBUILD index 826ecf131..2e5bce094 100644 --- a/user/libtommath/APKBUILD +++ b/user/libtommath/APKBUILD @@ -10,8 +10,7 @@ license="Unlicense" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://github.com/libtom/libtommath/releases/download/v${pkgver/_/-}/ltm-${pkgver/_/-}.tar.xz" -builddir="$srcdir/$pkgname-${pkgver/_/-}" +source="https://github.com/libtom/libtommath/releases/download/v$pkgver/ltm-$pkgver.tar.xz" build() { make PREFIX=/usr -f makefile.shared diff --git a/user/llvm8/APKBUILD b/user/llvm8/APKBUILD index b86bfda2b..21e3267b6 100644 --- a/user/llvm8/APKBUILD +++ b/user/llvm8/APKBUILD @@ -211,8 +211,8 @@ _test_utils() { _common_subpkg replaces="" - local litver=$(python3 "$builddir"/utils/lit/setup.py --version 2>/dev/null \ - | sed 's/\.dev.*$//') + local litver="$(python3 "$builddir"/utils/lit/setup.py --version 2>/dev/null \ + | sed 's/\.dev.*$//')" test -n "$litver" || return 1 provides="$provides lit=$litver-r$pkgrel" diff --git a/user/lm_sensors/APKBUILD b/user/lm_sensors/APKBUILD index 3b46a20f1..cf8e93f1b 100644 --- a/user/lm_sensors/APKBUILD +++ b/user/lm_sensors/APKBUILD @@ -1,6 +1,8 @@ # Maintainer: pkgname=lm_sensors +_pkgname=lm-sensors pkgver=3.5.0 +_pkgver=$(printf '%s' "$pkgver" | tr . -) pkgrel=0 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring." url="https://hwmon.wiki.kernel.org/lm_sensors" @@ -17,7 +19,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archiv sensord.confd sensord.initd " -builddir="$srcdir/${pkgname/_/-}-${pkgver//./-}" +builddir="$srcdir/$_pkgname-$_pkgver" prepare() { cd "$builddir" diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD index 3cf8fd603..e0deea91a 100644 --- a/user/lua-filesystem/APKBUILD +++ b/user/lua-filesystem/APKBUILD @@ -3,7 +3,7 @@ pkgname=lua-filesystem _pkgname=luafilesystem pkgver=1.7.0.2 -_pkgver=${pkgver//./_} +_pkgver=$(printf '%s' "$pkgver" | tr . _) _rockver=${pkgver%.*}-${pkgver##*.} pkgrel=1 pkgdesc="Filesystem functions for Lua" @@ -26,9 +26,9 @@ check() { } package() { - local rockdir="$pkgdir"/usr/lib/luarocks/rocks-5.3/$_pkgname/$_rockver + local rockdir="$pkgdir/usr/lib/luarocks/rocks-5.3/$_pkgname/$_rockver" cd "$builddir" - make LUA_LIBDIR="$pkgdir"/$(pkg-config --variable=INSTALL_CMOD lua) install + make LUA_LIBDIR="$pkgdir/$(pkg-config --variable=INSTALL_CMOD lua)" install mkdir -p "$rockdir" echo 'rock_manifest = {}' > "$rockdir"/rock_manifest } diff --git a/user/lua-socket/APKBUILD b/user/lua-socket/APKBUILD index 16bfbcf40..89cbd7447 100644 --- a/user/lua-socket/APKBUILD +++ b/user/lua-socket/APKBUILD @@ -5,7 +5,7 @@ _name=luasocket pkgver=3.0_rc1_git20160306 pkgrel=0 _ver=${pkgver%_git*} -_ver=${_ver/_rc/-rc} +_ver=$(printf '%s' "$_ver" | sed 's/_rc/-rc/') pkgdesc="Networking library for Lua" url="http://luaforge.net/projects/luasocket/" arch="all" diff --git a/user/lynx/APKBUILD b/user/lynx/APKBUILD index 4e69511e8..24af506f4 100644 --- a/user/lynx/APKBUILD +++ b/user/lynx/APKBUILD @@ -3,8 +3,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lynx pkgver=2.8.9_p1 -_relver=${pkgver/_p/rel.} -_v=${_relver%rel.*} +_relver="${pkgver%_p*}rel.${pkgver#*_p}" pkgrel=0 pkgdesc="Cross-platform text-based browser" url="https://lynx.invisible-island.net/" @@ -14,7 +13,7 @@ depends="gzip" makedepends="glib-dev ncurses-dev openssl-dev perl utmps-dev zlib-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}.tar.bz2" -builddir="$srcdir"/${pkgname}${_relver} +builddir="$srcdir/${pkgname}${_relver}" build() { cd "$builddir" diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index 4b8dc8d5a..50100c2bb 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -196,7 +196,7 @@ _mv_gpipe() { } _dri() { - local n=${subpkgname##*-dri-} + local n="${subpkgname##*-dri-}" pkgdesc="Mesa DRI driver for $n" case $n in ati) diff --git a/user/newt/APKBUILD b/user/newt/APKBUILD index 0ba5de3ed..361caa50b 100644 --- a/user/newt/APKBUILD +++ b/user/newt/APKBUILD @@ -2,6 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=newt pkgver=0.52.21 +_pkgver=$(printf '%s' "$pkgver" | tr . -) pkgrel=0 pkgdesc="Terminal user interface library" url="https://pagure.io/newt/" @@ -11,8 +12,8 @@ license="LGPL-2.0-only" depends="" makedepends="popt-dev slang-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://pagure.io/newt/archive/r${pkgver//./-}/newt-r${pkgver//./-}.tar.gz" -builddir="$srcdir/newt-r${pkgver//./-}" +source="https://pagure.io/newt/archive/r$_pkgver/newt-r$_pkgver.tar.gz" +builddir="$srcdir/newt-r$_pkgver" prepare() { default_prepare diff --git a/user/openjdk7/APKBUILD b/user/openjdk7/APKBUILD index de476ea21..e87060a19 100644 --- a/user/openjdk7/APKBUILD +++ b/user/openjdk7/APKBUILD @@ -214,7 +214,7 @@ jrelib() { jre/lib/security jre/lib/ext/*.jar jre/lib/cmm \ jre/ASSEMBLY_EXCEPTION jre/THIRD_PARTY_README jre/LICENSE; do - local dirname=${A%/*} + local dirname="${A%/*}" mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname done @@ -247,7 +247,7 @@ jre() { jre/lib/$_jarch/xawt \ jre/lib/$_jarch/libsplashscreen.so; do - local dirname=${A%/*} + local dirname="${A%/*}" mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname done diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD index 24dd5e28a..8ac3960b4 100644 --- a/user/openjdk8/APKBUILD +++ b/user/openjdk8/APKBUILD @@ -104,8 +104,8 @@ unpack() { prepare() { cd "$builddir" - local ver_u=$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4) - local ver_b=$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4) + local ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)" + local ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)" [ "${pkgver#*.}" = "$ver_u.$ver_b" ] \ || die "Version mismatch, source is 8.$ver_u.$ver_b, but abuild defines $pkgver!" diff --git a/user/opus/APKBUILD b/user/opus/APKBUILD index 2b2a2d887..7d6854a1b 100644 --- a/user/opus/APKBUILD +++ b/user/opus/APKBUILD @@ -14,7 +14,8 @@ builddir="$srcdir/$pkgname-$pkgver" build() { cd "$builddir" - CFLAGS="${CFLAGS/-Os/-O2}" ./configure \ + CFLAGS="$(printf '%s' "$CFLAGS" | sed 's/-Os/-O2/')" \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index 3afe246c1..daa11c586 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -247,7 +247,7 @@ prepare() { default_prepare update_config_sub - local vapi=$(sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h) + local vapi="$(sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h)" if [ "$vapi" != "$_apiver" ]; then error "Upstreram API version is now $vapi. Expecting $_apiver" error "After updating _apiver, all 3rd-party extensions must be rebuilt." diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD index 312916128..695f108cb 100644 --- a/user/postfix/APKBUILD +++ b/user/postfix/APKBUILD @@ -56,7 +56,8 @@ package() { "$pkgdir"/var/lib/postfix chown -R postfix:postfix \ "$pkgdir"/var/spool/postfix - chgrp postdrop "$pkgdir"/var/spool/postfix/{public,maildrop} + chgrp postdrop "$pkgdir"/var/spool/postfix/public \ + "$pkgdir"/var/spool/postfix/maildrop chmod 0750 "$pkgdir"/var/lib/postfix chgrp postdrop "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue chmod 2755 "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD index 91bdf258a..97300d986 100644 --- a/user/postgresql/APKBUILD +++ b/user/postgresql/APKBUILD @@ -69,8 +69,8 @@ prepare() { build() { export PYTHON=/usr/bin/python3 - export CFLAGS="${CFLAGS/-Os/-O2}" - export CPPFLAGS="${CPPFLAGS/-Os/-O2}" + export CFLAGS="$(printf '%s' "$CFLAGS" | sed 's/-Os/-O2/')" + export CFLAGS="$(printf '%s' "$CPPFLAGS" | sed 's/-Os/-O2/')" ./configure \ --build=$CBUILD \ diff --git a/user/ppp/APKBUILD b/user/ppp/APKBUILD index bcd4c85cf..c99d82171 100644 --- a/user/ppp/APKBUILD +++ b/user/ppp/APKBUILD @@ -78,7 +78,8 @@ package() { install -m 0644 etc.ppp/options "$pkgdir"/etc/ppp/options install -Dm 0644 "$srcdir"/ppp.pamd "$pkgdir"/etc/pam.d/ppp - install -Dm 0755 -t "$pkgdir"/usr/bin/ scripts/p{on,off,log} + install -Dm 0755 -t "$pkgdir"/usr/bin/ scripts/pon \ + scripts/poff scripts/plog install -Dm 0644 -t "$pkgdir"/usr/share/man/man1/ scripts/pon.1 install -Dm 0755 contrib/pppgetpass/pppgetpass.vt \ diff --git a/user/py3-alabaster/APKBUILD b/user/py3-alabaster/APKBUILD index 65356c103..4bf90edf0 100644 --- a/user/py3-alabaster/APKBUILD +++ b/user/py3-alabaster/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-alabaster _pkgname=alabaster +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.7.12 pkgrel=0 pkgdesc="Default theme for Sphinx Documentation Generator" @@ -11,7 +13,7 @@ arch="noarch" license="BSD-3-Clause" depends="python3 py3-pygments" makedepends="python3-dev" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-babel/APKBUILD b/user/py3-babel/APKBUILD index b9ce036aa..dc20f1d39 100644 --- a/user/py3-babel/APKBUILD +++ b/user/py3-babel/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-babel _pkgname=Babel +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.6.0 pkgrel=0 pkgdesc="Internationalization tools for Python" @@ -10,8 +12,8 @@ arch="noarch" license="BSD-3-Clause" depends="python3" makedepends="python3-dev" -checkdepends="py3-pytest py3-freezegun py3-python-dateutil py3-tz" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +checkdepends="py3-pytest py3-freezegun py3-python-dateutil py3-tz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-cffi/APKBUILD b/user/py3-cffi/APKBUILD index 4760f7521..439609e37 100644 --- a/user/py3-cffi/APKBUILD +++ b/user/py3-cffi/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-cffi _pkgname=cffi +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.12.3 pkgrel=0 pkgdesc="Interface for Python to call in to C code" @@ -12,7 +14,7 @@ depends="python3 py3-cparser" makedepends="libffi-dev python3-dev" checkdepends="py3-pytest" subpackages="" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-chardet/APKBUILD b/user/py3-chardet/APKBUILD index 81f03379a..f33618402 100644 --- a/user/py3-chardet/APKBUILD +++ b/user/py3-chardet/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-chardet _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=3.0.4 pkgrel=0 pkgdesc="The Universal Character Encoding Detector" @@ -13,7 +15,7 @@ license="LGPL-2.1-only" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-commonmark/APKBUILD b/user/py3-commonmark/APKBUILD index f8df6a75e..6f27198b2 100644 --- a/user/py3-commonmark/APKBUILD +++ b/user/py3-commonmark/APKBUILD @@ -2,16 +2,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-commonmark _pkgname=commonmark +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.9.0 pkgrel=0 pkgdesc="Python parser for the CommonMark Markdown flavour" -url="https://pypi.org/project/CommonMark/" +url="https://pypi.org/project/commonmark/" arch="noarch" license="BSD-3-Clause" depends="python3" makedepends="" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-cryptography/APKBUILD b/user/py3-cryptography/APKBUILD index 1f3b6d7ba..d1c6da05c 100644 --- a/user/py3-cryptography/APKBUILD +++ b/user/py3-cryptography/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-cryptography _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.7 pkgrel=0 pkgdesc="A package which provides cryptographic recipes and primitives" @@ -13,7 +15,7 @@ license="Apache-2.0 OR BSD-3-Clause" depends="python3 py3-cffi py3-asn1crypto py3-six" makedepends="python3-dev libffi-dev openssl-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-docopt/APKBUILD b/user/py3-docopt/APKBUILD index b0bdf48a7..cf1616ad2 100644 --- a/user/py3-docopt/APKBUILD +++ b/user/py3-docopt/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-docopt _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.6.2 pkgrel=0 pkgdesc="Expressive Python argument parsing library" @@ -11,7 +13,7 @@ license="MIT" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-docutils/APKBUILD b/user/py3-docutils/APKBUILD index febab9f74..30e60456d 100644 --- a/user/py3-docutils/APKBUILD +++ b/user/py3-docutils/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-docutils _pkgname=docutils +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.14 pkgrel=0 pkgdesc="Documentation utilities for Python" @@ -12,7 +14,7 @@ license="Custom" depends="python3 py3-pillow py3-roman" makedepends="python3-dev" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-freezegun/APKBUILD b/user/py3-freezegun/APKBUILD index 4148189a0..fcdc15747 100644 --- a/user/py3-freezegun/APKBUILD +++ b/user/py3-freezegun/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-freezegun _pkgname=freezegun +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.3.11 pkgrel=0 pkgdesc="Let your Python tests travel through time" @@ -12,7 +14,7 @@ license="Apache-2.0" depends="python3 py3-six" makedepends="python3-dev" checkdepends="py3-python-dateutil py3-pytest py3-mock py3-pbr" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-future/APKBUILD b/user/py3-future/APKBUILD index 3fead3a17..13265d2e6 100644 --- a/user/py3-future/APKBUILD +++ b/user/py3-future/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-future _pkgname=${pkgname##py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.17.1 pkgrel=0 pkgdesc="Easy, clean, reliable Python 2/3 compatibility" @@ -13,7 +15,7 @@ license="MIT" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-html5lib/APKBUILD b/user/py3-html5lib/APKBUILD index f65096fad..898efe4f1 100644 --- a/user/py3-html5lib/APKBUILD +++ b/user/py3-html5lib/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-html5lib _pkgname=html5lib +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="HTML parser based on the WHATWG HTML specification" @@ -11,7 +13,7 @@ license="MIT" depends="python3 py3-six py3-webencodings" makedepends="python3-dev" checkdepends="py3-pytest py3-mock py3-pytest-expect" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-hypothesis/APKBUILD b/user/py3-hypothesis/APKBUILD index 808a84296..8775838a1 100644 --- a/user/py3-hypothesis/APKBUILD +++ b/user/py3-hypothesis/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-hypothesis _pkgname=hypothesis +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=4.14.3 pkgrel=0 pkgdesc="A library for property based testing" @@ -12,7 +14,7 @@ license="MPL-2.0" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest py3-attrs" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-imagesize/APKBUILD b/user/py3-imagesize/APKBUILD index c47afd26f..8b2dad108 100644 --- a/user/py3-imagesize/APKBUILD +++ b/user/py3-imagesize/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-imagesize _pkgname=imagesize +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.1.0 pkgrel=0 pkgdesc="Parse image file header and return image size" @@ -11,7 +13,7 @@ license="MIT" depends="python3" makedepends="python3-dev" #subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-jinja2/APKBUILD b/user/py3-jinja2/APKBUILD index 5f54488f5..71a4c2313 100644 --- a/user/py3-jinja2/APKBUILD +++ b/user/py3-jinja2/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-jinja2 _pkgname=Jinja2 +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.10 pkgrel=0 pkgdesc="A small but fast and easy to use stand-alone template engine written in pure python." @@ -11,7 +13,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest py3-markupsafe" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD index cdb7b4362..8e07f64aa 100644 --- a/user/py3-lxml/APKBUILD +++ b/user/py3-lxml/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-lxml _pkgname=lxml +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=4.3.4 pkgrel=0 pkgdesc="Python LXML Library" @@ -12,7 +14,7 @@ options="!check" # No test suite. license="BSD-3-Clause" depends="" makedepends="python3-dev libxml2-dev libxslt-dev" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-mako/APKBUILD b/user/py3-mako/APKBUILD index cf0db705a..0f7a0ab72 100644 --- a/user/py3-mako/APKBUILD +++ b/user/py3-mako/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-mako _pkgname=Mako +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.12 pkgrel=0 pkgdesc="Fast templating language for Python" @@ -12,7 +14,7 @@ depends="python3" makedepends="python3-dev" checkdepends="py3-markupsafe py3-mock py3-pbr py3-pluggy py3-py py3-pytest py3-six" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir"/$_pkgname-$pkgver build() { diff --git a/user/py3-markdown/APKBUILD b/user/py3-markdown/APKBUILD index d8faf68a3..40df4e38d 100644 --- a/user/py3-markdown/APKBUILD +++ b/user/py3-markdown/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: pkgname=py3-markdown _pkgname=Markdown +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=3.1.1 pkgrel=0 pkgdesc="A Python implementation of Markdown" @@ -12,7 +14,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-markupsafe/APKBUILD b/user/py3-markupsafe/APKBUILD index 9d2c46b51..ced64dfdf 100644 --- a/user/py3-markupsafe/APKBUILD +++ b/user/py3-markupsafe/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-markupsafe _pkgname=MarkupSafe +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.1.1 pkgrel=0 pkgdesc="Safely add untrusted strings to HTML/XML markup." @@ -11,7 +13,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-mock/APKBUILD b/user/py3-mock/APKBUILD index 1164ba07c..28047234a 100644 --- a/user/py3-mock/APKBUILD +++ b/user/py3-mock/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-mock _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.0.0 pkgrel=0 pkgdesc="A Python Mocking and Patching Library for Testing" @@ -13,7 +15,7 @@ license="BSD-2-Clause" depends="python3 py3-pbr py3-six" makedepends="python3-dev" subpackages="" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-openssl/APKBUILD b/user/py3-openssl/APKBUILD index f39f3da42..2908ca5c7 100644 --- a/user/py3-openssl/APKBUILD +++ b/user/py3-openssl/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-openssl _pkgname=pyOpenSSL +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=19.0.0 pkgrel=0 pkgdesc="Python wrapper module around the OpenSSL library" @@ -13,7 +15,7 @@ license="Apache-2.0" depends="python3 py3-cryptography py3-six" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-packaging/APKBUILD b/user/py3-packaging/APKBUILD index 08936d2a5..87527b822 100644 --- a/user/py3-packaging/APKBUILD +++ b/user/py3-packaging/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-packaging _pkgname=packaging +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=19.0 pkgrel=0 pkgdesc="Core utilities for Python packages" @@ -11,7 +13,7 @@ license="Apache-2.0 AND BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest py3-pretend py3-pyparsing" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-passlib/APKBUILD b/user/py3-passlib/APKBUILD index e3b86d402..83d184039 100644 --- a/user/py3-passlib/APKBUILD +++ b/user/py3-passlib/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-passlib _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.7.1 pkgrel=0 pkgdesc="Python password hashing framework" @@ -13,7 +15,7 @@ depends="python3" checkdepends="py3-nose" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-pbr/APKBUILD b/user/py3-pbr/APKBUILD index bfbf75df6..53bd5311c 100644 --- a/user/py3-pbr/APKBUILD +++ b/user/py3-pbr/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-pbr _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=5.4.1 pkgrel=0 pkgdesc="Python Build Reasonableness" @@ -13,7 +15,7 @@ license="Apache-2.0" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-pexpect/APKBUILD b/user/py3-pexpect/APKBUILD index 2394872d5..b4e0e1745 100644 --- a/user/py3-pexpect/APKBUILD +++ b/user/py3-pexpect/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=py3-pexpect _pkgname=${pkgname#*-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=4.7.0 pkgrel=0 pkgdesc="Python library for managing console applications" @@ -10,7 +12,7 @@ arch="noarch" license="ISC" depends="python3 py3-ptyprocess" makedepends="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/pexpect-$pkgver" build() { diff --git a/user/py3-pillow/APKBUILD b/user/py3-pillow/APKBUILD index e137a6b0f..24583fbc7 100644 --- a/user/py3-pillow/APKBUILD +++ b/user/py3-pillow/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-pillow _pkgname=Pillow +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=5.3.0 pkgrel=0 pkgdesc="A Python Imaging Library" diff --git a/user/py3-pretend/APKBUILD b/user/py3-pretend/APKBUILD index 7cf86f96f..87ba1cdf6 100644 --- a/user/py3-pretend/APKBUILD +++ b/user/py3-pretend/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-pretend _pkgname=pretend +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.9 pkgrel=0 pkgdesc="A library for stubbing in Python" @@ -12,7 +14,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-pygments/APKBUILD b/user/py3-pygments/APKBUILD index 81088c5d6..a9c885418 100644 --- a/user/py3-pygments/APKBUILD +++ b/user/py3-pygments/APKBUILD @@ -4,6 +4,8 @@ # Maintainer: pkgname=py3-pygments _pkgname=Pygments +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.4.2 pkgrel=0 pkgdesc="A syntax highlighting package written in Python" @@ -14,7 +16,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-pyparsing/APKBUILD b/user/py3-pyparsing/APKBUILD index f84545871..b1ed948fb 100644 --- a/user/py3-pyparsing/APKBUILD +++ b/user/py3-pyparsing/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-pyparsing _pkgname=pyparsing +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.3.1 pkgrel=0 pkgdesc="Python parsing module" @@ -12,7 +14,7 @@ license="MIT" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-pysocks/APKBUILD b/user/py3-pysocks/APKBUILD index 61ed10714..b6ad62c26 100644 --- a/user/py3-pysocks/APKBUILD +++ b/user/py3-pysocks/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-pysocks _pkgname=PySocks +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.7.0 pkgrel=0 pkgdesc="SOCKS client module for Python" @@ -14,7 +16,7 @@ depends="python3" makedepends="python3-dev py3-atomicwrites py3-attrs py3-more-itertools py3-pluggy py3-py py3-pytest" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/PySocks-$pkgver" build() { diff --git a/user/py3-pytest-expect/APKBUILD b/user/py3-pytest-expect/APKBUILD index a8fcfadcf..0a3d5cb17 100644 --- a/user/py3-pytest-expect/APKBUILD +++ b/user/py3-pytest-expect/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-pytest-expect _pkgname=pytest-expect +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.1.0 pkgrel=0 pkgdesc="py.test plugin to store test expectations and mark tests based on them" @@ -10,7 +12,7 @@ arch="noarch" license="MIT" depends="python3 py3-pytest py3-u-msgpack-python" makedepends="python3-dev" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-python-dateutil/APKBUILD b/user/py3-python-dateutil/APKBUILD index 0e47c9ce1..2d114ce9d 100644 --- a/user/py3-python-dateutil/APKBUILD +++ b/user/py3-python-dateutil/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-python-dateutil _pkgname=python-dateutil +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.8.0 pkgrel=0 pkgdesc="Extensions to the standard Python datetime module" @@ -11,7 +13,7 @@ license="Apache-2.0 AND BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest py3-hypothesis py3-freezegun" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-random2/APKBUILD b/user/py3-random2/APKBUILD index 9293281ed..d8ac44035 100644 --- a/user/py3-random2/APKBUILD +++ b/user/py3-random2/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-random2 _pkgname=random2 +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="A Python module implementing Python 2's RNG" @@ -11,7 +13,7 @@ license="Python-2.0" depends="python3" makedepends="python3-dev" install="" -source="$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.zip" +source="$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.zip" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-recommonmark/APKBUILD b/user/py3-recommonmark/APKBUILD index 2b0d6db68..a0b15b675 100644 --- a/user/py3-recommonmark/APKBUILD +++ b/user/py3-recommonmark/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-recommonmark _pkgname=recommonmark +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.5.0 pkgrel=0 pkgdesc="Bridge between CommonMark and docutils" @@ -13,7 +15,7 @@ depends="python3 py3-commonmark py3-docutils py3-sphinx" checkdepends="py3-future" makedepends="" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-requests/APKBUILD b/user/py3-requests/APKBUILD index 947eb68f6..a82061ee2 100644 --- a/user/py3-requests/APKBUILD +++ b/user/py3-requests/APKBUILD @@ -4,6 +4,8 @@ # Maintainer: pkgname=py3-requests _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.22.0 pkgrel=0 pkgdesc="A HTTP request library for Python" @@ -14,7 +16,7 @@ options="!check" # tests connect to remote sites depends="python3 py3-chardet py3-idna py3-certifi py3-urllib3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-rfc3339/APKBUILD b/user/py3-rfc3339/APKBUILD index b1ea564a9..34332a1d8 100644 --- a/user/py3-rfc3339/APKBUILD +++ b/user/py3-rfc3339/APKBUILD @@ -4,6 +4,8 @@ # Maintainer: pkgname=py3-rfc3339 _pkgname=pyRFC3339 +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.1 pkgrel=0 pkgdesc="Generate and parse RFC 3339 timestamps" @@ -14,7 +16,7 @@ license="MIT" depends="python3 py3-tz" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-snowballstemmer/APKBUILD b/user/py3-snowballstemmer/APKBUILD index 5e24c7788..b86f0e46d 100644 --- a/user/py3-snowballstemmer/APKBUILD +++ b/user/py3-snowballstemmer/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-snowballstemmer _pkgname=snowballstemmer +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.2.1 pkgrel=0 pkgdesc="This package provides 16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms." @@ -11,7 +13,7 @@ options="!check" # Test script nowhere to be found license="BSD-2-Clause" depends="python3" makedepends="python3-dev" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinx/APKBUILD b/user/py3-sphinx/APKBUILD index 8fe5a9944..c8606a2fe 100644 --- a/user/py3-sphinx/APKBUILD +++ b/user/py3-sphinx/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinx _pkgname=Sphinx +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.0.0 pkgrel=1 pkgdesc="Sphinx Python Documentation Generator" @@ -13,7 +15,7 @@ license="BSD-2-Clause AND BSD-3-Clause AND MIT" depends="python3 py3-alabaster py3-babel py3-pygments py3-docutils py3-imagesize py3-jinja2 py3-packaging py3-pyparsing py3-requests py3-snowballstemmer py3-tz py3-sphinxcontrib-applehelp py3-sphinxcontrib-devhelp py3-sphinxcontrib-htmlhelp py3-sphinxcontrib-jsmath py3-sphinxcontrib-qthelp py3-sphinxcontrib-serializinghtml imagemagick" makedepends="python3-dev" checkdepends="py3-pytest py3-docutils py3-html5lib" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-applehelp/APKBUILD b/user/py3-sphinxcontrib-applehelp/APKBUILD index 20e2a4430..26010c36a 100644 --- a/user/py3-sphinxcontrib-applehelp/APKBUILD +++ b/user/py3-sphinxcontrib-applehelp/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-applehelp _pkgname=sphinxcontrib-applehelp +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="A Sphinx extension to output Apple help books" @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-asyncio/APKBUILD b/user/py3-sphinxcontrib-asyncio/APKBUILD index 73056c35a..09f91c27b 100644 --- a/user/py3-sphinxcontrib-asyncio/APKBUILD +++ b/user/py3-sphinxcontrib-asyncio/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-sphinxcontrib-asyncio _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.2.0 pkgrel=0 pkgdesc="Sphinx extension for using asyncio coroutines in markup" @@ -13,7 +15,7 @@ depends="python3" checkdepends="py3-pytest" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-devhelp/APKBUILD b/user/py3-sphinxcontrib-devhelp/APKBUILD index 01bfdf037..5b25ff13c 100644 --- a/user/py3-sphinxcontrib-devhelp/APKBUILD +++ b/user/py3-sphinxcontrib-devhelp/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-devhelp _pkgname=sphinxcontrib-devhelp +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="A sphinx extension to output Devhelp documents" @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-htmlhelp/APKBUILD b/user/py3-sphinxcontrib-htmlhelp/APKBUILD index 66e2da105..1e5f428d6 100644 --- a/user/py3-sphinxcontrib-htmlhelp/APKBUILD +++ b/user/py3-sphinxcontrib-htmlhelp/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-htmlhelp _pkgname=sphinxcontrib-htmlhelp +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="A sphinx extension to output HtmlHelp" @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest py3-html5lib" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-jsmath/APKBUILD b/user/py3-sphinxcontrib-jsmath/APKBUILD index 0a760859f..9443b5d25 100644 --- a/user/py3-sphinxcontrib-jsmath/APKBUILD +++ b/user/py3-sphinxcontrib-jsmath/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-jsmath _pkgname=sphinxcontrib-jsmath +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="A sphinx extension which renders display math in HTML via JavaScript" @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-qthelp/APKBUILD b/user/py3-sphinxcontrib-qthelp/APKBUILD index 9feee1eae..fb32bad02 100644 --- a/user/py3-sphinxcontrib-qthelp/APKBUILD +++ b/user/py3-sphinxcontrib-qthelp/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-qthelp _pkgname=sphinxcontrib-qthelp +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.2 pkgrel=0 pkgdesc="A Sphinx extension to output QtHelp documents." @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-serializinghtml/APKBUILD b/user/py3-sphinxcontrib-serializinghtml/APKBUILD index d576f8de8..b18e17848 100644 --- a/user/py3-sphinxcontrib-serializinghtml/APKBUILD +++ b/user/py3-sphinxcontrib-serializinghtml/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-serializinghtml _pkgname=sphinxcontrib-serializinghtml +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.1.3 pkgrel=0 pkgdesc="A Sphinx extension to output serialized HTML (json and pickle)" @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3 py3-markupsafe" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-tox/APKBUILD b/user/py3-tox/APKBUILD index 6776b8de6..fe36077c9 100644 --- a/user/py3-tox/APKBUILD +++ b/user/py3-tox/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-tox _pkgname=tox +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=3.0.0 pkgrel=0 pkgdesc="virtualenv management and test command line tool" @@ -12,7 +14,7 @@ license="MIT" depends="py3-py py3-pluggy py3-virtualenv py3-six python3" makedepends="python3-dev" #checkdepends="py3-pytest py3-tox" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-transitions/APKBUILD b/user/py3-transitions/APKBUILD index 8d9005f3e..255e631d5 100644 --- a/user/py3-transitions/APKBUILD +++ b/user/py3-transitions/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-transitions _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.6.9 pkgrel=0 pkgdesc="Python state machine library" @@ -12,7 +14,7 @@ license="MIT" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-twisted/APKBUILD b/user/py3-twisted/APKBUILD index a29880a9c..38265d761 100644 --- a/user/py3-twisted/APKBUILD +++ b/user/py3-twisted/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-twisted _pkgname=Twisted +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=19.2.1 pkgrel=0 pkgdesc="Asynchronous networking framework written in Python" @@ -11,7 +13,7 @@ license="MIT" depends="py3-incremental" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.bz2" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.bz2" builddir="$srcdir/Twisted-$pkgver" build() { diff --git a/user/py3-u-msgpack-python/APKBUILD b/user/py3-u-msgpack-python/APKBUILD index 1f7f03e82..20fe5e6e0 100644 --- a/user/py3-u-msgpack-python/APKBUILD +++ b/user/py3-u-msgpack-python/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-u-msgpack-python _pkgname=u-msgpack-python +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.5.1 pkgrel=0 pkgdesc="A portable, lightweight MessagePack serializer and deserializer written in pure Python." @@ -11,7 +13,7 @@ license="MIT" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-webencodings/APKBUILD b/user/py3-webencodings/APKBUILD index 8802cc1eb..967596d83 100644 --- a/user/py3-webencodings/APKBUILD +++ b/user/py3-webencodings/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-webencodings _pkgname=webencodings +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.5.1 pkgrel=0 pkgdesc="Character encoding aliases for legacy web content" @@ -12,7 +14,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-websockets/APKBUILD b/user/py3-websockets/APKBUILD index 3dad1684a..d3db557cb 100644 --- a/user/py3-websockets/APKBUILD +++ b/user/py3-websockets/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-websockets _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=8.0 pkgrel=0 pkgdesc="Python implementation of RFCs 6455 and 7692" @@ -11,7 +13,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-zope-interface/APKBUILD b/user/py3-zope-interface/APKBUILD index d5262edb9..b1025e17c 100644 --- a/user/py3-zope-interface/APKBUILD +++ b/user/py3-zope-interface/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-zope-interface _pkgname=zope.interface +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=4.6.0 pkgrel=0 pkgdesc="Separate distribution of the zope.interface package used in Zope" @@ -12,7 +14,7 @@ license="ZPL-2.1" depends="python3 py3-zope-event" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { |