[gentoo-commits] gentoo-x86 commit in app-text/fbreader: fbreader-0.12.7.ebuild ChangeLog fbreader-0.12.10.ebuild fbreader-0.12.5.1.ebuild

[gentoo-commits] gentoo-x86 commit in app-text/fbreader: fbreader-0.12.7.ebuild ChangeLog fbreader-0.12.10.ebuild fbreader-0.12.5.1.ebuild

[Dror Levin (spatz)]

spatz       10/04/08 17:13:01

  Modified:             fbreader-0.12.7.ebuild ChangeLog
  Added:                fbreader-0.12.10.ebuild
  Removed:              fbreader-0.12.5.1.ebuild
  Log:
  Version bump (bug 311411), respect LDFLAGS. Remove old.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-text/fbreader/fbreader-0.12.7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/fbreader/fbreader-0.12.7.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/fbreader/fbreader-0.12.7.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/fbreader/fbreader-0.12.7.ebuild?r1=1.1&r2=1.2

Index: fbreader-0.12.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fbreader-0.12.7.ebuild	6 Mar 2010 19:37:00 -0000	1.1
+++ fbreader-0.12.7.ebuild	8 Apr 2010 17:13:01 -0000	1.2
@@ -1,6 +1,6 @@
 # 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.1 2010/03/06 19:37:00 spatz Exp $
+# $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
 
@@ -35,7 +35,8 @@
 	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 "s:^	LDFLAGS += -s::" makefiles/config.mk || 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



1.16                 app-text/fbreader/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/fbreader/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/fbreader/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/fbreader/ChangeLog?r1=1.15&r2=1.16

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog	6 Mar 2010 19:37:00 -0000	1.15
+++ ChangeLog	8 Apr 2010 17:13:01 -0000	1.16
@@ -1,6 +1,12 @@
 # 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.15 2010/03/06 19:37:00 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.16 2010/04/08 17:13:01 spatz Exp $
+
+*fbreader-0.12.10 (08 Apr 2010)
+
+  08 Apr 2010; Dror Levin <spatz@gentoo.org> -fbreader-0.12.5.1.ebuild,
+  fbreader-0.12.7.ebuild, +fbreader-0.12.10.ebuild:
+  Version bump (bug 311411), respect LDFLAGS. Remove old.
 
 *fbreader-0.12.7 (06 Mar 2010)
 



1.1                  app-text/fbreader/fbreader-0.12.10.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/fbreader/fbreader-0.12.10.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/fbreader/fbreader-0.12.10.ebuild?rev=1.1&content-type=text/plain

Index: fbreader-0.12.10.ebuild
===================================================================
# 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.10.ebuild,v 1.1 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
}