[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-qt/files/, app-i18n/tagainijisho/files/, app-i18n/qimhangul/, ...
commit: 6a543ac64d80e5ddb860e1653a269261f5d0e016
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jul 1 16:44:28 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Aug 7 07:27:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a543ac6
app-i18n/*: Remove last-rited ibus-qt, qimhangul, tagainijisho
Closes: https://bugs.gentoo.org/644728
app-i18n/ibus-qt/Manifest | 1 -
app-i18n/ibus-qt/files/ibus-qt-doc.patch | 11
app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild | 53 ---
app-i18n/ibus-qt/metadata.xml | 14 -
app-i18n/qimhangul/Manifest| 1 -
app-i18n/qimhangul/metadata.xml| 8 ---
app-i18n/qimhangul/qimhangul-0.2.0.ebuild | 17 ---
app-i18n/tagainijisho/Manifest | 1 -
.../files/tagainijisho-1.0.3-sqlite.patch | 15 --
app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild | 59 --
profiles/package.mask | 6 ---
11 files changed, 186 deletions(-)
diff --git a/app-i18n/ibus-qt/Manifest b/app-i18n/ibus-qt/Manifest
deleted file mode 100644
index 92d317c3991..000
--- a/app-i18n/ibus-qt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ibus-qt-1.3.3.tar.gz 141523 BLAKE2B
641ec53005ccb3b14646986bb0df4b091b88bcd4a181c82050d596f1840361d49451fcc1382d3fab1f54e463c9b0426b4f8bfd86b8f53224cb9c04dd298d5c87
SHA512
825a32fec51f10f466efd4255743a12ae98af63bacd07d5dc04e18fab6b830501b04491146c1f8bc92edd93dbf8eaeb68cf71062ffdbf25c2970d807b655c80a
diff --git a/app-i18n/ibus-qt/files/ibus-qt-doc.patch
b/app-i18n/ibus-qt/files/ibus-qt-doc.patch
deleted file mode 100644
index dbc1e925136..000
--- a/app-i18n/ibus-qt/files/ibus-qt-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -77,7 +77,7 @@
- pkg_check_modules(IBUS REQUIRED ibus-1.0>=1.3.7)
-
- # check doxygen
--find_package(Doxygen REQUIRED)
-+find_package(Doxygen)
-
- # =
- # Define variables
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
deleted file mode 100644
index 0ed171d3290..000
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="https://github.com/ibus/ibus/wiki";
-SRC_URI="https://github.com/ibus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="app-i18n/ibus
- dev-libs/icu:=
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- sys-apps/dbus
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}"/${PN}-doc.patch )
-
-src_configure() {
- append-cxxflags -std=c++14
-
- local mycmakeargs=(
- -DLIBDIR=$(get_libdir)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc; then
- emake -C "${BUILD_DIR}" docs
- fi
-}
-
-src_install() {
- if use doc; then
- HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
- fi
-
- cmake-utils_src_install
-}
diff --git a/app-i18n/ibus-qt/metadata.xml b/app-i18n/ibus-qt/metadata.xml
deleted file mode 100644
index 4346ded0668..000
--- a/app-i18n/ibus-qt/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-
-c...@gentoo.org
-Cjk
-
-
-The Qt client for IBus. It provides a Qt immodule.
-
-
-ibus/ibus-qt
-
-
diff --git a/app-i18n/qimhangul/Manifest b/app-i18n/qimhangul/Manifest
deleted file mode 100644
index 27064af0817..000
--- a/app-i18n/qimhangul/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qimhangul-0.2.0.tar.gz 336566 BLAKE2B
ecc5f2cd5f2f2815590e80e38c2e3f022c2a3fad6be8bee36abcc7284c5dc621be8987459576e05d962d74c7e3abe3df60dca73fe6c3468e82153fc47549a1ee
SHA512
0871dddf48211841be36facde39cd215c247a5b89c1167baadd33b839eff084b7c39185804e1e62a7acc001178b56751d4f0301e327e1e0709b4340b7a003d0e
diff --git a/app-i18n/qimhangul/metadata.xml b/app-i18n/qimhangul/metadata.xml
deleted file mode 100644
index c921b96adf6..000
--- a/app-i18n/qimhangul/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-
- c...@gentoo.org
- Cjk
-
-
diff --git a/app-i18n/qimhangul/qimhangul-0.2.0.ebuild
b/app-i18n/qimhangul/qimhangul-0.2.0.ebuild
deleted file mode 100644
index 44a23c251b4..000
--- a/app-i18n/qimhangul/qimhangul-0.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the t
[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-qt/
commit: 1376fece2166c6ad083cfec84edc1b91a3aa9659
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Tue Aug 22 11:02:53 2017 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Aug 22 14:20:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1376fece
app-i18n/ibus-qt: Stabilize 1.3.3 on amd64/x86.
app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
index 2f5012d1e5e..0ed171d3290 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc"
RDEPEND="app-i18n/ibus
[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-qt/, app-i18n/ibus-qt/files/
commit: 48b7e0852e4493e4c5cb5dbe19578239cb674035
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Tue Aug 22 11:06:04 2017 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Aug 22 14:20:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b7e085
app-i18n/ibus-qt: Delete old version.
app-i18n/ibus-qt/Manifest | 1 -
.../ibus-qt/files/ibus-qt-1.2.0.20091217-doc.patch | 21 ---
.../files/ibus-qt-1.3.1-display-unset.patch| 70 --
app-i18n/ibus-qt/files/ibus-qt-1.3.1-gold.patch| 22 ---
.../ibus-qt/files/ibus-qt-1.3.1-qvariant.patch | 24
app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild | 60 ---
6 files changed, 198 deletions(-)
diff --git a/app-i18n/ibus-qt/Manifest b/app-i18n/ibus-qt/Manifest
index 57db878f056..1f16079cf98 100644
--- a/app-i18n/ibus-qt/Manifest
+++ b/app-i18n/ibus-qt/Manifest
@@ -1,2 +1 @@
-DIST ibus-qt-1.3.1-Source.tar.gz 141488 SHA256
4079577a240c961278f7bdab11a5ad546dff414c687c60560fdbc19208b3ac85 SHA512
2cd28f8ff3fff411496ccaf9ab67ab5332b7f2d2d0d0e3460dbeb34874ed931aa56c222c3ea5ce39053577b91cd2de4ebe01152039cd6def37c366ab3065cff2
WHIRLPOOL
585ead9a02d2014f7536aa633c72e07f8ce990c768d0aa9b5bf00105166f467307fb12457c5da4c2aa0b7b5cf9656d616de7d0e344e8d02161e123368bdad9ff
DIST ibus-qt-1.3.3.tar.gz 141523 SHA256
29bff835a4a07396c5f174d29c2266a39767c1abad48b2b0da1ab8d4c66fb44a SHA512
825a32fec51f10f466efd4255743a12ae98af63bacd07d5dc04e18fab6b830501b04491146c1f8bc92edd93dbf8eaeb68cf71062ffdbf25c2970d807b655c80a
WHIRLPOOL
692f5dcf1e89c28a90a4fdfbd0bc62e00e5f680798ecfe9c7a47c9d26510c30415a07facae0e7e44f0416f7b3675a6c4445c8812294ec37ea523603a68d7c6a0
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
deleted file mode 100644
index 497574c6a9a..000
--- a/app-i18n/ibus-qt/files/ibus-qt-1.2.0.20091217-doc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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/files/ibus-qt-1.3.1-display-unset.patch
b/app-i18n/ibus-qt/files/ibus-qt-1.3.1-display-unset.patch
deleted file mode 100644
index 1613a10371e..000
--- a/app-i18n/ibus-qt/files/ibus-qt-1.3.1-display-unset.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-commit d2a4e30fdb92aeaf476dcaaf2b5d6f8275d6af70
-Author: Peter Wu
-Date: Tue Sep 4 19:40:08 2012 +0200
-
-Do not crash on missing/invalid DISPLAY envvar.
-
-- Check whether the passed DISPLAY environment variable contains ":".
-
-- Fallback to "-display" parameter passed to QApplication.
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2ad5588..8866ac0 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -92,9 +92,11 @@ set_target_properties(
- target_link_libraries(
- ibus-qt
- debug ${QT_QTCORE_LIBRARY_DEBUG}
-+debug ${QT_QTGUI_LIBRARY_DEBUG}
- debug ${QT_QTDBUS_LIBRARY_DEBUG}
- debug ${QT_QTXML_LIBRARY_DEBUG}
- optimized ${QT_QTCORE_LIBRARY_RELEASE}
-+optimized ${QT_QTGUI_LIBRARY_RELEASE}
- optimized ${QT_QTDBUS_LIBRARY_RELEASE}
- optimized ${QT_QTXML_LIBRARY_RELEASE}
- ${DBUS_LIBRARIES}
-diff --git a/src/qibusbus.cpp b/src/qibusbus.cpp
-index 6a45d65..ed8248a 100644
a/src/qibusbus.cpp
-+++ b/src/qibusbus.cpp
-@@ -12,7 +12,8 @@
- #include "qibusbus.h"
- #include "qibusibusproxy.h"
- #include "qibusdbusproxy.h"
--
-+#include
-+#include
-
- namespace IBus {
- /**
-@@ -121,15 +122,23 @@ QString
- Bus::getSocketPath (void)
- {
- QString display = getenv ("DISPLAY");
--QStringList strs = display.split(":");
- QString hostname = "unix";
- QString display_number = "0";
-+/* fallback when -display is passed to QApplication with no DISPLAY env */
-+if (display == NULL) {
-+Display * dpy = QX11Info::display();
-+if (dpy)
-+display = XDisplayString(dpy);
-+}
-+if (display != NULL && display.contains(':')) {
-+QStringList strs = display.split(":");
-
--if (!strs[0].isEmpty())
--hostname = strs[0];
--strs = strs[1].split(".");
--if (!strs[0].isEmpty())
--display_number = strs[0];
-+if (!strs[0].isEmpty())
-+hostname = strs[0];
-+strs = strs[1].split(".");
-+if (!strs[0].isEmpty())
-+display_number = strs[0];
-+}
-
- QString path =
- QDir::homePath() +
diff --git a/app-i18n/ibus-qt/files/ibus-qt-1.3.1-gold.patch
b/app-i18n/ibus-qt/files/ibus-qt-1.3.1-gold.patch
deleted file mode 100644
index d4b18d9863a..000
[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-qt/
commit: ac45159994e801b7c3021ce87257970e1512a08b
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Tue Aug 22 10:57:20 2017 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Aug 22 14:20:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac451599
app-i18n/ibus-qt: Fix building with GCC <6 and ICU >=59.
app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
index f12619e7885..2f5012d1e5e 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit cmake-utils
+inherit cmake-utils flag-o-matic
DESCRIPTION="Qt IBus library and Qt input method plugin"
HOMEPAGE="https://github.com/ibus/ibus/wiki";
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
PATCHES=( "${FILESDIR}"/${PN}-doc.patch )
src_configure() {
+ append-cxxflags -std=c++14
+
local mycmakeargs=(
-DLIBDIR=$(get_libdir)
)
[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-qt/
commit: 9aca2a1681207b1e96d49a233c4309cf777e9913
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Aug 5 13:59:07 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Aug 5 14:04:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aca2a16
app-i18n/ibus-qt: update to EAPI 6
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild | 49 +--
app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild | 36 -
app-i18n/ibus-qt/metadata.xml | 7 +++--
3 files changed, 44 insertions(+), 48 deletions(-)
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
index e83c2b1b568..848efda5893 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
@@ -1,10 +1,12 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-inherit cmake-utils eutils multilib
+EAPI="6"
+
+inherit cmake-utils
MY_P="${P}-Source"
+
DESCRIPTION="Qt IBus library and Qt input method plugin"
HOMEPAGE="https://github.com/ibus/ibus/wiki";
SRC_URI="https://ibus.googlecode.com/files/${MY_P}.tar.gz";
@@ -14,46 +16,43 @@ SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc"
-RDEPEND=">=app-i18n/ibus-1.3.7
- >=sys-apps/dbus-1.2
- x11-libs/libX11
- >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtdbus-4.5:4"
+RDEPEND="app-i18n/ibus
+ dev-libs/icu:=
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ sys-apps/dbus
+ x11-libs/libX11"
DEPEND="${RDEPEND}
- >=dev-libs/icu-4:=
- dev-util/cmake
virtual/pkgconfig
doc? ( app-doc/doxygen )"
-
S="${WORKDIR}/${MY_P}"
-DOCS="AUTHORS README TODO"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.0.20091217-doc.patch
+ "${FILESDIR}"/${P}-display-unset.patch
+ "${FILESDIR}"/${P}-gold.patch
+ "${FILESDIR}"/${P}-qvariant.patch
+)
src_configure() {
- local mycmakeargs=( -DLIBDIR=$(get_libdir)
-DDOCDIR=${EPREFIX}/usr/share/doc/${PF} all )
-
+ local mycmakeargs=(
+ -DLIBDIR=$(get_libdir)
+ -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+ )
cmake-utils_src_configure
}
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.2.0.20091217-doc.patch" \
- "${FILESDIR}"/${P}-display-unset.patch \
- "${FILESDIR}"/${P}-gold.patch \
- "${FILESDIR}"/${P}-qvariant.patch
-}
-
src_compile() {
cmake-utils_src_compile
- if use doc ; then
- cd "${CMAKE_BUILD_DIR}"
- emake docs || die
+ if use doc; then
+ emake -C "${BUILD_DIR}" docs
fi
}
src_install() {
- if use doc ; then
- HTML_DOCS="${CMAKE_BUILD_DIR}/docs/html/*"
+ if use doc; then
+ HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
fi
cmake-utils_src_install
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
index d8f08b8ea1d..a990fbc5aab 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
@@ -1,51 +1,49 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-inherit cmake-utils eutils multilib
+EAPI="6"
+
+inherit cmake-utils
DESCRIPTION="Qt IBus library and Qt input method plugin"
HOMEPAGE="https://github.com/ibus/ibus/wiki";
-SRC_URI="https://github.com/ibus/ibus-qt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ibus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc"
-RDEPEND=">=app-i18n/ibus-1.3.7
- >=sys-apps/dbus-1.2
- x11-libs/libX11
- >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtdbus-4.5:4"
+RDEPEND="app-i18n/ibus
+ dev-libs/icu:=
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ sys-apps/dbus
+ x11-libs/libX11"
DEPEND="${RDEPEND}
- >=dev-libs/icu-4:=
- dev-util/cmake
virtual/pkgconfig
doc? ( app-doc/doxygen )"
-DOCS="AUTHORS README TODO"
-
PATCHES=( "${FILESDIR}"/${PN}-doc.patch )
src_configure() {
- local mycmakeargs=( -DLIBDIR=$(get_libdir) all )
-
+ local mycmakeargs=(
+ -DLIBDIR=$(get_libdir)
+ )
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile
- if use doc ; then
- cd "${CMAKE_BUILD_DIR}"
- emake docs || die
+ if use doc; then
+ emake -C "${BUILD_DIR}" docs
fi
}
src_install() {
- if use doc ; then
- HTML_DOCS="${CMAKE_BUILD_DIR}/docs/html/*"
+ if use doc; then
+ HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
fi
cmake-utils_src_install
diff --git a/app-i18n/ibus-qt/m
[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-qt/
commit: abe619b118eef74891393aec75a983066814ba14
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Aug 5 13:32:20 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Aug 5 14:04:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe619b1
app-i18n/ibus-qt: drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/ibus-qt/Manifest | 1 -
app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild | 57 ---
2 files changed, 58 deletions(-)
diff --git a/app-i18n/ibus-qt/Manifest b/app-i18n/ibus-qt/Manifest
index bc5cb6fa3b9..57db878f056 100644
--- a/app-i18n/ibus-qt/Manifest
+++ b/app-i18n/ibus-qt/Manifest
@@ -1,3 +1,2 @@
DIST ibus-qt-1.3.1-Source.tar.gz 141488 SHA256
4079577a240c961278f7bdab11a5ad546dff414c687c60560fdbc19208b3ac85 SHA512
2cd28f8ff3fff411496ccaf9ab67ab5332b7f2d2d0d0e3460dbeb34874ed931aa56c222c3ea5ce39053577b91cd2de4ebe01152039cd6def37c366ab3065cff2
WHIRLPOOL
585ead9a02d2014f7536aa633c72e07f8ce990c768d0aa9b5bf00105166f467307fb12457c5da4c2aa0b7b5cf9656d616de7d0e344e8d02161e123368bdad9ff
-DIST ibus-qt-1.3.2-Source.tar.gz 139496 SHA256
070c8ef4e6c74eddf7ddf4385936aed730c2dfe2160162e5c56b5158d1061a76 SHA512
b82c744265daec4bbda3c7f2f1874fab52aca77cbe726a04f350502e1e5637f5e07b5218a81efa6ccf3715e73638e6442376cdf73d5435e47c3bd3571dcbc0c5
WHIRLPOOL
926c8db73249c5c6697befb19f2e425a24ea531f9154295a32dbc8907270ae9ac07ef58c15aa99adc54289b136ee5f01189466f48ebc895b952685ae9457c850
DIST ibus-qt-1.3.3.tar.gz 141523 SHA256
29bff835a4a07396c5f174d29c2266a39767c1abad48b2b0da1ab8d4c66fb44a SHA512
825a32fec51f10f466efd4255743a12ae98af63bacd07d5dc04e18fab6b830501b04491146c1f8bc92edd93dbf8eaeb68cf71062ffdbf25c2970d807b655c80a
WHIRLPOOL
692f5dcf1e89c28a90a4fdfbd0bc62e00e5f680798ecfe9c7a47c9d26510c30415a07facae0e7e44f0416f7b3675a6c4445c8812294ec37ea523603a68d7c6a0
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
deleted file mode 100644
index 3be3858a114..000
--- a/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit cmake-utils eutils multilib
-
-MY_P="${P}-Source"
-DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="https://github.com/ibus/ibus/wiki";
-SRC_URI="https://ibus.googlecode.com/files/${MY_P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=">=app-i18n/ibus-1.3.7
- >=sys-apps/dbus-1.2
- x11-libs/libX11
- >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtdbus-4.5:4"
-DEPEND="${RDEPEND}
- >=dev-libs/icu-4:=
- dev-util/cmake
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS README TODO"
-
-src_configure() {
- local mycmakeargs=( -DLIBDIR=$(get_libdir)
-DDOCDIR=${EPREFIX}/usr/share/doc/${PF} all )
-
- cmake-utils_src_configure
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.2.0.20091217-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
-}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-qt/
commit: eb37411ffc57fbc928c144dbc9591b7741aa97bc
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Aug 5 14:04:01 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Aug 5 14:04:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb37411f
app-i18n/ibus-qt: add missing dependency
Gentoo-Bug: 594482
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild | 1 +
app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
index 848efda5893..9cec4d2d4c8 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
@@ -20,6 +20,7 @@ RDEPEND="app-i18n/ibus
dev-libs/icu:=
dev-qt/qtcore:4
dev-qt/qtdbus:4
+ dev-qt/qtgui:4
sys-apps/dbus
x11-libs/libX11"
DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
index a990fbc5aab..f12619e7885 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
@@ -18,6 +18,7 @@ RDEPEND="app-i18n/ibus
dev-libs/icu:=
dev-qt/qtcore:4
dev-qt/qtdbus:4
+ dev-qt/qtgui:4
sys-apps/dbus
x11-libs/libX11"
DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-qt/files/, app-i18n/ibus-qt/
commit: db9c6e15ec57ecc0a05e8d87dbc74b4513745cc6
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Aug 5 13:46:46 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Aug 5 14:04:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db9c6e15
app-i18n/ibus-qt: update patches
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../ibus-qt/files/ibus-qt-1.2.0.20091217-doc.patch | 4 ++--
.../files/ibus-qt-1.3.1-display-unset.patch| 22 -
app-i18n/ibus-qt/files/ibus-qt-1.3.1-gold.patch| 11 +--
.../ibus-qt/files/ibus-qt-1.3.1-qvariant.patch | 23 +-
.../{ibus-qt-1.3-doc.patch => ibus-qt-doc.patch} | 4 ++--
app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild | 8
app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild | 4 ++--
7 files changed, 36 insertions(+), 40 deletions(-)
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
index a2adbd7b953..497574c6a9a 100644
--- 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
@@ -1,5 +1,5 @@
ibus-qt-1.2.0.20091217-Source.orig/CMakeLists.txt 2009-12-17
14:50:00.0 +0900
-+++ ibus-qt-1.2.0.20091217-Source/CMakeLists.txt 2010-01-03
09:11:53.0 +0900
+--- a/CMakeLists.txt
b/CMakeLists.txt
@@ -76,7 +76,7 @@
# pkg_check_modules(IBUS REQUIRED ibus-1.0>=1.2.0)
diff --git a/app-i18n/ibus-qt/files/ibus-qt-1.3.1-display-unset.patch
b/app-i18n/ibus-qt/files/ibus-qt-1.3.1-display-unset.patch
index 8325779282f..1613a10371e 100644
--- a/app-i18n/ibus-qt/files/ibus-qt-1.3.1-display-unset.patch
+++ b/app-i18n/ibus-qt/files/ibus-qt-1.3.1-display-unset.patch
@@ -1,15 +1,12 @@
-From d2a4e30fdb92aeaf476dcaaf2b5d6f8275d6af70 Mon Sep 17 00:00:00 2001
-From: Peter Wu
-Date: Tue, 4 Sep 2012 19:40:08 +0200
-Subject: [PATCH] Do not crash on missing/invalid DISPLAY envvar.
+commit d2a4e30fdb92aeaf476dcaaf2b5d6f8275d6af70
+Author: Peter Wu
+Date: Tue Sep 4 19:40:08 2012 +0200
-- Check whether the passed DISPLAY environment variable contains ":".
+Do not crash on missing/invalid DISPLAY envvar.
-- Fallback to "-display" parameter passed to QApplication.
- src/CMakeLists.txt |2 ++
- src/qibusbus.cpp | 23 ---
- 2 files changed, 18 insertions(+), 7 deletions(-)
+- Check whether the passed DISPLAY environment variable contains ":".
+
+- Fallback to "-display" parameter passed to QApplication.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2ad5588..8866ac0 100644
@@ -41,7 +38,7 @@ index 6a45d65..ed8248a 100644
namespace IBus {
/**
-@@ -121,15 +122,23 @@
+@@ -121,15 +122,23 @@ QString
Bus::getSocketPath (void)
{
QString display = getenv ("DISPLAY");
@@ -71,6 +68,3 @@ index 6a45d65..ed8248a 100644
QString path =
QDir::homePath() +
---
-1.7.10
-
diff --git a/app-i18n/ibus-qt/files/ibus-qt-1.3.1-gold.patch
b/app-i18n/ibus-qt/files/ibus-qt-1.3.1-gold.patch
index 3d108026911..d4b18d9863a 100644
--- a/app-i18n/ibus-qt/files/ibus-qt-1.3.1-gold.patch
+++ b/app-i18n/ibus-qt/files/ibus-qt-1.3.1-gold.patch
@@ -1,5 +1,12 @@
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
+commit 0f3b716934f5e5e2b8a72140f875a6e598b28750
+Author: fujiwarat
+Date: Thu Dec 13 07:10:19 2012 +0900
+
+Fix an undefined reference to 'XDisplayString'
+
+BUG=http://code.google.com/p/ibus/issues/detail?id=1560
+
+Review URL: https://codereview.appspot.com/6923057
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8866ac0..f419141 100644
diff --git a/app-i18n/ibus-qt/files/ibus-qt-1.3.1-qvariant.patch
b/app-i18n/ibus-qt/files/ibus-qt-1.3.1-qvariant.patch
index 23981b35ded..ab010829ca6 100644
--- a/app-i18n/ibus-qt/files/ibus-qt-1.3.1-qvariant.patch
+++ b/app-i18n/ibus-qt/files/ibus-qt-1.3.1-qvariant.patch
@@ -1,21 +1,19 @@
-From 40e119bd5577fc383990ad02b175ec64292f764b Mon Sep 17 00:00:00 2001
-From: Jekyll Wu
-Date: Tue, 16 Oct 2012 11:24:06 +0900
-Subject: [PATCH] Fix a non-const lvalue build error with clang-3.1
+commit 40e119bd5577fc383990ad02b175ec64292f764b
+Author: Jekyll Wu
+Date: Tue Oct 16 11:24:06 2012 +0900
-BUG=http://code.google.com/p/ibus/issues/detail?id=1506
+Fix a non-const lvalue build error with clang-3.1
-Review URL: https://codereview.appspot.com/6697048
-Patch from Jekyll Wu .
- src/qibusserializable.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+BUG=http://code.google.com/p/ibus/issues/detail?id=1506
+
+Review URL: https://codereview.appspot.com/6697048
+Patch from Jekyll Wu .
diff --git a/src/qibusserializable.h b/src/qibusserializable.h
index 594d973..92a32ed 100644
--- a/src/qibusserializable.h
+++ b/src/qibusserializable.h
-@@ -91,7 +91,7 @@ class Serializable : public Object
+@@ -91,7 +91,7 @@ private:
template
[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-qt/
commit: c0555385075e553f95dc7e9517aa614bc718f5f9
Author: Yixun Lan gentoo org>
AuthorDate: Tue Sep 20 03:26:06 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Tue Sep 20 03:28:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0555385
app-i18n/ibus-qt: don't get_libdir called in global scope
Gentoo-Bug: 593390
Package-Manager: portage-2.3.0
app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild | 8 ++--
app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild | 8 ++--
app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild | 8 ++--
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
index 407d4d1..c4d864b 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -30,7 +30,11 @@ S="${WORKDIR}/${MY_P}"
DOCS="AUTHORS README TODO"
-mycmakeargs="-DLIBDIR=$(get_libdir) -DDOCDIR=${EPREFIX}/usr/share/doc/${PF}
all"
+src_configure() {
+ local mycmakeargs=( -DLIBDIR=$(get_libdir)
-DDOCDIR=${EPREFIX}/usr/share/doc/${PF} all )
+
+ cmake-utils_src_configure
+}
src_prepare() {
epatch "${FILESDIR}/${PN}-1.2.0.20091217-doc.patch" \
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
index f3088c3..8088fdc 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -30,7 +30,11 @@ S="${WORKDIR}/${MY_P}"
DOCS="AUTHORS README TODO"
-mycmakeargs="-DLIBDIR=$(get_libdir) -DDOCDIR=${EPREFIX}/usr/share/doc/${PF}
all"
+src_configure() {
+ local mycmakeargs=( -DLIBDIR=$(get_libdir)
-DDOCDIR=${EPREFIX}/usr/share/doc/${PF} all )
+
+ cmake-utils_src_configure
+}
src_prepare() {
epatch "${FILESDIR}/${PN}-1.2.0.20091217-doc.patch"
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
index cf130f7..4a7674e 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -29,7 +29,11 @@ DOCS="AUTHORS README TODO"
PATCHES=( "${FILESDIR}"/${PN}-1.3-doc.patch )
-mycmakeargs="-DLIBDIR=$(get_libdir) all"
+src_configure() {
+ local mycmakeargs=( -DLIBDIR=$(get_libdir) all )
+
+ cmake-utils_src_configure
+}
src_compile() {
cmake-utils_src_compile
[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-qt/
commit: 488f74aef63d095254c1bb24b9ec701252b1807d
Author: Tobias Klausmann gentoo org>
AuthorDate: Tue Sep 1 18:47:42 2015 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Tue Sep 1 18:47:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488f74ae
app-i18n/ibus-qt: Fixing HOMEPAGE move due to code.google.com shutdown
Package-Manager: portage-2.2.20.1
app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild | 2 +-
app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild | 2 +-
app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
index acccd22..407d4d1 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils eutils multilib
MY_P="${P}-Source"
DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="https://code.google.com/p/ibus/";
+HOMEPAGE="https://github.com/ibus/ibus/wiki";
SRC_URI="https://ibus.googlecode.com/files/${MY_P}.tar.gz";
LICENSE="GPL-2"
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
index 9260454..f3088c3 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils eutils multilib
MY_P="${P}-Source"
DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="https://code.google.com/p/ibus/";
+HOMEPAGE="https://github.com/ibus/ibus/wiki";
SRC_URI="https://ibus.googlecode.com/files/${MY_P}.tar.gz";
LICENSE="GPL-2"
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
index cbd7389..cf130f7 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
inherit cmake-utils eutils multilib
DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="https://code.google.com/p/ibus/";
+HOMEPAGE="https://github.com/ibus/ibus/wiki";
SRC_URI="https://github.com/ibus/ibus-qt/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
