Version bump, bug #395509, thank yaleks for this job. Drop old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

7 files changed, 67 insertions, 95 deletions

diff --git a/app-text/yagf/ChangeLog b/app-text/yagf/ChangeLog
index 7a90c70e590b..14c1f7d51800 100644
--- a/app-text/yagf/ChangeLog
+++ b/app-text/yagf/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/yagf
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yagf/ChangeLog,v 1.8 2011/09/12 13:18:16 pva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/yagf/ChangeLog,v 1.9 2012/03/19 06:12:15 pva Exp $
+
+*yagf-0.9 (19 Mar 2012)
+
+  19 Mar 2012; Peter Volkov <pva@gentoo.org> -yagf-0.8.4.ebuild,
+  -yagf-0.8.5.ebuild, -yagf-0.8.6.ebuild, +yagf-0.9.ebuild,
+  +files/yagf-0.9-mdv-linkage.patch, metadata.xml:
+  Version bump, bug #395509, thank yaleks for this job. Drop old.
+
+  08 Mar 2012; Aleksandr Yakimov <yaleks@gentoo.ru> +yagf-0.9.ebuild, metadata.xml:
+  Version bump to 0.9
 
   12 Sep 2011; Peter Volkov <pva@gentoo.org> yagf-0.8.7.ebuild, metadata.xml:
   Add tesseract/pdf support thank Yaleks for this job.
