| 1 |
commit: 7efa28d485458743e6c25201b75526628f341af6 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 5 14:57:02 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 5 15:17:56 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efa28d4 |
| 7 |
|
| 8 |
sys-apps/pmount: Bump to EAPI 7 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../pmount-0.9.19-testsuite-missing-dir.patch | 6 ++--- |
| 13 |
.../files/pmount-0.9.99_alpha-locale-regex.patch | 4 ++-- |
| 14 |
sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild | 27 ++++++++++++---------- |
| 15 |
3 files changed, 20 insertions(+), 17 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch |
| 18 |
index 93d0555f0f3..319a1d6f04a 100644 |
| 19 |
--- a/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch |
| 20 |
+++ b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch |
| 21 |
@@ -16,21 +16,21 @@ diff --git a/tests/check_fstab/a b/tests/check_fstab/a |
| 22 |
new file mode 100644 |
| 23 |
index 0000000..d16d1c5 |
| 24 |
--- /dev/null |
| 25 |
-+++ tests/check_fstab/a |
| 26 |
++++ b/tests/check_fstab/a |
| 27 |
@@ -0,0 +1 @@ |
| 28 |
+This file is a 'dummy device file' for the fstab check |
| 29 |
diff --git a/tests/check_fstab/d b/tests/check_fstab/d |
| 30 |
new file mode 100644 |
| 31 |
index 0000000..d16d1c5 |
| 32 |
--- /dev/null |
| 33 |
-+++ tests/check_fstab/d |
| 34 |
++++ b/tests/check_fstab/d |
| 35 |
@@ -0,0 +1 @@ |
| 36 |
+This file is a 'dummy device file' for the fstab check |
| 37 |
diff --git a/tests/check_fstab/fstab b/tests/check_fstab/fstab |
| 38 |
new file mode 100644 |
| 39 |
index 0000000..8ba6f6c |
| 40 |
--- /dev/null |
| 41 |
-+++ tests/check_fstab/fstab |
| 42 |
++++ b/tests/check_fstab/fstab |
| 43 |
@@ -0,0 +1,6 @@ |
| 44 |
+# A dummy fstab file for |
| 45 |
+ |
| 46 |
|
| 47 |
diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch |
| 48 |
index c96fc055452..3dabd03c965 100644 |
| 49 |
--- a/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch |
| 50 |
+++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch |
| 51 |
@@ -1,7 +1,7 @@ |
| 52 |
http://bugs.gentoo.org/416985 |
| 53 |
|
| 54 |
---- src/conffile.c |
| 55 |
-+++ src/conffile.c |
| 56 |
+--- a/src/conffile.c |
| 57 |
++++ b/src/conffile.c |
| 58 |
@@ -372,7 +372,7 @@ static int cf_prepare_regexps() |
| 59 |
/* A regexp matching a boolean value*/ |
| 60 |
|
| 61 |
|
| 62 |
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild |
| 63 |
index 52df8b15b9f..7df482af2a2 100644 |
| 64 |
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild |
| 65 |
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild |
| 66 |
@@ -1,12 +1,13 @@ |
| 67 |
-# Copyright 1999-2019 Gentoo Authors |
| 68 |
+# Copyright 1999-2020 Gentoo Authors |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
-EAPI=5 |
| 72 |
-inherit eutils bash-completion-r1 |
| 73 |
+EAPI=7 |
| 74 |
+inherit bash-completion-r1 |
| 75 |
|
| 76 |
DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user" |
| 77 |
HOMEPAGE="https://launchpad.net/pmount" |
| 78 |
SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2" |
| 79 |
+S=${WORKDIR}/${P/_/-} |
| 80 |
|
| 81 |
LICENSE="GPL-2" |
| 82 |
SLOT="0" |
| 83 |
@@ -21,21 +22,22 @@ DEPEND="${RDEPEND} |
| 84 |
dev-util/intltool |
| 85 |
sys-devel/gettext" |
| 86 |
|
| 87 |
-S=${WORKDIR}/${P/_/-} |
| 88 |
+PATCHES=( |
| 89 |
+ "${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch |
| 90 |
+ "${FILESDIR}"/${P}-locale-regex.patch |
| 91 |
+) |
| 92 |
|
| 93 |
src_prepare() { |
| 94 |
# Restore default value from pmount <= 0.9.23 wrt #393633 |
| 95 |
sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die |
| 96 |
|
| 97 |
- cat <<-EOF > po/POTFILES.skip |
| 98 |
+ cat <<-EOF > po/POTFILES.skip || die |
| 99 |
src/conffile.c |
| 100 |
src/configuration.c |
| 101 |
src/loop.c |
| 102 |
EOF |
| 103 |
|
| 104 |
- epatch \ |
| 105 |
- "${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch \ |
| 106 |
- "${FILESDIR}"/${P}-locale-regex.patch |
| 107 |
+ default |
| 108 |
} |
| 109 |
|
| 110 |
src_configure() { |
| 111 |
@@ -45,14 +47,15 @@ src_configure() { |
| 112 |
src_test() { |
| 113 |
local testdir=${S}/tests/check_fstab |
| 114 |
|
| 115 |
- ln -s $testdir/a $testdir/b && ln -s $testdir/d $testdir/c && \ |
| 116 |
- ln -s $testdir/c $testdir/e \ |
| 117 |
- || die "Unable to create fake symlinks required for testsuite" |
| 118 |
+ ln -s a "${testdir}/b" && |
| 119 |
+ ln -s d "${testdir}/c" && |
| 120 |
+ ln -s c "${testdir}/e" || |
| 121 |
+ die "Unable to create fake symlinks required for testsuite" |
| 122 |
|
| 123 |
emake check |
| 124 |
} |
| 125 |
|
| 126 |
-src_install () { |
| 127 |
+src_install() { |
| 128 |
# Must be run SETUID+SETGID, bug #250106 |
| 129 |
exeinto /usr/bin |
| 130 |
exeopts -m 6710 -g plugdev |
Archives