1 |
commit: 2b6b60259c34edd5067ac298522a04e95ed2c5cc |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 31 16:13:50 2016 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 31 16:13:50 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b6b6025 |
7 |
|
8 |
net-fs/smbtatools: ebuilds fixes for newer samba and newer cmake |
9 |
|
10 |
- Bumped ebuild to EAPI6 |
11 |
- Patched CMakeLists.txt to fix issues with include paths when using newer cmake |
12 |
- Specify libsmbclient vars in src_configure using pkg-config, fixes bug 561800 |
13 |
|
14 |
Package-Manager: portage-2.2.26 |
15 |
|
16 |
.../files/smbtatools-1.2.6-fix-cmake.patch | 38 ++++++++++++++++++++++ |
17 |
...ols-1.2.6.ebuild => smbtatools-1.2.6-r1.ebuild} | 19 +++++++---- |
18 |
2 files changed, 50 insertions(+), 7 deletions(-) |
19 |
|
20 |
diff --git a/net-fs/smbtatools/files/smbtatools-1.2.6-fix-cmake.patch b/net-fs/smbtatools/files/smbtatools-1.2.6-fix-cmake.patch |
21 |
new file mode 100644 |
22 |
index 0000000..2b8979b |
23 |
--- /dev/null |
24 |
+++ b/net-fs/smbtatools/files/smbtatools-1.2.6-fix-cmake.patch |
25 |
@@ -0,0 +1,38 @@ |
26 |
+--- a/CMakeLists.txt 2016-03-31 11:14:33.462962843 -0400 |
27 |
++++ b/CMakeLists.txt 2016-03-31 11:53:16.319234121 -0400 |
28 |
+@@ -30,7 +30,7 @@ |
29 |
+ MESSAGE( FATAL_ERROR "ERROR: you need the qt development files and library installed.") |
30 |
+ ENDIF() |
31 |
+ IF (QT_INCLUDE_DIR) |
32 |
+- INCLUDE_DIRECTORIES($QT_INCLUDE_DIR) |
33 |
++ INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR}) |
34 |
+ ENDIF() |
35 |
+ |
36 |
+ |
37 |
+@@ -42,7 +42,7 @@ |
38 |
+ MESSAGE( FATAL_ERROR "ERROR: you need the pango library and headers installed.") |
39 |
+ ENDIF() |
40 |
+ IF (LIBPANGO_INCLUDE_DIRS) |
41 |
+- INCLUDE_DIRECTORIES($LIBPANGO_INCLUDE_DIRS) |
42 |
++ INCLUDE_DIRECTORIES(${LIBPANGO_INCLUDE_DIRS}) |
43 |
+ ENDIF() |
44 |
+ |
45 |
+ # |
46 |
+@@ -53,7 +53,7 @@ |
47 |
+ MESSAGE( FATAL_ERROR "ERROR: you need the cairo library and headers installed.") |
48 |
+ ENDIF() |
49 |
+ IF (LIBCAIRO_INCLUDE_DIRS) |
50 |
+- INCLUDE_DIRECTORIES($LIBCAIRO_INCLUDE_DIRS) |
51 |
++ INCLUDE_DIRECTORIES(${LIBCAIRO_INCLUDE_DIRS}) |
52 |
+ ENDIF() |
53 |
+ |
54 |
+ |
55 |
+@@ -65,7 +65,7 @@ |
56 |
+ MESSAGE( FATAL_ERROR "ERROR: you will need curl development files installed.") |
57 |
+ ENDIF() |
58 |
+ if (CURL_INCLUDE_DIRS) |
59 |
+- INCLUDE_DIRECTORIES($CURL_INCLUDE_DIRS) |
60 |
++ INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) |
61 |
+ ENDIF() |
62 |
+ |
63 |
+ # compile on SunOS |
64 |
|
65 |
diff --git a/net-fs/smbtatools/smbtatools-1.2.6.ebuild b/net-fs/smbtatools/smbtatools-1.2.6-r1.ebuild |
66 |
similarity index 63% |
67 |
rename from net-fs/smbtatools/smbtatools-1.2.6.ebuild |
68 |
rename to net-fs/smbtatools/smbtatools-1.2.6-r1.ebuild |
69 |
index 4ef8cf4..c2d65eb 100644 |
70 |
--- a/net-fs/smbtatools/smbtatools-1.2.6.ebuild |
71 |
+++ b/net-fs/smbtatools/smbtatools-1.2.6-r1.ebuild |
72 |
@@ -1,8 +1,8 @@ |
73 |
-# Copyright 1999-2013 Gentoo Foundation |
74 |
+# Copyright 1999-2016 Gentoo Foundation |
75 |
# Distributed under the terms of the GNU General Public License v2 |
76 |
# $Id$ |
77 |
|
78 |
-EAPI=4 |
79 |
+EAPI=6 |
80 |
|
81 |
inherit cmake-utils |
82 |
|
83 |
@@ -15,27 +15,32 @@ SLOT="0" |
84 |
KEYWORDS="~amd64 ~x86" |
85 |
IUSE="debug" |
86 |
|
87 |
-DEPEND=" |
88 |
+RDEPEND=" |
89 |
dev-db/libdbi |
90 |
>=dev-db/sqlite-3.7.0:3 |
91 |
net-fs/samba |
92 |
net-misc/curl |
93 |
- sys-libs/ncurses |
94 |
+ sys-libs/ncurses:0= |
95 |
sys-libs/talloc |
96 |
x11-libs/cairo |
97 |
x11-libs/pango |
98 |
dev-qt/qtgui:4 |
99 |
- |
100 |
" |
101 |
-RDEPEND="${DEPEND} |
102 |
+DEPEND="${RDEPEND} |
103 |
+ virtual/pkgconfig |
104 |
+" |
105 |
+RDEPEND+=" |
106 |
net-fs/smbtad |
107 |
" |
108 |
|
109 |
DOCS="doc/smbta-guide.html doc/gfx/*.png" |
110 |
+PATCHES=( "${FILESDIR}"/${P}-fix-cmake.patch ) |
111 |
|
112 |
src_configure() { |
113 |
local mycmakeargs=( |
114 |
- $(cmake-utils_use debug) |
115 |
+ -Ddebug=$(usex debug) |
116 |
+ -DLIBSMBCLIENT_LIBRARIES="$(pkg-config --libs smbclient)" |
117 |
+ -DLIBSMBCLIENT_INCLUDE_DIRS="$(pkg-config --variable includedir smbclient)" |
118 |
) |
119 |
|
120 |
cmake-utils_src_configure |