Restore installation of documentation and revert syntax to used in -r1 wrt #451984 by Nikoli

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

1 files changed, 14 insertions, 16 deletions

diff --git a/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild b/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild
index 56cb0f47b770..263672a172fd 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild,v 1.1 2013/01/13 17:50:03 eva Exp $
-
-EAPI="5"
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild,v 1.2 2013/01/14 08:35:48 ssuominen Exp $
 
+EAPI=5
 inherit bash-completion-r1 eutils
 
 DESCRIPTION="D-Bus bindings for glib"
@@ -15,15 +14,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc static-libs test"
 
-RDEPEND="
-	>=dev-libs/expat-2
+RDEPEND=">=dev-libs/expat-2
 	>=dev-libs/glib-2.26
-	>=sys-apps/dbus-1.6.2
-"
+	>=sys-apps/dbus-1.6.2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.4 )
-"
+	doc? ( >=dev-util/gtk-doc-1.4 )"
 
 # out of sources build directory
 BD=${WORKDIR}/${P}-build
@@ -35,18 +31,17 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.100-fix-tests.patch
 
 	# Wrong sections.txt file in the tarball; https://bugs.freedesktop.org/show_bug.cgi?id=55830
-	cp "${FILESDIR}/${P}-dbus-glib-sections.txt" doc/reference/dbus-glib-sections.txt || die
+	cp "${FILESDIR}"/${P}-dbus-glib-sections.txt doc/reference/dbus-glib-sections.txt || die
 }
 
 src_configure() {
-	# gtk-doc needs to be built when using out-of-source build
 	local myconf=(
 		--localstatedir="${EPREFIX}"/var
 		--enable-bash-completion
 		$(use_enable debug verbose-mode)
 		$(use_enable debug asserts)
-		$(use_enable doc gtk-doc)
 		$(use_enable static-libs static)
+		$(use_enable doc gtk-doc)
 		)
 
 	mkdir "${BD}"
@@ -70,23 +65,26 @@ src_configure() {
 src_compile() {
 	cd "${BD}"
 	einfo "Running make in ${BD}"
-	default
+	emake
 
 	if use test; then
 		cd "${TBD}"
 		einfo "Running make in ${TBD}"
-		default
+		emake
 	fi
 }
 
 src_test() {
 	cd "${TBD}"
-	default
+	emake check
 }
 
 src_install() {
+	# NEWS file is obsolete
+	dodoc AUTHORS ChangeLog HACKING README
+
 	cd "${BD}"
-	default
+	emake DESTDIR="${D}" install
 
 	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus
 	rm -rf "${ED}"/etc/bash_completion.d || die