diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2009-02-09 22:47:55 +0000 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2009-02-09 22:47:55 +0000 |
| commit | a65ab385b5e8204c04661dc3395233c2dd609ca9 (patch) | |
| tree | ae90aff123bec1378c2ce366217398cf48625d48 /app-text | |
| parent | rely on upstream's init script, they package everyone elses and are receptive... (diff) | |
| download | gentoo-2-a65ab385b5e8204c04661dc3395233c2dd609ca9.tar.gz gentoo-2-a65ab385b5e8204c04661dc3395233c2dd609ca9.tar.bz2 gentoo-2-a65ab385b5e8204c04661dc3395233c2dd609ca9.zip | |
Some stylistyc changes to FBreader; thanks to pva =)
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/fbreader/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/fbreader/fbreader-0.10.3.ebuild | 32 |
2 files changed, 11 insertions, 26 deletions
diff --git a/app-text/fbreader/ChangeLog b/app-text/fbreader/ChangeLog index 2a6a63ad906e..3089dab9468b 100644 --- a/app-text/fbreader/ChangeLog +++ b/app-text/fbreader/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/fbreader # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.2 2009/02/06 19:09:22 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.3 2009/02/09 22:47:55 alexxy Exp $ + + 09 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org> fbreader-0.10.3.ebuild: + Some stylistyc changes *fbreader-0.10.3 (06 Feb 2009) diff --git a/app-text/fbreader/fbreader-0.10.3.ebuild b/app-text/fbreader/fbreader-0.10.3.ebuild index 0114bfeb7f58..c089ae15fd1e 100644 --- a/app-text/fbreader/fbreader-0.10.3.ebuild +++ b/app-text/fbreader/fbreader-0.10.3.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.10.3.ebuild,v 1.1 2009/02/06 19:09:22 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.10.3.ebuild,v 1.2 2009/02/09 22:47:55 alexxy 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" @@ -25,29 +27,14 @@ DEPEND="dev-libs/expat RDEPEND="${DEPEND}" pkg_setup() { - local toolkitsnum toolkitstypes="qt3 qt4 gtk" toolkitstype - declare -i toolkitsnum=0 - for toolkitstype in ${toolkitstypes}; do - useq ${toolkitstype} && let toolkitsnum++ - done - if [ ${toolkitsnum} -gt 1 ]; then - eerror - eerror "You can't use more than one of toolkits." - eerror "Select exactly one toolkits type out of these: ${toolkitstypes}" - eerror - die "Multiple toolkits types selected." - elif [ ${toolkitsnum} -lt 1 ]; then - eerror - eerror "Select exactly one toolkits type out of these: ${toolkitstypes}" - eerror - die "No toolkits type selected." - fi + confutils_require_one qt3 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" echo "TARGET_ARCH = desktop" > makefiles/target.mk @@ -57,19 +44,14 @@ src_prepare() { 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 - fi - - if use qt3 ; then + elif use qt3 ; then # qt3 echo "UI_TYPE = qt" >> makefiles/target.mk sed -i "s:MOC = moc-qt3:MOC = ${QTDIR}/bin/moc:" makefiles/arch/desktop.mk || die "updating desktop.mk failed" sed -i "s:QTINCLUDE = -I /usr/include/qt3:QTINCLUDE = -I ${QTDIR}/include:" makefiles/arch/desktop.mk || die "updating desktop.mk failed" sed -i "s:UILIBS = -lqt-mt:UILIBS = -L${QTDIR}/lib -lqt-mt:" makefiles/arch/desktop.mk - - fi - - if use gtk ; then + elif use gtk ; then # gtk echo "UI_TYPE = gtk" >> makefiles/target.mk fi |