revbump to fix path used (bug #165187) and scrollkeeper detection

(Portage version: 2.1.3.16)

5 files changed, 88 insertions, 1 deletions

diff --git a/app-text/gtranslator/ChangeLog b/app-text/gtranslator/ChangeLog
index 0bd920064b3d..5d0b5c80e00c 100644
--- a/app-text/gtranslator/ChangeLog
+++ b/app-text/gtranslator/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/gtranslator
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.25 2007/02/02 12:20:14 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.26 2007/10/28 14:47:35 eva Exp $
+
+*gtranslator-1.1.6-r1 (28 Oct 2007)
+
+  28 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gtranslator-1.1.6-defines.patch,
+  +files/gtranslator-1.1.6-scrollkeeper.patch, +gtranslator-1.1.6-r1.ebuild:
+  fix defines (even so probably not the best solution) per bug #165187
+  fix scrollkeeper detection to also work with rarian
 
   02 Feb 2007; Mart Raudsepp <leio@gentoo.org> -gtranslator-1.1.5.ebuild:
   Remove old
diff --git a/app-text/gtranslator/files/digest-gtranslator-1.1.6-r1 b/app-text/gtranslator/files/digest-gtranslator-1.1.6-r1
new file mode 100644
index 000000000000..4b9eaa7cbe89
--- /dev/null
+++ b/app-text/gtranslator/files/digest-gtranslator-1.1.6-r1
@@ -0,0 +1,3 @@
+MD5 44b3c0f79cd282f63713b504d3c4f696 gtranslator-1.1.6.tar.gz 1443119
+RMD160 42f6104dbc30bed06c172e292431e76cbd88cacd gtranslator-1.1.6.tar.gz 1443119
+SHA256 15af61a307c6cb1d460f2c139d9a9cd2c4cae5b49cfe8e2481d8a910187cbf16 gtranslator-1.1.6.tar.gz 1443119
diff --git a/app-text/gtranslator/files/gtranslator-1.1.6-defines.patch b/app-text/gtranslator/files/gtranslator-1.1.6-defines.patch
new file mode 100644
index 000000000000..0559921e659d
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-1.1.6-defines.patch
@@ -0,0 +1,14 @@
+--- ./src/defines.h	2005-02-06 06:56:02.000000000 +0100
++++ ./src/defines.h	2007-02-04 00:37:53.000000000 +0100
+@@ -22,8 +22,8 @@
+ 
+ #define BUILD_STRING	"1.1.6 -- 2005-02-06 12:56:02"
+ #define BUILD_VERSIONS	"2.6.1 / 2.6.1 / 2.9.1 / 2.6.17"
+-#define SCHEMESDIR	"/usr/local/share/gtranslator/colorschemes"
+-#define SCRIPTSDIR	"/usr/local/share/gtranslator/scripts"
+-#define WINDOW_ICON	"/usr/local/share/pixmaps/gtranslator.png"
++#define SCHEMESDIR	"/usr/share/gtranslator/colorschemes"
++#define SCRIPTSDIR	"/usr/share/gtranslator/scripts"
++#define WINDOW_ICON	"/usr/share/pixmaps/gtranslator.png"
+ 
+ #endif
diff --git a/app-text/gtranslator/files/gtranslator-1.1.6-scrollkeeper.patch b/app-text/gtranslator/files/gtranslator-1.1.6-scrollkeeper.patch
new file mode 100644
index 000000000000..45d4c7c22a22
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-1.1.6-scrollkeeper.patch
@@ -0,0 +1,22 @@
+--- configure.in	2007-10-28 15:12:22.000000000 +0100
++++ configure.in	2007-10-28 15:11:33.000000000 +0100
+@@ -118,7 +118,7 @@
+ AC_CHECK_PROG(sc_present, scrollkeeper-config, yes, no)
+ if test "z$sc_present" = "zyes" ; then
+ 	AC_MSG_CHECKING([for scrollkeeper])
+-	_VERSION=`scrollkeeper-config --version|sed -e 's/\.//g'`
++	_VERSION=`scrollkeeper-config --version|sed -e 's/^\([0-9\.]\+\).*/\1/g;s/\.//g'`
+ 	if test $_VERSION -ge 0 -o $_VERSION -ge 02; then
+ 		AC_MSG_RESULT(yes)
+ 		SC_STATEDIR=`scrollkeeper-config --pkglocalstatedir`
+--- configure	2007-10-28 15:17:28.000000000 +0100
++++ configure	2007-10-28 15:11:54.000000000 +0100
+@@ -5656,7 +5656,7 @@
+ if test "z$sc_present" = "zyes" ; then
+ 	echo "$as_me:$LINENO: checking for scrollkeeper" >&5
+ echo $ECHO_N "checking for scrollkeeper... $ECHO_C" >&6
+-	_VERSION=`scrollkeeper-config --version|sed -e 's/\.//g'`
++	_VERSION=`scrollkeeper-config --version|sed -e 's/^\([0-9\.]\+\).*/\1/g;s/\.//g'`
+ 	if test $_VERSION -ge 0 -o $_VERSION -ge 02; then
+ 		echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
diff --git a/app-text/gtranslator/gtranslator-1.1.6-r1.ebuild b/app-text/gtranslator/gtranslator-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..0094dd22d3f7
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-1.1.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.1.6-r1.ebuild,v 1.1 2007/10/28 14:47:35 eva Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="An enhanced gettext po file editor for GNOME"
+HOMEPAGE="http://gtranslator.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gtranslator/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.4.12
+	app-text/gtkspell
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonoboui-2
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/gnome-vfs-2"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.1.4
+	>=dev-util/intltool-0.22
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README THANKS TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix path (bug #165187)
+	epatch "${FILESDIR}"/${P}-defines.patch
+
+	# Fix scrollkeeper detection
+	epatch "${FILESDIR}"/${P}-scrollkeeper.patch
+}