commit:     4f4ba7ccdb2bccd1835237c9ffba27e2bafe45c5
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 10:57:48 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 11:14:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f4ba7cc

sys-apps/firejail-lts: Move LTS version to separate package

Having it in a separate package makes it easier for users to follow LTS
branch of firejail. Before that users had to mask older versions to test
LTS. It's better than having it slotted because portage by default picks
up latest version from any slot and user would have to explicitly
install particular slot.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/{firejail => firejail-lts}/Manifest             |  1 -
 .../files/firejail-lts-0.9.38.6-sysmacros.patch}         |  0
 .../firejail-lts-0.9.38.6.ebuild}                        | 12 ++++++++++--
 sys-apps/{firejail => firejail-lts}/metadata.xml         | 16 +++-------------
 sys-apps/firejail/Manifest                               |  1 -
 sys-apps/firejail/firejail-0.9.44.2.ebuild               |  3 ++-
 sys-apps/firejail/metadata.xml                           |  3 +++
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail-lts/Manifest
similarity index 50%
copy from sys-apps/firejail/Manifest
copy to sys-apps/firejail-lts/Manifest
index 3024036..adccb37 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail-lts/Manifest
@@ -1,2 +1 @@
 DIST firejail-0.9.38.6.tar.bz2 158685 SHA256 
76a25da5d2c3e2b50d0f3ff750614a43742f7115b0c65b92ba5c71a226006b70 SHA512 
ba65ba77faa5f278a632f01cabc7ce963cd9a6c665a531ab4b5abfb076e670b52b1326c097a7e180aa717085aace4ecc4b9922c28066752f1afc77e123dfad26
 WHIRLPOOL 
fcafc4155bdf2fc914eebc45bad7ce0c1ebc042705f57334f820453b3095aec444f7b49dbd84284e308d0f63185163be3f6089025df8815eca4983a007a853c0
-DIST firejail-0.9.44.2.tar.xz 213092 SHA256 
c5adef1943daa33049c4c39e5a19a0d02b897f1b1581be094ec600490dde8851 SHA512 
c7babda0fa2ca35113fcbebf213448e57889d4447a188f2ad2bc06f76fda1024f22b4f3569050330792b57d9f1026ecf11470bbd534a7bdd74320da1bc584f9e
 WHIRLPOOL 
365bd20a946a8210c12d4981ec7057c3bd47af00fcd37f98e65164dd70482bc0461cd445bc24cb7cf04231111575f972e52accc8d08f23b0f0e26141918f2978

diff --git a/sys-apps/firejail/files/firejail-0.9.38.6-sysmacros.patch 
b/sys-apps/firejail-lts/files/firejail-lts-0.9.38.6-sysmacros.patch
similarity index 100%
rename from sys-apps/firejail/files/firejail-0.9.38.6-sysmacros.patch
rename to sys-apps/firejail-lts/files/firejail-lts-0.9.38.6-sysmacros.patch

diff --git a/sys-apps/firejail/firejail-0.9.38.6.ebuild 
b/sys-apps/firejail-lts/firejail-lts-0.9.38.6.ebuild
similarity index 66%
rename from sys-apps/firejail/firejail-0.9.38.6.ebuild
rename to sys-apps/firejail-lts/firejail-lts-0.9.38.6.ebuild
index d35fd1c..575d166 100644
--- a/sys-apps/firejail/firejail-0.9.38.6.ebuild
+++ b/sys-apps/firejail-lts/firejail-lts-0.9.38.6.ebuild
@@ -6,15 +6,23 @@ EAPI=5
 
 inherit eutils
 
-DESCRIPTION="Security sandbox for any type of processes"
+MY_PN=firejail
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Security sandbox for any type of processes; LTS branch"
 HOMEPAGE="https://firejail.wordpress.com/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+seccomp"
 
