[PR PATCH] apparmor: merge apparmor-vim

[PR PATCH] apparmor: merge apparmor-vim

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages no-vim-split
https://github.com/void-linux/void-packages/pull/31630

apparmor: merge apparmor-vim
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31630.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-no-vim-split-31630.patch --]
[-- Type: text/x-diff, Size: 1503 bytes --]

From 112dee65294c4ed2f6cc7824e8ef9f21779ef900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 23 Jun 2021 23:37:47 +0700
Subject: [PATCH] apparmor: merge apparmor-vim

---
 srcpkgs/apparmor/template | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 2431832981c7..ea2611c2443d 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
 version=3.0.1
-revision=4
+revision=5
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
@@ -18,6 +18,7 @@ homepage="https://gitlab.com/apparmor/apparmor"
 changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
 distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
 checksum=5f9afc157c5e2610737186a31fc9bd6a1d339a2ee85ac4f2667dce59cf60f1c7
+replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="--with-perl --with-python"
@@ -64,15 +65,6 @@ post_install() {
 	rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
 }
 
-apparmor-vim_package() {
-	short_desc+=" - Vim syntax"
-	depends="vim"
-	pkg_install() {
-		vmove usr/share/vim/vimfiles/syntax/apparmor.vim
-		vmove usr/share/man/man5/apparmor.vim.5
-	}
-}
-
 libapparmor_package() {
 	short_desc+=" - Library"
 	pkg_install() {

Re: apparmor: merge apparmor-vim

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31630#issuecomment-866999301

Comment:
Missing the symlink removal.

Re: apparmor: merge apparmor-vim

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/31630#issuecomment-867028145

Comment:
ping @olivier-mauras 

Re: [PR PATCH] [Updated] apparmor: merge apparmor-vim

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages no-vim-split
https://github.com/void-linux/void-packages/pull/31630

apparmor: merge apparmor-vim
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31630.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-no-vim-split-31630.patch --]
[-- Type: text/x-diff, Size: 1787 bytes --]

From 51c7ec9e05e88b371f7a1b70c1df8556470bb3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 23 Jun 2021 23:37:47 +0700
Subject: [PATCH] apparmor: merge apparmor-vim

---
 srcpkgs/apparmor-vim      |  1 -
 srcpkgs/apparmor/template | 12 ++----------
 2 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/apparmor-vim

diff --git a/srcpkgs/apparmor-vim b/srcpkgs/apparmor-vim
deleted file mode 120000
index ea0b7d22829c..000000000000
--- a/srcpkgs/apparmor-vim
+++ /dev/null
@@ -1 +0,0 @@
-apparmor
\ No newline at end of file
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 2431832981c7..ea2611c2443d 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
 version=3.0.1
-revision=4
+revision=5
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
@@ -18,6 +18,7 @@ homepage="https://gitlab.com/apparmor/apparmor"
 changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
 distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
 checksum=5f9afc157c5e2610737186a31fc9bd6a1d339a2ee85ac4f2667dce59cf60f1c7
+replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="--with-perl --with-python"
@@ -64,15 +65,6 @@ post_install() {
 	rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
 }
 
-apparmor-vim_package() {
-	short_desc+=" - Vim syntax"
-	depends="vim"
-	pkg_install() {
-		vmove usr/share/vim/vimfiles/syntax/apparmor.vim
-		vmove usr/share/man/man5/apparmor.vim.5
-	}
-}
-
 libapparmor_package() {
 	short_desc+=" - Library"
 	pkg_install() {

Re: [PR PATCH] [Merged]: apparmor: merge apparmor-vim

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]

There's a merged pull request on the void-packages repository

apparmor: merge apparmor-vim
https://github.com/void-linux/void-packages/pull/31630

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->