[gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/ - gentoo-commits

From:	Andreas Sturmlechner <asturm@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
Date:	Sat, 17 Apr 2021 11:41:04
Message-Id:	`1618659648.68a682a2301bec17bfbd0dc887d9f490669471b0.asturm@gentoo`

1

commit:     68a682a2301bec17bfbd0dc887d9f490669471b0

2

Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>

3

AuthorDate: Mon Apr  5 12:36:41 2021 +0000

4

Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>

5

CommitDate: Sat Apr 17 11:40:48 2021 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a682a2

7

8

sys-fs/dislocker: Tidyup, DESCRIPTION w/o PN

9

10

- Unnecessary ${S}

11

- local mycmakeargs

12

- missing || die

13

14

Bug: https://bugs.gentoo.org/700784

15

Package-Manager: Portage-3.0.18, Repoman-3.0.3

16

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

17

18

 sys-fs/dislocker/dislocker-0.7.1-r3.ebuild | 21 ++++++++++-----------

19

 sys-fs/dislocker/dislocker-9999.ebuild     | 21 ++++++++++-----------

20

 2 files changed, 20 insertions(+), 22 deletions(-)

21

22

diff --git a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild

23

index 73f3b33aa54..90375bf7590 100644

24

--- a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild

25

+++ b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild

26

@@ -1,11 +1,12 @@

27

-# Copyright 1999-2020 Gentoo Authors

28

+# Copyright 1999-2021 Gentoo Authors

29

 # Distributed under the terms of the GNU General Public License v2

30

31

 EAPI=7

32

33

+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"

34

 inherit cmake flag-o-matic

35

36

-DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."

37

+DESCRIPTION="Read BitLocker encrypted partitions"

38

 HOMEPAGE="https://github.com/Aorimn/dislocker"

39

40

 if [[ ${PV} == *9999* ]]; then

41

@@ -28,8 +29,6 @@ DEPEND="

42

"

43

 RDEPEND="${DEPEND}"

44

45

-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"

46

-

47

 src_prepare() {

48

 	if use ruby && [[ ${PV} == "0.7.1" ]]; then

49

 		PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )

50

@@ -37,17 +36,17 @@ src_prepare() {

51

 	cmake_src_prepare

52

53

 # We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE

54

-#    sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die

55

-	sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die

56

+#    sed 's:Werror:Wno-error:g' -i "src/CMakeLists.txt" || die

57

+	sed 's:-D_FORTIFY_SOURCE=2::g' -i "src/CMakeLists.txt" || die

58

59

-#	sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die

60

+#	sed 's:\.\./man:'../../${P}/man':g' -i "src/CMakeLists.txt" || die

61

 # Do not process compressed versions of the manuals

62

-	sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "${S}/src/CMakeLists.txt" || die

63

-	sed -r 's:^(.+\.1\.gz):#\1:' -i "${S}/src/CMakeLists.txt" || die

64

+	sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "src/CMakeLists.txt" || die

65

+	sed -r 's:^(.+\.1\.gz):#\1:' -i "src/CMakeLists.txt" || die

66

}

67

68

 src_configure() {

69

-	mycmakeargs=(

70

+	local mycmakeargs=(

71

 		$(cmake_use_find_package ruby Ruby)

72

)

73

 	cmake_src_configure

74

@@ -57,6 +56,6 @@ src_install() {

75

 	if ! use ruby; then

76

 		rm "${S}/man/linux/${PN}-find.1" || die

77

fi

78

-	find "${S}/man/linux" -name '*.1' -exec doman '{}' +

79

+	find "${S}/man/linux" -name '*.1' -exec doman '{}' + || die

80

 	cmake_src_install

81

}

82

83

diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild

84

index 73f3b33aa54..90375bf7590 100644

85

--- a/sys-fs/dislocker/dislocker-9999.ebuild

86

+++ b/sys-fs/dislocker/dislocker-9999.ebuild

87

@@ -1,11 +1,12 @@

88

-# Copyright 1999-2020 Gentoo Authors

89

+# Copyright 1999-2021 Gentoo Authors

90

 # Distributed under the terms of the GNU General Public License v2

91

92

 EAPI=7

93

94

+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"

95

 inherit cmake flag-o-matic

96

97

-DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."

98

+DESCRIPTION="Read BitLocker encrypted partitions"

99

 HOMEPAGE="https://github.com/Aorimn/dislocker"

100

101

 if [[ ${PV} == *9999* ]]; then

102

@@ -28,8 +29,6 @@ DEPEND="

103

"

104

 RDEPEND="${DEPEND}"

105

106

-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"

107

-

108

 src_prepare() {

109

 	if use ruby && [[ ${PV} == "0.7.1" ]]; then

110

 		PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )

111

@@ -37,17 +36,17 @@ src_prepare() {

112

 	cmake_src_prepare

113

114

 # We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE

115

-#    sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die

116

-	sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die

117

+#    sed 's:Werror:Wno-error:g' -i "src/CMakeLists.txt" || die

118

+	sed 's:-D_FORTIFY_SOURCE=2::g' -i "src/CMakeLists.txt" || die

119

120

-#	sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die

121

+#	sed 's:\.\./man:'../../${P}/man':g' -i "src/CMakeLists.txt" || die

122

 # Do not process compressed versions of the manuals

123

-	sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "${S}/src/CMakeLists.txt" || die

124

-	sed -r 's:^(.+\.1\.gz):#\1:' -i "${S}/src/CMakeLists.txt" || die

125

+	sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "src/CMakeLists.txt" || die

126

+	sed -r 's:^(.+\.1\.gz):#\1:' -i "src/CMakeLists.txt" || die

127

}

128

129

 src_configure() {

130

-	mycmakeargs=(

131

+	local mycmakeargs=(

132

 		$(cmake_use_find_package ruby Ruby)

133

)

134

 	cmake_src_configure

135

@@ -57,6 +56,6 @@ src_install() {

136

 	if ! use ruby; then

137

 		rm "${S}/man/linux/${PN}-find.1" || die

138

fi

139

-	find "${S}/man/linux" -name '*.1' -exec doman '{}' +

140

+	find "${S}/man/linux" -name '*.1' -exec doman '{}' + || die

141

 	cmake_src_install

142

}

1	commit: 68a682a2301bec17bfbd0dc887d9f490669471b0
2	Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3	AuthorDate: Mon Apr 5 12:36:41 2021 +0000
4	Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5	CommitDate: Sat Apr 17 11:40:48 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a682a2
7
8	sys-fs/dislocker: Tidyup, DESCRIPTION w/o PN
9
10	- Unnecessary ${S}
11	- local mycmakeargs
12	- missing \|\| die
13
14	Bug: https://bugs.gentoo.org/700784
15	Package-Manager: Portage-3.0.18, Repoman-3.0.3
16	Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
17
18	sys-fs/dislocker/dislocker-0.7.1-r3.ebuild \| 21 ++++++++++-----------
19	sys-fs/dislocker/dislocker-9999.ebuild \| 21 ++++++++++-----------
20	2 files changed, 20 insertions(+), 22 deletions(-)
21
22	diff --git a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
23	index 73f3b33aa54..90375bf7590 100644
24	--- a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
25	+++ b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
26	@@ -1,11 +1,12 @@
27	-# Copyright 1999-2020 Gentoo Authors
28	+# Copyright 1999-2021 Gentoo Authors
29	# Distributed under the terms of the GNU General Public License v2
30
31	EAPI=7
32
33	+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
34	inherit cmake flag-o-matic
35
36	-DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
37	+DESCRIPTION="Read BitLocker encrypted partitions"
38	HOMEPAGE="https://github.com/Aorimn/dislocker"
39
40	if [[ ${PV} == 9999 ]]; then
41	@@ -28,8 +29,6 @@ DEPEND="
42	"
43	RDEPEND="${DEPEND}"
44
45	-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
46	-
47	src_prepare() {
48	if use ruby && [[ ${PV} == "0.7.1" ]]; then
49	PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
50	@@ -37,17 +36,17 @@ src_prepare() {
51	cmake_src_prepare
52
53	# We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
54	-# sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" \|\| die
55	- sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" \|\| die
56	+# sed 's:Werror:Wno-error:g' -i "src/CMakeLists.txt" \|\| die
57	+ sed 's:-D_FORTIFY_SOURCE=2::g' -i "src/CMakeLists.txt" \|\| die
58
59	-# sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" \|\| die
60	+# sed 's:\.\./man:'../../${P}/man':g' -i "src/CMakeLists.txt" \|\| die
61	# Do not process compressed versions of the manuals
62	- sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "${S}/src/CMakeLists.txt" \|\| die
63	- sed -r 's:^(.+\.1\.gz):#\1:' -i "${S}/src/CMakeLists.txt" \|\| die
64	+ sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "src/CMakeLists.txt" \|\| die
65	+ sed -r 's:^(.+\.1\.gz):#\1:' -i "src/CMakeLists.txt" \|\| die
66	}
67
68	src_configure() {
69	- mycmakeargs=(
70	+ local mycmakeargs=(
71	$(cmake_use_find_package ruby Ruby)
72	)
73	cmake_src_configure
74	@@ -57,6 +56,6 @@ src_install() {
75	if ! use ruby; then
76	rm "${S}/man/linux/${PN}-find.1" \|\| die
77	fi
78	- find "${S}/man/linux" -name '*.1' -exec doman '{}' +
79	+ find "${S}/man/linux" -name '*.1' -exec doman '{}' + \|\| die
80	cmake_src_install
81	}
82
83	diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
84	index 73f3b33aa54..90375bf7590 100644
85	--- a/sys-fs/dislocker/dislocker-9999.ebuild
86	+++ b/sys-fs/dislocker/dislocker-9999.ebuild
87	@@ -1,11 +1,12 @@
88	-# Copyright 1999-2020 Gentoo Authors
89	+# Copyright 1999-2021 Gentoo Authors
90	# Distributed under the terms of the GNU General Public License v2
91
92	EAPI=7
93
94	+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
95	inherit cmake flag-o-matic
96
97	-DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
98	+DESCRIPTION="Read BitLocker encrypted partitions"
99	HOMEPAGE="https://github.com/Aorimn/dislocker"
100
101	if [[ ${PV} == 9999 ]]; then
102	@@ -28,8 +29,6 @@ DEPEND="
103	"
104	RDEPEND="${DEPEND}"
105
106	-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
107	-
108	src_prepare() {
109	if use ruby && [[ ${PV} == "0.7.1" ]]; then
110	PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
111	@@ -37,17 +36,17 @@ src_prepare() {
112	cmake_src_prepare
113
114	# We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
115	-# sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" \|\| die
116	- sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" \|\| die
117	+# sed 's:Werror:Wno-error:g' -i "src/CMakeLists.txt" \|\| die
118	+ sed 's:-D_FORTIFY_SOURCE=2::g' -i "src/CMakeLists.txt" \|\| die
119
120	-# sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" \|\| die
121	+# sed 's:\.\./man:'../../${P}/man':g' -i "src/CMakeLists.txt" \|\| die
122	# Do not process compressed versions of the manuals
123	- sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "${S}/src/CMakeLists.txt" \|\| die
124	- sed -r 's:^(.+\.1\.gz):#\1:' -i "${S}/src/CMakeLists.txt" \|\| die
125	+ sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "src/CMakeLists.txt" \|\| die
126	+ sed -r 's:^(.+\.1\.gz):#\1:' -i "src/CMakeLists.txt" \|\| die
127	}
128
129	src_configure() {
130	- mycmakeargs=(
131	+ local mycmakeargs=(
132	$(cmake_use_find_package ruby Ruby)
133	)
134	cmake_src_configure
135	@@ -57,6 +56,6 @@ src_install() {
136	if ! use ruby; then
137	rm "${S}/man/linux/${PN}-find.1" \|\| die
138	fi
139	- find "${S}/man/linux" -name '*.1' -exec doman '{}' +
140	+ find "${S}/man/linux" -name '*.1' -exec doman '{}' + \|\| die
141	cmake_src_install
142	}

Gentoo Archives: gentoo-commits