diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-02-13 19:32:23 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-02-13 19:32:23 +0000 |
commit | 230c07d1bcd23bafa30383a0be71514bdc971d91 (patch) | |
tree | dd0b9d8e71cc665e29ce2205702b658f36a56cb0 /app-text | |
parent | Updated metadata.xml to reflect new selinux herd. (diff) | |
download | gentoo-2-230c07d1bcd23bafa30383a0be71514bdc971d91.tar.gz gentoo-2-230c07d1bcd23bafa30383a0be71514bdc971d91.tar.bz2 gentoo-2-230c07d1bcd23bafa30383a0be71514bdc971d91.zip |
Remove older. Update to eapi4 and use REQUIRED_USE
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
-rw-r--r-- | app-text/fbreader/ChangeLog | 8 | ||||
-rw-r--r-- | app-text/fbreader/fbreader-0.12.10.ebuild | 19 | ||||
-rw-r--r-- | app-text/fbreader/fbreader-0.12.7.ebuild | 65 |
3 files changed, 15 insertions, 77 deletions
diff --git a/app-text/fbreader/ChangeLog b/app-text/fbreader/ChangeLog index b56271c2ca83..731324f7473e 100644 --- a/app-text/fbreader/ChangeLog +++ b/app-text/fbreader/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/fbreader -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.17 2010/04/26 21:07:19 spatz Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.18 2011/02/13 19:32:22 scarabeus Exp $ + + 13 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> -fbreader-0.12.7.ebuild, + fbreader-0.12.10.ebuild: + Remove older. Update to eapi4 and use REQUIRED_USE 26 Apr 2010; Dror Levin <spatz@gentoo.org> fbreader-0.12.10.ebuild, +files/fbreader-0.12.10-gcc45.patch: diff --git a/app-text/fbreader/fbreader-0.12.10.ebuild b/app-text/fbreader/fbreader-0.12.10.ebuild index e0357efe0331..0f5833cc24e9 100644 --- a/app-text/fbreader/fbreader-0.12.10.ebuild +++ b/app-text/fbreader/fbreader-0.12.10.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.10.ebuild,v 1.3 2010/04/26 21:10:25 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.10.ebuild,v 1.4 2011/02/13 19:32:22 scarabeus Exp $ -EAPI=2 +EAPI=4 -inherit eutils confutils +inherit eutils DESCRIPTION="E-Book Reader. Supports many e-book formats." HOMEPAGE="http://www.fbreader.org/" @@ -26,9 +26,7 @@ DEPEND="dev-libs/expat " RDEPEND="${DEPEND}" -pkg_setup() { - confutils_require_one qt4 gtk -} +REQUIRED_USE=" ^^ ( qt4 gtk )" src_prepare() { epatch "${FILESDIR}/${P}-gcc45.patch" # bug 317189 @@ -43,18 +41,19 @@ src_prepare() { echo "TARGET_ARCH = desktop" > makefiles/target.mk echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk - if use qt4 ; then + if use qt4; then # qt4 echo "UI_TYPE = qt4" >> makefiles/target.mk sed -i "s:MOC = moc-qt4:MOC = /usr/bin/moc:" makefiles/arch/desktop.mk || die "updating desktop.mk failed" sed -i "s:UILIBS = -lQtGui:UILIBS = -L/usr/lib/qt4 -lQtGui:" makefiles/arch/desktop.mk - elif use gtk ; then + fi + if use gtk; then # gtk echo "UI_TYPE = gtk" >> makefiles/target.mk fi - if use debug ; then + if use debug; then echo "TARGET_STATUS = debug" >> makefiles/target.mk else echo "TARGET_STATUS = release" >> makefiles/target.mk diff --git a/app-text/fbreader/fbreader-0.12.7.ebuild b/app-text/fbreader/fbreader-0.12.7.ebuild deleted file mode 100644 index 64989fcde355..000000000000 --- a/app-text/fbreader/fbreader-0.12.7.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.7.ebuild,v 1.2 2010/04/08 17:13:01 spatz Exp $ - -EAPI=2 - -inherit confutils - -DESCRIPTION="E-Book Reader. Supports many e-book formats." -HOMEPAGE="http://www.fbreader.org/" -SRC_URI="http://www.fbreader.org/${PN}-sources-${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="debug gtk +qt4" -DEPEND="dev-libs/expat - dev-libs/liblinebreak - net-misc/curl - dev-libs/fribidi - app-arch/bzip2 - dev-db/sqlite - qt4? ( x11-libs/qt-gui:4 ) - gtk? ( >=x11-libs/gtk+-2.4 ) - " -RDEPEND="${DEPEND}" - -pkg_setup() { - confutils_require_one qt4 gtk -} - -src_prepare() { - #Tidy up the .desktop file - sed -i "s:^Name=E-book reader:Name=FBReader:" fbreader/desktop/desktop || die "sed failed" - sed -i "s:^Name\[ru\]=.*$:Name\[ru\]=FBReader:" fbreader/desktop/desktop || die "sed failed" - sed -i "s:^Icon=FBReader.png:Icon=FBReader:" fbreader/desktop/desktop || die "sed failed" - sed -i "/^ LDFLAGS += -s$/ d" makefiles/config.mk || die "sed failed" - sed -i "/^LDFLAGS =$/ d" makefiles/arch/desktop.mk || die "sed failed" - - echo "TARGET_ARCH = desktop" > makefiles/target.mk - echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk - - if use qt4 ; then - # qt4 - echo "UI_TYPE = qt4" >> makefiles/target.mk - - sed -i "s:MOC = moc-qt4:MOC = /usr/bin/moc:" makefiles/arch/desktop.mk || die "updating desktop.mk failed" - sed -i "s:UILIBS = -lQtGui:UILIBS = -L/usr/lib/qt4 -lQtGui:" makefiles/arch/desktop.mk - elif use gtk ; then - # gtk - echo "UI_TYPE = gtk" >> makefiles/target.mk - fi - - if use debug ; then - echo "TARGET_STATUS = debug" >> makefiles/target.mk - else - echo "TARGET_STATUS = release" >> makefiles/target.mk - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - dosym /usr/bin/FBReader /usr/bin/fbreader -} |