diff options
| -rw-r--r-- | net-libs/qxmpp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/qxmpp/qxmpp-0.7.4.ebuild | 22 | ||||
| -rw-r--r-- | net-libs/qxmpp/qxmpp-9999.ebuild | 20 |
3 files changed, 38 insertions, 10 deletions
diff --git a/net-libs/qxmpp/ChangeLog b/net-libs/qxmpp/ChangeLog index 48c038cefa9c..f3b9206f81f9 100644 --- a/net-libs/qxmpp/ChangeLog +++ b/net-libs/qxmpp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/qxmpp # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/ChangeLog,v 1.21 2012/10/01 19:52:08 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/ChangeLog,v 1.22 2012/10/04 15:19:59 pinkbyte Exp $ + + 04 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> qxmpp-0.7.4.ebuild, + qxmpp-9999.ebuild: + Add doc USE-flag wrt bug #437174, thanks to Nikoli 01 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> qxmpp-9999.ebuild: Use proper path for documentation in live ebuild too diff --git a/net-libs/qxmpp/qxmpp-0.7.4.ebuild b/net-libs/qxmpp/qxmpp-0.7.4.ebuild index d2e153516c83..13a01c974dfc 100644 --- a/net-libs/qxmpp/qxmpp-0.7.4.ebuild +++ b/net-libs/qxmpp/qxmpp-0.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-0.7.4.ebuild,v 1.1 2012/10/01 19:44:24 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-0.7.4.ebuild,v 1.2 2012/10/04 15:19:59 pinkbyte Exp $ EAPI=4 @@ -13,19 +13,31 @@ SRC_URI="http://qxmpp.googlecode.com/files/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug" +IUSE="debug doc" DEPEND="x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/speex" RDEPEND="${DEPEND}" -src_configure() { +src_prepare(){ + if ! use doc; then + sed -i \ + -e '/SUBDIRS/s/doc//' \ + -e '/INSTALLS/d' \ + qxmpp.pro || die "sed for removing docs failed" + fi + qt4-r2_src_prepare +} + +src_configure(){ eqmake4 "${S}"/qxmpp.pro "PREFIX=/usr" "LIBDIR=$(get_libdir)" } src_install() { qt4-r2_src_install - # Use proper path for documentation - mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${P} || die "doc mv failed" + if use doc; then + # Use proper path for documentation + mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${P} || die "doc mv failed" + fi } diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild index 4105da5d23ba..23535da301fc 100644 --- a/net-libs/qxmpp/qxmpp-9999.ebuild +++ b/net-libs/qxmpp/qxmpp-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-9999.ebuild,v 1.6 2012/10/01 19:52:08 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-9999.ebuild,v 1.7 2012/10/04 15:19:59 pinkbyte Exp $ EAPI=4 @@ -14,19 +14,31 @@ HOMEPAGE="http://code.google.com/p/qxmpp/" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="debug" +IUSE="debug doc" DEPEND="x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/speex" RDEPEND="${DEPEND}" +src_prepare(){ + if ! use doc; then + sed -i \ + -e '/SUBDIRS/s/doc//' \ + -e '/INSTALLS/d' \ + qxmpp.pro || die "sed for removing docs failed" + fi + qt4-r2_src_prepare +} + src_configure(){ eqmake4 "${S}"/qxmpp.pro "PREFIX=/usr" "LIBDIR=$(get_libdir)" } src_install() { qt4-r2_src_install - # Use proper path for documentation - mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${P} || die "doc mv failed" + if use doc; then + # Use proper path for documentation + mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${P} || die "doc mv failed" + fi } |