Message-ID: <1485247978.11710.38.camel@gmail.com>
Subject: Re: [alpine-aports] [PATCH v3] main/perl-encode: upgrade to 2.88
From: Leonardo Arena <rnalrd@gmail.com>
To: Valery Kartel <valery.kartel@gmail.com>, 
	alpine-aports@lists.alpinelinux.org
Date: Tue, 24 Jan 2017 09:52:58 +0100
In-Reply-To: <20170123201038.12852-1-valery.kartel@gmail.com>
References: <20170123201038.12852-1-valery.kartel@gmail.com>
Content-Type: multipart/signed; micalg="pgp-sha256";
	protocol="application/pgp-signature"; boundary="=-VJzVvH91EWjAh+wSUyeh"
Precedence: list
Mime-Version: 1.0


--=-VJzVvH91EWjAh+wSUyeh
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On lun, 2017-01-23 at 22:10 +0200, Valery Kartel wrote:
> - fix doc
> - move *.pod to -doc
> - rename -piconv subpackage to -utils (because there are several
> utils)
> - move development script and data to -dev
>=20
> ---
> v1 -> v3: fix typo
> ---
> =C2=A0main/perl-encode/APKBUILD | 52 +++++++++++++++++++++++++++++++++--
> ------------
> =C2=A01 file changed, 37 insertions(+), 15 deletions(-)
>=20

Pushed with modifications below:

