main/perl-encode: upgrade to 2.88 v1 PROPOSED

Valery Kartel: 1
 main/perl-encode: upgrade to 2.88

 1 files changed, 35 insertions(+), 15 deletions(-)

Oh,

previously I post http://patchwork.alpinelinux.org/patch/2816/ and somehow
thought it's accepted and used it on my own build host.

for now it replaces="perl" :)

2017-01-23 15:02 GMT+02:00 Leonardo Arena <rnalrd@gmail.com>:

What do you think about to apply perl fixes http://patchwork.alpinelinux.
org/patch/2816/  ?

2017-01-23 15:07 GMT+02:00 Valery Kartel <valery.kartel@gmail.com>:

Thanks
On lun, 2017-01-23 at 15:24 +0200, Valery Kartel wrote:

[alpine-aports] [PATCH] main/perl-encode: upgrade to 2.88 Export this patch

- fix doc
- move *.pod to -doc
- rename -piconv subpackage to -utils (because there are several utils)
- move development script and data to -dev
---
 main/perl-encode/APKBUILD | 50 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 15 deletions(-)

Leonardo Arena <rnalrd@gmail.com>

7 years ago

[...] 

Next

diff --git a/main/perl-encode/APKBUILD b/main/perl-encode/APKBUILD
index 63b4b8c104..f306e70e6c 100644
--- a/main/perl-encode/APKBUILD
+++ b/main/perl-encode/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-encode
 _pkgreal=Encode
-pkgver=2.86
+pkgver=2.88
 pkgrel=0
 pkgdesc="character encodings in Perl"
 url="http://search.cpan.org/dist/Encode/"
@@ -13,37 +13,57 @@ cpandepends=""
 cpanmakedepends="   "
 depends="$cpandepends"
 makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc $pkgname-piconv"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-utils::noarch"
 source="http://search.cpan.org/CPAN/authors/id/D/DA/DANKOGAI/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	make && make test
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-# we split out /usr/bin/piconv to separate package to avoid conflict with
-# piconv shipped with perl itself
-piconv() {
-	pkgdesc="perl implementation of iconv"
+utils() {
+	pkgdesc="perl Encode utils"
+	replaces="perl-utils"
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+}
+

Leonardo Arena <rnalrd@gmail.com>

7 years ago

there's no package "perl-utils" to be replaced. piconv and encguess
belong to main perl package:

(1/1) Installing perl-encode-utils (2.88-r0)
ERROR: perl-encode-utils-2.88-r0: trying to overwrite usr/bin/encguess
owned by perl-5.24.0-r0.
ERROR: perl-encode-utils-2.88-r0: trying to overwrite usr/bin/piconv
owned by perl-5.24.0-r0.

Next

+dev() {
+	default_dev
+	replaces="perl-dev"
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/piconv "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/enc2xs "$subpkgdir"/usr/bin || reutrn 1

Leonardo Arena <rnalrd@gmail.com>

7 years ago

Spelling error                                              ^

Other than these it looks okay to me.

Thanks!

-|_eo

+	local file; for file in $(find "$pkgdir" -name "*.e2x"); do
+		file=${file#$pkgdir/}
+		mkdir -p "$subpkgdir"/${file%/*} || return 1
+		mv "$pkgdir"/$file "$subpkgdir"/$file || return 1
+	done
+}
+
+doc() {
+	default_doc
+	replaces="perl-doc"
+	local file; for file in $(find "$pkgdir" -name "*.pod"); do
+		file=${file#$pkgdir/}
+		mkdir -p "$subpkgdir"/${file%/*} || return 1
+		mv "$pkgdir"/$file "$subpkgdir"/$file || return 1
+	done
 }
 
-md5sums="ebb87962b8cbaf0097721d0b7f1becfc  Encode-2.86.tar.gz"
-sha256sums="dfdb3dc709ce29a366eb162297378cbc8a1ae6720df3aba2ef0bae38478dfb2a  Encode-2.86.tar.gz"
-sha512sums="fa5feeb8f7b555c91322948cd526762fbdca6ef240b640800e7af0dcf75cffca48f8877a1a7b876798b8441de8a0075aeb50ea4769f52b1d180f68316c84d599  Encode-2.86.tar.gz"
+md5sums="119e8668e1d7b128ce39375445526a7e  Encode-2.88.tar.gz"
+sha256sums="e45ce444dfc87b01a16d3029d9a027beab1fdeff9860699b4b62a141420be338  Encode-2.88.tar.gz"
+sha512sums="1261415abd9c2ad5f8d009441e1f2f541d7e94c570549d3b895df57d5c7480087ec646b2691724007a5797238cb7249347d9b97b7c46018973a7ef33274fe162  Encode-2.88.tar.gz"
-- 
2.11.0



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

Leonardo Arena <rnalrd@gmail.com>

7 years ago

Hi,

On lun, 2017-01-23 at 13:51 +0200, Valery Kartel wrote: