version bump, drop old

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

3 files changed, 47 insertions, 14 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index eb2a611c390c..e1f3f3378226 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.156 2015/01/19 09:36:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.157 2015/02/28 15:36:43 dlan Exp $
+
+*ibus-1.5.10 (28 Feb 2015)
+
+  28 Feb 2015; Yixun Lan <dlan@gentoo.org> -ibus-1.5.9.ebuild,
+  +ibus-1.5.10.ebuild:
+  version bump, drop old
 
   19 Jan 2015; Pacho Ramos <pacho@gentoo.org> ibus-1.5.9-r1.ebuild:
   eautoreconf is needed (#536022 by OGINO Masanori), USE vala needs USE
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index aad0e8d28d56..42cc5198912f 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,20 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST ibus-1.5.10.tar.gz 2169299 SHA256 1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594 SHA512 2f7f07c20cac5f934f24c3bc99b29efe30aa5ced501ac442a9da16454cb889d946fa262b3495c1778f200c8f62a1fd8d67f47f43ae6ee214d3d392feb6e413c9 WHIRLPOOL 575d5bba84ed8afb608030260b5fbbd47bdfc4ff1368590e0c34b2fed1cf2878e71bdb7b6da286d0b0d5a27f7fcc9e2a02675a86bbc9417c1d060246b7a6acbd
 DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
 DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
 DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41
 DIST ibus-1.5.9.tar.gz 2128459 SHA256 ad41014aa3cb961854ee0aa392a5abd7452fab2c6b77d8ff2d736b7405b48ac6 SHA512 8a21303abceb38f1e5903342590c229a243db1497503fa08d547e1029bc25b90a2031f0386e57ddfcb897a14819d202289fcac1e3c8bad059698b04501a7ede9 WHIRLPOOL 88135818669cb3c189ce02a7caba3ec262bd95ffa6d139e8f76113ca91fc778f5f7703cfbfb1f5d5dd3cbb6948ba14d9c326f318b0286381caec45db3b453221
+EBUILD ibus-1.5.10.ebuild 4745 SHA256 6775138da28ee9a6b77a88eb2469d6185acbb35077f2913e083eb8ccca38c59c SHA512 62e83382e55c79df46b105f3b6e7cd512acc12e6271115bab54d486364f5d30b9a8d8b64043e2aabe3afdd3a71c8b46be505ce001bce0c3bd6d3f35d65828f67 WHIRLPOOL 3aa9bdde56a621d61e69c60e1d8e70e0acdc8262693f856d870020826213b56d9e394ea6f11dcc61ed91fe2168e731680ce9fc562b60b97849c514135a2423b3
 EBUILD ibus-1.5.5.ebuild 4427 SHA256 965b1ebdda67881f6f153401bacba5014bd126e53a040188dcb66f02775b816d SHA512 3d0b03e98220c652a9e5219d8844b4c4871d64fa1b8c5b96b1f3940699bc623e0fbb2a88251bc42e2dff3c1e29bc9ec2df714085f5d19996cefafef012e18030 WHIRLPOOL b8dad8962180fcdaf1f9eb5580004f78aafe1c9503174c5a8f35bd35bcda29087e139a7fbb6bc86b5d8eb5c5c850c0b6bd74631119cb06976a94b5fce7626d7d
 EBUILD ibus-1.5.8-r1.ebuild 4363 SHA256 621c0763552dc28fecd2cb5912ef8d3d13a4885ab0f39f209f36e31648533c44 SHA512 053c147844559354a5d841fe5fced2d5082cfc0f9a06273074c6dc84d6b0f28de1d3709e663021093a863b56b38782151937fd69334bedaab70e118e542bb3ee WHIRLPOOL e96973d988a25df48f31a49326a3e7c52a8d80511afe03ff25427179d989d2b87767c6598e84f403a5ddfae4ad9ffbde6d1e3dcb55bc72ece7055018b6c04c80
 EBUILD ibus-1.5.9-r1.ebuild 4750 SHA256 bb5e979b86b26179bd0515baeef41382c26258dc7d78f2fdcccf164c97fa1c6c SHA512 305297a22df69e33a5018022aa969f104c966aa29d9e4838104a1adb4690314df72da1026f84742b28142bb69850718aa796cb229b9dcee4573335c0c7037ccc WHIRLPOOL 2139bdad76358e875fd02fd4def872a9c3fa26e2ec9e9cb37894149b0125aa9e35bb22b98ee310a04c6803b5f8eb5de060af5b31a5796b6ace7939bc97fabe20
-EBUILD ibus-1.5.9.ebuild 4360 SHA256 dc6e53fb76f217ae6822aca80ccd072c595b978825f983adc09116f76bae16ab SHA512 d6b3436aad5fa1972b2b1ca21a05b6974c70615d579735a8649025a9733a542304627d045343024d0f27eca9c1e8d327d96e44e6f5b7d4a665687e6be453d584 WHIRLPOOL 9f3e2a55fd9f51fc1eaf5b6682b5396288b268a469dba54b0b510de69853762d0e36797bdf88d623486afee78d7d146b851964de5756ffbf3b93173902939f98
-MISC ChangeLog 24295 SHA256 56cb6ca82cb6004178015370511c92629b635ca863788d5e408e3c66abd24f29 SHA512 0faa972fcbb5acb549cc585e9c6891134895d7ad797f78a55b18f710c3c2aff4fecd2d2d20b7195ea2ef9c6c5d02c132c7fb15a113bca3a8d7f9e8727c7e628d WHIRLPOOL 8f61f7b1775578472794e8b83370468eb8a65ff08bca220558f80e6ba7fadccf7e7fed005adc042971d14ce5ed410f72f697c216cd8ac15d7fec4dca671754dd
+MISC ChangeLog 24434 SHA256 ec2e776e7b8ad8e14dbf2312a8666c6c27f878a681721caa642c3f8a7407cbca SHA512 1435eb24ffc349f79ca7f1b8f60f42b832bab6694dced78e8f6fa78364f9356776f3139920c34a03c38204b58982b0559ab2f604cacf6c644494c156f5990cfd WHIRLPOOL b8fbb9b3eeac01339c2377c78a90a0d457482502868dfc2eb205e414ffcdf7a47fd5a32d19cec125e8a8f1e2a1c7f20fd94d0ff04c7d2ac1655e3b39ca4b3c60
 MISC metadata.xml 907 SHA256 568c340b720f7300fc7fe240c3e374333315a56875fafd73f02a387709bfeaa7 SHA512 db257d82bf2f810da847b74f1770137288b89c8d6b827e46181d5d2ac8798c5acbdb1bb5ab0d82204f421426242abca912c6ab8ac0c1a4049a8c5944b2c7dd8b WHIRLPOOL 7f5f53519558eb5ee3d2f3db3bf08d1e490c1b5d84d5d76965fda838158facfe18168a32e95eaff1574ca62fde44f6ca95a1bfce3a86af200c8d4d5679054ddd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS80BYACgkQCaWpQKGI+9TD3wCfbKwW+JJ6jWQHlM14XOW8x0gP
-f1AAniGntJB+47FumrNUKxv9o/ZsBngF
-=ZrAn
+iQIcBAEBCAAGBQJU8W/VAAoJEJIMDbyqvv1VwcQP/jfgSawQueDMd/foNUSnfmGq
+ySvsOjNwWZtCfr32I7LjhK1ksWQ3LwmZa3yM/U13l6L7XPMEkev2VJZKCE6LIL6Q
+LkbJJkngkiZZpUM8dSH9GfvnL1vZG4ODVtPJwQAQ7z5nbAUmCvC7yo2VYXBfLa1K
+IUULDigsl2e80N3LVe7Em6MC566yg2A7wMUJhI52rmIdqtDOIdQYlhUYvvkZpFAV
+OyO954qXberAsqTHkOpMskItO7YIQ4m7fg9zy5QyulwEWEJhQO3/STMO2ALZ+eyF
+ccWNUMFKgjJB/XKkHeWPNuGYcXSwUgicVEU8z2itD7PbdonRz1qFU5F/ghXI9Jse
+jWEG7oRm89p5X9F2DhG+UCGLelYyvZTxrm9WwIEzWc3yuRouI5jZiruet3CYRIaD
+IS5Rc3Tl21hbI93oJJFKWiYbe35gGeeGdTxWuBOu0RTmiZjlVXs0V7YPP+Hdtuhz
+Hbye3GdLOCuq+c0K4ARW66F9+BTcoKa/pke82nNCXn/btuJOSjewCtJiID6TswwC
+51g8VsetVApuBlTQooK0pS1blle6bpGZfNLNx76upRKah8B8kTZ3sSR1K9ewWpX6
+m+BgGvcPMsr4JuoojC9EYqvpETtrw149dNKUNKBgy86eE8zPRqxxR7FdTi2sLITB
+OmZ5gVJ1n4EF9+Ih5H0g
+=gi2c
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.5.9.ebuild b/app-i18n/ibus/ibus-1.5.10.ebuild
index c8c0a1b5dcd1..762fe39edb33 100644
--- a/app-i18n/ibus/ibus-1.5.9.ebuild
+++ b/app-i18n/ibus/ibus-1.5.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.9.ebuild,v 1.1 2014/11/12 14:31:12 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.10.ebuild,v 1.1 2015/02/28 15:36:43 dlan Exp $
 
 EAPI=5
 
@@ -9,23 +9,31 @@ VALA_MIN_API_VERSION="0.20"
 VALA_USE_DEPEND="vapigen"
 # Vapigen is needed for the vala binding
 # Valac is needed when building from git for the engine
+UPSTREAM_VER=
 
-inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
+inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="|| ( gtk gtk3 X )
+REQUIRED_USE="
+	|| ( gtk gtk3 X )
 	deprecated? ( python )
+	vala? ( introspection )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		|| ( deprecated ( gtk3 introspection ) ) )" #342903
 
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
+	${UPSTRAM_PATCHSET_URI}"
+
 COMMON_DEPEND="
 	>=dev-libs/glib-2.26:2
 	gnome-base/librsvg:2
@@ -33,7 +41,6 @@ COMMON_DEPEND="
 	app-text/iso-codes
 	>=gnome-base/dconf-0.13.4
 	x11-libs/libnotify
-
 	gconf? ( >=gnome-base/gconf-2.12:2 )
 	gtk? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
@@ -64,8 +71,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )
-	gnome-base/gconf"
+	vala? ( $(vala_depend) )"
 
 # stress test in bus/ fails
 # IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
@@ -96,10 +102,20 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
 	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
 	sed -e 's/dconf update/:/' \
 		-i data/dconf/Makefile.{am,in} || die
 	use vala && vala_src_prepare
+
+	eautoreconf
 }
 
 src_configure() {