--- elektra-0.8.3.ebuild.old	2012-11-01 19:46:44.913451806 +0100
+++ elektra-0.8.3.ebuild	2012-11-01 19:50:00.625167877 +0100
@@ -13,10 +13,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples iconv static-libs test xml yajl"
-
-PLUGINS="ccode;dbus;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;\
-simpleini;struct;success;syslog;tcl;template;timeofday;tracer;type;validation"
+IUSE="dbus doc examples iconv inifile simpleini static-libs syslog tcl test xml yajl"
 
 RDEPEND="dev-libs/libxml2"
 DEPEND="${RDEPEND}
@@ -24,28 +21,48 @@
 	doc? ( app-doc/doxygen )
 	iconv? ( virtual/libiconv )
 	test? ( dev-libs/libxml2[static-libs] )
-	yajl? ( dev-libs/yajl )"
+	yajl? ( <dev-libs/yajl-2 )"
 
 src_configure() {
+	local PLUGINS="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;\
+struct;success;template;timeofday;tracer;type;validation"
+
+	#fix QA issues with upstream patches
+	epatch "${FILESDIR}/${P}-introduce-attributes.patch"
+	epatch "${FILESDIR}/${P}-fix-yajl-if-user-config.patch"
+
 	#move doc files to correct location
-	sed -i "s/elektra-api/elektra-${PV}/" ${S}/cmake/ElektraCache.cmake
+	sed -i "s/elektra-api/${PF}/" \
+		"${S}/cmake/ElektraCache.cmake" || die
 
+	if use dbus; then
+		PLUGINS+=";dbus"
+	fi
 	if use doc; then
-		PLUGINS="${PLUGINS};doc"
+		PLUGINS+=";doc"
 	fi
 	if use iconv; then
-		PLUGINS="${PLUGINS};iconv"
+		PLUGINS+=";iconv"
+	fi
+	if use inifile; then
+		PLUGINS+=";simpleini"
+	fi
+	if use syslog; then
+		PLUGINS+=";syslog"
+	fi
+	if use tcl; then
+		PLUGINS+=";tcl"
 	fi
 	if use xml; then
-		PLUGINS="${PLUGINS};xmltool"
+		PLUGINS+=";xmltool"
 	fi
 	if use yajl; then
-		PLUGINS="${PLUGINS};yajl"
+		PLUGINS+=";yajl"
 	fi
 
 	local mycmakeargs=(
-		-DPLUGINS=${PLUGINS}
-		-DLATEX_COMPILER=OFF
+		"-DPLUGINS=${PLUGINS}"
+		"-DLATEX_COMPILER=OFF"
 		$(cmake-utils_use doc BUILD_DOCUMENTATION)
 		$(cmake-utils_use examples BUILD_EXAMPLES)
 		$(cmake-utils_use static-libs BUILD_STATIC)
@@ -53,18 +70,21 @@
 	)
 
         cmake-utils_src_configure
-
 }
 
 src_install() {
-	dodoc doc/AUTHORS doc/CHANGES doc/NEWS doc/README doc/todo/TODO
+	cmake-utils_src_install
 
-#	if use doc; then	
-#		mv ${CMAKE_BUILD_DIR}/doc/man/man3/err.3 ${CMAKE_BUILD_DIR}/doc/man/man3/elektra_err.3
-#		doman ${CMAKE_BUILD_DIR}/doc/man/man3/*.3
-#	fi
-
-	cmake-utils_src_install 
+	dodoc doc/AUTHORS doc/CHANGES doc/NEWS doc/README doc/todo/TODO
 
+	if use doc; then
+		pushd ${CMAKE_BUILD_DIR}/doc/man/man3 >/dev/null
+		local manpage
+		for manpage in $(ls -d *.3); do
+			newman ${manpage} ${PN}-${manpage} || die
+		done
+		popd >/dev/null
+		einfo "Removing redundant ${D}/usr/share/doc/${PF}/man..."
+		rm -rf "${D}/usr/share/doc/${PF}/man"
+	fi
 }
-