+DEPEND="!sys-apps/firejail"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
 src_prepare() {
        epatch "${FILESDIR}"/${P}-sysmacros.patch
        find -name Makefile.in -exec sed -i -r \

diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail-lts/metadata.xml
similarity index 54%
copy from sys-apps/firejail/metadata.xml
copy to sys-apps/firejail-lts/metadata.xml
index 13c3aaf..942b4a0 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail-lts/metadata.xml
@@ -12,24 +12,14 @@
                descendants to have their own private view of the globally 
shared
                kernel resources, such as the network stack, process table, 
mount
                table.
+
+               This is long term support branch of firejail. For bleeding edge 
version
+               see sys-apps/firejail.
        </longdescription>
        <upstream>
                <remote-id type="sourceforge">firejail</remote-id>
        </upstream>
        <use>
-               <flag name="apparmor">Enable support for custom AppArmor
-                       profiles</flag>
-               <flag name="bind">Enable custom bind mounts</flag>
-               <flag name="chroot">Enable chrooting to custom directory</flag>
-               <flag name="file-transfer">Enable file transfers between 
sandboxes and
-                       the host system</flag>
-               <flag name="network">Enable networking features</flag>
-               <flag name="network-restricted">Grant access to --interface,
-                       --net=ethXXX and --netfilter only to root user; regular 
users are
-                       only allowed --net=none</flag>
                <flag name="seccomp">Enable system call filtering</flag>
-               <flag name="userns">Enable attaching a new user namespace to a
-                       sandbox (--noroot option)</flag>
-               <flag name="x11">Enable X11 sandboxing</flag>
        </use>
 </pkgmetadata>

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 3024036..18ec9ff 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,2 +1 @@
-DIST firejail-0.9.38.6.tar.bz2 158685 SHA256 
76a25da5d2c3e2b50d0f3ff750614a43742f7115b0c65b92ba5c71a226006b70 SHA512 
ba65ba77faa5f278a632f01cabc7ce963cd9a6c665a531ab4b5abfb076e670b52b1326c097a7e180aa717085aace4ecc4b9922c28066752f1afc77e123dfad26
 WHIRLPOOL 
fcafc4155bdf2fc914eebc45bad7ce0c1ebc042705f57334f820453b3095aec444f7b49dbd84284e308d0f63185163be3f6089025df8815eca4983a007a853c0
 DIST firejail-0.9.44.2.tar.xz 213092 SHA256 
c5adef1943daa33049c4c39e5a19a0d02b897f1b1581be094ec600490dde8851 SHA512 
c7babda0fa2ca35113fcbebf213448e57889d4447a188f2ad2bc06f76fda1024f22b4f3569050330792b57d9f1026ecf11470bbd534a7bdd74320da1bc584f9e
 WHIRLPOOL 
365bd20a946a8210c12d4981ec7057c3bd47af00fcd37f98e65164dd70482bc0461cd445bc24cb7cf04231111575f972e52accc8d08f23b0f0e26141918f2978

diff --git a/sys-apps/firejail/firejail-0.9.44.2.ebuild 
b/sys-apps/firejail/firejail-0.9.44.2.ebuild
index 3ce7e35..b3b3b46 100644
--- a/sys-apps/firejail/firejail-0.9.44.2.ebuild
+++ b/sys-apps/firejail/firejail-0.9.44.2.ebuild
@@ -16,7 +16,8 @@ KEYWORDS="amd64"
 IUSE="apparmor +bind +chroot +file-transfer +network
        network-restricted +seccomp +userns x11"
 
-DEPEND="apparmor? ( sys-libs/libapparmor )"
+DEPEND="!sys-apps/firejail
+       apparmor? ( sys-libs/libapparmor )"
 RDEPEND="${DEPEND}
        x11? ( x11-wm/xpra[client,server] )"
 

diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index 13c3aaf..34eb184 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -12,6 +12,9 @@
                descendants to have their own private view of the globally 
shared
                kernel resources, such as the network stack, process table, 
mount
                table.
+
+               This is bleeding edge branch. For long term support version see
+               sys-apps/firejail-lts.
        </longdescription>
        <upstream>
                <remote-id type="sourceforge">firejail</remote-id>

Reply via email to