diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-08-15 13:20:59 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-08-15 13:20:59 +0000 |
| commit | 6c37c3872581a3123a56269d6615329a509c0bd0 (patch) | |
| tree | 2b553c9cb1c3096d40ed2f4cb696d368a506504d /app-i18n/scim-bridge | |
| parent | Drop totally bogus built_with_use and append-ldflags combo for -lz (diff) | |
| download | gentoo-2-6c37c3872581a3123a56269d6615329a509c0bd0.tar.gz gentoo-2-6c37c3872581a3123a56269d6615329a509c0bd0.tar.bz2 gentoo-2-6c37c3872581a3123a56269d6615329a509c0bd0.zip | |
Migrate to EAPI 2 to get rid of built_with_use for bug #261562.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'app-i18n/scim-bridge')
| -rw-r--r-- | app-i18n/scim-bridge/ChangeLog | 6 | ||||
| -rw-r--r-- | app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild | 25 |
2 files changed, 15 insertions, 16 deletions
diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog index df4d703074e1..446b23ef4509 100644 --- a/app-i18n/scim-bridge/ChangeLog +++ b/app-i18n/scim-bridge/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-i18n/scim-bridge # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.26 2009/05/09 16:36:43 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.27 2009/08/15 13:20:59 betelgeuse Exp $ + + 15 Aug 2009; Petteri Räty <betelgeuse@gentoo.org> + scim-bridge-0.4.16.ebuild: + Migrate to EAPI 2 to get rid of built_with_use for bug #261562. 09 May 2009; Diego E. Pettenò <flameeyes@gentoo.org> scim-bridge-0.4.16.ebuild, +files/scim-bridge-0.4.16+gcc-4.4.patch: diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild index 166825510f78..a39c196f2e87 100644 --- a/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild +++ b/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild,v 1.2 2009/05/09 16:36:43 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild,v 1.3 2009/08/15 13:20:59 betelgeuse Exp $ + +EAPI="2" -EAPI="1" inherit autotools eutils qt3 DESCRIPTION="Yet another IM-client of SCIM" @@ -22,7 +23,10 @@ RDEPEND=">=app-i18n/scim-1.4.6 >=x11-libs/pango-1.1 ) qt3? ( - x11-libs/qt:3 + || ( + x11-libs/qt:3[immqt-bc] + x11-libs/qt:3[immqt] + ) >=x11-libs/pango-1.1 ) qt4? ( @@ -43,15 +47,7 @@ get_gtk_confdir() { fi } -pkg_setup() { - if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then - die "You need to rebuild >=x11-libs/qt-3.3.4 with immqt-bc(recommended) or immqt USE flag enabled." - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}/${PN}-0.4.15.2-qt4.patch" epatch "${FILESDIR}/${PN}-0.4.15.2-gcc43.patch" epatch "${FILESDIR}/${P}+gcc-4.4.patch" @@ -61,19 +57,18 @@ src_unpack() { eautoreconf } -src_compile() { +src_configure() { econf \ $(use_enable gtk gtk2-immodule) \ $(use_enable qt3 qt3-immodule) \ $(use_enable qt4 qt4-immodule) \ $(use_enable doc documents) || die - emake || die } src_install() { emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README + dodoc AUTHORS ChangeLog NEWS README || die } pkg_postinst() { |