diff options
| author | Olliver Schinagl <oliver@schinagl.nl> | 2019-04-12 08:02:59 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-04-30 11:22:12 +0000 |
| commit | a8a09e406f140276f260f7bc8b99e2b6a95897e6 (patch) | |
| tree | 8280696d1f8f5c2f782aa61e797a41228d8e5cbf /main/git | |
| parent | 0a02793adaad319cd2cd09f07b21494fec7d41ae (diff) | |
| download | aports-a8a09e406f140276f260f7bc8b99e2b6a95897e6.tar.bz2 aports-a8a09e406f140276f260f7bc8b99e2b6a95897e6.tar.xz | |
main/git: Git does not replace git-perl anymore
In the entire aports repository there is no mention of git-perl except
for our own aport. Matter of fact, git-perl is just an addon, which
depends on git. So no replace magic is needed anymore here.
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
Diffstat (limited to 'main/git')
| -rw-r--r-- | main/git/APKBUILD | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 281fcb096b..f4abbe77f3 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -20,7 +20,6 @@ depends="" # 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 python2-dev pcre2-dev asciidoc xmlto perl-error tcl tk" -replaces="git-perl" # note that order matters subpackages="$pkgname-doc $pkgname-bash-completion:completion:noarch @@ -82,7 +81,6 @@ package() { _perl_git_svn() { pkgdesc="Perl interface to Git::SVN" depends="git=$pkgver-r$pkgrel" - replaces="git-perl" local vendorlib vendorlib=$(_perl_config vendorlib) @@ -94,7 +92,6 @@ _perl_git_svn() { _perl_git() { pkgdesc="Perl interface to Git" depends="git=$pkgver-r$pkgrel perl-error" - replaces="git-perl" local i for i in "$(_perl_config vendorlib)" "$(_perl_config vendorarch)"; do @@ -107,7 +104,6 @@ _perl_git() { email() { pkgdesc="Git tools for sending email" depends="perl perl-git=$pkgver-r$pkgrel perl-net-smtp-ssl perl-authen-sasl" - replaces="git" mkdir -p "$subpkgdir"/$_gitcoredir mv "$pkgdir"/$_gitcoredir/*email* "$pkgdir"/$_gitcoredir/*imap* \ @@ -118,7 +114,6 @@ svn() { pkgdesc="Subversion support for git" depends="perl perl-git-svn=$pkgver-r$pkgrel perl-subversion perl-term-readkey" - replaces="" mkdir -p "$subpkgdir"/$_gitcoredir mv "$pkgdir"/$_gitcoredir/git-svn \ @@ -129,7 +124,6 @@ svn() { cvs() { pkgdesc="Git tools for importing CVS repositories" depends="perl perl-git=$pkgver-r$pkgrel cvs perl-dbd-sqlite" - replaces="git-perl" mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/$_gitcoredir mv "$pkgdir"/usr/bin/git-cvs* "$subpkgdir"/usr/bin/ @@ -147,7 +141,6 @@ _fast_import() { p4() { pkgdesc="Git tools for working with Perforce depots" depends="git=$pkgver-r$pkgrel git-fast-import=$pkgver-r$pkgrel" - replaces="git" mkdir -p "$subpkgdir"/$_gitcoredir/mergetools mv "$pkgdir"/$_gitcoredir/*p4* "$subpkgdir"/$_gitcoredir/ @@ -158,7 +151,6 @@ p4() { daemon() { pkgdesc="Git protocol daemon" depends="git=$pkgver-r$pkgrel" - replaces="git" mkdir -p "$subpkgdir"/$_gitcoredir mv "$pkgdir"/$_gitcoredir/git-daemon \ @@ -172,7 +164,6 @@ daemon() { gitweb() { pkgdesc="Simple web interface to git repositories" depends="git=$pkgver-r$pkgrel perl" - replaces="git" mkdir -p "$subpkgdir"/usr/share "$subpkgdir"$_gitcoredir mv "$pkgdir"/usr/share/gitweb "$subpkgdir"/usr/share/ @@ -182,7 +173,6 @@ gitweb() { completion() { pkgdesc="Bash completion for $pkgname" depends="" - replaces="" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" install -Dm644 "$builddir"/contrib/completion/git-completion.bash \ @@ -192,7 +182,6 @@ completion() { subtree() { depends="git=$pkgver-r$pkgrel" pkgdesc="Split git repository into subtrees" - replaces="" cd "$builddir"/contrib/subtree make prefix=/usr DESTDIR="$pkgdir" @@ -202,7 +191,6 @@ subtree() { subtree_doc() { pkgdesc="Split git repository into subtrees (documentation)" depends="" - replaces="" cd "$builddir"/contrib/subtree make install-man prefix=/usr DESTDIR="$subpkgdir" @@ -212,7 +200,6 @@ subtree_doc() { gui() { pkgdesc="GUI interface for git" depends="git=$pkgver-r$pkgrel tcl tk" - replaces="" mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/usr/libexec/git-core mv "$pkgdir"/usr/share/git-gui "$subpkgdir"/usr/share/ @@ -225,7 +212,6 @@ gui() { gitk() { pkgdesc="Gitk interface for git" depends="git=$pkgver-r$pkgrel tcl tk" - replaces="" mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/usr/bin mv "$pkgdir"/usr/share/gitk "$subpkgdir"/usr/share/ @@ -235,7 +221,6 @@ gitk() { diff_highlight() { pkgdesc="diff highlight for git" depends="git=$pkgver-r$pkgrel perl" - replaces="" cd "$builddir"/contrib/diff-highlight @@ -249,7 +234,6 @@ diff_highlight() { _git_perl() { pkgdesc="Additional Git commands that requires perl" depends="git=$pkgver-r$pkgrel perl-git=$pkgver-r$pkgrel perl" - replaces="" mkdir -p "$subpkgdir"/usr/lib cd "$pkgdir" |
