diff options
| author | Leonardo Arena <rnalrd@gmail.com> | 2010-12-17 14:24:51 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@gmail.com> | 2010-12-17 14:24:51 +0000 |
| commit | f7e7d3b21e9b8a400598a7078d0f1e1a648050c4 (patch) | |
| tree | be943b405d5ce7a74fae86230f950de5485a8879 | |
| parent | 147c4b5bb05728a203f448d5568619a335efaf3a (diff) | |
| parent | 0dd224b9d6cdbd2dff1c73e827dff748c3cd1446 (diff) | |
| download | aports-f7e7d3b21e9b8a400598a7078d0f1e1a648050c4.tar.bz2 aports-f7e7d3b21e9b8a400598a7078d0f1e1a648050c4.tar.xz | |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports
33 files changed, 472 insertions, 103 deletions
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 9bb3c1bb2..9d594da6b 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools pkgver=2.0.7 -pkgrel=1 +pkgrel=3 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" depends= diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index cb2dfa065..c8ed7537a 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk -pkgver=1.8.1 +pkgver=1.8.1.1 pkgrel=0 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" @@ -156,7 +156,7 @@ sound_en() { _move_dir var/lib/asterisk/sounds/en } -md5sums="b8d8af8146e9eed90063feb7fabffd25 asterisk-1.8.1.tar.gz +md5sums="489440fe1172af8c06323f470d600670 asterisk-1.8.1.1.tar.gz b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch diff --git a/main/libmpdclient/APKBUILD b/main/libmpdclient/APKBUILD index e80f9c3e7..ba57ebe31 100644 --- a/main/libmpdclient/APKBUILD +++ b/main/libmpdclient/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libmpdclient -pkgver=2.2 +pkgver=2.3 pkgrel=0 pkgdesc="An asynchronous API library for interfacing MPD in the C, C++ & Objective C languages" url="http://mpd.wikia.com/wiki/Client:libmpdclient" @@ -21,4 +21,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="8b9dff75d6c820b781ce066417df4078 libmpdclient-2.2.tar.bz2" +md5sums="d14bad30c9c117aa6b211ad9f96cfbe0 libmpdclient-2.3.tar.bz2" diff --git a/main/linux-grsec/0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch b/main/linux-grsec/0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch new file mode 100644 index 000000000..3ba0a1e31 --- /dev/null +++ b/main/linux-grsec/0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch @@ -0,0 +1,42 @@ +Subject: [PATCH] staging: hv: fix netvsc sleeping while atomic +Date: Fri, 17 Dec 2010 11:40:24 +0200 +Message-Id: <1292578824-14408-1-git-send-email-timo.teras@iki.fi> +X-Mailer: git-send-email 1.7.1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +X-Virus-Scanned: ClamAV using ClamSMTP +Status: O +Content-Length: 845 +Lines: 29 + +The channel callbacks are called directly from vmbus_event_dpc +which runs in tasklet context. These callbacks need to use +GFP_ATOMIC. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16701 + +Cc: Hank Janssen <hjanssen@microsoft.com> +Cc: Haiyang Zhang <haiyangz@microsoft.com> +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +--- + drivers/staging/hv/netvsc.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c +index 8022781..3784923 100644 +--- a/drivers/staging/hv/netvsc.c ++++ b/drivers/staging/hv/netvsc.c +@@ -1236,7 +1236,7 @@ static void NetVscOnChannelCallback(void *Context) + /* ASSERT(device); */ + + packet = kzalloc(NETVSC_PACKET_SIZE * sizeof(unsigned char), +- GFP_KERNEL); ++ GFP_ATOMIC); + if (!packet) + return; + buffer = packet; +-- +1.7.1 + + diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index bce1bb543..4021b6a4b 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=2.6.35.9 _kernver=2.6.35 -pkgrel=4 +pkgrel=5 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -20,7 +20,10 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 0004-arp-flush-arp-cache-on-device-change.patch r8169-fix-rx-checksum-offload.patch r8169-add-gro-support.patch + 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch + 0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch + setlocalversion.patch kernelconfig.x86 kernelconfig.x86_64 @@ -153,6 +156,7 @@ ea7a7eb2775b71ae5ef24d029a4905bd xfrm-fix-gre-key-endianess.patch 0ccecafd4123dcad0b0cd7787553d734 r8169-fix-rx-checksum-offload.patch 139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch 648d8b477248f233c318a3b7a961febf 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch +7cae2d1e1947fa57d7aaaf31c649471c 0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch 8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch -47ca10abf2b420ea393395325e3a67f6 kernelconfig.x86 -eaa1f4b90c35ae9c94c16bbe4c4ba4f5 kernelconfig.x86_64" +a9494f66196bc6308da0f129221d31b8 kernelconfig.x86 +b38f1f99f8f3b75c52d4a1ab2b0d13fd kernelconfig.x86_64" diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 3d6d023ae..498f17bf8 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -3394,11 +3394,11 @@ CONFIG_DRM_TTM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_KMS is not set CONFIG_DRM_I810=m CONFIG_DRM_I830=m CONFIG_DRM_I915=m -CONFIG_DRM_I915_KMS=y +# CONFIG_DRM_I915_KMS is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index 9f43887cd..627e7c812 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -3227,11 +3227,11 @@ CONFIG_DRM_TTM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_KMS is not set CONFIG_DRM_I810=m CONFIG_DRM_I830=m CONFIG_DRM_I915=m -CONFIG_DRM_I915_KMS=y +# CONFIG_DRM_I915_KMS is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m diff --git a/main/linux-vserver/0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch b/main/linux-vserver/0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch new file mode 100644 index 000000000..3ba0a1e31 --- /dev/null +++ b/main/linux-vserver/0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch @@ -0,0 +1,42 @@ +Subject: [PATCH] staging: hv: fix netvsc sleeping while atomic +Date: Fri, 17 Dec 2010 11:40:24 +0200 +Message-Id: <1292578824-14408-1-git-send-email-timo.teras@iki.fi> +X-Mailer: git-send-email 1.7.1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +X-Virus-Scanned: ClamAV using ClamSMTP +Status: O +Content-Length: 845 +Lines: 29 + +The channel callbacks are called directly from vmbus_event_dpc +which runs in tasklet context. These callbacks need to use +GFP_ATOMIC. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16701 + +Cc: Hank Janssen <hjanssen@microsoft.com> +Cc: Haiyang Zhang <haiyangz@microsoft.com> +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +--- + drivers/staging/hv/netvsc.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c +index 8022781..3784923 100644 +--- a/drivers/staging/hv/netvsc.c ++++ b/drivers/staging/hv/netvsc.c +@@ -1236,7 +1236,7 @@ static void NetVscOnChannelCallback(void *Context) + /* ASSERT(device); */ + + packet = kzalloc(NETVSC_PACKET_SIZE * sizeof(unsigned char), +- GFP_KERNEL); ++ GFP_ATOMIC); + if (!packet) + return; + buffer = packet; +-- +1.7.1 + + diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 503463217..de2b21846 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -5,7 +5,7 @@ pkgname=linux-${_flavor} pkgver=2.6.35.9 _kernver=2.6.35 -pkgrel=2 +pkgrel=3 pkgdesc="Linux kernel with vserver" url="http://linux-vserver.org/" depends="mkinitfs linux-firmware" @@ -16,6 +16,7 @@ install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch + 0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch patch-2.6.35.9-vs2.3.0.36.33.diff setlocalversion.patch kernelconfig.x86 @@ -45,7 +46,7 @@ prepare() { done mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config + cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \ silentoldconfig } @@ -54,7 +55,7 @@ prepare() { menuconfig() { cd "$srcdir"/build make menuconfig - cp .config "$startdir"/$_config + cp .config "$startdir"/$_config || return 1 } build() { @@ -62,15 +63,15 @@ build() { make CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ || return 1 - } package() { cd "$srcdir"/build mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules - make modules_install install \ + make -j1 modules_install install \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_PATH="$pkgdir"/boot + INSTALL_PATH="$pkgdir"/boot \ + || return 1 rm -f "$pkgdir"/lib/modules/${_abi_release}/build \ "$pkgdir"/lib/modules/${_abi_release}/source @@ -129,7 +130,8 @@ dev() { md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 eca407cf4872ad77ae23adc8242389c4 patch-2.6.35.9.bz2 648d8b477248f233c318a3b7a961febf 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch +7cae2d1e1947fa57d7aaaf31c649471c 0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch 915974abb0ad49337b91f0f487593fd2 patch-2.6.35.9-vs2.3.0.36.33.diff 8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch -f703a5fa7a90d60e3e35bb92d1f99c37 kernelconfig.x86 -9483d5a8e2955d5e26b5ee70bac1d065 kernelconfig.x86_64" +10b1e713ce4422e69e1c96ba78feb7a9 kernelconfig.x86 +dc9477df20cf7da64bfc8e25fcd47ac3 kernelconfig.x86_64" diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86 index 31d9864d0..a081014d2 100644 --- a/main/linux-vserver/kernelconfig.x86 +++ b/main/linux-vserver/kernelconfig.x86 @@ -3418,11 +3418,11 @@ CONFIG_DRM_TTM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_KMS is not set CONFIG_DRM_I810=m CONFIG_DRM_I830=m CONFIG_DRM_I915=m -CONFIG_DRM_I915_KMS=y +# CONFIG_DRM_I915_KMS is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m diff --git a/main/linux-vserver/kernelconfig.x86_64 b/main/linux-vserver/kernelconfig.x86_64 index 8253abd81..922b6d3a1 100644 --- a/main/linux-vserver/kernelconfig.x86_64 +++ b/main/linux-vserver/kernelconfig.x86_64 @@ -3278,11 +3278,11 @@ CONFIG_DRM_TTM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_KMS is not set CONFIG_DRM_I810=m CONFIG_DRM_I830=m CONFIG_DRM_I915=m -CONFIG_DRM_I915_KMS=y +# CONFIG_DRM_I915_KMS is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD index beab99567..4e9a68806 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sebastian Wicki <gandro@gmx.net> # Maintainer: Natanael Copa <natanael.copa@gmail.com> pkgname=mpd -pkgver=0.15.15 +pkgver=0.16 pkgrel=0 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" url="http://musicpd.org" @@ -48,6 +48,6 @@ package() { "$pkgdir"/var/lib/mpd/playlists \ "$pkgdir"/var/lib/mpd/music } -md5sums="af0972af6237771acc420d2452fa627a mpd-0.15.15.tar.bz2 +md5sums="3fc8ccc4488cbaadc1a10f415eada35f mpd-0.16.tar.bz2 31d1515232d688d610d1664a0fb2a6a0 mpd.initd dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd" diff --git a/main/perl-cgi-session/APKBUILD b/main/perl-cgi-session/APKBUILD index d4cf621da..3da7e71c5 100644 --- a/main/perl-cgi-session/APKBUILD +++ b/main/perl-cgi-session/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-cgi-session _name=CGI-Session -pkgver=4.42 -pkgrel=0 +pkgver=4.43 +pkgrel=1 pkgdesc="perl module for persistent session data in CGI applications" -url="http://search.cpan.org/~markstos/CGI-Session-4.42/" -arch="x86 x86_64" +url="http://search.cpan.org/~markstos/CGI-Session-$pkgver/" +arch="noarch" license="PerlArtistic" depends="perl" makedepends="perl-dev" @@ -24,4 +24,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete find "$pkgdir" -name .packlist -delete } -md5sums="6544261a6aae66410188520b27e10699 CGI-Session-4.42.tar.gz" +md5sums="3ac7f31d5d2e11e28cc75c78d5042382 CGI-Session-4.43.tar.gz" diff --git a/main/perl-io-socket-ssl/APKBUILD b/main/perl-io-socket-ssl/APKBUILD index b5069f019..cc3c28ee5 100644 --- a/main/perl-io-socket-ssl/APKBUILD +++ b/main/perl-io-socket-ssl/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-io-socket-ssl _realname=IO-Socket-SSL -pkgver=1.30 +pkgver=1.37 pkgrel=0 pkgdesc="Nearly transparent SSL encapsulation for IO::Socket::INET" url="http://search.cpan.org/dist/IO-Socket-SSL/" -arch="x86 x86_64" +arch="noarch" license="GPL" depends="perl perl-net-ssleay" makedepends="perl-dev" @@ -19,9 +19,13 @@ build() { PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 make || return 1 +} + +package() { + cd "$srcdir/$_realname-$pkgver" make DESTDIR="$pkgdir" install # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } -md5sums="374f74487ef6fedc9326e20ac1e20dc0 IO-Socket-SSL-1.30.tar.gz" +md5sums="a75c962ce989865213ca4320766fdb77 IO-Socket-SSL-1.37.tar.gz" diff --git a/main/perl-net-cidr-lite/APKBUILD b/main/perl-net-cidr-lite/APKBUILD index 20e47a0c1..bb7cb0948 100644 --- a/main/perl-net-cidr-lite/APKBUILD +++ b/main/perl-net-cidr-lite/APKBUILD @@ -3,10 +3,10 @@ pkgname=perl-net-cidr-lite _realname=Net-CIDR-Lite pkgver=0.21 -pkgrel=0 +pkgrel=1 pkgdesc="Perl extension for merging IPv4 or IPv6 CIDR addresses" url="http://search.cpan.org/~dougw/Net-CIDR-Lite-0.21/" -arch="x86 x86_64" +arch="noarch" license="Unknown" depends="perl" makedepends="perl-dev" diff --git a/main/remmina-plugins/APKBUILD b/main/remmina-plugins/APKBUILD index eedfc63a8..46478d49b 100644 --- a/main/remmina-plugins/APKBUILD +++ b/main/remmina-plugins/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=remmina-plugins -pkgver=0.8.4 -pkgrel=1 +pkgver=0.9.0 +pkgrel=0 pkgdesc="Remmina plugins" url="http://sourceforge.net/projects/remmina/" arch="x86 x86_64" @@ -34,4 +34,4 @@ package() { rm "$pkgdir"/usr/lib/remmina/plugins/*.*a } -md5sums="873f1cf8afb46a911e1a4bd90d776f15 remmina-plugins-0.8.4.tar.gz" +md5sums="96f63d2636fcf3bc845e5d92d4a46f05 remmina-plugins-0.9.0.tar.gz" diff --git a/main/remmina/APKBUILD b/main/remmina/APKBUILD index f0f475f38..5cc8df6da 100644 --- a/main/remmina/APKBUILD +++ b/main/remmina/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=remmina -pkgver=0.8.3 -pkgrel=1 +pkgver=0.9.1 +pkgrel=0 pkgdesc="Remmina is a remote desktop client written in GTK+" url="http://remmina.sourceforge.net/" arch="x86 x86_64" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="b4c6830eb6ee5794bd1ca549fb918d16 remmina-0.8.3.tar.gz" +md5sums="67ab0c7023c00623cd370364b5aa1e38 remmina-0.9.1.tar.gz" diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD index 7f517c5d1..44897b211 100644 --- a/main/vim/APKBUILD +++ b/main/vim/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vim -pkgver=7.3.003 +pkgver=7.3.82 _srcver=${pkgver%.*} _patchver=${pkgver##*.} pkgrel=0 @@ -17,6 +17,85 @@ source="ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.001 ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.002 ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.003 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.004 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.005 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.006 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.007 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.008 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.009 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.010 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.011 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.012 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.013 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.014 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.015 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.016 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.017 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.018 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.019 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.020 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.021 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.022 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.023 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.024 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.025 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.026 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.027 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.028 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.029 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.030 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.031 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.032 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.033 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.034 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.035 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.036 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.037 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.038 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.039 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.040 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.041 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.042 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.043 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.044 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.045 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.046 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.047 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.048 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.049 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.050 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.051 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.052 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.053 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.054 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.055 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.056 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.057 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.058 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.059 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.060 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.061 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.062 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.063 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.064 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.065 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.066 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.067 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.068 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.069 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.070 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.071 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.072 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.073 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.074 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.075 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.076 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.077 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.078 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.079 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.080 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.081 + ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.082 vimrc " @@ -66,4 +145,83 @@ md5sums="5b9510a17074e2b37d8bb38ae09edbf2 vim-7.3.tar.bz2 aa5582d8289b43255f45d4bb6f62e140 7.3.001 2949cbdfe86f533c487fd144c5935c7a 7.3.002 9059db41cf3a468935745242cb9c0514 7.3.003 +9aaa4490d2fbf9a1e780a151fb41f279 7.3.004 +bf5b5fad8c4de23449fa7c7c01969369 7.3.005 +f53d95dfb1eee5f5f769594174d0e9d4 7.3.006 +a7a4c56110662bc3ba6fbb2fd645d94f 7.3.007 +be756a231afe754d004b6c8a9d12bb50 7.3.008 +f4ed2feff44e2c1898fd5e60f9f97b0d 7.3.009 +4fffed01d3683b0b8b23df600a0bada2 7.3.010 +4ee8f06dce300c0be029bf00b03ef093 7.3.011 +89faf7d5eef1d1d50b657fe34ee7c90b 7.3.012 +6a029d61f7d51c1bea55330732676319 7.3.013 +d0109c0c413c405fdb827ec20f3903d8 7.3.014 +4db0a869dbe00c360541ad2c1ca87a2d 7.3.015 +e0c634532a865d7ed47942080e371b3e 7.3.016 +f52aa5bc3df02c3bb4c75849b2b5f431 7.3.017 +02270ecbc1dc2f57de80441ac7cdd0f0 7.3.018 +5c1be1a0a107261e0a716c877c82fc97 7.3.019 +ef09917435a7cab9382abe3708cf5152 7.3.020 +53c90651baf1b4b28c99947de58deb91 7.3.021 +c4cb1bf3fa0a45d9cad997cd02fa9439 7.3.022 +1e34e216b0e419096f796d3511ce88da 7.3.023 +5c2ff27d8ce8d1aeb42ff16ca1cb89c2 7.3.024 +69b3e00a17230da16d3be4b96f125196 7.3.025 +687a80a82d05e8e91e9ee659b3e0dd67 7.3.026 +1994a0d1e52111b9fa1b999745da93b8 7.3.027 +2438a52f25cf167bbf5711fc8c7323d7 7.3.028 +302ca6aa621c215736f3db069f8c2285 7.3.029 +ceb0e12297907b13dd39fafffa731c62 7.3.030 +acb42f7f4545a63d35396360dc2799ff 7.3.031 +56c9d1681bfc9fe5e76c281b905f0ad8 7.3.032 +4a399b6f1bcde6d991088118f5a58222 7.3.033 +40580589a13a36cc72a600200b93b8d2 7.3.034 +8f7a617b0cf8fea46e4b1557bc286fda 7.3.035 +3ac58b7fe8347ad87f3628bfb4970f1b 7.3.036 +d83c7635e8b65db98a377f3cc7b72ce0 7.3.037 +a310c68726540ac1a0759ef12778bed1 7.3.038 +6b7243d85b86e03b4a782e4bf6d7646e 7.3.039 +8aa33a527433f1907b72ac7c514d455d 7.3.040 +979abe1512bc48dbaed028a23cb2f6cc 7.3.041 +984ce81978ef2b12b3a09986d37e4719 7.3.042 +27b2418128b4322c3cb92b13d577ad6c 7.3.043 +c29e637b242682dc6df544a0bc89abc4 7.3.044 +bd6ac17eecf226a2d6a31e4fb9069ded 7.3.045 +d97f518c548de06b11b5682f2ca4d9a9 7.3.046 +ae37e72299f02ea1b7f2bb59932ed306 7.3.047 +39aaaf13dfef317febb2442626f262f1 7.3.048 +6469fb212e95ad83c21aaaaf8aee0f3a 7.3.049 +e40dc723ef91adee9854faceaba1e201 7.3.050 +5611eda78907716863ebd6ebd19a000f 7.3.051 +01011da656094510c1cdabbc80c129b9 7.3.052 +faaf035020dcf22b57fa76c998e4553b 7.3.053 +90bd11788f022dc1107f93e702734a2a 7.3.054 +5b4fe73d1c47ab36a6b0a8f5ddd2fe65 7.3.055 +b53b7452e5b92bb1b91e9dd97e52dfcd 7.3.056 +bce5e42b7d2b7a91c332e39ed1f0eec8 7.3.057 +1c6054466398f4612a81289de764ef5c 7.3.058 +e2cf5697e8708390e106553de68ebb2b 7.3.059 +16da4369ed89f0305cf2c3ed1bf338fc 7.3.060 +cbed85cdfe0ad4a1b7b43efc64b1531c 7.3.061 +77f08258dbf30e12914475802eeb9b3d 7.3.062 +97c878554fec3d4f9caf934c0a0c227d 7.3.063 +5f74fee465073a3eb48565300636d9db 7.3.064 +a20ea56117d918b43f5109c9c06787ed 7.3.065 +7c51cfbd55673906035df7b274b247c4 7.3.066 +45625adbc8757b46ba9393dc136cc2e1 7.3.067 +49b340dc261ed455c97d955517264a89 7.3.068 +b423664733d7fd9d7de052dad8154643 7.3.069 +b9ef636a41df5500f8437d38ab3177e2 7.3.070 +1afcb15f38d1e4926918dbbe52356382 7.3.071 +132f122c3b8ac49c1ad56f54c8994e3a 7.3.072 +4a387415ce192506bcb7353cd8dda3c0 7.3.073 +e2b2af94486554c6818693fbf1e3c34e 7.3.074 +91acb2d1e70f6b7bff5e02460d4c3e62 7.3.075 +2627b860bed5c08cead6e48986577fed 7.3.076 +2a8c6197b193a16cb273606d8afcb6b5 7.3.077 +660b3e99b1433a4e992e087e66bc1567 7.3.078 +f69b91c3c55ef81df257178e0af1ca73 7.3.079 +bbe3b3aa56bde525cd4028e807014b33 7.3.080 +d4ce2f5eab7a74f8a51a352b05fde53f 7.3.081 +75b69fb091a12c588992dd282841bde0 7.3.082 97aecde2ab504e543a96bec84b3b5638 vimrc" diff --git a/testing/audacious-plugins/APKBUILD b/testing/audacious-plugins/APKBUILD index 9dc18b6c9..84e8910c8 100644 --- a/testing/audacious-plugins/APKBUILD +++ b/testing/audacious-plugins/APKBUILD @@ -2,12 +2,13 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=audacious-plugins pkgver=2.4.2 -pkgrel=1 +pkgrel=3 pkgdesc="playlist-oriented media player with multiple interfaces (plugins)" url="http://audacious-media-player.org/" arch="all" license="ISC" depends=audacious +#_want_ffmpeg="ffmpeg-dev" makedepends="libmowgli-dev libmcs-dev libguess-dev @@ -20,9 +21,13 @@ makedepends="libmowgli-dev libsamplerate-dev libcue-dev libmms-dev + libsndfile-dev + libogg-dev libvorbis-dev - ffmpeg-dev + + $_want_ffmpeg + alsa-lib-dev faad2-dev neon-dev diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD index 70aa179df..746762d20 100644 --- a/testing/bluez/APKBUILD +++ b/testing/bluez/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bluez -pkgver=4.72 +pkgver=4.81 pkgrel=0 pkgdesc="Tools for the Bluetooth protocol stack" url="http://www.bluez.org/" @@ -10,7 +10,7 @@ depends= makedepends="dbus-dev gst-plugins-base-dev alsa-lib-dev libusb-compat-dev libnl-dev" subpackages="$pkgname-dev $pkgname-doc libbluetooth $pkgname-alsa $pkgname-cups - $pkgname-netlink $pkgname-gstreamer" + $pkgname-gstreamer" source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2 bluetooth.initd bluetooth.confd @@ -27,7 +27,6 @@ build() { --enable-gstreamer \ --enable-alsa \ --enable-usb \ - --enable-netlink \ --enable-tools \ --enable-bccmd \ --enable-hid2hci \ @@ -57,8 +56,8 @@ libbluetooth() { alsa() { pkgdesc="Bluez plugin for ALSA" - mkdir -p "$subpkgdir"/etc "$subpkgdir"/usr/lib - mv "$pkgdir"/etc/alsa* "$subpkgdir"/etc/ + mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/share/alsa* "$subpkgdir"/usr/share/ || return 1 mv "$pkgdir"/usr/lib/alsa* "$subpkgdir"/usr/lib/ } @@ -68,19 +67,12 @@ cups() { mv "$pkgdir"/usr/lib/cups "$subpkgdir"/usr/lib/ } -netlink() { - pkgdesc="Bluez netlink plugin" - mkdir -p "$subpkgdir"/usr/lib/bluetooth/plugins - mv "$pkgdir"/usr/lib/bluetooth/plugins/netlink.so \ - "$subpkgdir"/usr/lib/bluetooth/plugins -} - gstreamer() { pkgdesc="Bluez plugin for gstreamer" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/gstreamer* \ "$subpkgdir"/usr/lib/ } -md5sums="1e7e4261954275076479a08dbeae26ca bluez-4.72.tar.bz2 -66408fb89b05e7ce7e61c4c3c356d2c6 bluetooth.initd +md5sums="75fbc768bf626fc8f4cf466006767723 bluez-4.81.tar.bz2 +c511078403d7d27673581a8bb468b90b bluetooth.initd a159d897a057f4675548327329c4cc22 bluetooth.confd" diff --git a/testing/bluez/bluetooth.initd b/testing/bluez/bluetooth.initd index 9ec58e97c..ef25720bf 100644 --- a/testing/bluez/bluetooth.initd +++ b/testing/bluez/bluetooth.initd @@ -12,7 +12,7 @@ start() { ebegin "Starting Bluetooth" if [ -x /sbin/udevadm ]; then - udevadm trigger --subsystem-match=bluetooth + udevadm trigger --subsystem-match=bluetooth --action=add eend $? fi diff --git a/testing/faenza-icon-theme/APKBUILD b/testing/faenza-icon-theme/APKBUILD new file mode 100644 index 000000000..a74e17290 --- /dev/null +++ b/testing/faenza-icon-theme/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: William Pitcock <nenolod@dereferenced.org> +pkgname=faenza-icon-theme +pkgver=0.8 +pkgrel=0 +pkgdesc="icons designed to go in tandem with equinox themes" +arch="noarch" +url="http://tiheum.deviantart.com/art/Faenza-Icons-173323228" +license="GPL" +depends= +makedepends="wget" +install= +subpackages= +source="https://launchpad.net/~tiheum/+archive/equinox/+files/faenza-icon-theme_$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver + +package() { + cd "$_builddir" + + mkdir -p "$pkgdir"/usr/share/icons + cp -dpRf Faenza* "$pkgdir"/usr/share/icons +} + +md5sums="c4f87cf4105d2330a259296f8e73e709 faenza-icon-theme_0.8.tar.gz" diff --git a/testing/gtk-equinox-engine/APKBUILD b/testing/gtk-equinox-engine/APKBUILD new file mode 100644 index 000000000..b6b8ec214 --- /dev/null +++ b/testing/gtk-equinox-engine/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: William Pitcock <nenolod@dereferenced.org> +pkgname=gtk-equinox-engine +pkgver=1.30.2 +pkgrel=1 +pkgdesc="enhanced cairo-based GTK+ engine" +url="http://gnome-look.org/content/show.php/Equinox+GTK+Engine" +license="GPL" +arch="all" +depends= +makedepends="gtk+-dev" +install= +subpackages= +source="http://gnome-look.org/CONTENT/content-files/121881-equinox-1.30.tar.bz2" + +_builddir="$srcdir"/equinox-${pkgver%.*} + +prepare() { + cd "$srcdir" + + msg "Unpacking GTK+ engine" + tar zxf equinox-gtk-engine.tar.gz + + cd "$_builddir" +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir"/usr/share/themes + cd "$pkgdir"/usr/share/themes + + msg "Unpacking themes" + tar zxf "$srcdir"/equinox-themes.tar.gz +} + +md5sums="07d43dede6bdc17ba74f1740a3743601 121881-equinox-1.30.tar.bz2" diff --git a/testing/libamz/APKBUILD b/testing/libamz/APKBUILD new file mode 100644 index 000000000..67a0343cd --- /dev/null +++ b/testing/libamz/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: William Pitcock <nenolod@dereferenced.org> +pkgname=libamz +pkgver=0.0.2 +pkgrel=0 +pkgdesc="library and tools for accessing amazon mp3 download queues" +url="http://nenolod.net/projects/libamz" +arch="all" +license="ISC" +depends= +makedepends="libgcrypt-dev libsoup-dev libxml2-dev gtk+-dev" +install= +subpackages="$pkgname-dev" +source="http://nenolod.net/~nenolod/distfiles/$pkgname-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # workaround bug in busybox + sed -e "/touch/s/0001010000/200001010000/g" \ + -i configure +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="fcecea69be7b62aa6d31b80b23e8f0db libamz-0.0.2.tar.bz2" diff --git a/testing/py-boto/APKBUILD b/testing/py-boto/APKBUILD index 00b3fe9d9..8663a6de0 100644 --- a/testing/py-boto/APKBUILD +++ b/testing/py-boto/APKBUILD @@ -3,10 +3,10 @@ pkgname=py-boto _pkgname=boto pkgver=1.9b -pkgrel=0 +pkgrel=1 pkgdesc="An integrated interface to current and future infrastructural services offered by Amazon Web Services." url="http://code.google.com/p/boto/" -arch="x86 x86_64" +arch="noarch" license="MIT" depends="python" makedepends="python-dev py-setuptools" diff --git a/testing/py-docutils/APKBUILD b/testing/py-docutils/APKBUILD index 33154afe7..1206517d4 100644 --- a/testing/py-docutils/APKBUILD +++ b/testing/py-docutils/APKBUILD @@ -3,10 +3,10 @@ pkgname=py-docutils _pkgname=docutils pkgver=0.7 -pkgrel=1 +pkgrel=2 pkgdesc="Documentation Utilities for Python" url="http://docutils.sourceforge.net/" -arch="x86 x86_64" +arch="noarch" license="PublicDomain" depends="python py-imaging py-roman" makedepends="python-dev py-setuptools" diff --git a/testing/py-jinja2/APKBUILD b/testing/py-jinja2/APKBUILD index 31aa7dcf0..b5d4ffc96 100644 --- a/testing/py-jinja2/APKBUILD +++ b/testing/py-jinja2/APKBUILD @@ -3,10 +3,10 @@ pkgname=py-jinja2 _pkgname=Jinja2 pkgver=2.5.5 -pkgrel=0 +pkgrel=1 pkgdesc="A small but fast and easy to use stand-alone template engine written in pure python." url="http://jinja.pocoo.org/" -arch="x86 x86_64" +arch="noarch" license="BSD" depends="python" makedepends="python-dev py-setuptools" diff --git a/testing/py-pygments/APKBUILD b/testing/py-pygments/APKBUILD index ac6da6e10..bf65a2bfd 100644 --- a/testing/py-pygments/APKBUILD +++ b/testing/py-pygments/APKBUILD @@ -3,10 +3,10 @@ pkgname=py-pygments _pkgname=Pygments pkgver=1.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Pygments is a syntax highlighting package written in Python." url="http://pygments.org/" -arch="x86 x86_64" +arch="noarch" license="BSD" depends="python" makedepends="python-dev py-setuptools" diff --git a/testing/py-roman/APKBUILD b/testing/py-roman/APKBUILD index 79b389423..1caffb1d6 100644 --- a/testing/py-roman/APKBUILD +++ b/testing/py-roman/APKBUILD @@ -3,10 +3,10 @@ pkgname=py-roman _pkgname=roman pkgver=1.4.0 -pkgrel=0 +pkgrel=1 pkgdesc="Integer to Roman numerals converter" url="http://pypi.python.org/pypi/roman" -arch="x86 x86_64" +arch="noarch" license="Python2.1.1" depends="python" makedepends="python-dev py-setuptools" diff --git a/testing/py-sphinx/APKBUILD b/testing/py-sphinx/APKBUILD index 3b43e52d2..6bdfd9053 100644 --- a/testing/py-sphinx/APKBUILD +++ b/testing/py-sphinx/APKBUILD @@ -3,10 +3,10 @@ pkgname=py-sphinx _pkgname=Sphinx pkgver=1.0.5 -pkgrel=0 +pkgrel=1 pkgdesc="Python Documentation Generator" url="http://sphinx.pocoo.org/" -arch="x86 x86_64" +arch="noarch" license="BSD" depends="python py-docutils py-jinja2 py-pygments" makedepends="python-dev py-setuptools" diff --git a/testing/py-templayer/APKBUILD b/testing/py-templayer/APKBUILD index 776fdfbc2..eeefd4bb5 100644 --- a/testing/py-templayer/APKBUILD +++ b/testing/py-templayer/APKBUILD @@ -1,41 +1,43 @@ # Contributor: Matt Smith <mcs@darkregion.net> # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=py-templayer -_name=templayer +_pkgname=templayer pkgver=1.5.1 -pkgrel=0 +pkgrel=1 pkgdesc="Templayer is a layered template library for Python and Django" url="http://excess.org/templayer/" -arch="x86 x86_64" +arch="noarch" license="LGPL" depends="python" -makedepends="python-dev" +makedepends="python-dev py-setuptools" install= subpackages="$pkgname-doc" -source="http://excess.org/$pkgname/$_name-$pkgver.tar.gz" +source="http://excess.org/$_pkgname/$_pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/$_name-$pkgver +_builddir="$srcdir"/$_pkgname-$pkgver prepare() { - cd "$_builddir" - # apply patches here + cd "$_builddir" + # apply patches here } build() { - return 0 + cd "$_builddir" + python setup.py build || return 1 } package() { - cd "$_builddir" - python setup.py install --root "$pkgdir" + cd "$_builddir" + python setup.py install --root "$pkgdir" } doc() { - mkdir -p "$subpkgdir"/usr/share/doc/$pkgname - cd "$_builddir" - install -Dm644 docs/reference.html "$subpkgdir"/usr/share/doc/$pkgname/reference.html - install -Dm644 docs/tutorial.html "$subpkgdir"/usr/share/doc/$pkgname/tutorial.html - install -Dm644 docs/tutorial_examples.tar.gz "$subpkgdir"/usr/share/doc/$pkgname/tutorial_examples.tar.gz + cd "$_builddir" + + mkdir -p "$subpkgdir"/usr/share/doc/$pkgname + for doc in reference.html tutorial.html tutorial_examples.tar.gz; do + install -Dm644 ./docs/$doc "$subpkgdir"/usr/share/doc/$pkgname/$doc + done } md5sums="9d1a3aa0cece34a2492792278aad406d templayer-1.5.1.tar.gz" diff --git a/testing/py-urwid/APKBUILD b/testing/py-urwid/APKBUILD index 64ad1403f..4fe907447 100644 --- a/testing/py-urwid/APKBUILD +++ b/testing/py-urwid/APKBUILD @@ -1,21 +1,20 @@ # Contributor: Matt Smith <mcs@darkregion.net> # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=py-urwid -_name=urwid +_pkgname=urwid pkgver=0.9.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="Urwid is a console user interface library for Python" url="http://excess.org/urwid/" arch="x86 x86_64" license="LGPL" depends="python" -makedepends="python-dev py-templayer" +makedepends="python-dev py-setuptools py-templayer" install= subpackages="$pkgname-doc" -source="http://excess.org/$pkgname/$_name-$pkgver.tar.gz - " +source="http://excess.org/$_pkgname/$_pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/$_name-$pkgver +_builddir="$srcdir"/$_pkgname-$pkgver prepare() { cd "$_builddir" @@ -24,20 +23,28 @@ prepare() { build() { cd "$_builddir" - python setup.py build - return 0 + python setup.py build || return 1 } package() { cd "$_builddir" python setup.py install --root "$pkgdir" +} + +doc() { + cd "$_builddir" - # generate tutorial examples, and copy documentation + # generate tutorial examples, and copy documentation python docgen_tutorial.py -s - mkdir -p "$pkgdir"/usr/share/doc/$pkgname/tutorial_examples - cp -a example*.py "$pkgdir"/usr/share/doc/$pkgname/tutorial_examples/ - install -Dm644 reference.html "$pkgdir"/usr/share/doc/$pkgname/reference.html - install -Dm644 tutorial.html "$pkgdir"/usr/share/doc/$pkgname/tutorial.html + mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/tutorial_examples + cp -a example*.py "$subpkgdir"/usr/share/doc/$pkgname/tutorial_examples/ + + for doc in CHANGELOG reference.html tutorial.html; do + install -Dm644 $doc "$subpkgdir"/usr/share/doc/$pkgname/$doc + done + + # Fix subdir perms + find "$subpkgdir"/usr/share/doc/$pkgname/ -type d -exec chmod 755 '{}' \; } md5sums="4722cdf898f711dcae1121aa80920152 urwid-0.9.9.1.tar.gz" diff --git a/testing/speedometer/APKBUILD b/testing/speedometer/APKBUILD index 2f009c547..bafa60272 100644 --- a/testing/speedometer/APKBUILD +++ b/testing/speedometer/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=speedometer pkgver=2.7 -pkgrel=1 +pkgrel=2 pkgdesc="Measure and display the rate of data across a network connection or data being stored in a file" url="http://excess.org/speedometer/" -arch="x86 x86_64" +arch="noarch" license="LGPL" depends="python py-urwid" makedepends= |