diff --git a/app-text/yagf/files/yagf-0.9-mdv-linkage.patch b/app-text/yagf/files/yagf-0.9-mdv-linkage.patch
new file mode 100644
index 000000000000..32b28de6aa1c
--- /dev/null
+++ b/app-text/yagf/files/yagf-0.9-mdv-linkage.patch
@@ -0,0 +1,12 @@
+Index: yagf-0.9/CMakeLists.txt
+===================================================================
+--- yagf-0.9.orig/CMakeLists.txt
++++ yagf-0.9/CMakeLists.txt
+@@ -21,6 +21,7 @@ qt4_add_resources(yagf_RCC_SRCS ${yagf_R
+ include_directories( ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR})
+ add_executable(yagf ${SOURCES} ${UI_HEADERS} ${MOC_SRCS} ${yagf_RCC_SRCS} ${QM_FILES})
+ add_library(xspreload SHARED ${INT_SOURCES})
++target_link_libraries(xspreload dl)
+ target_link_libraries(yagf ${QT_LIBRARIES} ${ASPELL_LIBRARIES})
+ add_custom_target(translations DEPENDS ${QM_FILES})
+ qt4_add_translation(${CMAKE_BINARY_DIR}/yagf_ru.qm ${PROJECT_SOURCE_DIR}/src/mainform.cpp ${PROJECT_SOURCE_DIR}/src/popplerdialog.cpp ${MOC_SRCS} ${UI_HEADERS} ${PROJECT_SOURCE_DIR}/src/translations/yagf_ru.ts)
diff --git a/app-text/yagf/metadata.xml b/app-text/yagf/metadata.xml
index f9b4c1e1bdea..731d32701e5c 100644
--- a/app-text/yagf/metadata.xml
+++ b/app-text/yagf/metadata.xml
@@ -10,14 +10,18 @@
   <name>Aleksandr Yakimov</name>
 </maintainer>
 	<longdescription lang="en">
-	YAGF is a graphical interface for the cuneiform text recognition program on
-	the Linux platform. With YAGF you can scan images via XSane, perform images
-	preprocessing and recognize texts using cuneiform from a single command
-	centre. YAGF also makes it easy to scan and recognize several images
-	sequentially.
+		YAGF is a graphical front-end for cuneiform and tesseract OCR tools.
+		With YAGF you can open already scanned image files or obtain new images
+		via XSane (scanning results are automatically passed to YAGF).
+		Once you have a scanned image you can prepare it for recognition, select
+		particular image areas for recognition, set the recognition language and
+		so no. Recognized text is displayed in a editor window where it can be
+		corrected, saved to disk or copied to clipboard.
+		YAGF also provides some facilities for a multi-page recognition (see
+		the online help for more details).
 	</longdescription>
 	<use>
 		<flag name='cuneiform'>Enable support for the <pkg>app-text/cuneiform</pkg> OCR engine.</flag>
-		<flag name='tesseract'>Enable support for the tesseract OCR engine</flag>
+		<flag name='tesseract'>Enable support for the <pkg>app-text/tesseract</pkg> OCR engine.</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-text/yagf/yagf-0.8.4.ebuild b/app-text/yagf/yagf-0.8.4.ebuild
deleted file mode 100644
index 4fb62e0fd961..000000000000
--- a/app-text/yagf/yagf-0.8.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yagf/yagf-0.8.4.ebuild,v 1.1 2011/01/19 17:46:26 pva Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="Graphical front-end for cuneiform OCR tool"
-HOMEPAGE="http://symmetrica.net/cuneiform-linux/yagf-en.html"
-SRC_URI="http://symmetrica.net/cuneiform-linux/${P}-Source.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scanner"
-
-DEPEND="x11-libs/qt-gui:4
-	app-text/aspell"
-RDEPEND="${DEPEND}
-	app-text/cuneiform
-	scanner? ( media-gfx/xsane )"
-
-DOCS="AUTHORS ChangeLog DESCRIPTION README"
-S="${WORKDIR}/${P}-Source"
-
-CMAKE_IN_SOURCE_BUILD=1
diff --git a/app-text/yagf/yagf-0.8.5.ebuild b/app-text/yagf/yagf-0.8.5.ebuild
deleted file mode 100644
index b267379f0e51..000000000000
--- a/app-text/yagf/yagf-0.8.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yagf/yagf-0.8.5.ebuild,v 1.1 2011/02/07 19:23:32 pva Exp $
-
-EAPI="4"
-
-inherit cmake-utils
-
-MY_P="${P}-Source"
-
-DESCRIPTION="Graphical front-end for cuneiform OCR tool"
-HOMEPAGE="http://symmetrica.net/cuneiform-linux/yagf-en.html"
-SRC_URI="http://symmetrica.net/cuneiform-linux/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scanner"
-
-DEPEND="x11-libs/qt-gui:4
-	app-text/aspell"
-RDEPEND="${DEPEND}
-	app-text/cuneiform
-	scanner? ( media-gfx/xsane )"
-
-DOCS="AUTHORS ChangeLog DESCRIPTION README"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_IN_SOURCE_BUILD=1
diff --git a/app-text/yagf/yagf-0.8.6.ebuild b/app-text/yagf/yagf-0.8.6.ebuild
deleted file mode 100644
index 5001ae3e8f5d..000000000000
--- a/app-text/yagf/yagf-0.8.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yagf/yagf-0.8.6.ebuild,v 1.1 2011/04/29 09:13:43 pva Exp $
-
-EAPI="4"
-
-inherit cmake-utils
-
-MY_P="${P}-Source"
-
-DESCRIPTION="Graphical front-end for cuneiform OCR tool"
-HOMEPAGE="http://symmetrica.net/cuneiform-linux/yagf-en.html"
-SRC_URI="http://symmetrica.net/cuneiform-linux/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scanner"
-
-DEPEND="x11-libs/qt-gui:4
-	app-text/aspell"
-RDEPEND="${DEPEND}
-	app-text/cuneiform
-	scanner? ( media-gfx/xsane )"
-
-DOCS="AUTHORS ChangeLog DESCRIPTION README"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_IN_SOURCE_BUILD=1
diff --git a/app-text/yagf/yagf-0.9.ebuild b/app-text/yagf/yagf-0.9.ebuild
new file mode 100644
index 000000000000..a74627bc1eab
--- /dev/null
+++ b/app-text/yagf/yagf-0.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/yagf/yagf-0.9.ebuild,v 1.1 2012/03/19 06:12:15 pva Exp $
+
+EAPI="4"
+inherit cmake-utils
+
+DESCRIPTION="Graphical front-end for cuneiform and tesseract OCR tools"
+HOMEPAGE="http://symmetrica.net/cuneiform-linux/yagf-en.html"
+SRC_URI="http://symmetrica.net/cuneiform-linux/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scanner +cuneiform tesseract pdf"
+
+REQUIRED_USE="|| ( cuneiform tesseract )"
+
+DEPEND=">=x11-libs/qt-gui-4.7
+	app-text/aspell"
+RDEPEND="${DEPEND}
+	cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )
+	scanner? ( media-gfx/xsane )
+	pdf? ( || ( app-text/poppler[utils] app-text/ghostscript-gpl ) )"
+
+DOCS="AUTHORS ChangeLog DESCRIPTION README"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-mdv-linkage.patch
+}