pesa        14/11/15 02:22:22

  Modified:             ChangeLog
  Added:                assistant-4.8.6-r1.ebuild
  Log:
  Version bump (bug 510042). Add multilib support (bug 498010).
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
0xDADED6B2671CB57D!)

Revision  Changes    Path
1.15                 dev-qt/assistant/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/assistant/ChangeLog?rev=1.15&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/assistant/ChangeLog?rev=1.15&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/assistant/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog   6 Oct 2014 09:53:19 -0000       1.14
+++ ChangeLog   15 Nov 2014 02:22:22 -0000      1.15
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/assistant
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.14 
2014/10/06 09:53:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.15 
2014/11/15 02:22:22 pesa Exp $
+
+*assistant-4.8.6-r1 (15 Nov 2014)
+
+  15 Nov 2014; Davide Pesavento <[email protected]> +assistant-4.8.6-r1.ebuild:
+  Version bump (bug 510042). Add multilib support (bug 498010).
 
   06 Oct 2014; Michael Palimaka <[email protected]> assistant-5.3.2.ebuild:
   dev-qt/qtwebkit:5 no longer has a widgets USE flag.



1.1                  dev-qt/assistant/assistant-4.8.6-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/assistant/assistant-4.8.6-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/assistant/assistant-4.8.6-r1.ebuild?rev=1.1&content-type=text/plain

Index: assistant-4.8.6-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-4.8.6-r1.ebuild,v 
1.1 2014/11/15 02:22:22 pesa Exp $

EAPI=5

inherit eutils qt4-build-multilib

DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"

if [[ ${QT4_BUILD_TYPE} == live ]]; then
        KEYWORDS=""
else
        KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos"
fi

IUSE="webkit"

DEPEND="
        ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
        ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
        ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
        ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
        webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"

PATCHES=(
        "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
)

QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"

src_prepare() {
        # bug 401173
        use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")

        qt4-build-multilib_src_prepare
}

multilib_src_configure() {
        local myconf=(
                -system-libpng -system-libjpeg -system-zlib
                -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 
-no-sql-odbc
                -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm 
-xinput -xkb
                -fontconfig -no-multimedia -no-opengl -no-phonon -no-svg 
-no-xmlpatterns
                $(qt_use webkit)
        )
        qt4_multilib_src_configure
}

multilib_src_install_all() {
        qt4_multilib_src_install_all

        doicon tools/assistant/tools/assistant/images/assistant.png
        make_desktop_entry assistant Assistant assistant 
'Qt;Development;Documentation'
}




Reply via email to