app-text/pdfedit: Version bump. Fixed build issue reported in bug #277723 by Andrew Savchenko. Some cleanups.

svn path=/sunrise/; revision=8828

5 files changed, 49 insertions, 69 deletions

diff --git a/app-text/pdfedit/ChangeLog b/app-text/pdfedit/ChangeLog
index a11195e6f..8440ae102 100644
--- a/app-text/pdfedit/ChangeLog
+++ b/app-text/pdfedit/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Jul 2009; Peter Volkov <pva@gentoo.org> -pdfedit-0.4.1.ebuild,
+  +pdfedit-0.4.2.ebuild, -files/boost_compile.patch:
+  Version bump. Fixed build issue reported in bug #277723 by Andrew Savchenko.
+  Some cleanups.
+
   13 Jul 2009; Markos Chandras <hwoarang@gentoo.org> pdfedit-0.4.1.ebuild,
   +files/boost_compile.patch:
   Eapi2fy it. Apply patch to fix boost compilation problems ( bug 277723 )
diff --git a/app-text/pdfedit/Manifest b/app-text/pdfedit/Manifest
index 77f816b71..4a3ba1254 100644
--- a/app-text/pdfedit/Manifest
+++ b/app-text/pdfedit/Manifest
@@ -1,5 +1,4 @@
-AUX boost_compile.patch 1319 RMD160 84628958697ac4e9afae5d953ed1d39db3603eec SHA1 022712dcbd0ee364b60933275ea837c73bd5d9bb SHA256 68165a9258bd4585817db7d1fa804300964d79f77163979847d0b322635245d5
-DIST pdfedit-0.4.1.tar.gz 3361429 RMD160 e8ce8a69d740440f533b67e393ab2fab58a2b283 SHA1 4d9e5df215ed6ce89396d8f8406bba92f15a70cc SHA256 93304e374f40c2dba1f0087b840cd0a30a16907ac8908a21d443c6e94e34cfc5
-EBUILD pdfedit-0.4.1.ebuild 718 RMD160 be100f942050715bfb261641bb60871d229413e6 SHA1 d98fc77befa51c15d2db26fedbe8dd0f477b3c02 SHA256 5ca82cbf7463de8eb6f09ee4f50d1d4eda917fdc244a8a0f2e6199fff86e4fd6
-MISC ChangeLog 2208 RMD160 7e33a97ab1900182c22a19592d268a896584c5c4 SHA1 0f7dac870744c22efe12904df8755e603f3b0518 SHA256 90d065815c5b64addb0420b573f555abb715c89ccd0a26731e14a9ec60eb5b30
+DIST pdfedit-0.4.2.tar.gz 2943349 RMD160 7a7b5ab57a94cb57153d3774e8478173dac91ee7 SHA1 2e87ec5f31a309f34e700447e85f76cee0d94e3a SHA256 226e0d9e2fcaab1c8a0cf5e2498f2c26bafb59dbcfec64996371927db918e780
+EBUILD pdfedit-0.4.2.ebuild 1164 RMD160 f5aedd90a3f93e921c4ee745c1d5f43423131666 SHA1 0e3889c0a5533f3f32b6e68c167779369f6a604d SHA256 4c4c88b56fa2ba5b2efa0f26f334541be7e50c0452aa71fc0d7e5978c5e7fa55
+MISC ChangeLog 2426 RMD160 18732afca9ec4765705f882710d6c25416f26c0b SHA1 b3633a7cb60324bc332bbf0c8096e5dc58f243b6 SHA256 3db03146b19b9793b29117c551fb51454bea17502fc288b91bdc5ab676ec4275
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-text/pdfedit/files/boost_compile.patch b/app-text/pdfedit/files/boost_compile.patch
deleted file mode 100644
index 0221b808e..000000000
--- a/app-text/pdfedit/files/boost_compile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: pdfedit-0.4.1/src/kernel/cpdf.cc
-===================================================================
---- pdfedit-0.4.1.orig/src/kernel/cpdf.cc	2008-11-19 23:15:28.000000000 +0100
-+++ pdfedit-0.4.1/src/kernel/cpdf.cc	2008-11-19 23:16:59.000000000 +0100
-@@ -2347,7 +2347,7 @@ using namespace std;
- 		instance->file = file;
- 		kernelPrintDbg(debug::DBG_INFO, "Instance created successfully openMode=" << openMode);
- 		return instance;
--	}catch(exception &e)
-+	}catch(std::exception &e)
- 	{
- 		kernelPrintDbg(DBG_CRIT, "Pdf instance creation failed. cause="<<e.what());
- 		string what=string("CPdf open failed. reason=")+e.what();
-@@ -2631,7 +2631,7 @@ using namespace utils;
- 		try
- 		{
- 			minPos = getNodePosition(*this, newValue, &nodeCountCache);
--		}catch(exception &e)
-+		}catch(std::exception &e)
- 		{
- 			// position can't be determined
- 			// no special handling is needed, minPos keeps its value
-@@ -2690,7 +2690,7 @@ using namespace utils;
- 				kernelPrintDbg(DBG_WARN, "page with original position="<<i->first<<" is ambiguous. Invalidating.");
- 				// page position is ambiguous and so it has to be invalidate
- 				i->second->invalidate();
--			}catch(exception & e)
-+			}catch(std::exception & e)
- 			{
- 				kernelPrintDbg(DBG_CRIT, "Unexpected error. cause="<<e.what());
- 				assert(!"Possibly bug.");
diff --git a/app-text/pdfedit/pdfedit-0.4.1.ebuild b/app-text/pdfedit/pdfedit-0.4.1.ebuild
deleted file mode 100644
index bc6d1dfab..000000000
--- a/app-text/pdfedit/pdfedit-0.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit qt3
-
-DESCRIPTION="Editor for manipulating PDF documents. GUI and commandline interface."
-HOMEPAGE="http://pdfedit.petricek.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc"
-RDEPEND="=x11-libs/qt-3*
-	media-libs/t1lib"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}/boost_compile.patch"
-}
-
-src_configure() {
-	econf $(use_enable doc doxygen-doc) $(use_enable doc advanced-doc)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-}
diff --git a/app-text/pdfedit/pdfedit-0.4.2.ebuild b/app-text/pdfedit/pdfedit-0.4.2.ebuild
new file mode 100644
index 000000000..dfe4172a3
--- /dev/null
+++ b/app-text/pdfedit/pdfedit-0.4.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit qt3
+
+DESCRIPTION="Editor for manipulating PDF documents. GUI and commandline interface."
+HOMEPAGE="http://pdfedit.petricek.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+RDEPEND="=x11-libs/qt-3*
+	media-libs/t1lib"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	doc? ( app-doc/doxygen )"
+
+src_configure(){
+	# for C{,XX}_EXTRA read README and bug #277723
+	# Disable parallel make detection as we pass required -j with emake
+	# ARCH is set to avoid pollution of CFLAGS with arch value...
+	econf \
+		--docdir=/usr/share/doc/${PF}/ \
+		--with-parallel-make=off \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable doc advanced-doc) \
+		ARCH="" \
+		C_EXTRA="-fmessage-length=0 -D_FORTIFY_SOURCE=2 -fno-strict-aliasing ${CFLAGS}" \
+		CXX_EXTRA="-fmessage-length=0 -D_FORTIFY_SOURCE=2 -fno-strict-aliasing -fexceptions ${CXXFLAGS}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	rm "${D}"/usr/share/doc/${PF}/{LICENSE.GPL,README.cygwin}
+}