> diff --git a/main/perl-encode/APKBUILD b/main/perl-encode/APKBUILD
> index 63b4b8c104..ced4453e87 100644
> --- a/main/perl-encode/APKBUILD
> +++ b/main/perl-encode/APKBUILD
> @@ -3,7 +3,7 @@
> =C2=A0# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
> =C2=A0pkgname=3Dperl-encode
> =C2=A0_pkgreal=3DEncode
> -pkgver=3D2.86
> +pkgver=3D2.88
> =C2=A0pkgrel=3D0
> =C2=A0pkgdesc=3D"character encodings in Perl"
> =C2=A0url=3D"http://search.cpan.org/dist/Encode/"
> @@ -12,38 +12,60 @@ license=3D"GPL PerlArtistic"
> =C2=A0cpandepends=3D""
> =C2=A0cpanmakedepends=3D"=C2=A0=C2=A0=C2=A0"
> =C2=A0depends=3D"$cpandepends"
> +depends_dev=3D"$pkgname-utils"
> =C2=A0makedepends=3D"perl-dev $cpanmakedepends"
> -subpackages=3D"$pkgname-doc $pkgname-piconv"
> +subpackages=3D"$pkgname-doc $pkgname-dev $pkgname-utils::noarch"
> =C2=A0source=3D"http://search.cpan.org/CPAN/authors/id/D/DA/DANKOGAI/$_pk=
gre
> al-$pkgver.tar.gz"
> -
> -_builddir=3D"$srcdir/$_pkgreal-$pkgver"
> +builddir=3D"$srcdir/$_pkgreal-$pkgver"
> =C2=A0
> =C2=A0prepare() {
> -	cd "$_builddir"
> +	cd "$builddir"
> =C2=A0	export CFLAGS=3D`perl -MConfig -E 'say $Config{ccflags}'`
> =C2=A0	PERL_MM_USE_DEFAULT=3D1 perl Makefile.PL INSTALLDIRS=3Dvendor
> =C2=A0}
> =C2=A0
> =C2=A0build() {
> -	cd "$_builddir"
> +	cd "$builddir"
> =C2=A0	export CFLAGS=3D`perl -MConfig -E 'say $Config{ccflags}'`
> =C2=A0	make && make test
> =C2=A0}
> =C2=A0
> =C2=A0package() {
> -	cd "$_builddir"
> +	cd "$builddir"
> =C2=A0	make DESTDIR=3D"$pkgdir" install || return 1
> =C2=A0	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \)
> -delete
> =C2=A0}
> =C2=A0
> -# we split out /usr/bin/piconv to separate package to avoid conflict
> with
> -# piconv shipped with perl itself
> -piconv() {
> -	pkgdesc=3D"perl implementation of iconv"
> +utils() {
> +	replaces=3D"perl-utils"

replaces=3D"perl" used instead.

> +	pkgdesc=3D"$pkgdesc (utilities)"
> +	depends=3D"$pkgname perl"

provides=3D"perl-piconv" added to avoid breaking current installs.

> +	mkdir -p "$subpkgdir"/usr
> +	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
> +}
> +
> +dev() {
> +	default_dev
> +	replaces=3D"perl-dev"
> =C2=A0	mkdir -p "$subpkgdir"/usr/bin
> -	mv "$pkgdir"/usr/bin/piconv "$subpkgdir"/usr/bin/
> +	mv "$pkgdir"/usr/bin/enc2xs "$subpkgdir"/usr/bin || return 1
> +	local file; for file in $(find "$pkgdir" -name "*.e2x"); do
> +		file=3D${file#$pkgdir/}
> +		mkdir -p "$subpkgdir"/${file%/*} || return 1
> +		mv "$pkgdir"/$file "$subpkgdir"/$file || return 1
> +	done
> +}
> +
> +doc() {
> +	default_doc
> +	replaces=3D"perl-doc"
> +	local file; for file in $(find "$pkgdir" -name "*.pod"); do
> +		file=3D${file#$pkgdir/}
> +		mkdir -p "$subpkgdir"/${file%/*} || return 1
> +		mv "$pkgdir"/$file "$subpkgdir"/$file || return 1
> +	done
> =C2=A0}
> =C2=A0
> -md5sums=3D"ebb87962b8cbaf0097721d0b7f1becfc=C2=A0=C2=A0Encode-2.86.tar.g=
z"
> -sha256sums=3D"dfdb3dc709ce29a366eb162297378cbc8a1ae6720df3aba2ef0bae38
> 478dfb2a=C2=A0=C2=A0Encode-2.86.tar.gz"
> -sha512sums=3D"fa5feeb8f7b555c91322948cd526762fbdca6ef240b640800e7af0dc
> f75cffca48f8877a1a7b876798b8441de8a0075aeb50ea4769f52b1d180f68316c84d
> 599=C2=A0=C2=A0Encode-2.86.tar.gz"
> +md5sums=3D"119e8668e1d7b128ce39375445526a7e=C2=A0=C2=A0Encode-2.88.tar.g=
z"
> +sha256sums=3D"e45ce444dfc87b01a16d3029d9a027beab1fdeff9860699b4b62a141
> 420be338=C2=A0=C2=A0Encode-2.88.tar.gz"
> +sha512sums=3D"1261415abd9c2ad5f8d009441e1f2f541d7e94c570549d3b895df57d
> 5c7480087ec646b2691724007a5797238cb7249347d9b97b7c46018973a7ef33274fe
> 162=C2=A0=C2=A0Encode-2.88.tar.gz"

Thanks!

-|_eo
--=-VJzVvH91EWjAh+wSUyeh
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAABCAAGBQJYhxXqAAoJELAPckZGG2T6VHEH/RHFNPkx4t9ftQosIb3wd9/L
j6ZaKe8+3+2uoMctAiGYFtCHyXfMhhKYQ1NeLSr6VSWRMCoZ+tcDSJMQgb6f4kTo
dwfrhQzBxmU+AKw+kSCnmvPH3VRS5jtpKsBdIx4RM0pqAXsf/hJrlYkh8ieh6vV0
EoXZXY0AM6mmKLj9BzsJNwBZNwsuxatZn4+fG1dldrMcP9lDoBox8LgFEwwMSjx9
5DOmkbszr1g4FndQOFnZhiubZcwQNIqdBbWAMp7Nm3bmPvZaPaIHykbv3OS17REU
cXO790UpUsmgmlXd/49OhbROcf/qorAlwvXh8t3Jads3/TENLJ3Bx5OJjbXDYN8=
=0qfB
-----END PGP SIGNATURE-----

--=-VJzVvH91EWjAh+wSUyeh--



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---