updated with new utf8-ru patches for the latest versions

(Portage version: 2.1.2.2)

5 files changed, 33 insertions, 8 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index e60c76ffc1e6..900c10549600 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.120 2007/01/23 16:00:16 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.121 2007/03/12 05:23:10 nerdboy Exp $
+
+  12 Mar 2007; Steve Arnold <nerdboy@gentoo.org> doxygen-1.4.7.ebuild,
+  doxygen-1.5.1.ebuild:
+  Updated with new utf8-ru patches for the latest versions.  Thanks to
+  Sergey Belyashov <Sergey.Belyashov at gmail.com> for the utf8-ru fixes.
+  Fixes bug #167617.
 
   23 Jan 2007; Marius Mauch <genone@gentoo.org> doxygen-1.4.2.ebuild,
   doxygen-1.4.3-r1.ebuild, doxygen-1.4.4.ebuild, doxygen-1.4.5.ebuild,
diff --git a/app-doc/doxygen/doxygen-1.4.7.ebuild b/app-doc/doxygen/doxygen-1.4.7.ebuild
index 7860944c699a..89d88562d90f 100644
--- a/app-doc/doxygen/doxygen-1.4.7.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.7.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v 1.17 2007/01/23 16:00:16 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v 1.18 2007/03/12 05:23:10 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3
 
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-#	unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
+SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+	unicode? ( mirror://gentoo/${P}-utf8-ru.patch.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="doc qt3 tetex"
+IUSE="doc qt3 tetex unicode"
 
 RDEPEND=">=media-gfx/graphviz-2.6
 	qt3? ( $(qt_min_version 3.3) )
@@ -26,6 +26,12 @@ EPATCH_SUFFIX="patch"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	# still needs patch for Russian text in source files (see bug #112076)
+	if use unicode; then
+	    epatch ${WORKDIR}/${P}-utf8-ru.patch || die "utf8-ru patch failed"
+	fi
+
 	# use CFLAGS, CXXFLAGS, LDFLAGS
 	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
 		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
diff --git a/app-doc/doxygen/doxygen-1.5.1.ebuild b/app-doc/doxygen/doxygen-1.5.1.ebuild
index ba11fa41444f..7bddd74566fb 100644
--- a/app-doc/doxygen/doxygen-1.5.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.1.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.1.ebuild,v 1.2 2007/01/23 16:00:16 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.1.ebuild,v 1.3 2007/03/12 05:23:10 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3
 
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+	unicode? ( mirror://gentoo/${P}-utf8-ru.patch.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc qt3 tetex"
+IUSE="doc qt3 tetex unicode"
 
 RDEPEND=">=media-gfx/graphviz-2.6
 	qt3? ( $(qt_min_version 3.3) )
@@ -25,6 +26,12 @@ EPATCH_SUFFIX="patch"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	# still needs patch for Russian text in source files (see bug #112076)
+	if use unicode; then
+	    epatch ${WORKDIR}/${P}-utf8-ru.patch || die "utf8-ru patch failed"
+	fi
+
 	# use CFLAGS, CXXFLAGS, LDFLAGS
 	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
 		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
diff --git a/app-doc/doxygen/files/digest-doxygen-1.4.7 b/app-doc/doxygen/files/digest-doxygen-1.4.7
index c62d1675acad..82f5a07c8502 100644
--- a/app-doc/doxygen/files/digest-doxygen-1.4.7
+++ b/app-doc/doxygen/files/digest-doxygen-1.4.7
@@ -1,3 +1,6 @@
+MD5 86330eb72f57ae01be3cb9d8c8a3069b doxygen-1.4.7-utf8-ru.patch.gz 14755
+RMD160 8d83de95c416a352caa101277874caa1f68347f1 doxygen-1.4.7-utf8-ru.patch.gz 14755
+SHA256 a4293ad1687c911ec6074677292172897bdec386f142c9af4b2f0726b91f2069 doxygen-1.4.7-utf8-ru.patch.gz 14755
 MD5 11db63a72bd3b510fd2fa7ae48086979 doxygen-1.4.7.src.tar.gz 2928354
 RMD160 4de02b866cef53a7fd6f54e0ba90111814a9d77a doxygen-1.4.7.src.tar.gz 2928354
 SHA256 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed doxygen-1.4.7.src.tar.gz 2928354
diff --git a/app-doc/doxygen/files/digest-doxygen-1.5.1 b/app-doc/doxygen/files/digest-doxygen-1.5.1
index 6b34e2e4cb77..e39b83edb917 100644
--- a/app-doc/doxygen/files/digest-doxygen-1.5.1
+++ b/app-doc/doxygen/files/digest-doxygen-1.5.1
@@ -1,3 +1,6 @@
+MD5 d04fdbc005281b2d8debc6f421625012 doxygen-1.5.1-utf8-ru.patch.gz 14581
+RMD160 a0237fc0fb52cae3483e15ccbdb0633c5745f8ce doxygen-1.5.1-utf8-ru.patch.gz 14581
+SHA256 0c9205193021401cb78ea8e69880ef8ae35a89677f3018ba2cac2acac7065c55 doxygen-1.5.1-utf8-ru.patch.gz 14581
 MD5 43b8e58e5ca70cb8f1285c35a171014e doxygen-1.5.1.src.tar.gz 2888159
 RMD160 bacd34a5a69833e42e116d997c99df03dd837062 doxygen-1.5.1.src.tar.gz 2888159
 SHA256 c00233e17f64b9da8d05b7bc2b077abebc03edbfa9fbc063359ef17ec6e11578 doxygen-1.5.1.src.tar.gz 2888159