Version bumped. Added doc USE flag, bug #297567. Fixed doc path, bug #297955.

(Portage version: 2.1.7.16/cvs/Linux x86_64)

5 files changed, 61 insertions, 74 deletions

diff --git a/app-i18n/ibus-qt/ChangeLog b/app-i18n/ibus-qt/ChangeLog
index 7390a9039779..3f80e4d056b6 100644
--- a/app-i18n/ibus-qt/ChangeLog
+++ b/app-i18n/ibus-qt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-i18n/ibus-qt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ChangeLog,v 1.4 2009/12/16 14:14:05 matsuu Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ChangeLog,v 1.5 2010/01/03 01:45:54 matsuu Exp $
+
+*ibus-qt-1.2.0.20091217 (03 Jan 2010)
+
+  03 Jan 2010; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-qt-1.2.0.20090822.ebuild, -ibus-qt-1.2.0.20091014.ebuild,
+  -ibus-qt-1.2.0.20091206.ebuild, +ibus-qt-1.2.0.20091217.ebuild,
+  +files/ibus-qt-1.2.0.20091217-doc.patch:
+  Version bumped. Added doc USE flag, bug #297567. Fixed doc path, bug
+  #297955. Removed old versions.
 
 *ibus-qt-1.2.0.20091216 (16 Dec 2009)
 
diff --git a/app-i18n/ibus-qt/files/ibus-qt-1.2.0.20091217-doc.patch b/app-i18n/ibus-qt/files/ibus-qt-1.2.0.20091217-doc.patch
new file mode 100644
index 000000000000..a2adbd7b9538
--- /dev/null
+++ b/app-i18n/ibus-qt/files/ibus-qt-1.2.0.20091217-doc.patch
@@ -0,0 +1,21 @@
+--- ibus-qt-1.2.0.20091217-Source.orig/CMakeLists.txt	2009-12-17 14:50:00.000000000 +0900
++++ ibus-qt-1.2.0.20091217-Source/CMakeLists.txt	2010-01-03 09:11:53.000000000 +0900
+@@ -76,7 +76,7 @@
+ # pkg_check_modules(IBUS REQUIRED ibus-1.0>=1.2.0)
+ 
+ # check doxygen
+-find_package(Doxygen REQUIRED)
++find_package(Doxygen)
+ 
+ # =====
+ # Define variables
+@@ -100,8 +100,7 @@
+ # install
+ set(MAIN_DOCS
+     AUTHORS
+-    README
+-    INSTALL)
++    README)
+ install(FILES ${MAIN_DOCS}
+     DESTINATION ${DOCDIR})
+ 
diff --git a/app-i18n/ibus-qt/ibus-qt-1.2.0.20090822.ebuild b/app-i18n/ibus-qt/ibus-qt-1.2.0.20090822.ebuild
deleted file mode 100644
index f91620140e35..000000000000
--- a/app-i18n/ibus-qt/ibus-qt-1.2.0.20090822.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.2.0.20090822.ebuild,v 1.1 2009/08/24 15:00:19 matsuu Exp $
-
-EAPI="1"
-inherit cmake-utils multilib
-
-MY_P="${P}-Source"
-DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/ibus-1.2
-	>=sys-apps/dbus-1.2
-	>=x11-libs/qt-core-4.5:4
-	>=x11-libs/qt-core-4.5:4
-	>=x11-libs/qt-dbus-4.5:4"
-DEPEND="${RDEPEND}
-	>=dev-libs/icu-4
-	dev-util/cmake
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS README TODO"
-
-mycmakeargs="-DLIBDIR=$(get_libdir)"
diff --git a/app-i18n/ibus-qt/ibus-qt-1.2.0.20091014.ebuild b/app-i18n/ibus-qt/ibus-qt-1.2.0.20091014.ebuild
deleted file mode 100644
index 83a3c7b8363b..000000000000
--- a/app-i18n/ibus-qt/ibus-qt-1.2.0.20091014.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.2.0.20091014.ebuild,v 1.1 2009/10/17 17:15:10 matsuu Exp $
-
-EAPI="1"
-inherit cmake-utils multilib
-
-MY_P="${P}-Source"
-DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/ibus-1.2
-	>=sys-apps/dbus-1.2
-	>=x11-libs/qt-core-4.5:4
-	>=x11-libs/qt-core-4.5:4
-	>=x11-libs/qt-dbus-4.5:4"
-DEPEND="${RDEPEND}
-	>=dev-libs/icu-4
-	dev-util/cmake
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS README TODO"
-
-mycmakeargs="-DLIBDIR=$(get_libdir)"
diff --git a/app-i18n/ibus-qt/ibus-qt-1.2.0.20091206.ebuild b/app-i18n/ibus-qt/ibus-qt-1.2.0.20091217.ebuild
index 1b3b36569775..75df48e0d3da 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.2.0.20091206.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.2.0.20091217.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.2.0.20091206.ebuild,v 1.1 2009/12/06 16:24:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.2.0.20091217.ebuild,v 1.1 2010/01/03 01:45:54 matsuu Exp $
 
-EAPI="1"
-inherit cmake-utils multilib
+EAPI="2"
+inherit cmake-utils eutils multilib
 
 MY_P="${P}-Source"
 DESCRIPTION="Qt IBus library and Qt input method plugin"
@@ -13,21 +13,42 @@ SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="doc"
 
 RDEPEND=">=app-i18n/ibus-1.2
 	>=sys-apps/dbus-1.2
 	x11-libs/libX11
 	>=x11-libs/qt-core-4.5:4
-	>=x11-libs/qt-core-4.5:4
 	>=x11-libs/qt-dbus-4.5:4"
 DEPEND="${RDEPEND}
 	>=dev-libs/icu-4
 	dev-util/cmake
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}/${MY_P}"
 
 DOCS="AUTHORS README TODO"
 
-mycmakeargs="-DLIBDIR=$(get_libdir)"
+mycmakeargs="-DLIBDIR=$(get_libdir) -DDOCDIR=/usr/share/doc/${PF} all"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-doc.patch"
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		cd "${CMAKE_BUILD_DIR}"
+		emake docs || die
+	fi
+}
+
+src_install() {
+	if use doc ; then
+		HTML_DOCS="${CMAKE_BUILD_DIR}/docs/html/*"
+	fi
+
+	cmake-utils_src_install
+}