From 47bbfd4ca70f843fee4b806004c9fe30fb795967 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 25 Jun 2018 18:47:59 -0500 Subject: system/git: [PD] take, bump, un-split core perl commands --- system/git/APKBUILD | 101 ++++++---------------------------------------------- 1 file changed, 10 insertions(+), 91 deletions(-) (limited to 'system') diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 0a400b851..7fdb90fff 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Łukasz Jendrysik -# Maintainer: Natanael Copa +# Maintainer: A. Wilcox pkgname=git -pkgver=2.15.0 +pkgver=2.17.1 pkgrel=0 pkgdesc="A distributed version control system" url="https://www.git-scm.com/" arch="all" -license="GPL2+" -depends= -replaces="git-perl" +license="GPL-2.0+" +depends="perl-error" +replaces="git-perl perl-git" # secfixes: # 2.14.1: @@ -17,9 +17,6 @@ replaces="git-perl" # note that order matters subpackages="$pkgname-doc $pkgname-bash-completion:completion:noarch - perl-$pkgname-svn:_perl_git_svn:noarch - perl-$pkgname:_perl_git:noarch - $pkgname-svn $pkgname-email $pkgname-fast-import:_fast_import $pkgname-cvs::noarch @@ -28,13 +25,9 @@ subpackages="$pkgname-doc $pkgname-gitweb $pkgname-subtree::noarch $pkgname-subtree-doc:subtree_doc:noarch - $pkgname-perl:_git_perl:noarch - $pkgname-gui::noarch - $pkgname-gitk::noarch " -# we need tcl and tk to be built before git due to git-gui and gitk makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev - pcre2-dev asciidoctor xmlto perl-error tcl tk" + pcre2-dev asciidoctor xmlto perl-error" checkdepends="python3" source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz bb-tar.patch @@ -62,7 +55,6 @@ prepare() { build() { cd "$builddir" - make -j1 prefix=/usr DESTDIR="$pkgdir" perl/perl.mak make prefix=/usr DESTDIR="$pkgdir" } @@ -84,32 +76,11 @@ package() { "$pkgdir"/etc/conf.d/git-daemon make prefix=/usr DESTDIR="$pkgdir" install-man -} - -_perl_git_svn() { - pkgdesc="Perl interface to Git::SVN" - depends="git=$pkgver-r$pkgrel" - replaces="git-perl" - eval local `perl -V:vendorlib` - mkdir -p "$subpkgdir"/$vendorlib/Git - mv "$pkgdir"/$vendorlib/Git/SVN* "$subpkgdir"/$vendorlib/Git/ -} - -_perl_git() { - pkgdesc="Perl interface to Git" - depends="git=$pkgver-r$pkgrel perl-error" - replaces="git-perl" - eval local `perl -V:vendorlib` - eval local `perl -V:vendorarch` - for i in $vendorlib $vendorarch; do - mkdir -p "$subpkgdir"/${i%/*} - mv "$pkgdir"/$i "$subpkgdir"/$i - done + find "$pkgdir" -name perllocal.pod -delete } email() { - depends="perl perl-git=$pkgver-r$pkgrel perl-net-smtp-ssl - perl-authen-sasl" + depends="perl perl-net-smtp-ssl perl-authen-sasl" pkgdesc="Git tools for sending email" replaces="git" mkdir -p "$subpkgdir"/$_gitcoredir @@ -117,21 +88,9 @@ email() { "$subpkgdir"/$_gitcoredir } -svn() { - depends="perl perl-git-svn=$pkgver-r$pkgrel perl-subversion - perl-term-readkey" - pkgdesc="Subversion support for git" - replaces="" - - mkdir -p "$subpkgdir"/$_gitcoredir - mv "$pkgdir"/$_gitcoredir/git-svn \ - "$pkgdir"$_gitcoredir/git-remote-testsvn \ - "$subpkgdir"/$_gitcoredir/ -} - cvs() { pkgdesc="Git tools for importing CVS repositories" - depends="perl perl-git=$pkgver-r$pkgrel cvs perl-dbd-sqlite" + depends="perl cvs perl-dbd-sqlite" replaces="git-perl" mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/$_gitcoredir mv "$pkgdir"/usr/bin/git-cvs* "$subpkgdir"/usr/bin/ @@ -208,47 +167,7 @@ subtree_doc() { gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 } -gui() { - depends="git=$pkgver-r$pkgrel tcl tk" - pkgdesc="GUI interface for git" - replaces="" - - mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/usr/libexec/git-core - mv "$pkgdir"/usr/share/git-gui "$subpkgdir"/usr/share/ - mv "$pkgdir"/usr/libexec/git-core/git-citool \ - "$pkgdir"/usr/libexec/git-core/git-gui \ - "$pkgdir"/usr/libexec/git-core/git-gui--askpass \ - "$subpkgdir"/usr/libexec/git-core/ -} - -gitk() { - depends="git=$pkgver-r$pkgrel tcl tk" - pkgdesc="Gitk interface for git" - replaces="" - - mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/share/gitk "$subpkgdir"/usr/share/ - mv "$pkgdir"/usr/bin/gitk "$subpkgdir"/usr/bin/ -} - -# catch-the-rest of stuff that needs perl -_git_perl() { - depends="git=$pkgver-r$pkgrel perl-git=$pkgver-r$pkgrel perl" - pkgdesc="Additional Git commands that requires perl" - replaces="" - - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/ - cd "$pkgdir" - find -type f | xargs file --mime-type | grep perl | cut -d: -f1| while read f; do - mkdir -p "$subpkgdir"/${f%/*} - mv "$f" "$subpkgdir"/${f%/*} - done - find "$subpkgdir" -name perllocal.pod -delete -} - - -sha512sums="994704b440ebce104a99d815dd713af3173f29e70646d7135c3fcd1ac4694a26e499f0732843606c397cbf6108809eb397546c837623a4adbe1ccb2fc825cb64 git-2.15.0.tar.xz +sha512sums="77c27569d40fbae1842130baa0cdda674a02e384631bd8fb1f2ddf67ce372dd4903b2ce6b4283a4ae506cdedd5daa55baa2afe6a6689528511e24e4beb864960 git-2.17.1.tar.xz 85767b5e03137008d6a96199e769e3979f75d83603ac8cb13a3481a915005637409a4fd94e0720da2ec6cd1124f35eba7cf20109a94816c4b4898a81fbc46bd2 bb-tar.patch 135645fa57c41c50bec6d09f7d3c92f26d30334b5f342d50942c24e0dd11106e40c36b11346c9e6cd69e98b7a9ebeec80e4e4f1506ef689f39d7ef4539727dae dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd -- cgit v1.2.3-70-g09d2