Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 429722 | Differences between
and this patch

Collapse All | Expand All

(-)a/elektra-0.8.3.ebuild.old (-21 / +41 lines)
Lines 13-22 Link Here
13
LICENSE="BSD"
13
LICENSE="BSD"
14
SLOT="0"
14
SLOT="0"
15
KEYWORDS="~amd64 ~x86"
15
KEYWORDS="~amd64 ~x86"
16
IUSE="doc examples iconv static-libs test xml yajl"
16
IUSE="dbus doc examples iconv inifile static-libs syslog tcl test xml yajl"
17
18
PLUGINS="ccode;dbus;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;\
19
simpleini;struct;success;syslog;tcl;template;timeofday;tracer;type;validation"
20
17
21
RDEPEND="dev-libs/libxml2"
18
RDEPEND="dev-libs/libxml2"
22
DEPEND="${RDEPEND}
19
DEPEND="${RDEPEND}
Lines 24-51 Link Here
24
	doc? ( app-doc/doxygen )
21
	doc? ( app-doc/doxygen )
25
	iconv? ( virtual/libiconv )
22
	iconv? ( virtual/libiconv )
26
	test? ( dev-libs/libxml2[static-libs] )
23
	test? ( dev-libs/libxml2[static-libs] )
27
	yajl? ( dev-libs/yajl )"
24
	yajl? ( <dev-libs/yajl-2 )"
28
25
29
src_configure() {
26
src_configure() {
27
	local PLUGINS="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;\
28
struct;success;template;timeofday;tracer;type;validation"
29
30
	#fix QA issues with upstream patches
31
	epatch "${FILESDIR}/${P}-introduce-attributes.patch"
32
	epatch "${FILESDIR}/${P}-fix-yajl-if-user-config.patch"
33
30
	#move doc files to correct location
34
	#move doc files to correct location
31
	sed -i "s/elektra-api/elektra-${PV}/" ${S}/cmake/ElektraCache.cmake
35
	sed -i "s/elektra-api/${PF}/" \
36
		"${S}/cmake/ElektraCache.cmake" || die
32
37
38
	if use dbus; then
39
		PLUGINS+=";dbus"
40
	fi
33
	if use doc; then
41
	if use doc; then
34
		PLUGINS="${PLUGINS};doc"
42
		PLUGINS+=";doc"
35
	fi
43
	fi
36
	if use iconv; then
44
	if use iconv; then
37
		PLUGINS="${PLUGINS};iconv"
45
		PLUGINS+=";iconv"
46
	fi
47
	if use inifile; then
48
		PLUGINS+=";simpleini"
49
	fi
50
	if use syslog; then
51
		PLUGINS+=";syslog"
52
	fi
53
	if use tcl; then
54
		PLUGINS+=";tcl"
38
	fi
55
	fi
39
	if use xml; then
56
	if use xml; then
40
		PLUGINS="${PLUGINS};xmltool"
57
		PLUGINS+=";xmltool"
41
	fi
58
	fi
42
	if use yajl; then
59
	if use yajl; then
43
		PLUGINS="${PLUGINS};yajl"
60
		PLUGINS+=";yajl"
44
	fi
61
	fi
45
62
46
	local mycmakeargs=(
63
	local mycmakeargs=(
47
		-DPLUGINS=${PLUGINS}
64
		"-DPLUGINS=${PLUGINS}"
48
		-DLATEX_COMPILER=OFF
65
		"-DLATEX_COMPILER=OFF"
49
		$(cmake-utils_use doc BUILD_DOCUMENTATION)
66
		$(cmake-utils_use doc BUILD_DOCUMENTATION)
50
		$(cmake-utils_use examples BUILD_EXAMPLES)
67
		$(cmake-utils_use examples BUILD_EXAMPLES)
51
		$(cmake-utils_use static-libs BUILD_STATIC)
68
		$(cmake-utils_use static-libs BUILD_STATIC)
Lines 53-70 Link Here
53
	)
70
	)
54
71
55
        cmake-utils_src_configure
72
        cmake-utils_src_configure
56
57
}
73
}
58
74
59
src_install() {
75
src_install() {
60
	dodoc doc/AUTHORS doc/CHANGES doc/NEWS doc/README doc/todo/TODO
76
	cmake-utils_src_install
61
77
62
#	if use doc; then	
78
	dodoc doc/AUTHORS doc/CHANGES doc/NEWS doc/README doc/todo/TODO
63
#		mv ${CMAKE_BUILD_DIR}/doc/man/man3/err.3 ${CMAKE_BUILD_DIR}/doc/man/man3/elektra_err.3
64
#		doman ${CMAKE_BUILD_DIR}/doc/man/man3/*.3
65
#	fi
66
67
	cmake-utils_src_install 
68
79
80
	if use doc; then
81
		pushd ${CMAKE_BUILD_DIR}/doc/man/man3 >/dev/null
82
		local manpage
83
		for manpage in $(ls -d *.3); do
84
			newman ${manpage} ${PN}-${manpage} || die
85
		done
86
		popd >/dev/null
87
		einfo "Removing redundant ${D}/usr/share/doc/${PF}/man..."
88
		rm -rf "${D}/usr/share/doc/${PF}/man"
89
	fi
69
}
90
}
70

Return to bug 429722