Sync with portage [Mon Jun 25 00:39:52 MSK 2012].

2012-06-25 00:39:55 +04:00 · 2012-06-25 00:39:55 +04:00 · e8a423ebe5
commit e8a423ebe5
parent 4abc0f3936
8172 changed files with 24728 additions and 12485 deletions
--- a/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild,v 1.4 2012/06/22 19:31:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild,v 1.5 2012/06/24 18:39:16 ago Exp $

 EAPI=4

@ -22,7 +22,7 @@ SRC_URI="${MIRROR}/glext.h.${GLEXT}.xz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND="app-arch/xz-utils"
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@ -1,2 +1,3 @@
 DIST clamav-0.97.3.tar.gz 45793398 RMD160 9fee55f0b115fafa622e1092483e380afd0dc5b9 SHA1 263c7b8b7dc1536652ab64e32263d1c60e138655 SHA256 3a8cece5b7e6b15410f6b8f96ff5591b2c5a72f290ee8a28fefda44cb5ae7aba
 DIST clamav-0.97.4.tar.gz 48386114 RMD160 a8da7621d6c8bce05adf2521f082b3e5e94dd9e1 SHA1 56f90cf8a73acba8f97beca86b42c65c3923935d SHA256 958dd09c9da9ceb50c9e556b3ced9cbdf40e836d2bdc98286ce96e84fd4a5a53
+DIST clamav-0.97.5.tar.gz 14754465 RMD160 882294b892c7660669e9164918b1e08651b37d77 SHA1 1bb317ead4a1a677a9a11a063fc35a63f22309e9 SHA256 db6c5e1a5ec8ca0b8006cf82661d3158d3365ba1b4bc14c03c5d0bca89a93c0d
--- a/app-antivirus/clamav/clamav-0.97.5.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.5.ebuild
@ -0,0 +1,123 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.5.ebuild,v 1.1 2012/06/24 16:34:40 hanno Exp $
+
+EAPI=4
+
+inherit eutils autotools-utils flag-o-matic user
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="http://www.clamav.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses )
+	iconv? ( virtual/libiconv )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	dev-libs/libtommath
+	>=sys-libs/zlib-1.2.2
+	sys-devel/libtool"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.97-nls.patch
+)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	use ppc64 && append-flags -mminimal-toc
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-experimental
+		--enable-id-check
+		--with-dbdir=/var/lib/clamav
+		--with-system-tommath
+		$(use_enable bzip2)
+		$(use_enable clamdtop)
+		$(use_enable ipv6)
+		$(use_enable milter)
+		$(use_with iconv)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	rm -rf "${ED}"/var/lib/clamav
+	newinitd "${FILESDIR}"/clamd.rc clamd
+	newconfd "${FILESDIR}"/clamd.conf clamd
+
+	keepdir /var/lib/clamav
+	fowners clamav:clamav /var/lib/clamav
+	keepdir /var/run/clamav
+	fowners clamav:clamav /var/run/clamav
+	keepdir /var/log/clamav
+	fowners clamav:clamav /var/log/clamav
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/clamav.logrotate clamav
+
+	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/clamd.conf
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/freshclam.conf
+
+	if use milter ; then
+		# MilterSocket one to include ' /' because there is a 2nd line for
+		# inet: which we want to leave
+		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamav-milter.pid:" \
+			-e "s+^\#\(ClamdSocket\) .*+\1 unix:/var/run/clamav/clamd.sock+" \
+			-e "s:.*\(User\) .*:\1 clamav:" \
+			-e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \
+			"${ED}"/etc/clamav-milter.conf
+		cat > "${ED}"/etc/conf.d/clamd <<-EOF
+			MILTER_NICELEVEL=19
+			START_MILTER=no
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+}
--- a/app-arch/hardlink++/Manifest
+++ b/app-arch/hardlink++/Manifest
@ -1 +0,0 @@
-DIST hardlink++-0.02.tgz 12228 RMD160 249b91706b0203945786c6a0ae25d1d9350b4384 SHA1 7a9cf4f7711cb30c1d0a49f4e0e7e7d06cf27000 SHA256 1f5c80fa3e62d1d3281c2649fde38dfb7700e8b29fedab54e42e83f3d2959182
--- a/app-arch/hardlink++/files/hardlink++-0.02-gcc-43-compile-fix.patch
+++ b/app-arch/hardlink++/files/hardlink++-0.02-gcc-43-compile-fix.patch
@ -1,11 +0,0 @@
-diff -Nuar hardlink++-0.02/hardlink.h
--- hardlink++-0.02.orig/hardlink.h	2008-12-11 12:57:24.563543862 -0800
-+++ hardlink++-0.02/hardlink.h	2008-12-11 13:02:56.091753425 -0800
-@@ -39,6 +39,7 @@
- 
- // C includes
- #include <unistd.h>
-+#include <stdlib.h>
- #include <dirent.h>
- #include <sys/stat.h>
- 
--- a/app-arch/hardlink++/files/hardlink++-0.02-gcc34-optimize-help.patch
+++ b/app-arch/hardlink++/files/hardlink++-0.02-gcc34-optimize-help.patch
@ -1,48 +0,0 @@
-diff -Nuar hardlink++-0.02.orig/hardlink.cpp hardlink++-0.02/hardlink.cpp
--- hardlink++-0.02.orig/hardlink.cpp	2003-08-14 19:25:32.000000000 -0700
-+++ hardlink++-0.02/hardlink.cpp	2005-01-29 19:57:12.312478520 -0800
-@@ -171,7 +171,7 @@
- 
- // If two files have the same inode and are on the same device then they are
- // already hardlinked.
-bool isAlreadyHardlinked(
-+inline bool isAlreadyHardlinked(
-     const struct stat & st1,     // first file's status
-     const struct stat & st2 )    // second file's status
- {
-@@ -185,7 +185,7 @@
- 
- // Determine if a file is eligibile for hardlinking.  Files will only be
- // considered for hardlinking if this function returns true.
-bool eligibleForHardlink(
-+inline bool eligibleForHardlink(
-     const struct stat & st1,     // first file's status
-     const struct stat & st2 )    // second file's status
- {
-@@ -203,7 +203,7 @@
-         );
- }
- 
-bool getFileStatus( const string & filename, struct stat & st )
-+inline bool getFileStatus( const string & filename, struct stat & st )
- {
-     // Get the file status
-     if ( !lstat ( filename.c_str(), &st ) )
-diff -Nuar hardlink++-0.02.orig/hardlink.h hardlink++-0.02/hardlink.h
--- hardlink++-0.02.orig/hardlink.h	2003-08-14 17:24:59.000000000 -0700
-+++ hardlink++-0.02/hardlink.h	2005-01-29 19:55:40.699405824 -0800
-@@ -103,10 +103,10 @@
-     public:
- 	// cStats( void ):dircount(0) {}
- 
-	void foundDirectory( void ) { ++dircount; }
-	void foundRegularFile( void ) { ++regularfiles; }
-	void didComparison( void ) { ++comparisons; }
-	void foundHardlink( const off_t filesize  )
-+	inline void foundDirectory( void ) { ++dircount; }
-+	inline void foundRegularFile( void ) { ++regularfiles; }
-+	inline void didComparison( void ) { ++comparisons; }
-+	inline void foundHardlink( const off_t filesize  )
- 	{
- 	    ++hardlinked_previously;
- 	    bytes_saved_previously += filesize;
--- a/app-arch/hardlink++/hardlink++-0.02.ebuild
+++ b/app-arch/hardlink++/hardlink++-0.02.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/hardlink++/hardlink++-0.02.ebuild,v 1.6 2012/05/19 12:33:12 ssuominen Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Save disk space by hardlinking identical files"
-HOMEPAGE="http://www.sodarock.com/hardlink/"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc34-optimize-help.patch \
-		"${FILESDIR}"/${P}-gcc-43-compile-fix.patch
-
-	rm -f Makefile
-}
-
-src_compile() {
-	$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS} hardlink.cpp -o ${PN} || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-}
-
-pkg_postinst() {
-	echo
-	ewarn "This codepath is dead. Migrate to app-arch/hardlink or"
-	ewarn "app-arch/hardlink-fedora instead."
-}
--- a/app-arch/lha/lha-114i-r7.ebuild
+++ b/app-arch/lha/lha-114i-r7.ebuild
@ -1,12 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/lha-114i-r7.ebuild,v 1.9 2010/04/06 05:46:49 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/lha-114i-r7.ebuild,v 1.10 2012/06/24 09:56:04 ssuominen Exp $

-EAPI="3"
+EAPI=4
+inherit autotools eutils flag-o-matic

-inherit eutils autotools
-
-MY_P="${PN}-1.14i-ac20050924p1"
+MY_P=${PN}-1.14i-ac20050924p1

 DESCRIPTION="Utility for creating and opening lzh archives"
 HOMEPAGE="http://lha.sourceforge.jp"
@ -17,27 +16,32 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
 IUSE=""

-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}

 src_prepare() {
 	epatch "${FILESDIR}"/${P}-file-list-from-stdin.patch
+
+	sed -i -e '/^AM_C_PROTOTYPES/d' configure.ac || die #423125
+
 	eautoreconf
 }

 src_configure() {
+	append-cppflags -DPROTOTYPES #423125
+
 	if [[ ${CHOST} == *-interix* ]]; then
 		export ac_cv_header_inttypes_h=no
 		export ac_cv_func_iconv=no
 	fi
+
 	econf
 }

 src_install() {
-	emake DESTDIR="${D}" \
+	emake \
+		DESTDIR="${D}" \
 		mandir="${EPREFIX}"/usr/share/man/ja \
-		install || die "emake failed."
+		install
+
 	dodoc ChangeLog Hacking_of_LHa
 }
--- a/app-arch/rpm/rpm-4.9.1.3.ebuild
+++ b/app-arch/rpm/rpm-4.9.1.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.3.ebuild,v 1.7 2012/06/08 17:57:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.3.ebuild,v 1.8 2012/06/23 17:09:14 armin76 Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="http://rpm.org/releases/rpm-4.9.x/${P}.tar.bz2"

 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"

 IUSE="nls python doc caps lua acl"

--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@ -2,3 +2,4 @@ DIST xz-4.999.9beta.tar.gz 1037541 RMD160 1253ce01746c748c8549effa5041224044919c
 DIST xz-5.0.1.tar.gz 1236843 RMD160 b4ea20bc85024bbe11cf02941e2259a0d44b8a61 SHA1 a5e7b697d4413f79e36a6c5959ece3db40938c1c SHA256 3770b8872a4322b9502937b4781d523303bf193962c4822899fd3a210878fc80
 DIST xz-5.0.2.tar.gz 1241178 RMD160 9ae8c5021e02ac3122ef323575b7124a2bd20d90 SHA1 2f64e90df16a4cc143bf7ba5788953fac593f4f6 SHA256 57e979baaa40147dde1bbb284e3618f8f18b6532c932648bd57b5aee674b98a7
 DIST xz-5.0.3.tar.gz 1257140 RMD160 81f8a268dad49f46e4b4cacf9dd5bc23525170f5 SHA1 50ce842bea6519537457d9ad90d110a127656786 SHA256 10eb4df72dffb2fb14c3d2d82b450e72282ffcb9ee3908a8e5b392b8f09681bf
+DIST xz-5.0.4.tar.gz 1281166 RMD160 1aab29e0c2c2a16e87a5b322f6c760824d275f45 SHA1 3e976d7715fde43422572c70f927bfdae56a94c3 SHA256 d67405798dad645965fe51cf4e40c23d1201fb234378d3c44f5a3787142b83b6
--- a/app-arch/xz-utils/xz-utils-5.0.4.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.0.4.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.4.ebuild,v 1.1 2012/06/23 18:27:00 vapier Exp $
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI="2"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	inherit git-2 autotools
+	SRC_URI=""
+	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+else
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+	EXTRA_DEPEND=
+fi
+
+inherit eutils multilib
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="http://tukaani.org/xz/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+src_prepare() {
+	eautopoint
+	eautoreconf
+}
+fi
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	find "${D}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
+	rm "${D}"/usr/share/doc/xz/COPYING* || die
+	mv "${D}"/usr/share/doc/{xz,${PF}} || die
+	prepalldocs
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma.so.0
+}
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@ -1,3 +1,4 @@
 DIST bacula-5.0.3.tar.gz 3800556 RMD160 0ae8f303b379daffdf09e4eab9b35182759add41 SHA1 4ced1c4f8984a063a1134b59968d163243017611 SHA256 9905598e18bbe94fa871ddcb3f13ef8b754dcb301331b67b5b92a65eb834fdb4
 DIST bacula-5.2.5.tar.gz 4030327 RMD160 8de3f53bc5f053e66aff05721c5e246762ce260c SHA1 67e984128d15744118c70697641693f487310b64 SHA256 d731884b882178c597d8b7ef3f50c5622c87b1760d87133c24524faf43937f6d
 DIST bacula-5.2.6.tar.gz 4035050 RMD160 2494d9e1c9b8029c4ad699255023cab16c434903 SHA1 471cf224d5566e65a3a6cebd59d13c25f0825a8a SHA256 7cc60df4eccae0c71c26d2cdb4b1a2524f95e880913264cf4f4fcc7a5d949927
+DIST bacula-5.2.9.tar.gz 4104956 RMD160 5f3472beeb4dce28c5d65ac87bb6e30a84cc210b SHA1 6c24f8ab57cd140508967013938739cfca6a66e2 SHA256 f6421fa49007882f79963ed2544920d8aa4488ce28ca3ccd36d130adbf249e27
--- a/app-backup/bacula/bacula-5.2.9.ebuild
+++ b/app-backup/bacula/bacula-5.2.9.ebuild
@ -0,0 +1,353 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild,v 1.1 2012/06/24 18:28:00 tomjbe Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
+
+inherit eutils multilib python qt4-r2 user
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
+
+DEPEND="
+	>=sys-libs/zlib-1.1.4
+	dev-libs/gmp
+	!bacula-clientonly? (
+		postgres? ( dev-db/postgresql-base[threads] )
+		mysql? ( virtual/mysql )
+		sqlite3? ( dev-db/sqlite:3 )
+		!bacula-nodir? ( virtual/mta )
+	)
+	qt4? (
+		x11-libs/qt-svg:4
+		x11-libs/qwt:5
+	)
+	ssl? ( dev-libs/openssl )
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	readline? ( >=sys-libs/readline-4.1 )
+	dev-libs/lzo
+	sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if use bacula-clientonly && use static && use qt4; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
+		ewarn
+	fi
+
+	if ! use bacula-clientonly; then
+		# USE=static only supported for bacula-clientonly
+		if use static; then
+			ewarn
+			ewarn "USE=static only supported together with USE=bacula-clientonly."
+			ewarn "Ignoring 'static' useflag."
+			ewarn
+		fi
+		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
+			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bacula' has been created.  Please see the bacula manual"
+			einfo "for information about running bacula as a non-root user."
+			einfo
+		fi
+	fi
+
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
+
+	# bug #310087
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
+
+	# stop build for errors in subdirs
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-Makefile.patch
+
+	# bat needs to respect LDFLAGS
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
+
+	# bug #328701
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-fix-static.patch
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf} \
+			$(use_with mysql) \
+			$(use_with sqlite3) \
+			$(use_with postgres postgresql) \
+			--enable-batch-insert"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt4 bat)"
+	fi
+
+	myconf="${myconf} \
+		--disable-tray-monitor \
+		$(use_with X x) \
+		$(use_with python) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--host=${CHOST} \
+		${myconf}
+	# correct configuration for QT based bat
+	if use qt4 ; then
+		pushd src/qt-console
+		eqmake4
+		popd
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/share/pixmaps
+	doins scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt4 && ! use static ; then
+		insinto /usr/share/pixmaps
+		doins src/qt-console/images/bat_icon.png
+		insinto /usr/share/applications
+		doins scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
+	if ! use qt4; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	if use bacula-clientonly || use bacula-nodir; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog LICENSE ReleaseNotes SUPPORT technotes
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+		# set database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite3 databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt4'."
+	einfo
+}
--- a/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild,v 1.3 2012/05/31 03:10:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild,v 1.4 2012/06/24 08:38:34 flameeyes Exp $

 EAPI=4

@ -39,6 +39,10 @@ if [[ ${PV} == "9999" ]]; then
 	src_prepare() {
 		eautoreconf
 	}
+else
+	src_prepare() {
+		epatch "${FILESDIR}"/${P}+gcc-4.7.patch
+	}
 fi

 src_configure() {
--- a/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
+++ b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
@ -0,0 +1,42 @@
+Index: eid-mw-4.0.2/common/src/socket/socket.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/socket/socket.cpp
+++ eid-mw-4.0.2/common/src/socket/socket.cpp
+@@ -21,6 +21,10 @@
+ #include "../eiderrors.h"
+ #include <iostream>
+ 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+ namespace eIDMW
+ {
+ 
+Index: eid-mw-4.0.2/common/src/socket/socketserver.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/socket/socketserver.cpp
+++ eid-mw-4.0.2/common/src/socket/socketserver.cpp
+@@ -26,6 +26,7 @@
+ #include <netinet/in.h>
+ #include <sys/ioctl.h>
+ #include <errno.h>
+#include <unistd.h>
+ #ifndef SOCKET_ERROR
+ #define SOCKET_ERROR -1
+ #endif
+Index: eid-mw-4.0.2/common/src/util.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/util.cpp
+++ eid-mw-4.0.2/common/src/util.cpp
+@@ -27,6 +27,10 @@
+ 
+ #include <stdlib.h>
+ 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
--- a/app-crypt/gnupg/gnupg-2.0.19.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.19.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19.ebuild,v 1.5 2012/05/31 03:13:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19.ebuild,v 1.6 2012/06/24 10:39:27 ago Exp $

 EAPI="4"

@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns bzip2 doc ldap nls readline static selinux smartcard usb"

 COMMON_DEPEND_LIBS="
--- a/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild,v 1.5 2012/06/10 18:34:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild,v 1.6 2012/06/24 15:13:05 ulm Exp $

 EAPI=4

@ -191,10 +191,10 @@ src_configure() {
 		myconf="${myconf} --without-x --without-ns"
 	fi

+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
 	if [[ ${PV##*.} = 9999 ]]; then
-		# These variables are not needed for building. We add them to
-		# configure options because they are stored in the Emacs binary
-		# and available in variable "system-configuration-options".
 		myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
 	fi

@ -230,8 +230,6 @@ src_compile() {
 		# cleanup, otherwise emacs will be dumped again in src_install
 		(cd src; emake versionclean)
 	fi
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
 	emake CC="$(tc-getCC)"
 }

--- a/app-editors/emacs/emacs-23.4-r3.ebuild
+++ b/app-editors/emacs/emacs-23.4-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.2 2012/06/13 17:59:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.3 2012/06/24 15:12:02 ulm Exp $

 EAPI=4
 WANT_AUTOMAKE="none"
@ -174,6 +174,10 @@ src_configure() {
 		myconf="${myconf} --without-x --without-ns"
 	fi

+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
 	# According to configure, this option is only used for GNU/Linux
 	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
 	# out the location because $(get_libdir) does not necessarily return
@ -196,8 +200,6 @@ src_configure() {

 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
 	emake CC="$(tc-getCC)"
 }

--- a/app-editors/emacs/emacs-24.1.ebuild
+++ b/app-editors/emacs/emacs-24.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1.ebuild,v 1.3 2012/06/13 17:59:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1.ebuild,v 1.4 2012/06/24 15:12:02 ulm Exp $

 EAPI=4

@ -178,6 +178,10 @@ src_configure() {
 		myconf="${myconf} --without-x --without-ns"
 	fi

+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
 	# According to configure, this option is only used for GNU/Linux
 	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
 	# out the location because $(get_libdir) does not necessarily return
@ -206,8 +210,6 @@ src_configure() {

 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
 	emake CC="$(tc-getCC)"
 }

--- a/app-editors/vile/Manifest
+++ b/app-editors/vile/Manifest
@ -3,6 +3,4 @@ DIST vile-9.4a.patch.gz 17204 RMD160 014224261fddff7d1216ec11773e237b98759ee1 SH
 DIST vile-9.4b.patch.gz 63382 RMD160 a489623a64bbd0d2f2318de9ed8308d22f1e101c SHA1 fe0d74e81ec0c1beb0e2e33dab82b8b30304b0d7 SHA256 ea497117967cd3d2af536bca3622578f56e63af52e3aba5733950e175d7f1027
 DIST vile-9.4c.patch.gz 8660 RMD160 c7cc75142a5b806c7e443cefa195d2d4547653aa SHA1 d6c0618062b5507aee052425ab716ddf8dcbe23a SHA256 cdf699023b77c51d360660f67fa34e720715b9a48e65344b20e9cff8e4a619f5
 DIST vile-9.4d.patch.gz 18117 RMD160 d1aaa203546046bb452701e4fc17148970bf6c82 SHA1 fadb4c736ba51f59ad56a0debf61ae6e940e3bff SHA256 6b84efc15f93158dcdab0ce23951de6a041a1dc181c6d84268634842bab0d686
-DIST vile-9.8e.tgz 2197935 RMD160 be8f3c34ad8c430e69f717692e44f800442735da SHA1 bc8f299e19cfc38f8aa0f7d438b06d04b5ef1b3c SHA256 d0ad1d42bb7118e941eb3cda40396abfe9a02e5306711485e6c2e70ec35fe427
-DIST vile-9.8f.tgz 2211083 RMD160 2cc206bc983d8d6c99b8eb7dca43f53826b18fdc SHA1 1c4c8881daae305407d148fc83cab7226d69536b SHA256 9dbd6f9c9935b9287f6e20d50755045f998e8f7b89eb737224942673f23f3340
 DIST vile-9.8g.tgz 2220840 RMD160 4ea510e33fc0c5397c4eab3304c8ea2301ff3842 SHA1 304e3fc706fb94393b6513e36c5a6826c314001f SHA256 7644909e2a64d85c6a3a45d1ad8bb18bce937119507fcc66d705aab8d4522be7
--- a/app-editors/vile/vile-9.8e.ebuild
+++ b/app-editors/vile/vile-9.8e.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.8e.ebuild,v 1.3 2011/12/13 21:57:44 radhermit Exp $
-
-EAPI=4
-
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="http://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="perl"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	perl? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	app-admin/eselect-vi"
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		$(use_with perl )
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CHANGES* README doc/*.doc
-	dohtml doc/*.html
-}
-
-pkg_postinst() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
--- a/app-editors/vile/vile-9.8f.ebuild
+++ b/app-editors/vile/vile-9.8f.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.8f.ebuild,v 1.3 2012/02/10 18:01:31 grobian Exp $
-
-EAPI="4"
-
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="http://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="perl"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	perl? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	app-admin/eselect-vi"
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		$(use_with perl )
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CHANGES* README doc/*.doc
-	dohtml doc/*.html
-}
-
-pkg_postinst() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
--- a/app-editors/vile/vile-9.8g.ebuild
+++ b/app-editors/vile/vile-9.8g.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.8g.ebuild,v 1.1 2012/03/19 06:42:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.8g.ebuild,v 1.3 2012/06/24 10:38:11 ago Exp $

 EAPI="4"

@ -10,7 +10,7 @@ SRC_URI="ftp://invisible-island.net/vile/current/${P}.tgz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="perl"

 RDEPEND=">=sys-libs/ncurses-5.2
--- a/app-editors/xvile/Manifest
+++ b/app-editors/xvile/Manifest
@ -3,6 +3,4 @@ DIST vile-9.4a.patch.gz 17204 RMD160 014224261fddff7d1216ec11773e237b98759ee1 SH
 DIST vile-9.4b.patch.gz 63382 RMD160 a489623a64bbd0d2f2318de9ed8308d22f1e101c SHA1 fe0d74e81ec0c1beb0e2e33dab82b8b30304b0d7 SHA256 ea497117967cd3d2af536bca3622578f56e63af52e3aba5733950e175d7f1027
 DIST vile-9.4c.patch.gz 8660 RMD160 c7cc75142a5b806c7e443cefa195d2d4547653aa SHA1 d6c0618062b5507aee052425ab716ddf8dcbe23a SHA256 cdf699023b77c51d360660f67fa34e720715b9a48e65344b20e9cff8e4a619f5
 DIST vile-9.4d.patch.gz 18117 RMD160 d1aaa203546046bb452701e4fc17148970bf6c82 SHA1 fadb4c736ba51f59ad56a0debf61ae6e940e3bff SHA256 6b84efc15f93158dcdab0ce23951de6a041a1dc181c6d84268634842bab0d686
-DIST vile-9.8e.tgz 2197935 RMD160 be8f3c34ad8c430e69f717692e44f800442735da SHA1 bc8f299e19cfc38f8aa0f7d438b06d04b5ef1b3c SHA256 d0ad1d42bb7118e941eb3cda40396abfe9a02e5306711485e6c2e70ec35fe427
-DIST vile-9.8f.tgz 2211083 RMD160 2cc206bc983d8d6c99b8eb7dca43f53826b18fdc SHA1 1c4c8881daae305407d148fc83cab7226d69536b SHA256 9dbd6f9c9935b9287f6e20d50755045f998e8f7b89eb737224942673f23f3340
 DIST vile-9.8g.tgz 2220840 RMD160 4ea510e33fc0c5397c4eab3304c8ea2301ff3842 SHA1 304e3fc706fb94393b6513e36c5a6826c314001f SHA256 7644909e2a64d85c6a3a45d1ad8bb18bce937119507fcc66d705aab8d4522be7
--- a/app-editors/xvile/xvile-9.8e.ebuild
+++ b/app-editors/xvile/xvile-9.8e.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xvile/xvile-9.8e.ebuild,v 1.2 2011/12/13 22:07:53 radhermit Exp $
-
-EAPI=4
-
-inherit versionator
-
-MY_P="${PN/x/}-${PV}"
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="http://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="perl"
-
-RDEPEND="perl? ( dev-lang/perl )
-	=app-editors/vile-${PV}
-	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0
-	>=x11-libs/libICE-1.0.0
-	>=x11-libs/libSM-1.0.0
-	>=x11-libs/libXaw-1.0.1
-	>=x11-libs/libXpm-3.5.4.2
-	>=x11-proto/xproto-7.0.4"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		--with-x \
-		$(use_with perl)
-}
-
-src_install() {
-	dobin xvile
-	dodoc CHANGES* README doc/*.doc
-	dohtml doc/*.html
-}
--- a/app-editors/xvile/xvile-9.8f.ebuild
+++ b/app-editors/xvile/xvile-9.8f.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xvile/xvile-9.8f.ebuild,v 1.1 2011/12/13 22:02:55 radhermit Exp $
-
-EAPI="4"
-
-inherit versionator
-
-MY_P="${PN/x/}-${PV}"
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="http://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="perl"
-
-RDEPEND="perl? ( dev-lang/perl )
-	=app-editors/vile-${PV}
-	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0
-	>=x11-libs/libICE-1.0.0
-	>=x11-libs/libSM-1.0.0
-	>=x11-libs/libXaw-1.0.1
-	>=x11-libs/libXpm-3.5.4.2
-	>=x11-proto/xproto-7.0.4"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		--with-x \
-		$(use_with perl)
-}
-
-src_install() {
-	dobin xvile
-	dodoc CHANGES* README doc/*.doc
-	dohtml doc/*.html
-}
--- a/app-editors/xvile/xvile-9.8g.ebuild
+++ b/app-editors/xvile/xvile-9.8g.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xvile/xvile-9.8g.ebuild,v 1.1 2012/03/19 06:46:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xvile/xvile-9.8g.ebuild,v 1.3 2012/06/24 10:38:35 ago Exp $

 EAPI="4"

@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/vile/current/${MY_P}.tgz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc ~x86"
 IUSE="perl"

 RDEPEND="perl? ( dev-lang/perl )
--- a/app-emulation/simh/metadata.xml
+++ b/app-emulation/simh/metadata.xml
@ -5,11 +5,9 @@
 	<maintainer>
 		<email>alex.buell@munted.eu</email>
 		<name>Alex Buell</name>
-		<description>Proxy maintainer. Assign bugs to him</description>
 	</maintainer>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
-		<description>CC him on bugs</description>
 	</maintainer>
 </pkgmetadata>
--- a/app-emulation/simh/simh-3.9.0-r1.ebuild
+++ b/app-emulation/simh/simh-3.9.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.9.0.ebuild,v 1.1 2012/05/19 09:52:52 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.9.0-r1.ebuild,v 1.1 2012/06/23 19:10:37 xmw Exp $

 EAPI=4

@ -51,7 +51,7 @@ src_compile() {

 src_install() {
 	for BINFILE in BIN/* ; do
-		newbin ${BINFILE} "simh-${BINFILE}"
+		newbin ${BINFILE} "simh-$(basename ${BINFILE})"
 	done

 	insinto /usr/share/simh
--- a/app-laptop/thinkfan/Manifest
+++ b/app-laptop/thinkfan/Manifest
@ -1,2 +1 @@
 DIST thinkfan-0.8.0.tar.gz 38396 RMD160 7368dd22ea1dc71d5f0ee6a7ed98220652597757 SHA1 35ba6c8155759947b411d52e092c57664e9179d7 SHA256 aa4062bdb1114224c372afc3796ffd5b0ae40d4442fc17e15af8876d0e7885ed
-DIST thinkfan-0.8_alpha2.tar.gz 26571 RMD160 25b448b133ade35cc5af235dcfe52f8898275821 SHA1 64a10ff959e4e68e630b29c5f74a8159a507a70a SHA256 28f4ee9a833ef4d39258941c7bbcbd49ad6410479417bb4acf05e58da67f10eb
--- a/app-laptop/thinkfan/thinkfan-0.8_alpha2.ebuild
+++ b/app-laptop/thinkfan/thinkfan-0.8_alpha2.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/thinkfan-0.8_alpha2.ebuild,v 1.3 2012/04/19 22:01:18 jdhore Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="simple fan control program for thinkpads"
-HOMEPAGE="http://thinkfan.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.3-makefile.patch \
-		"${FILESDIR}"/${PN}-0.7.3-openrc.patch
-	tc-export CC
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd rcscripts/thinkfan.gentoo ${PN}
-
-	doman ${PN}.1
-	dodoc ChangeLog NEWS README \
-		examples/${PN}.conf.{complex,sysfs,thinkpad}
-}
-
-pkg_postinst() {
-	elog "Please read the documentation and copy an"
-	elog "appropriate file to /etc/thinkfan.conf."
-}
--- a/app-misc/ranger/ranger-1.5.4.ebuild
+++ b/app-misc/ranger/ranger-1.5.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.5.4.ebuild,v 1.2 2012/05/31 13:04:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.5.4.ebuild,v 1.3 2012/06/24 03:42:49 radhermit Exp $

 EAPI="4"
 PYTHON_DEPEND="2:2.6 3:3.1"
@ -8,7 +8,7 @@ PYTHON_USE_WITH="ncurses"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.[45]"

-inherit distutils eutils
+inherit distutils

 DESCRIPTION="A vim-inspired file manager for the console"
 HOMEPAGE="http://ranger.nongnu.org/"
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-9999.ebuild,v 1.1 2012/06/24 03:42:02 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.6 3:3.1"
+PYTHON_USE_WITH="ncurses"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45]"
+
+inherit distutils git-2
+
+EGIT_REPO_URI="git://git.savannah.nongnu.org/ranger.git"
+
+DESCRIPTION="A vim-inspired file manager for the console"
+HOMEPAGE="http://ranger.nongnu.org/"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="virtual/pager"
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	elog "Ranger has many optional dependencies to support enhanced file previews."
+	elog "See the README or homepage for more details."
+}
--- a/app-office/calligra-l10n/Manifest
+++ b/app-office/calligra-l10n/Manifest
@ -1,77 +1,51 @@
-DIST calligra-l10n-ca-2.4.1.tar.bz2 445839 RMD160 6808ee093919f2775d8fa67a7573d9a3a84a0c05 SHA1 c80dd3ab66288af837d751aea295fad6b79173fd SHA256 e91358b9c7370a252fc17aca8c04d5aae1e21949eecdf11b29ce099f7a0e15fa
 DIST calligra-l10n-ca-2.4.2.tar.bz2 439286 RMD160 4e051649c8171aa3bc80b4e4671ef0558320f6a4 SHA1 0b20c08f0ab6da0465da36526b1fad96e19f3e42 SHA256 58383b9bdb26f93979ff9a1979d4f3eaa471e3f88fdffd3c80428e4ecdd83ff2
 DIST calligra-l10n-ca-2.4.90.tar.bz2 433807 RMD160 88e229ff8fb8ea671f48da426eea4f00ac84daed SHA1 51f0a7253416100dead7420825527df4e4f24b44 SHA256 ff11bac7db1b0f93115d24a7fb8de72a1d5aff2099e8430d5c053b618b2cf7f7
-DIST calligra-l10n-ca@valencia-2.4.1.tar.bz2 272051 RMD160 8bf42feb86db2f2f66ac382c877bc20ad52987e2 SHA1 6da2ec3b13c5c76ec3779029298eed4c1d5dbc04 SHA256 47ffb1182e24f103d5ea2d458c247abe7e717e6d3030a2ec659766ef4338d55d
 DIST calligra-l10n-ca@valencia-2.4.2.tar.bz2 272019 RMD160 2a0e33e2efefca8f30face62aa7b9a6dda0ba832 SHA1 67e869ac84d5a0733cc0ee07aa49bb1f26f6a8bf SHA256 493973c7c4c00c347cdd646dcd5196133943039acc56a22e1cf3d74c6677bf88
 DIST calligra-l10n-ca@valencia-2.4.90.tar.bz2 372594 RMD160 2f8ce46067f7edd66663aa20eaefbfc5f2447489 SHA1 be16db6bab6863b401c09f2f59f844e1579f2947 SHA256 9af3ccb859181d1ddddeb6c6ec22c3755b89573200becd03f8e8a0518c4c7210
-DIST calligra-l10n-cs-2.4.1.tar.bz2 348465 RMD160 c1c87dfc56156ce1e3e33c119a1394e8a44cd386 SHA1 6ad3988a7b5ad42afffbb7b3e6754a2a15593c61 SHA256 66b39dba1035791ca3f384a345917a1a75c1f3d18d05f9e1418c31f4583f7df5
 DIST calligra-l10n-cs-2.4.2.tar.bz2 348260 RMD160 e4386af3188bdf6f3f7b5e8dc585ef94ee4f7065 SHA1 37ba652b4608e08b5b36241004e384b920732a39 SHA256 f16fe04dca8c1436b548f633f70822f06c8831fa74ae1037c6c39cc9a6a879bf
-DIST calligra-l10n-da-2.4.1.tar.bz2 547245 RMD160 4f0b8b00bed56d9293d729ff66ea2792919d4569 SHA1 925a0e32c9298abecb8518afd139674365d2b5b5 SHA256 7ff2f6120bd8ac686495ef9471cd212a0ff02b5bc96fe8d2b3323a3c1d75b096
 DIST calligra-l10n-da-2.4.2.tar.bz2 547357 RMD160 c2e0b3bbf07966f0cd1896dcf834102068238fe5 SHA1 6fb954850045678f4fd5442d9968e3453d8a6fe1 SHA256 3bd32f32c369a702b517065242a7eacf16c6de17d669c9da43c7a3e53a75c6c4
 DIST calligra-l10n-da-2.4.90.tar.bz2 543489 RMD160 09486c51fc64e642f75bf5dfce243ade7415404f SHA1 5ac9c60cdc77a2591f16f4b12be5b907a08e2f77 SHA256 f3d57ca2c19a38c45a7872ccf49025b66d77ed68424e21e48eb1cf4accbde8bf
-DIST calligra-l10n-de-2.4.1.tar.bz2 717222 RMD160 3d1f191669894b90b53e02330ed0deae6db9b5a7 SHA1 28fac826898d1af82e89c1312bfc4f6b7b7134c1 SHA256 1bdbe3886f907edf1bd590baef5d38f4bf35a6d07b687c078cd5e8156c8fe773
 DIST calligra-l10n-de-2.4.2.tar.bz2 717949 RMD160 aec14375b6ce34949ec415a66a7ea15730593208 SHA1 ea6b67a955bfbba0b096039cd9cc2a7bc6f62eca SHA256 7956e869fbad1d924c75b2f81fdea67096dea2dea654c62ff8eeb33c900b9134
 DIST calligra-l10n-de-2.4.90.tar.bz2 706666 RMD160 65381e50477a7814eff55dfe257f599639d97e61 SHA1 b2c6cbb5353a8140334cdd2b08e260edc93d9076 SHA256 08d8d9ec8bb29bbb9814a8f8deeda32ba686bb9d4d3fbaa6a0ce2a9e08979efd
-DIST calligra-l10n-el-2.4.1.tar.bz2 418084 RMD160 bde144c28c695d4e79ecfd3d3724b5a03cb442ca SHA1 b3af9583ad89413b40757875b608c960975084ad SHA256 0d8632a70cee7c4b4772662862edca9bc031c2e9dddce834d6cfc3ef1af8c000
 DIST calligra-l10n-el-2.4.2.tar.bz2 417911 RMD160 db7ced6e3e11e770bf3269b51946462a6f64c4f1 SHA1 12ba6920c75d8a6037b134b8c8b04ad4a380fdd4 SHA256 f0fb12aba3bde23d3926e7d14503663b14d31368c19bbb6718becc2bb451771d
 DIST calligra-l10n-el-2.4.90.tar.bz2 412482 RMD160 a743cc0582e77bd02a6893e51de911f6eedbddec SHA1 0f28309a7a145227603a955609f0ec57485408c6 SHA256 12cf9e6a0ac40e2d79ddc234ba1b215637fddfb39ecb3783610e816ac66f8e08
-DIST calligra-l10n-en_GB-2.4.1.tar.bz2 391616 RMD160 52d7318df610c5bbc1d4046e2ce8ed13ce2ec890 SHA1 a6a17ea973fdcf8c7b97cb9746c94c956e1b5f77 SHA256 c6ff94d764e2e8d25e2e82eb2238f53f010009a4372af7e6c71d73d0b68d08f9
 DIST calligra-l10n-en_GB-2.4.2.tar.bz2 391579 RMD160 2f6200739622de729aa7f99f5450c4aba4589648 SHA1 c175c35d46384ac6da4084e548904f1827d489fb SHA256 79508089b486298f191c5054ccb4c4d6e864a3c149334be8ac9cf6d7fe96efcd
 DIST calligra-l10n-en_GB-2.4.90.tar.bz2 387239 RMD160 14befdd64d6bde8390de663b7a4c4cb060fbee2b SHA1 52adeb89e1c827342cadc38b8075e42c882c9a02 SHA256 17ca5b5d4820265bf3a3e5cce652a8f4248711304e80e4880af6e0041f447b73
-DIST calligra-l10n-es-2.4.1.tar.bz2 4379808 RMD160 ec77d4422d6d824221a6bcd28aae121651bc7ebf SHA1 889ac2aa840615872bf55d069f7e617704872a5f SHA256 d7bf511c489a1c5295550d596a180e57528bfef24d4ee5da976b53971ee58055
 DIST calligra-l10n-es-2.4.2.tar.bz2 4378526 RMD160 e040638cd6939b0d8e611b5d1fef508cf2518427 SHA1 5080c79fa45535fbdcc8cc470e2a2f4cd5d1af86 SHA256 a7e624b663dcc9e5e970a8b6831d9cdcb7eaf73fd5c6e2cba4b52511827f73cf
 DIST calligra-l10n-es-2.4.90.tar.bz2 4372775 RMD160 4fe34f91c548b3620a3401e84093337c7d9d6bc7 SHA1 f80ccb88e065fc5685a4097867b402ea68f0f8a9 SHA256 4290e89e135792be95806dda59afb9df46aaaadd1d99441ca2a07a9a374ba4c3
-DIST calligra-l10n-et-2.4.1.tar.bz2 686462 RMD160 4ffb7ad12c2172c2a6b6e259aa89190687fbc910 SHA1 45a05296ce9bf067430b0cfb48efb64f9c093cd9 SHA256 9ae5f5a72448043ec5531abad4b62e5e7debcc79ae11649b73fede4653c500a4
 DIST calligra-l10n-et-2.4.2.tar.bz2 686583 RMD160 4d6c34c4f270d0f496b8e3deeb66db168f36ca60 SHA1 2664be246f284cd4a0d5f85f0840df13b8ca7409 SHA256 77549b15b7aaaf5cd79b9344a161063de3ddd08672cbe3eae2d2c601e0600906
 DIST calligra-l10n-et-2.4.90.tar.bz2 682563 RMD160 f2a34bb98eccc5ed24667a8e42a21b23b021acc9 SHA1 37fdf69a65245a56eaf703be9f219ed50ae7731c SHA256 f67d0a837332467666d1fd1ba1ddbe6e6ec96c4cf40492195fe261018a03eaae
-DIST calligra-l10n-fi-2.4.1.tar.bz2 404655 RMD160 357f95edec3a302338346ebd55502342d49a424b SHA1 bf6e9daed60c81e89681741cea131c6d2bde9467 SHA256 be8938bbea19794e55ba2d980084780a69fc7d3aa8a62a68af6a9257fbb865c9
 DIST calligra-l10n-fi-2.4.2.tar.bz2 404798 RMD160 ad165a09a01a8e0802582436177f8c1dc8c8149e SHA1 7cb4b60b966ff61afc9a310da2f6aaa39e22b74d SHA256 d2fd27568fe71cb56627928f5949ea0dd1cf7a96d171c64c32280c790ae8f959
 DIST calligra-l10n-fi-2.4.90.tar.bz2 396183 RMD160 6b2c35cdb9e3bcbadcdd97e63e2b70a559ee628c SHA1 d9da2bedac54d83f46c88eba97208b152a6bdf33 SHA256 1d117072ea4df236e566a87f0522d17b715b7917940c32320ae28e1c970a581d
-DIST calligra-l10n-fr-2.4.1.tar.bz2 5612296 RMD160 39afbdcd2d59d0e98c795a0a975bc965f6398a4e SHA1 b5549206def719a2d7afd4d4332c62b33dc88913 SHA256 6c86b8e69f4bec22e27e50b23f68459715138d922d850ccbff7cd0dca09a692d
 DIST calligra-l10n-fr-2.4.2.tar.bz2 5612463 RMD160 f0cdb53885ab8310660d781ebec3404eec82dc1a SHA1 1e917e287c060f4836082f7ffafb0e29d1183066 SHA256 77af170a2fe143cc986794c0282237f2d0003251b2ca8abef503cfd665e8e59b
 DIST calligra-l10n-fr-2.4.90.tar.bz2 5609284 RMD160 96c022df4fe9c7db40fc6fde355997788e91c86f SHA1 ce8ec9a99acef8ab508deab7736e4d2d0aa0eb79 SHA256 c306a10ca3f175e7eae8a7fe1c011317fe12577061a8c31f3c5cb77b92fdc444
-DIST calligra-l10n-hu-2.4.1.tar.bz2 447794 RMD160 e4bf3f907496fa4f9df924523ef9a7a4d1c78e37 SHA1 f0c865d090d0ad0a1e36bc6cdb19496d2872371b SHA256 c9825c7068eff7576ec90ebd3ef2a6c658c00d0f97a7e0e18db28db0b488087b
 DIST calligra-l10n-hu-2.4.2.tar.bz2 447760 RMD160 22ee67dd12ae153ce53fce9cab08760616218973 SHA1 50d49f111a03c58948f4cf9a885d46c520eba471 SHA256 d46332e92ecf5050ce630ce91d982ade430a15646dfaec906c63759371cbf0ef
 DIST calligra-l10n-hu-2.4.90.tar.bz2 435865 RMD160 1844bdf16668216bb84d3f316f30f603f037a90a SHA1 ca20ed565c683c99011918999ece5f89cbcce4ab SHA256 619c87eb183f5726b501d2bf6215e66980cf48cd6a4e5cf0dc3c20957d53be97
-DIST calligra-l10n-it-2.4.1.tar.bz2 626451 RMD160 2b8790361f9791d2919535447bb80deac7ee5652 SHA1 70bed20680b80d99acddf68c91ce5772c450517d SHA256 d19e62093c887c099de85abaa867b62efeef7fe4b02eb241ce2c7f5d8cdb24cb
 DIST calligra-l10n-it-2.4.2.tar.bz2 626408 RMD160 224a9e96548c832f3184e82c189c0f4ac53b80c2 SHA1 a77263f7f7a02a039e2161834bac74ba1db1b8b9 SHA256 8cf43e50cff18e12a40380267e626fbe51d5c20fbbd92e04826043462977ba9c
 DIST calligra-l10n-it-2.4.90.tar.bz2 559822 RMD160 1f99600c4e30b22b884f1d2c12a57c00905d06b6 SHA1 131564603fbb3d6cc5b16a2c9a62bf0e970322cd SHA256 5eaa1797d2d87ac88faeaf932ba9f9ece956f48baeaa17a323d4c319ab10d4ef
-DIST calligra-l10n-kk-2.4.1.tar.bz2 405347 RMD160 f3052b520d644e7da0de16e7f92eb9f5a0a01495 SHA1 08f8e5a6d977278a27367ef306d47508774ff4b2 SHA256 11c9635ea1cb1c02dbb914d713df965252da78d6eb213d266293a51eee52e31a
 DIST calligra-l10n-kk-2.4.2.tar.bz2 405525 RMD160 379c7baa1d055772086e9c5a5ed51be8aba93422 SHA1 46dc6d748fb3bd3e1080477bba96d0feae029206 SHA256 9be217dd8e3040c26a24260274f8b12b464168ec438adff62f99e00ca55b1685
 DIST calligra-l10n-kk-2.4.90.tar.bz2 400695 RMD160 ff4251ea83c7c270cb5f54cc91e1681d6d57e3c2 SHA1 8eceb4105b338285a3a0ad19a5c603e39f6a342e SHA256 3c0c98bb557a86044e9455cee76ff04a547d3be62e5c49da174d5d72e5abc728
-DIST calligra-l10n-nb-2.4.1.tar.bz2 367089 RMD160 5842220708fd2c0f81406697f185291a50447658 SHA1 064d2b8be1d551dd62197d64ab006cbbc6b0b563 SHA256 c7ec9e41c3f0bcef23dcf38dc5d6ee6ff796f91eaf7c466a61f68a84d262cfc5
 DIST calligra-l10n-nb-2.4.2.tar.bz2 367184 RMD160 51e3aa2764712c72aff8d45f6c448c3f6824dacc SHA1 0b635cd2e7cecfd9a03e81ac57f31d8322218373 SHA256 0f7e99dcc03a556f617918d5f34840353b8df951f1c26b62cfd6a94524f3a38c
 DIST calligra-l10n-nb-2.4.90.tar.bz2 356179 RMD160 f21b7d258df1dadd5087a572d9eac27d0bfdfc4c SHA1 ade47c0dc79756f863ec818f8ea8b5ba1d18448d SHA256 e9313ee78a7657aefa7358680bff6e988e4ab722fe44e6f5be8b3ccac348b176
-DIST calligra-l10n-nds-2.4.1.tar.bz2 413675 RMD160 ccaa5f4d5ed395e71e3407dec87b4c50daf1f1f9 SHA1 69c38219b76e24370f01c3138518708be0d2333e SHA256 a870724d97992877c32b98f56a31f0d6d504affd8668f61eb78ecf1e1c80280d
 DIST calligra-l10n-nds-2.4.2.tar.bz2 413593 RMD160 d64e6db9cca9901dd4e57caf0208abcba7948739 SHA1 8c6cfb9b63b547a474a8edc2b809967173d4435b SHA256 f7da2b4f174ff1f26d43fb985eb2cc2f9b146c27df551095a33417dc0bbbbbfe
 DIST calligra-l10n-nds-2.4.90.tar.bz2 406346 RMD160 aba893b26902a9317d8004184a599ba39a866fbf SHA1 ae81dc2a4ebba8c5cfefed8ab9f015b15cf9822c SHA256 37a4e1754ba37647864a9e23199455306476281623be5c2135269d5759963164
-DIST calligra-l10n-nl-2.4.1.tar.bz2 3101210 RMD160 4381586f0bcd13230c300178cf4d1c59e371a72b SHA1 785d393e2159090e43f4d446971f5ca35fa98ead SHA256 0925debb77f789fda3cdbf3f5eecbc5a9fd7bef5a1d820bc12d190f6a3f6a751
 DIST calligra-l10n-nl-2.4.2.tar.bz2 3101289 RMD160 ba3aea5698348dadea0b4ce0eebb53c0c7814a73 SHA1 abe49752c08037a753ed5c0b0f00a8ebe71e4140 SHA256 3f55de4c0987554bdacc5f083fa4710b33f913ff243ddfc5776c5db0cc3e70a5
 DIST calligra-l10n-nl-2.4.90.tar.bz2 2596129 RMD160 0c1355abf21135e42c415ef45beac0bee0c675a8 SHA1 bff36b30810ff7ddd9a75b581acff5309588c8c4 SHA256 b8479091f8e7a854bc873cc7993bb4c7ebf8a3415f4ecfc4e52f9e303da24bde
-DIST calligra-l10n-pl-2.4.1.tar.bz2 430451 RMD160 e66040cc785568b38be1b2c8a21e6735f7ccb63b SHA1 34fe40f2cca6a607755cdf4aeae67c7cf67ff5cc SHA256 4c6994bbca6741c039960a388a2ae1ae491f02430b5b4d84dfff47997b9d6fe8
 DIST calligra-l10n-pl-2.4.2.tar.bz2 430288 RMD160 eb09c4b312a40fcf4c4b251f995e1bf53c7832b6 SHA1 5e1e162be0a00b2b08644319f76d88fa000d10d0 SHA256 1e9aee796c2ae7f47359d1f2527801c920f568d16765631e7c4ebcd3998fe1a8
 DIST calligra-l10n-pl-2.4.90.tar.bz2 424546 RMD160 103d3795b349a978bd14f2762668a3de286d54fc SHA1 576a2b7563188d92c073928976362a2e06fad008 SHA256 d2ef8d791eed17a3fd8aed0e1fe321dcba67e73da34e5239a1b46f093ee4e810
-DIST calligra-l10n-pt-2.4.1.tar.bz2 661702 RMD160 e7393b6c305fc01ffb58857fb8ee3c35fa33bd5e SHA1 692fe295df06b7d35baac97b51c9edaa7a47a6a2 SHA256 b86800b4775943d8e8c55874bb54f956ecdbe7932871ff12c8788a33cb61529f
 DIST calligra-l10n-pt-2.4.2.tar.bz2 661473 RMD160 f97598e0eada512c3370be622f652bb41d86f5db SHA1 dca99fc4547c3b2e86cd8daeb00dba0edd6d5578 SHA256 07c78220eafdcc4bd650658e969ed44ce63e3c727f4d20af80adcf4472290247
 DIST calligra-l10n-pt-2.4.90.tar.bz2 645009 RMD160 aeeda91d774fd724ff7e99ee61ee48c57df00805 SHA1 ae6008cd2848576beeed4a2d01495f3a7e104300 SHA256 6f651c59d52a05633cc7ff536dc326f50d2214aef9aa98a0e71487ce50e8eed2
-DIST calligra-l10n-pt_BR-2.4.1.tar.bz2 740021 RMD160 7da5bc5803c23632578cbe97272f2d75eab04688 SHA1 e036fc7d5cf6f872200fdd32b1699ef99cb436ed SHA256 9f9886a2af809e1cd19a89d806e78e241341565b78c25e874d61b2198c9c4fc5
 DIST calligra-l10n-pt_BR-2.4.2.tar.bz2 739210 RMD160 e982c86e290c3e7535b2ee195120949dc3f56bd0 SHA1 4bed4f26618134dde280ba27bfa2b0d9ddc57513 SHA256 5e63db1dc1333d8bdebe2552b72c1aec0be0c80f3e8e6bb2672d904af7a0f9a8
 DIST calligra-l10n-pt_BR-2.4.90.tar.bz2 705814 RMD160 370ed3f01c6bda73d7f402244943b1aed03f26f3 SHA1 0e75f852125261234fad3336948728e34842fd7f SHA256 6d60c436140682bd72712a6f6d61015d83b4a9826d8fd635378fcf1e2276b93d
-DIST calligra-l10n-ru-2.4.1.tar.bz2 582180 RMD160 fdc249e2ad8735dfb3c0f73585340e79123f7c31 SHA1 6ed334c95bae2bafbe197348ffec33a6368612d2 SHA256 8bcb3589cb47c39d723f3403d178ab408ebf07572f58f96d9e917293aa09fb91
 DIST calligra-l10n-ru-2.4.2.tar.bz2 582200 RMD160 30852077bf2e8d098beb91e162dde699ac7e9a50 SHA1 357ef2510c72735672227dc2ce862415be4adc81 SHA256 8a7e54ebfaa9dedb2ac599373e4ae08588f1bf5889223b4e4cbe152782c25046
 DIST calligra-l10n-ru-2.4.90.tar.bz2 578671 RMD160 4c9377fe948e12f0a8e99c3bec094f9c7c1954be SHA1 5148cfbe5cc02df3e6e7c843cf7efb331e8c5e3b SHA256 98081e0483a36faf28d15eb5c7d8535e4308c4664feaf0f1c722fdb93dc35132
-DIST calligra-l10n-sk-2.4.1.tar.bz2 367375 RMD160 7a81f6b2cc57db0c66b2754d8bb788b620e2edeb SHA1 04a24876644e9064515fbc7648dc2cb58a743de0 SHA256 c50c19c00a30e8105fcf3664ebeb8873c16dad078ed2272589040801f07db5eb
 DIST calligra-l10n-sk-2.4.2.tar.bz2 368330 RMD160 8fa2a1ba63baeb13f40c922da0f730d3e3d87003 SHA1 6507364b71899d4239144254e3987e0d202d5b96 SHA256 0667b38d459b4998c9eb1968e0807d809a73e77eda23fa5588ee128e5ad1f5e3
 DIST calligra-l10n-sk-2.4.90.tar.bz2 359337 RMD160 17e95ba9ed9cefe9fb335a2f548814e55904ef0a SHA1 0beb14e4207fa92c34d04b3d12dac4da757641e3 SHA256 31e6f85ea572a360a2b43c36e098e5b7ec7b2f114bedddb9a3c478766ad6922b
-DIST calligra-l10n-sv-2.4.1.tar.bz2 2047139 RMD160 5aa92135df6b6839fbcb4b2581eab03c97fe5159 SHA1 349ffc026eaa91804b38f07b485c697e70d98ae6 SHA256 90cda0ea4b307009d33ea1a69e3c31a47fc597b226d0a405d3021f025258d3ac
 DIST calligra-l10n-sv-2.4.2.tar.bz2 2047227 RMD160 b4f77397b11d219f4b244be6a316399bd1ffa052 SHA1 b08e235ecf25e4ef0d77a3616c0dea6dd0e816d3 SHA256 064435b6e06171ae7c0988403f545fcbaf632d1f3d4304847906d3969b05dc58
 DIST calligra-l10n-sv-2.4.90.tar.bz2 2043562 RMD160 1afe8e94d54175ff56b535900323ae9d4a9baba6 SHA1 06d4c5eafee37d5d6415dbaaa8a19a5c5e0d92d1 SHA256 23d5c3f01259c487f31d48b27afe43f1fb06d77aa2987264f7384e29f973723e
-DIST calligra-l10n-uk-2.4.1.tar.bz2 2126067 RMD160 c13c86e901bf9aa995ff9d43862b0918373498a9 SHA1 a4e04b541dfc0645dc158e60156b42aa60b29716 SHA256 f8d0641484383cca74180862e8ea87f173d2b2a930f3a389d4676bf4f15460bd
 DIST calligra-l10n-uk-2.4.2.tar.bz2 2126141 RMD160 e1793bc8f10c1238dfa2a52679f4104675b219cd SHA1 9f74f3399af76b092137a92a075a6e7f6a7b9344 SHA256 2a0124159d0ca3b0ca5806180659c3deb1d3b044cdfffabc2994df93de3989b9
 DIST calligra-l10n-uk-2.4.90.tar.bz2 2122732 RMD160 944adb97a9627f10c24fe31de27adbe334cdc082 SHA1 04543d15ca3cc75804bea3bc785c0915ad918c65 SHA256 8e4d5980140f49c64a4147ec1c93c7089671d1194aaf1de31b8b33ffe9c8fd99
-DIST calligra-l10n-zh_CN-2.4.1.tar.bz2 346321 RMD160 6b55670d5469c284a4f8b35b0f56cb8d6dfca86d SHA1 2635cc9cad771e550a55f54da1fc3c34cc94c652 SHA256 a64c051bf3388eb6c7b863d6dbe0a40c3ae0934acd8b9bd10519fe2e4fa8f49d
 DIST calligra-l10n-zh_CN-2.4.2.tar.bz2 346242 RMD160 6fbcca974de718b2d30325b3fb0d9793ca7677b0 SHA1 f935d413b6988805565e24b06f77722963e7fdcf SHA256 1631ffddf8538b1a70033f774713f43cd6bbd4ee5eecf3f5d2a1c634b0813d84
 DIST calligra-l10n-zh_CN-2.4.90.tar.bz2 343139 RMD160 8eeb88d460c7df801720f4154656d54ec19b486b SHA1 a56e865653679600f9e676722cfb97345ed33679 SHA256 97f5a8754d30631fd1cd7dfd64c9fb9d24accac108e84ee542b898a69ad824be
-DIST calligra-l10n-zh_TW-2.4.1.tar.bz2 386393 RMD160 839342417ff79bcda503ed048e2e956fa1dab929 SHA1 c4386d1fc6a35be3b41d4e49b37cec7a2c27c8e4 SHA256 f5763e13aac69659f1379a2e51f565791ee07d32a2df30c724415e4be0704ecd
 DIST calligra-l10n-zh_TW-2.4.2.tar.bz2 386400 RMD160 1cb6741cdb5c117dcae5b9d05e6241681d43555e SHA1 b4f9ff646563aee6634ab27d878c6fb0e3dbcf3a SHA256 294d50e1398e94f36b045c7ec21ac2ef63950e3ccc67864e50bca39b4216d4e1
 DIST calligra-l10n-zh_TW-2.4.90.tar.bz2 382931 RMD160 e59bc623e631d0a4d3a462c2aa9361f6fe40ca71 SHA1 0d949525f206596192d9a5e52a3a04438331f23a SHA256 27c999d53d964e420068d79171e90054e6621eff435c9b0f912a190e9d6b3788
--- a/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild,v 1.3 2012/06/01 17:14:36 scarabeus Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="Calligra localization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND="!app-office/koffice-l10n"
-
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-MY_LANGS="ca ca@valencia cs da de el en_GB es et fi fr hu it kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
-URI_BASE="mirror://kde/stable/${PN/-l10n/}-${PV}/${PN}/"
-SRC_URI=""
-SLOT="4"
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
-done
-unset MY_LANG
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local lng dir
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for lng in ${MY_LANGS}; do
-			dir="${PN}-${lng}-${PV}"
-			if [[ -d "${dir}" ]] ; then
-				echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_MESSAGES=ON -DBUILD_DATA=ON
-		$(cmake-utils_use_build doc)
-	)
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}
--- a/app-office/calligra-l10n/calligra-l10n-2.4.2.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.4.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.4.2.ebuild,v 1.1 2012/06/01 17:18:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.4.2.ebuild,v 1.2 2012/06/24 14:07:00 ago Exp $

 EAPI=4

@ -13,7 +13,7 @@ LICENSE="GPL-2"
 DEPEND="sys-devel/gettext"
 RDEPEND="!app-office/koffice-l10n"

-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"

 MY_LANGS="ca ca@valencia cs da de el en_GB es et fi fr hu it kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@ -1,4 +1,2 @@
-DIST calligra-2.4.1.tar.bz2 119301573 RMD160 5cb241ab46c6e064a05e39436da81f2a2a8df71f SHA1 f5be221d50088ac4537931811272392846cd7363 SHA256 59a5421484ec71bfc3db6351d44a88b22dd164a5ff8cd225b67ac2eb835774a3
 DIST calligra-2.4.2.tar.bz2 119318136 RMD160 e884a4e68ea65d24166f3992488413283894c3d8 SHA1 d44a6b321b0b90122b86e074785546f4a2b0d066 SHA256 0f6b87a013601008f1198791bf743143c60b3aba26e2729c085aa98372459193
-DIST calligra-2.4.90.tar.bz2 119019871 RMD160 8cca77e8b57dfa70e379623dbf09a5f1976a5cd9 SHA1 69c44af5234af420e3eadaf3d2cd0c4b79865370 SHA256 2a83cbfabc357bc93df7cc6d470a1537c962a9a068ade06f34d6cb1cd6a79c4a
-DIST calligra-2.4.91.tar.bz2 119281251 RMD160 642939226080ceb21e25bc986765c8a6ead63392 SHA1 60ea0883c743cec3eb7a9a223498c406652029a4 SHA256 c38042f2151f593ef5e8928ba45c58b52e3af40038fe7ae1333c69907b86a338
+DIST calligra-2.4.91.tar.bz2 119280417 RMD160 723f8c8331203e910f416b5ca0993f85c244cf34 SHA1 299c965a521e93137320ef094e9d68819f3d6001 SHA256 720fdae969102744677b633bae81d31488f8b49d4cfba89ca848faef5764a8a9
--- a/app-office/calligra/calligra-2.4.1.ebuild
+++ b/app-office/calligra/calligra-2.4.1.ebuild
@ -1,205 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild,v 1.7 2012/06/06 13:39:04 scarabeus Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=4
-
-EGIT_BRANCH="calligra/2.4"
-
-KDE_SCM=git
-KDE_MINIMAL=4.6.4
-QT_MINIMAL=4.8.1
-OPENGL_REQUIRED=optional
-
-KDE_HANDBOOK=optional
-
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-[[ ${PV} == *9999 ]] || KEYWORDS="amd64 x86"
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
-word-perfect xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="kexi words flow plan stage sheets krita karbon braindump"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_kexi? ( calligra_features_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim semantic-desktop )
-	calligra_features_sheets? ( eigen )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	>=x11-libs/qt-gui-4.8.1-r1
-	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		dev-libs/libpqxx
-	)
-	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions]
-		dev-libs/icu
-	)
-"
-DEPEND="${RDEPEND}"
-PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
-
-RESTRICT=test
-# bug 394273
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DIHAVEPATCHEDQT=ON"
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
-		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DWITH_LCMS=OFF"            # we use lcms:2
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with marble Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use semantic-desktop NEPOMUK)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build mso libmsooxml)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}
--- a/app-office/calligra/calligra-2.4.2.ebuild
+++ b/app-office/calligra/calligra-2.4.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild,v 1.4 2012/06/06 13:39:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild,v 1.6 2012/06/24 14:05:50 ago Exp $

 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@ -26,7 +26,7 @@ HOMEPAGE="http://www.calligra.org/"

 LICENSE="GPL-2"
 SLOT="4"
-[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
+[[ ${PV} == *9999 ]] || KEYWORDS="amd64 x86"
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
@ -121,6 +121,8 @@ PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
 RESTRICT=test
 # bug 394273

+PATCHES=( "${FILESDIR}/${PN}-2.4.2-marble.patch" )
+
 src_configure() {
 	local cal_ft

--- a/app-office/calligra/calligra-2.4.49.9999.ebuild
+++ b/app-office/calligra/calligra-2.4.49.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild,v 1.4 2012/06/06 13:39:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild,v 1.5 2012/06/23 22:44:01 dilfridge Exp $

 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@ -121,6 +121,8 @@ PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
 RESTRICT=test
 # bug 394273

+PATCHES=( "${FILESDIR}/${PN}-2.4.2-marble.patch" )
+
 src_configure() {
 	local cal_ft

--- a/app-office/calligra/calligra-2.4.90.ebuild
+++ b/app-office/calligra/calligra-2.4.90.ebuild
@ -1,219 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.90.ebuild,v 1.5 2012/06/06 13:39:04 scarabeus Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=4
-
-KDE_SCM=git
-KDE_MINIMAL=4.6.4
-QT_MINIMAL=4.8.1
-OPENGL_REQUIRED=optional
-
-KDE_HANDBOOK=optional
-
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-
-case ${PV} in
-	2.[456789].[789]?)
-		# beta or rc releases
-		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2" ;;
-	2.[456789].?)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2" ;;
-	2.[456789].9999)
-		# stable branch live ebuild
-		SRC_URI="" ;;
-	9999)
-		# master branch live ebuild
-		SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
-
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
-word-perfect xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="kexi words flow plan stage sheets krita karbon braindump"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_kexi? ( calligra_features_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim semantic-desktop )
-	calligra_features_sheets? ( eigen )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	>=x11-libs/qt-gui-4.8.1-r1
-	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		dev-libs/libpqxx
-	)
-	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions]
-		dev-libs/icu
-	)
-"
-DEPEND="${RDEPEND}"
-PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
-
-RESTRICT=test
-# bug 394273
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DIHAVEPATCHEDQT=ON"
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
-		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DWITH_LCMS=OFF"            # we use lcms:2
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with marble Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use semantic-desktop NEPOMUK)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build mso libmsooxml)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}
--- a/app-office/calligra/calligra-2.4.91.ebuild
+++ b/app-office/calligra/calligra-2.4.91.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.91.ebuild,v 1.1 2012/06/16 13:50:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.91.ebuild,v 1.2 2012/06/24 11:46:39 dilfridge Exp $

 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@ -42,7 +42,7 @@ SLOT="4"
 [[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"

 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular opengtl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
 word-perfect xbase +xml +xslt"

@ -102,7 +102,7 @@ RDEPEND="
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
 	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
+	opengtl? ( >=media-libs/opengtl-0.9.15 )
 	openexr? ( media-libs/openexr )
 	pdf? (
 		app-text/poppler
@ -189,7 +189,7 @@ src_configure() {
 		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
 		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
+		$(cmake-utils_use_with opengtl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with pdf Poppler)
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.23 2012/06/06 13:39:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.24 2012/06/24 11:46:39 dilfridge Exp $

 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@ -42,7 +42,7 @@ SLOT="4"
 [[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"

 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular opengtl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
 word-perfect xbase +xml +xslt"

@ -102,7 +102,7 @@ RDEPEND="
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
 	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
+	opengtl? ( >=media-libs/opengtl-0.9.15 )
 	openexr? ( media-libs/openexr )
 	pdf? (
 		app-text/poppler
@ -189,7 +189,7 @@ src_configure() {
 		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
 		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
+		$(cmake-utils_use_with opengtl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with pdf Poppler)
--- a/app-office/calligra/files/calligra-2.4.2-marble.patch
+++ b/app-office/calligra/files/calligra-2.4.2-marble.patch
@ -0,0 +1,185 @@
+From 94aa2f51a338c017339129b6c90c2d9da665e528 Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
+Date: Sun, 24 Jun 2012 00:05:21 +0200
+Subject: [PATCH] Marble includes need prefix marble/
+
+---
+ .../forms/widgets/mapbrowser/MapBrowserWidget.cpp  |    2 +-
+ .../forms/widgets/mapbrowser/MapBrowserWidget.h    |    2 +-
+ libs/main/rdf/KoRdfLocation.cpp                    |    4 ++--
+ libs/main/rdf/KoRdfLocationEditWidget.cpp          |    4 ++--
+ plugins/mapshape/MapShape.cpp                      |    2 +-
+ .../mapshape/MapShapeCommandChangeProjection.cpp   |    2 +-
+ plugins/mapshape/MapShapeCommandContentChange.cpp  |    2 +-
+ plugins/mapshape/MapShapeCommandSetMapThemeId.cpp  |    2 +-
+ plugins/mapshape/MapShapeCommandZoom.cpp           |    2 +-
+ plugins/mapshape/MapTool.cpp                       |    2 +-
+ plugins/reporting/maps/KoReportItemMaps.cpp        |    4 ++--
+ plugins/reporting/maps/KoReportItemMaps.h          |    2 +-
+ 12 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp
+index 0983141..bd0cf29 100644
+--- a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp
+++ b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp
+@@ -19,7 +19,7 @@
+ 
+ 
+ #include "MapBrowserWidget.h"
+-#include <MarbleWidget.h>
+#include <marble/MarbleWidget.h>
+ #include <QPointF>
+ #include <KDebug>
+ 
+diff --git a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
+index b699ca2..977eb5e 100644
+--- a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
+++ b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
+@@ -21,7 +21,7 @@
+ #ifndef MAPBROWSERWIDGET_H
+ #define MAPBROWSERWIDGET_H
+ 
+-#include <MarbleWidget.h>
+#include <marble/MarbleWidget.h>
+ 
+ #include "widgetfactory.h"
+ #include "container.h"
+diff --git a/libs/main/rdf/KoRdfLocation.cpp b/libs/main/rdf/KoRdfLocation.cpp
+index b51d0a2..1511806 100644
+--- a/libs/main/rdf/KoRdfLocation.cpp
+++ b/libs/main/rdf/KoRdfLocation.cpp
+@@ -32,8 +32,8 @@
+ // marble for geolocation
+ // #ifdef CAN_USE_MARBLE
+ // #include <LatLonEdit.h>
+-// #include <MarbleWidget.h>
+-// #include <MarbleWidgetInputHandler.h>
+// #include <marble/MarbleWidget.h>
+// #include <marble/MarbleWidgetInputHandler.h>
+ // #endif
+ 
+ using namespace Soprano;
+diff --git a/libs/main/rdf/KoRdfLocationEditWidget.cpp b/libs/main/rdf/KoRdfLocationEditWidget.cpp
+index 0436570..13bb23d 100644
+--- a/libs/main/rdf/KoRdfLocationEditWidget.cpp
+++ b/libs/main/rdf/KoRdfLocationEditWidget.cpp
+@@ -26,8 +26,8 @@
+ // marble for geolocation
+ // #ifdef CAN_USE_MARBLE
+ // #include <LatLonEdit.h>
+-// #include <MarbleWidget.h>
+-// #include <MarbleWidgetInputHandler.h>
+// #include <marble/MarbleWidget.h>
+// #include <marble/MarbleWidgetInputHandler.h>
+ // #endif
+ 
+ class KoRdfLocationEditWidgetPrivate
+diff --git a/plugins/mapshape/MapShape.cpp b/plugins/mapshape/MapShape.cpp
+index 06e3b0a..e8ec0c6 100644
+--- a/plugins/mapshape/MapShape.cpp
+++ b/plugins/mapshape/MapShape.cpp
+@@ -21,7 +21,7 @@
+ 
+ 
+ #include "MapShape.h"
+-#include <MarbleWidget.h>
+#include <marble/MarbleWidget.h>
+ #include <MarbleModel.h>
+ #include <KoImageData.h>
+ #include <KoXmlNS.h>
+diff --git a/plugins/mapshape/MapShapeCommandChangeProjection.cpp b/plugins/mapshape/MapShapeCommandChangeProjection.cpp
+index b41ed6b..9800725 100644
+--- a/plugins/mapshape/MapShapeCommandChangeProjection.cpp
+++ b/plugins/mapshape/MapShapeCommandChangeProjection.cpp
+@@ -21,7 +21,7 @@
+ #include "MapShapeCommandChangeProjection.h"
+ #include "MapShape.h"
+ 
+-#include <MarbleWidget.h>
+#include <marble/MarbleWidget.h>
+ 
+ MapShapeCommandChangeProjection::MapShapeCommandChangeProjection(MapShape * shape, Marble::Projection projection, KUndo2Command *parent)
+ : KUndo2Command(parent)
+diff --git a/plugins/mapshape/MapShapeCommandContentChange.cpp b/plugins/mapshape/MapShapeCommandContentChange.cpp
+index 52fc500..2ed8802 100644
+--- a/plugins/mapshape/MapShapeCommandContentChange.cpp
+++ b/plugins/mapshape/MapShapeCommandContentChange.cpp
+@@ -20,7 +20,7 @@
+ #include "MapShapeCommandContentChange.h"
+ 
+ #include "MapShape.h"
+-#include <MarbleWidget.h>
+#include <marble/MarbleWidget.h>
+ #include <QPointF>
+ 
+ 
+diff --git a/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp b/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp
+index 78c245a..4ca53ef 100644
+--- a/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp
+++ b/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp
+@@ -21,7 +21,7 @@
+ #include "MapShapeCommandSetMapThemeId.h"
+ #include "MapShape.h"
+ 
+-#include <MarbleWidget.h>
+#include <marble/MarbleWidget.h>
+ 
+ MapShapeCommandSetMapThemeId::MapShapeCommandSetMapThemeId(MapShape * shape, const QString& mapThemeId, KUndo2Command *parent)
+ : KUndo2Command(parent)
+diff --git a/plugins/mapshape/MapShapeCommandZoom.cpp b/plugins/mapshape/MapShapeCommandZoom.cpp
+index edeb6d7..6d0f897 100644
+--- a/plugins/mapshape/MapShapeCommandZoom.cpp
+++ b/plugins/mapshape/MapShapeCommandZoom.cpp
+@@ -21,7 +21,7 @@
+ #include "MapShapeCommandZoom.h"
+ #include "MapShape.h"
+ 
+-#include <MarbleWidget.h>
+#include <marble/MarbleWidget.h>
+ 
+ 
+ MapShapeCommandZoom::MapShapeCommandZoom(MapShape * shape, signed int value, KUndo2Command *parent)
+diff --git a/plugins/mapshape/MapTool.cpp b/plugins/mapshape/MapTool.cpp
+index 3733271..0f4bfca 100644
+--- a/plugins/mapshape/MapTool.cpp
+++ b/plugins/mapshape/MapTool.cpp
+@@ -42,7 +42,7 @@
+ #include <KoPointerEvent.h>
+ 
+ #include <MarbleControlBox.h>
+-#include <MarbleWidget.h>
+#include <marble/MarbleWidget.h>
+ #include <GeoDataLatLonAltBox.h>
+ 
+ 
+diff --git a/plugins/reporting/maps/KoReportItemMaps.cpp b/plugins/reporting/maps/KoReportItemMaps.cpp
+index 01969c3..ba2fa73 100644
+--- a/plugins/reporting/maps/KoReportItemMaps.cpp
+++ b/plugins/reporting/maps/KoReportItemMaps.cpp
+@@ -25,8 +25,8 @@
+ #include <QBuffer>
+ #include <kcodecs.h>
+ #include <renderobjects.h>
+-#include <MarbleWidget.h>
+-#include <MarbleModel.h>
+#include <marble/MarbleWidget.h>
+#include <marble/MarbleModel.h>
+ #include <QImage>
+ #include <QPixmap>
+ #include <sys/socket.h>
+diff --git a/plugins/reporting/maps/KoReportItemMaps.h b/plugins/reporting/maps/KoReportItemMaps.h
+index d07f2d0..a838a70 100644
+--- a/plugins/reporting/maps/KoReportItemMaps.h
+++ b/plugins/reporting/maps/KoReportItemMaps.h
+@@ -29,7 +29,7 @@
+ #include <kdebug.h>
+ #include <klocalizedstring.h>
+ #include <kglobalsettings.h>
+-#include <MarbleWidget.h>
+#include <marble/MarbleWidget.h>
+ #include <RdfForward.h>
+ #include <QMap>
+ 
+-- 
+1.7.9.2
+
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@ -18,6 +18,7 @@
 		<flag name="mso">Enable support for various MS Office TM file formats</flag>
 		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
 		<flag name="openctl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
+		<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
 		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
 		<flag name="xbase">Enable support for xbase compatible database formats</flag>
 		<flag name="xslt">Enable xslt and exslt support format support</flag>
--- a/app-office/karbon/Manifest
+++ b/app-office/karbon/Manifest
@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
--- a/app-office/karbon/files/karbon-2.3.3-newlibwpd.patch
+++ b/app-office/karbon/files/karbon-2.3.3-newlibwpd.patch
@ -1,180 +0,0 @@
-Description: porting to pwg & conversion as SVG output
- Reduced version of Calligra's commit 9cda7aed2ea103750172e61f5c800a474913fa59:
-    make wpg import compile again, simplified code by using high level libwpg function to convert to svg,
-    this makes us less dependent on libwpg API changes, code works with old an new libwpg versions
-Author: Jan Hambrecht <jaham@gmx.net>
-Author: Pino Toscano <pino@kde.org>
-Last-Update: 2011-02-06
-Applied-Upstream: Calligra 2.4
-
--- a/filters/karbon/wpg/import/CMakeLists.txt
-+++ b/filters/karbon/wpg/import/CMakeLists.txt
-@@ -4,13 +4,11 @@
- 
- set(wpgimport_PART_SRCS 
- WPGImport.cpp 
-OdgExporter.cxx
-FileOutputHandler.cxx
-GraphicsElement.cxx)
-+)
- 
- kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
- 
-target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES})
-+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
- 
- install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--- a/filters/karbon/wpg/import/WPGImport.cpp
-+++ b/filters/karbon/wpg/import/WPGImport.cpp
-@@ -23,6 +23,7 @@
- #include <QBuffer>
- #include <QByteArray>
- #include <QString>
-+#include <QFile>
- 
- #include <kdebug.h>
- #include <KoFilterChain.h>
-@@ -37,11 +38,9 @@
- #include <libwpg/WPGStreamImplementation.h>
- #else
- #include <libwpd-stream/libwpd-stream.h>
-+#include <libwpd/libwpd.h>
- #endif
- 
-#include "FileOutputHandler.hxx"
-#include "OdgExporter.hxx"
-
- #include <iostream>
- 
- K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
-@@ -56,35 +55,12 @@
- {
- }
- 
-static QByteArray createManifest()
-{
-    KoXmlWriter* manifestWriter;
-    QByteArray manifestData;
-    QBuffer manifestBuffer(&manifestData);
-
-    manifestBuffer.open(QIODevice::WriteOnly);
-    manifestWriter = new KoXmlWriter(&manifestBuffer);
-
-    manifestWriter->startDocument("manifest:manifest");
-    manifestWriter->startElement("manifest:manifest");
-    manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0");
-    manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics");
-    //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
-    manifestWriter->addManifestEntry("content.xml", "text/xml");
-    manifestWriter->endElement();
-    manifestWriter->endDocument();
-    delete manifestWriter;
-
-    return manifestData;
-}
-
-
- KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to)
- {
-     if (from != "application/x-wpg")
-         return KoFilter::NotImplemented;
- 
-    if (to != "application/vnd.oasis.opendocument.graphics")
-+    if (to != "image/svg+xml")
-         return KoFilter::NotImplemented;
- 
- #if LIBWPG_VERSION_MINOR<2
-@@ -96,6 +72,7 @@
-             input = olestream;
-         }
-     }
-+    libwpg::WPGString output;
- #else
-     WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
-     if (input->isOLEStream()) {
-@@ -105,6 +82,7 @@
-             input = olestream;
-         }
-      }
-+     ::WPXString output;
- #endif
- 
-     if (!libwpg::WPGraphics::isSupported(input)) {
-@@ -113,51 +91,21 @@
-         return KoFilter::NotImplemented;
-     }
- 
-    // do the conversion
-    std::ostringstream tmpStringStream;
-    FileOutputHandler tmpHandler(tmpStringStream);
-    OdgExporter exporter(&tmpHandler);
-    libwpg::WPGraphics::parse(input, &exporter);
-    delete input;
-
-
-    // create output store
-    KoStore* storeout;
-    storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write,
-                                    "application/vnd.oasis.opendocument.graphics", KoStore::Zip);
-
-    if (!storeout) {
-        kWarning() << "Couldn't open the requested file.";
-        return KoFilter::FileNotFound;
-    }
-
-#if 0
-    if (!storeout->open("styles.xml")) {
-        kWarning() << "Couldn't open the file 'styles.xml'.";
-        return KoFilter::CreationError;
-    }
-    //storeout->write( createStyles() );
-    storeout->close();
-#endif
-
-    if (!storeout->open("content.xml")) {
-        kWarning() << "Couldn't open the file 'content.xml'.";
-        return KoFilter::CreationError;
-    }
-    storeout->write(tmpStringStream.str().c_str());
-    storeout->close();
-
-    // store document manifest
-    storeout->enterDirectory("META-INF");
-    if (!storeout->open("manifest.xml")) {
-        kWarning() << "Couldn't open the file 'META-INF/manifest.xml'.";
-        return KoFilter::CreationError;
-+    if (!libwpg::WPGraphics::generateSVG(input, output)) {
-+        kWarning() << "ERROR: SVG Generation failed!";
-+        delete input;
-+        return KoFilter::ParsingError;
-     }
-    storeout->write(createManifest());
-    storeout->close();
-
-    // we are done!
-    delete storeout;
- 
-+    delete input;
-+ 
-+    QFile outputFile(m_chain->outputFile());
-+    if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-+        kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
-+        return KoFilter::InternalError;
-+    }
-+    outputFile.write(output.cstr());
-+    outputFile.close();
-+ 
-     return KoFilter::OK;
- }
--- a/filters/karbon/wpg/import/karbon_wpg_import.desktop
-+++ b/filters/karbon/wpg/import/karbon_wpg_import.desktop
-@@ -42,7 +42,7 @@
- Name[x-test]=xxKarbon WPG Import Filterxx
- Name[zh_CN]=Karbon WPG 导入过滤器
- Name[zh_TW]=Karbon WPG 匯入過濾程式
-X-KDE-Export=application/vnd.oasis.opendocument.graphics
-+X-KDE-Export=image/svg+xml
- X-KDE-Import=application/x-wpg
- X-KDE-Weight=1
- X-KDE-Library=wpgimport
--- a/app-office/karbon/karbon-2.3.3-r1.ebuild
+++ b/app-office/karbon/karbon-2.3.3-r1.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-2.3.3-r1.ebuild,v 1.3 2012/03/09 09:08:47 phajdan.jr Exp $
-
-EAPI=4
-KMNAME="koffice"
-KMMODULE="${PN}"
-
-inherit kde4-meta
-
-DESCRIPTION="KOffice vector drawing application."
-
-KEYWORDS="amd64 x86"
-IUSE="+pstoedit wpg"
-
-DEPEND="
-	media-libs/libart_lgpl
-	pstoedit? ( media-gfx/pstoedit )
-	wpg? ( app-text/libwpg[tools(+)] )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="filters/${KMMODULE}"
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-	plugins/
-	filters/
-"
-KMLOADLIBS="koffice-libs"
-
-PATCHES=( "${FILESDIR}/${P}-newlibwpd.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with wpg)
-		$(cmake-utils_use_with pstoedit)
-	)
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
--- a/app-office/karbon/metadata.xml
+++ b/app-office/karbon/metadata.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="wpg">Build wordperfect image support.</flag>
-	<flag name="pstoedit">Build support for PDF and PS import.</flag>
-</use>
-</pkgmetadata>
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
--- a/app-office/kexi/files/kexi-2.3.0-link.patch
+++ b/app-office/kexi/files/kexi-2.3.0-link.patch
@ -1,11 +0,0 @@
-diff -ruN kexi-2.3.0.orig/kexi/migration/kspread/CMakeLists.txt kexi-2.3.0/kexi/migration/kspread/CMakeLists.txt
--- kexi-2.3.0.orig/kexi/migration/kspread/CMakeLists.txt	2010-12-29 11:36:25.000000000 +0100
-+++ kexi-2.3.0/kexi/migration/kspread/CMakeLists.txt	2011-01-09 01:26:42.838672101 +0100
-@@ -18,6 +18,7 @@
-     kexidb
-     kexiutils
-     kspreadcommon
-+    kspreadodf
- )
- 
- install(TARGETS keximigrate_kspread DESTINATION ${PLUGIN_INSTALL_DIR})
--- a/app-office/kexi/kexi-2.3.3.ebuild
+++ b/app-office/kexi/kexi-2.3.3.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-2.3.3.ebuild,v 1.3 2011/05/09 23:12:16 hwoarang Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-inherit kde4-meta
-
-DESCRIPTION="KOffice integrated environment for database management"
-KEYWORDS="amd64 x86"
-IUSE="freetds mysql postgres reports xbase"
-
-DEPEND="
-	sys-libs/readline
-	app-arch/bzip2
-	~app-office/kspread-${PV}:${SLOT}
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-libs/libpqxx-3 )
-	reports? ( ~app-office/koffice-libs-${PV}:${SLOT}[reports] )
-	xbase? ( dev-db/xbase )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}"-2.3.0-link.patch )
-
-KMLOADLIBS="koffice-libs"
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-	kspread/
-"
-
-src_configure() {
-	 mycmakeargs=(
-		-DWITH_WEBFORMS=Off
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with postgres Pqxx)
-		$(cmake-utils_use_with xbase XBase)
-		-DBUILD_kexi=ON
-		$(cmake-utils_use_build reports koreport)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
--- a/app-office/kexi/metadata.xml
+++ b/app-office/kexi/metadata.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="xbase">Build support for xbase db types.</flag>
-	<flag name="reports">Enable the reports koffice module in kchart, also used by kplato and kexi</flag>
-</use>
-</pkgmetadata>
--- a/app-office/koffice-data/Manifest
+++ b/app-office/koffice-data/Manifest
@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
--- a/app-office/koffice-data/koffice-data-2.3.3.ebuild
+++ b/app-office/koffice-data/koffice-data-2.3.3.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-2.3.3.ebuild,v 1.3 2011/05/09 23:12:27 hwoarang Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="Shared KOffice data files"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/lcms:0"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="pics/
-	servicetypes/
-	templates/"
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	doc/CMakeLists.txt
-	doc/koffice.desktop"
--- a/app-office/koffice-data/metadata.xml
+++ b/app-office/koffice-data/metadata.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd> 
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-</pkgmetadata>
--- a/app-office/koffice-l10n/Manifest
+++ b/app-office/koffice-l10n/Manifest
@ -1,27 +0,0 @@
-DIST koffice-l10n-ca-2.3.2.tar.bz2 602048 RMD160 adae6cda90c797cbeaacfee1a51b81a309ce4d3e SHA1 cd2ce0d719b68a762ee4a4c3f312427de9229614 SHA256 63d732a7051f85fc83b790f356249198b731bd8c4c964494e62efb898ac27b08
-DIST koffice-l10n-ca@valencia-2.3.2.tar.bz2 333533 RMD160 468aa26dd2866711e00b450ee665afc7c2ba7e81 SHA1 87db015b8a8480955ae989cf4a17490aefabdae6 SHA256 f151b1dda67a1de6ff193e10f27dd6a7efc41c3b91128340d47c01a1cf26bea9
-DIST koffice-l10n-da-2.3.2.tar.bz2 574454 RMD160 57d60925d8064e061ecf0c0e65fa9f193d0364e1 SHA1 1a25131cd37e15e40fa6518146370f907abf2cfb SHA256 6342a80bf73d3f07f29af62a1775088590f057602dcf453887bab1f300d753e0
-DIST koffice-l10n-de-2.3.2.tar.bz2 1309655 RMD160 39b4ef117361d0d8bad4c174be56ef2254314558 SHA1 b7cc12c2081c01c5dd46dc7879dc55237d6ae8d2 SHA256 b5f4fce969baeebf90eccdc58767b5cb064bd8b12e4e17772274c5e26839d0f5
-DIST koffice-l10n-el-2.3.2.tar.bz2 344811 RMD160 71d68d73e89ace9301ac9c87850084a8b7b42a58 SHA1 cfc6f1c4dffec7e7094b56d70c494ef66a096fd0 SHA256 99d53f5c6f6199ce34b72c8c91f6c4d630fd9b39c9c38b4e0b691c7931120d01
-DIST koffice-l10n-en_GB-2.3.2.tar.bz2 335363 RMD160 a51fab0a9cfb4ee5ad8895ecf17ac0900778011b SHA1 a73dcbbd8263889da3cb58f496c74fc9a110b590 SHA256 7a0b4f2cedcc8354fddeba6f8397dfb22875fb0d17580f885dfa676c91835752
-DIST koffice-l10n-es-2.3.2.tar.bz2 6265591 RMD160 8fc6de2874831848edc5297af7be880e1d94abe8 SHA1 583bdc5ec58fbb70713030f6517ad85fa8423c62 SHA256 fbe126e61d7a9b8169636b631fde8647871b5aac79d53455cca3b060acc418ec
-DIST koffice-l10n-et-2.3.2.tar.bz2 732317 RMD160 60585cb33a75cd8fa3d49050b6a06108cd95283c SHA1 eb8e59252aa8bcd8b6d10b1055c10927a6c2d9e9 SHA256 e4220a8059dc8c7cc59d0a494b962e05191fee1e9801d2685b5084bc3faccd8d
-DIST koffice-l10n-fr-2.3.2.tar.bz2 6343416 RMD160 5ca4b7076dbc17cf57d01f3066958bd5d812817d SHA1 f59118355ecb963fb234a14cfb5ab518df22f1fe SHA256 64a6d568a2549e5ff8a26db7b2eb49c3664f43528fdd149bb2f76d8fd44fa640
-DIST koffice-l10n-gl-2.3.2.tar.bz2 366933 RMD160 4a5b7bc0b612c158594d73a43f4a770349014647 SHA1 7b07e05ce1ea7f5acbbb583ebae6e9203b8f79ed SHA256 85d28d5bcf432d38d0b075568522579b6e78067ee84a1fff10b88270645a133b
-DIST koffice-l10n-hu-2.3.2.tar.bz2 383914 RMD160 a52a5a1f1dfa6e045146d7fe9255a89d55322d6d SHA1 21b7959cc7a0db2354d789c782cb903ab692777c SHA256 ca55e7b8f5506b81d85528415785d3ad3dbd238c2b47973efa0965cc091792e1
-DIST koffice-l10n-it-2.3.2.tar.bz2 709685 RMD160 5f8e683d0bbe55dbdaf9db2b3e8070a3138c37c9 SHA1 e9ed5010461176656c34d19e4f2bc9bac2b3cfb1 SHA256 20ef49e34c514113396b2169912e83cbbff73279e830ad6181cd9a7e7d810a54
-DIST koffice-l10n-ja-2.3.2.tar.bz2 301144 RMD160 c6384cecc6bc40cb829cfe51681423af030cedf9 SHA1 0c4ae0395e2918f6c27330fe0bc544ce0d203e28 SHA256 beb0a98efde0b00249e240d70ebd5154fb86e8aab3585b4b8fda7d2d465cc270
-DIST koffice-l10n-kk-2.3.2.tar.bz2 333005 RMD160 f3d7b79447878a115c686147ba89c047866fded3 SHA1 4a3d01179e94d93e14704e80f9bc3dbd002e7d51 SHA256 545f1498ac85bc908da68c561f7b634cd915e1b850a5c618ba17663983f532ee
-DIST koffice-l10n-nb-2.3.2.tar.bz2 329542 RMD160 19d0b9a61f707e94bf16d38e43a3a47b25293503 SHA1 30f6bd5bbeb73fd72cd77c349bfcfb8296df4a7a SHA256 6a2cce45cbb63bb3915536c62199f18e0c3bde6cfac47bbc2ad147bcd40674c1
-DIST koffice-l10n-nds-2.3.2.tar.bz2 971904 RMD160 fa11c1cdbda67801742bc301637f1fe75527cb6e SHA1 0fa6515a49c59dcbd31ad38690757d5af9f19cdf SHA256 b247f3f10f0e058b60f87d4d8f459fe2a52e9a2517da48db3a0d80ff9f52c8a1
-DIST koffice-l10n-nl-2.3.2.tar.bz2 2787702 RMD160 3840535f89dbe11d62faf535c6119e51aa393dff SHA1 b05f583bb6143efeeec13ce722b91acb7a7167eb SHA256 ed5502c936dfbd751b6565d708e1cd80649f91b61ade630f05484f66e6266050
-DIST koffice-l10n-pl-2.3.2.tar.bz2 357991 RMD160 a1355cdce5d4a889820d38bc471f1faa1df89d24 SHA1 9ab2e029f4355a6324e48a1f1c26bf67c83400d2 SHA256 956241204bed7749efbc84d3574f1354d1860cf96ee92f4bb86ef0262c158dad
-DIST koffice-l10n-pt-2.3.2.tar.bz2 609615 RMD160 f4ea221a78d0320e13ea3ffbad91e27a0ae33320 SHA1 131782e538508b05e9d735e147792b271a100f91 SHA256 15144bd1d1d688e66d0ae5b3ee0ef133ad7e508f6bea7006b227e841ecca7ec7
-DIST koffice-l10n-pt_BR-2.3.2.tar.bz2 848370 RMD160 c75bc38ec08aab90018154e440a27304f249a103 SHA1 b7b258f2e2271ee5314f427dd42d1b3f572321ec SHA256 e1f340a87bc35cc1c73226ec2b8fed6264a2e69c3e18435f6c4460079dd02f81
-DIST koffice-l10n-ru-2.3.2.tar.bz2 558576 RMD160 932385267473db9f42d94b920cf5d9b6eab78238 SHA1 5cf50feb17049580b3916ea3102a3a23ef2e9138 SHA256 93e1eddb925dd5e739a4fa704069394c8519c242e5c1b7ba5bf412633d4d790c
-DIST koffice-l10n-sv-2.3.2.tar.bz2 2447736 RMD160 ce0255b1a286c188dacc07caa83e75f28a8bceb1 SHA1 700252dceff2ac35e20ee7fef3c9117c40964bff SHA256 c27afbef13d051ee46945e3aeb7c27e48d6ece22c347255e5586e3248158e2f6
-DIST koffice-l10n-tr-2.3.2.tar.bz2 322498 RMD160 88f5167f1daa48e2b4ee8a0ee6614d6fada5b53b SHA1 6301537a3caca81dd73ec797cedc679e8a159566 SHA256 a0107580d85989c5fa5369a230b7dce4cb77c494ee6590c78c9390de3f2f3a90
-DIST koffice-l10n-uk-2.3.2.tar.bz2 651651 RMD160 f75511e773a422cb101238a60c5a49c250e3caf9 SHA1 135976ae7b3ee13fe25e2ffd8282aa01cb0bfc56 SHA256 bef2a455478605b4f3bcc625586543135e19fe3cd25167b7896bb76af295aa10
-DIST koffice-l10n-wa-2.3.2.tar.bz2 331887 RMD160 b44a0a36ae992a53de217187c5cb554af4a34bf3 SHA1 275d54fc1b951f919a684eeeabefc4b779c120b5 SHA256 1071423fae2f97cb3b2ff988f9df9ed779221376a44872b55b058b9a84330131
-DIST koffice-l10n-zh_CN-2.3.2.tar.bz2 292546 RMD160 51058f5482d57152928bf091babb02d8ba6529fa SHA1 cce8483c29129343d783fe9f5f82108adb6a5207 SHA256 f138f8ae823ae437d4fdac4fe72558370c28a8741668f09f82de96cfafc30be2
-DIST koffice-l10n-zh_TW-2.3.2.tar.bz2 334294 RMD160 9c917ac639b548243f629a6f6dd102b8d32edf0d SHA1 8f73db090fca711143fce296eb66bc95c7b0f513 SHA256 b72276fd2fc9bebcce8f741bbe7da1c9bc70980ea3608a87898ad5aeb73d1be2
--- a/app-office/koffice-l10n/koffice-l10n-2.3.3.ebuild
+++ b/app-office/koffice-l10n/koffice-l10n-2.3.3.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-l10n/koffice-l10n-2.3.3.ebuild,v 1.3 2011/05/09 23:12:35 hwoarang Exp $
-
-EAPI=3
-
-inherit kde4-base
-
-DESCRIPTION="KOffice localization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND=""
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc"
-
-MY_LANGS="ca ca@valencia da de el en_GB es et fr gl hu it ja kk nb nds nl pl pt pt_BR
-	ru sv tr uk wa zh_CN zh_TW"
-URI_BASE="mirror://kde/stable/koffice-${PV}/${PN}/"
-SRC_URI=""
-SLOT="2"
-
-# special case for 2.3.3: l10n files are named 2.3.2, no change
-MY_PV="2.3.2"
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${MY_PV}.tar.bz2 )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local lng dir
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for lng in ${MY_LANGS}; do
-			dir="${PN}-${lng}-${MY_PV}"
-			if [[ -d "${dir}" ]] ; then
-				echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs
-
-	mycmakeargs="${mycmakeargs} -DBUILD_MESSAGES=ON -DBUILD_DATA=ON
-		$(cmake-utils_use_build doc)"
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}
--- a/app-office/koffice-libs/Manifest
+++ b/app-office/koffice-libs/Manifest
@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
--- a/app-office/koffice-libs/files/koffice-libs-2.3.3-qt48.patch
+++ b/app-office/koffice-libs/files/koffice-libs-2.3.3-qt48.patch
@ -1,42 +0,0 @@
-From accabfeac22e869e5a248a764a64096d107e4c7c Mon Sep 17 00:00:00 2001
-From: Michael Jansen <kde@michael-jansen.biz>
-Date: Mon, 11 Jul 2011 00:27:38 +0200
-Subject: [PATCH] Fix build with QT 4.8.
-
-KDChartBackgroundAttributes.cpp:153:26: error: ambiguous overload for 'operator<<' in '((QDebug*)((QDebug*)operator<<(QDebug, const QBrush&)(((const QBrush&)((const QBrush*)(& KDChart::BackgroundAttributes::brush() const())))).QDebug::operator<<(((const char*)"pixmapmode=")))->QDebug::operator<<(((int)((const KDChart::BackgroundAttributes*)ba)->KDChart::BackgroundAttributes::pixmapMode())))->QDebug::operator<<(((const char*)"pixmap=")) << KDChart::BackgroundAttributes::pixmap() const()'
-
-It does not know if it should convert QPixmap to QVariant or QBrush before dumping it into
-qDebug(). It happens because with qt4.8 qvariant is included implictely with klocale.h over
-qlocale.h. Which was not the case before qt4.8.
-
-Related:     QTBUG-19764: Please add QDebug operator for QPixmap
---
- .../kdchart/src/KDChartBackgroundAttributes.cpp    |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp b/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp
-index 2dc4974..9f2990a 100644
--- a/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp
-+++ b/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp
-@@ -22,6 +22,9 @@
- 
- #include "KDChartBackgroundAttributes.h"
- #include <QPixmap>
-+#if !defined(QT_NO_DEBUG_STREAM)
-+#include <QVariant>
-+#endif
- 
- #include <KDABLibFakes>
- 
-@@ -150,7 +153,7 @@ QDebug operator<<(QDebug dbg, const KDChart::BackgroundAttributes& ba)
- 	<< "visible="<<ba.isVisible()
- 	<< "brush="<<ba.brush()
- 	<< "pixmapmode="<<ba.pixmapMode()
-	<< "pixmap="<<ba.pixmap()
-+	<< "pixmap="<<QVariant(ba.pixmap())
- 	<< ")";
-     return dbg;
- }
-- 
-1.7.3.4
-
--- a/app-office/koffice-libs/koffice-libs-2.3.3-r1.ebuild
+++ b/app-office/koffice-libs/koffice-libs-2.3.3-r1.ebuild
@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-2.3.3-r1.ebuild,v 1.4 2011/10/01 03:21:29 phajdan.jr Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="libs"
-OPENGL_REQUIRED="optional"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Shared KOffice libraries"
-KEYWORDS="amd64 x86"
-IUSE="crypt openexr reports"
-
-RDEPEND="
-	>=app-office/koffice-data-${PV}:${SLOT}
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/soprano
-	$(add_kdebase_dep kdepimlibs)
-	media-libs/lcms:0
-	crypt? ( app-crypt/qca:2 )
-	openexr? ( media-libs/openexr )
-	opengl? ( media-libs/mesa )
-	!app-office/kchart
-"
-DEPEND="${RDEPEND}"
-#	doc? ( app-doc/doxygen )"
-
-KMEXTRA="
-	doc/koffice/
-	doc/thesaurus/
-	filters/generic_wrapper/
-	filters/libkowmf/
-	filters/libmsooxml/
-	filters/xsltfilter/
-	filters/kchart/
-	filters/kformula/
-	interfaces/
-	kchart/
-	kformula/
-	kounavail/
-	plugins/
-	tools/
-"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	doc/koffice.desktop
-	filters/
-"
-
-KMSAVELIBS="true"
-
-RESTRICT=test
-# bug 385025
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		-DWITH_Spnav=OFF
-		-DBUILD_kchart=ON
-		-DBUILD_kformula=ON
-		$(cmake-utils_use_build reports koreport)
-	)
-	use crypt && \
-		mycmakeargs+=(-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	newdoc kounavail/README README.kounavail || die
-
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-
-	# this is not useful and only leads to error messages, bug 381955
-	rm -f "${D}/usr/share/applications/kde4/koffice.desktop"
-}
--- a/app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild
+++ b/app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild,v 1.1 2012/02/07 21:10:50 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="libs"
-OPENGL_REQUIRED="optional"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Shared KOffice libraries"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt openexr reports"
-
-RDEPEND="
-	>=app-office/koffice-data-${PV}:${SLOT}
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/soprano
-	$(add_kdebase_dep kdepimlibs)
-	media-libs/lcms:0
-	crypt? ( app-crypt/qca:2 )
-	openexr? ( media-libs/openexr )
-	opengl? ( media-libs/mesa )
-	!app-office/kchart
-"
-DEPEND="${RDEPEND}"
-#	doc? ( app-doc/doxygen )"
-
-KMEXTRA="
-	doc/koffice/
-	doc/thesaurus/
-	filters/generic_wrapper/
-	filters/libkowmf/
-	filters/libmsooxml/
-	filters/xsltfilter/
-	filters/kchart/
-	filters/kformula/
-	interfaces/
-	kchart/
-	kformula/
-	kounavail/
-	plugins/
-	tools/
-"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	doc/koffice.desktop
-	filters/
-"
-
-KMSAVELIBS="true"
-
-RESTRICT=test
-# bug 385025
-
-PATCHES=( "${FILESDIR}/${P}-qt48.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		-DWITH_Spnav=OFF
-		-DBUILD_kchart=ON
-		-DBUILD_kformula=ON
-		$(cmake-utils_use_build reports koreport)
-	)
-	use crypt && \
-		mycmakeargs+=(-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	newdoc kounavail/README README.kounavail || die
-
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-
-	# this is not useful and only leads to error messages, bug 381955
-	rm -f "${D}/usr/share/applications/kde4/koffice.desktop"
-}
--- a/app-office/koffice-libs/metadata.xml
+++ b/app-office/koffice-libs/metadata.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-<flag name="reports">Enable the reports koffice module in kchart, also used by kplato and kexi</flag>
-</use>
-</pkgmetadata>
--- a/app-office/koffice-meta/koffice-meta-2.3.3.ebuild
+++ b/app-office/koffice-meta/koffice-meta-2.3.3.ebuild
@ -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-office/koffice-meta/koffice-meta-2.3.3.ebuild,v 1.3 2011/05/09 23:12:55 hwoarang Exp $
-
-EAPI=3
-
-DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages"
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2"
-
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE="nls reports"
-
-RDEPEND="
-	>=app-office/karbon-${PV}:${SLOT}
-	>=app-office/kexi-${PV}:${SLOT}
-	>=app-office/koffice-data-${PV}:${SLOT}
-	>=app-office/koffice-libs-${PV}:${SLOT}[reports?]
-	>=app-office/kpresenter-${PV}:${SLOT}
-	>=app-office/krita-${PV}:${SLOT}
-	>=app-office/kspread-${PV}:${SLOT}
-	>=app-office/kword-${PV}:${SLOT}
-	nls? ( >=app-office/koffice-l10n-${PV}:${SLOT} )
-	reports? ( >=app-office/kplato-${PV}:${SLOT} )
-	!app-office/kchart
-"
--- a/app-office/koffice-meta/metadata.xml
+++ b/app-office/koffice-meta/metadata.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd> 
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="reports">Enable the reports koffice module in kchart,
-		also used by kplato and kexi</flag>
-</use>
-</pkgmetadata>
--- a/app-office/kplato/Manifest
+++ b/app-office/kplato/Manifest
@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
--- a/app-office/kplato/kplato-2.3.3.ebuild
+++ b/app-office/kplato/kplato-2.3.3.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/kplato-2.3.3.ebuild,v 1.5 2012/04/03 20:00:55 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-VIRTUALX_REQUIRED=test
-inherit kde4-meta
-
-DESCRIPTION="KOffice project management application"
-
-KEYWORDS="amd64 x86"
-IUSE="python"
-
-DEPEND="~app-office/koffice-libs-${PV}:${SLOT}[reports]"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-	plugins/chartshape/kdchart
-"
-KMEXTRA="
-	filters/${KMMODULE}/
-	kdgantt/
-"
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with python PythonLibs)
-		-DBUILD_kplato=ON
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
--- a/app-office/kplato/metadata.xml
+++ b/app-office/kplato/metadata.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd> 
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-</pkgmetadata>
--- a/app-office/kpresenter/Manifest
+++ b/app-office/kpresenter/Manifest
@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
--- a/app-office/kpresenter/kpresenter-2.3.3.ebuild
+++ b/app-office/kpresenter/kpresenter-2.3.3.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-2.3.3.ebuild,v 1.3 2011/05/09 23:13:13 hwoarang Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice presentation program"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.35.0"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	filters/libmsooxml/
-	filters/kspread/xlsx/
-	libs/
-"
-KMEXTRA="
-	filters/${KMMODULE}/
-	filters/libmso/
-"
-
-KMLOADLIBS="koffice-libs"
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
--- a/app-office/kpresenter/metadata.xml
+++ b/app-office/kpresenter/metadata.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd> 
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-</pkgmetadata>
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
--- a/app-office/krita/files/krita-2.3.1-linkx11.patch
+++ b/app-office/krita/files/krita-2.3.1-linkx11.patch
@ -1,14 +0,0 @@
-diff -ruN krita-2.3.1.orig/krita/ui/CMakeLists.txt krita-2.3.1/krita/ui/CMakeLists.txt
--- krita-2.3.1.orig/krita/ui/CMakeLists.txt	2011-01-15 21:07:11.000000000 +0100
-+++ krita-2.3.1/krita/ui/CMakeLists.txt	2011-01-23 18:56:56.824000099 +0100
-@@ -216,6 +216,10 @@
- 
- target_link_libraries(kritaui ${KDE4_THREADWEAVER_LIBRARIES} kritaimage komain kowidgets ${PNG_LIBRARIES} ${EXIV2_LIBRARIES})
- 
-+IF(Q_WS_X11)
-+    TARGET_LINK_LIBRARIES(kritaui ${X11_LIBRARIES})
-+ENDIF(Q_WS_X11)
-+
- if(HAVE_OPENGL)
-     target_link_libraries(kritaui ${OPENGL_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${OPENEXR_LIBRARIES})
-     set (GL_INTERFACE_LIBRARIES ";${OPENGL_LIBRARIES};${QT_QTOPENGL_LIBRARY}")
--- a/app-office/krita/krita-2.3.3.ebuild
+++ b/app-office/krita/krita-2.3.3.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.3.3.ebuild,v 1.4 2011/08/08 21:04:33 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KOffice image manipulation program."
-
-KEYWORDS="amd64 x86"
-IUSE="gmm +kdcraw openexr +pdf +tiff"
-
-DEPEND="
-	>=app-office/koffice-libs-${PV}:${SLOT}[openexr=]
-	>=dev-cpp/eigen-2.0.3:2
-	>=media-libs/qimageblitz-0.0.4
-	>=media-gfx/exiv2-0.16
-	sci-libs/fftw:3.0
-	sys-devel/gcc[openmp]
-	gmm? ( sci-mathematics/gmm )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	opengl? ( media-libs/glew )
-	pdf? ( >=app-text/poppler-0.12.3-r3[qt4] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.3.1-linkx11.patch" )
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-"
-
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_Eigen2=ON
-		-DWITH_Exiv2=ON
-		-DWITH_FFTW3=ON
-		-DWITH_JPEG=ON
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with gmm)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with kdcraw)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with opengl GLEW)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
--- a/app-office/krita/metadata.xml
+++ b/app-office/krita/metadata.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="gmm">Enable library for sparse, dense and skyline matrices.</flag>
-	<flag name="kdcraw">Enable KDE image manipulating interface.</flag>
-</use>
-</pkgmetadata>
--- a/app-office/kspread/Manifest
+++ b/app-office/kspread/Manifest
@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
--- a/app-office/kspread/kspread-2.3.3.ebuild
+++ b/app-office/kspread/kspread-2.3.3.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-2.3.3.ebuild,v 1.3 2011/05/09 23:13:33 hwoarang Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice spreadsheet application"
-
-KEYWORDS="amd64 x86"
-IUSE="+solver"
-
-DEPEND="
-	dev-cpp/eigen:2
-	solver? ( sci-libs/gsl )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	kchart/
-	interfaces/
-	libs/
-	filters/
-	plugins/
-"
-KMEXTRA="filters/${KMMODULE}/
-	filters/libmso"
-
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_Eigen2=ON
-		$(cmake-utils_use_with solver GSL)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
--- a/app-office/kspread/metadata.xml
+++ b/app-office/kspread/metadata.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="solver">Use solver extension for solving lingebra and others.</flag>
-</use>
-</pkgmetadata>
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@ -1,2 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
-DIST kword-2.3.3-libwpg02.patch.bz2 9107 RMD160 0e6aa2afe288d692ee4cf569dd58451d329eaabc SHA1 c6c94c15d6b84e79a1369bf9314141ec57ecff7c SHA256 edf3187dc5f93bba7eac834a296baaee11a65d603a82b8d5544a16c916a9980e
--- a/app-office/kword/kword-2.3.3-r1.ebuild
+++ b/app-office/kword/kword-2.3.3-r1.ebuild
@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-2.3.3-r1.ebuild,v 1.6 2011/12/26 14:34:56 maekke Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice word processor"
-
-KEYWORDS="amd64 x86"
-IUSE="wpd"
-
-SRC_URI+=" http://dev.gentoo.org/~dilfridge/distfiles/kword-2.3.3-libwpg02.patch.bz2"
-
-DEPEND="
-	dev-libs/glib
-	gnome-extra/libgsf
-	wpd? ( app-text/libwpd )
-"
-RDEPEND="${DEPEND}
-	!app-text/wv2
-"
-
-PATCHES=( "${DISTDIR}/${PN}-2.3.3-libwpg02.patch.bz2" )
-
-KMEXTRA="filters/${KMMODULE}/
-	filters/libmso/
-"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	filters/
-	kspread/
-	libs/
-	plugins/
-"
-
-KMLOADLIBS="koffice-libs"
-
-RESTRICT="test"
-# bug 387791
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with wpd)
-		-DWITH_DCMTK=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
--- a/app-office/kword/kword-2.3.3.ebuild
+++ b/app-office/kword/kword-2.3.3.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-2.3.3.ebuild,v 1.4 2011/10/20 20:17:17 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice word processor"
-
-KEYWORDS="amd64 x86"
-IUSE="wpd"
-
-DEPEND="
-	wpd? ( app-text/libwpd )
-"
-RDEPEND="${DEPEND}
-	!app-text/wv2
-"
-
-KMEXTRA="filters/${KMMODULE}/
-	filters/libmso/
-"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	filters/
-	kspread/
-	libs/
-	plugins/
-"
-
-KMLOADLIBS="koffice-libs"
-
-RESTRICT="test"
-# bug 387791
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with wpd)
-		-DWITH_DCMTK=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
--- a/app-office/kword/metadata.xml
+++ b/app-office/kword/metadata.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="wpd">Build wordperfect document support.</flag>
-</use>
-</pkgmetadata>
--- a/app-text/kiwix/Manifest
+++ b/app-text/kiwix/Manifest
@ -1 +0,0 @@
-DIST kiwix-0.9-beta5-src.tar.bz2 3422705 RMD160 0997307c08fad60ca8d4e0ccc52dca8dc387d685 SHA1 7c9dd3d7c1f32544e837c80ce8057eff30caecff SHA256 5f9ff04e02114a95ca4849a8dc3cff91f54d01bc80ce9d2ca6dee1fcbba6a739
--- a/app-text/kiwix/kiwix-0.9_beta5.ebuild
+++ b/app-text/kiwix/kiwix-0.9_beta5.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kiwix/kiwix-0.9_beta5.ebuild,v 1.2 2012/05/04 03:33:15 jdhore Exp $
-
-EAPI=3
-
-inherit multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 2 -)-src"
-
-DESCRIPTION="A ZIM reader, especially for offline web content retrieved from Wikipedia"
-HOMEPAGE="http://www.kiwix.org/"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# No upgrade from 0.9_alpha possible, because a directory would be replaced
-# with a symlink, which PMS section 13.4 forbids. Bug #326685.
-RDEPEND="app-arch/xz-utils
-	=dev-cpp/clucene-0.9*
-	dev-lang/perl
-	dev-libs/icu
-	dev-libs/xapian
-	net-libs/libmicrohttpd
-	=net-libs/xulrunner-1.9*
-	>=net-misc/aria2-1.10
-	!!<app-text/kiwix-0.9_beta"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS CHANGELOG README || die
-}
--- a/app-text/pandoc/files/pandoc-1.9.4.1-file-enc.patch
+++ b/app-text/pandoc/files/pandoc-1.9.4.1-file-enc.patch
@ -0,0 +1,132 @@
+commit cc39c313c5eeedf8bc1693e0d80a510891a7fc4d
+Author: John MacFarlane <jgm@berkeley.edu>
+Date:   Fri Jun 22 21:24:02 2012 +0200
+
+    Don't encode/decode file paths if base >= 4.5.
+    
+    Prior to base 4.5 (and perhaps earlier - check), filepaths and command
+    line arguments were treated as unencoded lists of bytes, not unicode
+    strings, so we had to work around that by encoding and decoding
+    them.  This commit adds CPP checks for base 4.5 that disable the
+    encoding/decoding.
+    
+    Fixes a bug with multilingual filenames when pandoc was compiled
+    with ghc 7.4. Closes #540.
+
+Upstream-bug: https://github.com/jgm/pandoc/issues/540
+Reported-by: Nikolaj Sjujskij <sterkrig@myopera.com>
+diff --git a/src/Text/Pandoc/UTF8.hs b/src/Text/Pandoc/UTF8.hs
+index 4af1558..929bc3f 100644
+--- a/src/Text/Pandoc/UTF8.hs
+++ b/src/Text/Pandoc/UTF8.hs
+@@ -39,21 +39,25 @@ module Text.Pandoc.UTF8 ( readFile
+ 
+ where
+ 
+#if MIN_VERSION_base(4,5,0)
+#else
+import Codec.Binary.UTF8.String (encodeString)
+#endif
+
+ #if MIN_VERSION_base(4,2,0)
+ 
+ import System.IO hiding (readFile, writeFile, getContents,
+                           putStr, putStrLn, hPutStr, hPutStrLn, hGetContents)
+ import Prelude hiding (readFile, writeFile, getContents, putStr, putStrLn )
+-import Codec.Binary.UTF8.String (encodeString)
+ import qualified System.IO as IO
+ 
+ readFile :: FilePath -> IO String
+ readFile f = do
+-  h <- openFile (encodeString f) ReadMode
+  h <- openFile (encodePath f) ReadMode
+   hGetContents h
+ 
+ writeFile :: FilePath -> String -> IO ()
+-writeFile f s = withFile (encodeString f) WriteMode $ \h -> hPutStr h s
+writeFile f s = withFile (encodePath f) WriteMode $ \h -> hPutStr h s
+ 
+ getContents :: IO String
+ getContents = hGetContents stdin
+@@ -76,7 +80,6 @@ hGetContents h = hSetEncoding h utf8_bom >> IO.hGetContents h
+ #else
+ 
+ import qualified Data.ByteString as B
+-import Codec.Binary.UTF8.String (encodeString)
+ import Data.ByteString.UTF8 (toString, fromString)
+ import Prelude hiding (readFile, writeFile, getContents, putStr, putStrLn)
+ import System.IO (Handle)
+@@ -91,10 +94,10 @@ stripBOM s | bom `B.isPrefixOf` s = B.drop 3 s
+ stripBOM s = s
+ 
+ readFile :: FilePath -> IO String
+-readFile = liftM (toString . stripBOM) . B.readFile . encodeString
+readFile = liftM (toString . stripBOM) . B.readFile . encodePath
+ 
+ writeFile :: FilePath -> String -> IO ()
+-writeFile f = B.writeFile (encodeString f) . fromString
+writeFile f = B.writeFile (encodePath f) . fromString
+ 
+ getContents :: IO String
+ getContents = liftM (toString . stripBOM) B.getContents
+@@ -115,3 +118,10 @@ hPutStrLn :: Handle -> String -> IO ()
+ hPutStrLn h s = hPutStr h (s ++ "\n")
+ 
+ #endif
+
+encodePath :: FilePath -> FilePath
+#if MIN_VERSION_base(4,5,0)
+encodePath = id
+#else
+encodePath = encodeString
+#endif
+diff --git a/src/pandoc.hs b/src/pandoc.hs
+index 34d136a..7e9646c 100644
+--- a/src/pandoc.hs
+++ b/src/pandoc.hs
+@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
+ {-
+ Copyright (C) 2006-2012 John MacFarlane <jgm@berkeley.edu>
+ 
+@@ -56,8 +57,21 @@ import Network.HTTP (simpleHTTP, mkRequest, getResponseBody, RequestMethod(..))
+ import Network.URI (parseURI, isURI, URI(..))
+ import qualified Data.ByteString.Lazy as B
+ import Data.ByteString.Lazy.UTF8 (toString )
+-import Codec.Binary.UTF8.String (decodeString, encodeString)
+ import Text.CSL.Reference (Reference(..))
+#if MIN_VERSION_base(4,5,0)
+#else
+import Codec.Binary.UTF8.String (decodeString, encodeString)
+#endif
+
+encodePath, decodeArg :: FilePath -> FilePath
+#if MIN_VERSION_base(4,5,0)
+encodePath = id
+decodeArg  = id
+#else
+encodePath = encodeString
+decodeArg  = decodeString
+#endif
+
+ 
+ copyrightMessage :: String
+ copyrightMessage = "\nCopyright (C) 2006-2012 John MacFarlane\n" ++
+@@ -745,7 +759,7 @@ defaultWriterName x =
+ main :: IO ()
+ main = do
+ 
+-  rawArgs <- liftM (map decodeString) getArgs
+  rawArgs <- liftM (map decodeArg) getArgs
+   prg <- getProgName
+   let compatMode = (prg == "hsmarkdown")
+ 
+@@ -1023,7 +1037,7 @@ main = do
+              else return doc1
+ 
+   let writeBinary :: B.ByteString -> IO ()
+-      writeBinary = B.writeFile (encodeString outputFile)
+      writeBinary = B.writeFile (encodePath outputFile)
+ 
+   let writerFn :: FilePath -> String -> IO ()
+       writerFn "-" = UTF8.putStr
--- a/app-text/pandoc/pandoc-1.9.4.1-r1.ebuild
+++ b/app-text/pandoc/pandoc-1.9.4.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.9.4.1.ebuild,v 1.1 2012/06/22 20:04:23 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.9.4.1-r1.ebuild,v 1.1 2012/06/24 11:38:18 slyfox Exp $

 EAPI=4

@ -17,6 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="test" # missing files in tarball

 RDEPEND="=dev-haskell/base64-bytestring-0.1*[profile?]
 		=dev-haskell/blaze-html-0.5*[profile?]
@ -64,7 +65,9 @@ DEPEND="${RDEPEND}
 			dev-haskell/test-framework[profile?]
 		)"

-PATCHES=("${FILESDIR}/${PN}-1.9.4.1-ghc-7.5.patch")
+PATCHES=("${FILESDIR}/${PN}-1.9.4.1-ghc-7.5.patch"
+	"${FILESDIR}/${PN}-1.9.4.1-file-enc.patch"
+	)

 src_configure() {
 	cabal_src_configure \
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@ -1,5 +1,5 @@
 DIST xournal-0.4.5_p20111022-r2-patchset.tar.xz 35776 RMD160 a166eb7d6ba7aecce8161d3c9c5d7566d9c3dede SHA1 29cab6debcd2228a70adcffa4c920db50c8ba9db SHA256 4375f116ff82cae1e9497f1b76797a519319bf4012d4aa1262caee75406aeea4
-DIST xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz 21551 RMD160 6048a996fdb7b43e05beff67cf5ae0da53cff840 SHA1 0ff950726a7ad5b0012421c158406d6d49d2c38d SHA256 88b050483fc27f37f307adb358b3e5c4bfc0b600b7d3427599dea4c1ffe87fc2
 DIST xournal-0.4.5_p20111022.tar.xz 332700 RMD160 6578c037ad536c0173c533758c5f86ffc046dfbe SHA1 69f66e1125ba3de3deea14be1eb6d7e8f07abe61 SHA256 46573706645a78f1cbdd9e3eed0b2409ab61947eb5f78be9c1b7d7e4535f721f
 DIST xournal-0.4.6-gentoo.patch.xz 32720 RMD160 4cab7d7580d98ae9186fa39ab7ced7b9975ca15a SHA1 349acbf691b3c72a64defbffb2fb2f9baf203a7f SHA256 e8f03410cb1e31b50cac3b646fc5670f349f7ebc68854a481e2046de71ce38bf
+DIST xournal-0.4.6-r1-gentoo.patch.xz 40772 RMD160 a67ef0dc0118ee96e7876bc35fa6c8d7c58906b9 SHA1 bd1b53601dc8a5da3cc34b76746daa06a0a41a64 SHA256 96eb1cab0c6f18aaec0d90acb91c3a50e9c6a97c50f33c455ef11d9582b16f17
 DIST xournal-0.4.6.tar.xz 335128 RMD160 76ce8b2ac642c8a61dc22d821c0830b86c85cdb7 SHA1 7ad0654ed0c96ee874d6bcbb04c66413066a8a2e SHA256 4310fe579b8e99a66c40ba923fe0dce2e8543ad69c7660a01a675637970057d3
--- a/app-text/xournal/files/xournal-0.4.5_p20111022-aspectratio.patch
+++ b/app-text/xournal/files/xournal-0.4.5_p20111022-aspectratio.patch
@ -1,74 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3082301&group_id=163434&atid=827735
-To make the image patch even more useful, I've written this patch to allow the aspect ratio 
-to be preserved when resizing selections. (It doesn't just apply to images.) Simply resize using the right 
-mouse button (button-3) rather than the left mouse button.
-This patch should be applied after the enhanced image patch. (Though it'd be easy enough to make the
-changes to the raw 0.4.5 source directly since it doesn't change any of the image patch related areas.)
-David Barton ( db9052 ) - 2010-10-06 09:30:56 PDT
-
-diff -ur xournal-0.4.5/src/xo-paint.c xournal-0.4.5-aspectratio/src/xo-paint.c
--- xournal-0.4.5/src/xo-paint.c	2010-10-06 16:45:01.000000000 +0100
-+++ xournal-0.4.5-aspectratio/src/xo-paint.c	2010-10-06 17:10:19.000000000 +0100
-@@ -609,6 +609,12 @@
-     ui.selection->new_x2 = ui.selection->bbox.right;
-     gnome_canvas_item_set(ui.selection->canvas_item, "dash", NULL, NULL);
-     update_cursor_for_resize(pt);
-+
-+    // Check whether we should preserve the aspect ratio
-+    if (event->button.button == 3)
-+    	ui.cur_brush->tool_options |= TOOLOPT_SELECT_PRESERVE;
-+    else
-+    	ui.cur_brush->tool_options &= ~TOOLOPT_SELECT_PRESERVE;
-     return TRUE;
-   }
-   return FALSE;
-@@ -740,6 +746,38 @@
-   if (ui.selection->resizing_left) ui.selection->new_x1 = pt[0];
-   if (ui.selection->resizing_right) ui.selection->new_x2 = pt[0];
- 
-+  if (ui.cur_brush->tool_options & TOOLOPT_SELECT_PRESERVE) {
-+	  double aspectratio = (ui.selection->bbox.top - ui.selection->bbox.bottom)/(ui.selection->bbox.right - ui.selection->bbox.left);
-+	  double newheight = ui.selection->new_y1 - ui.selection->new_y2;
-+	  double newwidth = ui.selection->new_x2 - ui.selection->new_x1;
-+	  gboolean boundheight;
-+
-+	  // Resizing from top or bottom only
-+	  if ((ui.selection->resizing_top || ui.selection->resizing_bottom) && !(ui.selection->resizing_left || ui.selection->resizing_right))
-+		  boundheight = 0;
-+	  // Resizing from right or left only
-+	  else if (!(ui.selection->resizing_top || ui.selection->resizing_bottom) && (ui.selection->resizing_left || ui.selection->resizing_right))
-+		  boundheight = 1;
-+	  // Resizing from a corner
-+	  else if (newheight/aspectratio > newwidth)
-+		  boundheight = 0;
-+	  else
-+		  boundheight = 1;
-+
-+	  if (boundheight) {
-+		  // Bound the height
-+		  newheight = newwidth*aspectratio;
-+		  if (ui.selection->resizing_top) ui.selection->new_y1 = ui.selection->new_y2 + newheight;
-+		  else ui.selection->new_y2 = ui.selection->new_y1 - newheight;
-+	  }
-+	  else {
-+		  // Bound the width
-+		  newwidth = newheight/aspectratio;
-+		  if (ui.selection->resizing_left) ui.selection->new_x1 = ui.selection->new_x2 - newwidth;
-+		  else ui.selection->new_x2 = ui.selection->new_x1 + newwidth;
-+	  }
-+  }
-+
-   gnome_canvas_item_set(ui.selection->canvas_item, 
-     "x1", ui.selection->new_x1, "x2", ui.selection->new_x2,
-     "y1", ui.selection->new_y1, "y2", ui.selection->new_y2, NULL);
-diff -ur xournal-0.4.5/src/xournal.h xournal-0.4.5-aspectratio/src/xournal.h
--- xournal-0.4.5/src/xournal.h	2010-10-06 16:45:01.000000000 +0100
-+++ xournal-0.4.5-aspectratio/src/xournal.h	2010-10-06 16:31:07.000000000 +0100
-@@ -130,6 +130,7 @@
- #define TOOLOPT_ERASER_STANDARD     0
- #define TOOLOPT_ERASER_WHITEOUT     1
- #define TOOLOPT_ERASER_STROKES      2
-+#define TOOLOPT_SELECT_PRESERVE     1 // Preserve the aspect ratio of the selection when resizing
- 
- extern double predef_thickness[NUM_STROKE_TOOLS][THICKNESS_MAX];
- 
--- a/app-text/xournal/files/xournal-0.4.5_p20111022-gtk-recent.patch
+++ b/app-text/xournal/files/xournal-0.4.5_p20111022-gtk-recent.patch
@ -1,347 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3249971&group_id=163434&atid=827735
-When using GtkRecent for the management of recently used files, Xournal's recently used 
-files also appear in the shell. That's very convenient for the new document-centric shells 
-such as Gnome Shell and Unity.
-Timo Kluck ( tkluck ) - 2011-03-27 10:40:08 PDT
-
-=== modified file 'src/main.c'
--- src/main.c	2011-03-10 18:14:21 +0000
-+++ src/main.c	2011-03-27 16:32:52 +0000
-@@ -334,7 +334,6 @@
-   
-   if (bgpdf.status != STATUS_NOT_INIT) shutdown_bgpdf();
- 
-  save_mru_list();
-   if (ui.auto_save_prefs) save_config_to_file();
-   
-   return 0;
-
-=== modified file 'src/xo-callbacks.c'
--- src/xo-callbacks.c	2011-03-10 18:14:21 +0000
-+++ src/xo-callbacks.c	2011-03-27 16:32:52 +0000
-@@ -3101,32 +3101,36 @@
- 
- 
- void
-on_mru_activate                        (GtkMenuItem     *menuitem,
-+on_mru_activate                        (GtkRecentChooser *recentChooser,
-                                         gpointer         user_data)
- {
-  int which;
-   gboolean success;
-+  gchar *uri, *name;
-   GtkWidget *dialog;
-   
-   end_text();
-   if (!ok_to_close()) return; // user aborted on save confirmation
-   
-  for (which = 0 ; which < MRU_SIZE; which++) {
-    if (ui.mrumenu[which] == GTK_WIDGET(menuitem)) break;
-  }
-  if (which == MRU_SIZE || ui.mru[which] == NULL) return; // not found...
-
-+  uri = gtk_recent_chooser_get_current_uri (recentChooser);
-+  name = g_filename_from_uri (uri, NULL, NULL);
-   set_cursor_busy(TRUE);
-  success = open_journal(ui.mru[which]);
-+  success = open_journal(name);
-   set_cursor_busy(FALSE);
-  if (success) return;
-+  if (success) {
-+    g_free(uri);
-+    g_free(name);
-+    return;
-+  }
- 
-   /* open failed */
-   dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
-    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), ui.mru[which]);
-+    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), name);
-   gtk_dialog_run(GTK_DIALOG(dialog));
-   gtk_widget_destroy(dialog);
-  delete_mru_entry(which);
-+
-+  delete_mru_entry(name);
-+  g_free(uri);
-+  g_free(name);
- }
- 
- 
-
-=== modified file 'src/xo-callbacks.h'
--- src/xo-callbacks.h	2011-03-10 18:14:21 +0000
-+++ src/xo-callbacks.h	2011-03-27 16:32:52 +0000
-@@ -481,7 +481,7 @@
-                                         gpointer         user_data);
- 
- void
-on_mru_activate                        (GtkMenuItem     *menuitem,
-+on_mru_activate                        (GtkRecentChooser *recentChooser,
-                                         gpointer         user_data);
- 
- void
-
-=== modified file 'src/xo-file.c'
--- src/xo-file.c	2011-03-10 18:14:21 +0000
-+++ src/xo-file.c	2011-03-27 17:09:20 +0000
-@@ -1211,99 +1211,53 @@
-   }
- }
- 
-// initialize the recent files list
-+// initialize GtkRecentManager. Also backwards compatibility: import recent files into GtkRecentManager
- void init_mru(void)
- {
-  int i;
-+  GtkRecentFilter *recentFilter = gtk_recent_filter_new ();
-+  gtk_recent_filter_add_application ( recentFilter, "xournal");
-+  gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (GET_COMPONENT("fileRecentFiles_menu")), recentFilter);
-+
-   gsize lfptr;
-  char s[5];
-   GIOChannel *f;
-  gchar *str;
-+  gchar *str, *uri;
-   GIOStatus status;
-+  GtkRecentManager *recentManager = gtk_recent_manager_get_default ();
-   
-  g_strlcpy(s, "mru0", 5);
-  for (s[3]='0', i=0; i<MRU_SIZE; s[3]++, i++) {
-    ui.mrumenu[i] = GET_COMPONENT(s);
-    ui.mru[i] = NULL;
-  }
-   f = g_io_channel_new_file(ui.mrufile, "r", NULL);
-   if (f) status = G_IO_STATUS_NORMAL;
-   else status = G_IO_STATUS_ERROR;
-  i = 0;
-  while (status == G_IO_STATUS_NORMAL && i<MRU_SIZE) {
-+  while (status == G_IO_STATUS_NORMAL) {
-     lfptr = 0;
-     status = g_io_channel_read_line(f, &str, NULL, &lfptr, NULL);
-     if (status == G_IO_STATUS_NORMAL && lfptr>0) {
-       str[lfptr] = 0;
-      ui.mru[i] = str;
-      i++;
-+      uri = g_filename_to_uri (str, NULL, NULL);
-+      gtk_recent_manager_add_item (recentManager, uri);
-+      g_free(uri);
-+      g_free(str);
-     }
-   }
-   if (f) {
-     g_io_channel_shutdown(f, FALSE, NULL);
-     g_io_channel_unref(f);
-   }
-  update_mru_menu();
-}
-
-void update_mru_menu(void)
-{
-  int i;
-  gboolean anyone = FALSE;
-  gchar *tmp;
-   
-  for (i=0; i<MRU_SIZE; i++) {
-    if (ui.mru[i]!=NULL) {
-      tmp = g_strdup_printf("_%d %s", i+1,
-               g_strjoinv("__", g_strsplit_set(g_basename(ui.mru[i]),"_",-1)));
-      gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(ui.mrumenu[i]))),
-          tmp);
-      g_free(tmp);
-      gtk_widget_show(ui.mrumenu[i]);
-      anyone = TRUE;
-    }
-    else gtk_widget_hide(ui.mrumenu[i]);
-  }
-  gtk_widget_set_sensitive(GET_COMPONENT("fileRecentFiles"), anyone);
-+  g_unlink (ui.mrufile);
- }
- 
- void new_mru_entry(char *name)
- {
-  int i, j;
-  
-  for (i=0;i<MRU_SIZE;i++) 
-    if (ui.mru[i]!=NULL && !strcmp(ui.mru[i], name)) {
-      g_free(ui.mru[i]);
-      for (j=i+1; j<MRU_SIZE; j++) ui.mru[j-1] = ui.mru[j];
-      ui.mru[MRU_SIZE-1]=NULL;
-    }
-  if (ui.mru[MRU_SIZE-1]!=NULL) g_free(ui.mru[MRU_SIZE-1]);
-  for (j=MRU_SIZE-1; j>=1; j--) ui.mru[j] = ui.mru[j-1];
-  ui.mru[0] = g_strdup(name);
-  update_mru_menu();
-}
-
-void delete_mru_entry(int which)
-{
-  int i;
-  
-  if (ui.mru[which]!=NULL) g_free(ui.mru[which]);
-  for (i=which+1;i<MRU_SIZE;i++) 
-    ui.mru[i-1] = ui.mru[i];
-  ui.mru[MRU_SIZE-1] = NULL;
-  update_mru_menu();
-}
-
-void save_mru_list(void)
-{
-  FILE *f;
-  int i;
-  
-  f = fopen(ui.mrufile, "w");
-  if (f==NULL) return;
-  for (i=0; i<MRU_SIZE; i++)
-    if (ui.mru[i]!=NULL) fprintf(f, "%s\n", ui.mru[i]);
-  fclose(f);
-+  gchar *uri = g_filename_to_uri (name, NULL, NULL);
-+  gtk_recent_manager_add_item (gtk_recent_manager_get_default(), uri);
-+  g_free(uri);
-+}
-+
-+void delete_mru_entry(char *name)
-+{
-+  gchar *uri = g_filename_to_uri(name, NULL, NULL);
-+  gtk_recent_manager_remove_item(gtk_recent_manager_get_default(), uri, NULL);
-+  g_free(uri);
- }
- 
- void init_config_default(void)
-
-=== modified file 'src/xo-file.h'
--- src/xo-file.h	2011-03-10 18:14:21 +0000
-+++ src/xo-file.h	2011-03-27 16:32:52 +0000
-@@ -28,10 +28,8 @@
- void bgpdf_update_bg(int pageno, struct BgPdfPage *bgpg);
- 
- void init_mru(void);
-void update_mru_menu(void);
- void new_mru_entry(char *name);
-void delete_mru_entry(int which);
-void save_mru_list(void);
-+void delete_mru_entry(char *name);
- 
- void init_config_default(void);
- void load_config_from_file(void);
-
-=== modified file 'src/xo-interface.c'
--- src/xo-interface.c	2011-03-10 18:14:21 +0000
-+++ src/xo-interface.c	2011-03-27 17:09:20 +0000
-@@ -43,14 +43,6 @@
-   GtkWidget *separator1;
-   GtkWidget *fileRecentFiles;
-   GtkWidget *fileRecentFiles_menu;
-  GtkWidget *mru0;
-  GtkWidget *mru1;
-  GtkWidget *mru2;
-  GtkWidget *mru3;
-  GtkWidget *mru4;
-  GtkWidget *mru5;
-  GtkWidget *mru6;
-  GtkWidget *mru7;
-   GtkWidget *separator22;
-   GtkWidget *filePrintOptions;
-   GtkWidget *image624;
-@@ -397,41 +389,9 @@
-   gtk_widget_show (fileRecentFiles);
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), fileRecentFiles);
- 
-  fileRecentFiles_menu = gtk_menu_new ();
-+  fileRecentFiles_menu = gtk_recent_chooser_menu_new_for_manager (gtk_recent_manager_get_default ());
-   gtk_menu_item_set_submenu (GTK_MENU_ITEM (fileRecentFiles), fileRecentFiles_menu);
-
-  mru0 = gtk_menu_item_new_with_mnemonic (_("0"));
-  gtk_widget_show (mru0);
-  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru0);
-
-  mru1 = gtk_menu_item_new_with_mnemonic (_("1"));
-  gtk_widget_show (mru1);
-  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru1);
-
-  mru2 = gtk_menu_item_new_with_mnemonic (_("2"));
-  gtk_widget_show (mru2);
-  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru2);
-
-  mru3 = gtk_menu_item_new_with_mnemonic (_("3"));
-  gtk_widget_show (mru3);
-  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru3);
-
-  mru4 = gtk_menu_item_new_with_mnemonic (_("4"));
-  gtk_widget_show (mru4);
-  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru4);
-
-  mru5 = gtk_menu_item_new_with_mnemonic (_("5"));
-  gtk_widget_show (mru5);
-  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru5);
-
-  mru6 = gtk_menu_item_new_with_mnemonic (_("6"));
-  gtk_widget_show (mru6);
-  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru6);
-
-  mru7 = gtk_menu_item_new_with_mnemonic (_("7"));
-  gtk_widget_show (mru7);
-  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru7);
-
-+    
-   separator22 = gtk_separator_menu_item_new ();
-   gtk_widget_show (separator22);
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), separator22);
-@@ -1967,28 +1927,7 @@
-   g_signal_connect ((gpointer) fileSaveAs, "activate",
-                     G_CALLBACK (on_fileSaveAs_activate),
-                     NULL);
-  g_signal_connect ((gpointer) mru0, "activate",
-                    G_CALLBACK (on_mru_activate),
-                    NULL);
-  g_signal_connect ((gpointer) mru1, "activate",
-                    G_CALLBACK (on_mru_activate),
-                    NULL);
-  g_signal_connect ((gpointer) mru2, "activate",
-                    G_CALLBACK (on_mru_activate),
-                    NULL);
-  g_signal_connect ((gpointer) mru3, "activate",
-                    G_CALLBACK (on_mru_activate),
-                    NULL);
-  g_signal_connect ((gpointer) mru4, "activate",
-                    G_CALLBACK (on_mru_activate),
-                    NULL);
-  g_signal_connect ((gpointer) mru5, "activate",
-                    G_CALLBACK (on_mru_activate),
-                    NULL);
-  g_signal_connect ((gpointer) mru6, "activate",
-                    G_CALLBACK (on_mru_activate),
-                    NULL);
-  g_signal_connect ((gpointer) mru7, "activate",
-+  g_signal_connect ((gpointer) fileRecentFiles_menu, "item-activated",
-                     G_CALLBACK (on_mru_activate),
-                     NULL);
-   g_signal_connect ((gpointer) filePrintOptions, "activate",
-@@ -2520,14 +2459,6 @@
-   GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1");
-   GLADE_HOOKUP_OBJECT (winMain, fileRecentFiles, "fileRecentFiles");
-   GLADE_HOOKUP_OBJECT (winMain, fileRecentFiles_menu, "fileRecentFiles_menu");
-  GLADE_HOOKUP_OBJECT (winMain, mru0, "mru0");
-  GLADE_HOOKUP_OBJECT (winMain, mru1, "mru1");
-  GLADE_HOOKUP_OBJECT (winMain, mru2, "mru2");
-  GLADE_HOOKUP_OBJECT (winMain, mru3, "mru3");
-  GLADE_HOOKUP_OBJECT (winMain, mru4, "mru4");
-  GLADE_HOOKUP_OBJECT (winMain, mru5, "mru5");
-  GLADE_HOOKUP_OBJECT (winMain, mru6, "mru6");
-  GLADE_HOOKUP_OBJECT (winMain, mru7, "mru7");
-   GLADE_HOOKUP_OBJECT (winMain, separator22, "separator22");
-   GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions");
-   GLADE_HOOKUP_OBJECT (winMain, image624, "image624");
-
-=== modified file 'src/xournal.h'
--- src/xournal.h	2011-03-10 18:14:21 +0000
-+++ src/xournal.h	2011-03-27 16:32:52 +0000
-@@ -257,8 +257,6 @@
-   GdkCursor *cursor;
-   gboolean progressive_bg; // update PDF bg's one at a time
-   char *mrufile, *configfile; // file names for MRU & config
-  char *mru[MRU_SIZE]; // MRU data
-  GtkWidget *mrumenu[MRU_SIZE];
-   gboolean bg_apply_all_pages;
-   int window_default_width, window_default_height, scrollbar_step_increment;
-   gboolean print_ruling; // print the paper ruling ?
-
--- a/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch
+++ b/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch
@ -0,0 +1,10 @@
+diff -ruN xournal-0.4.5_p20111022.orig/src/Makefile.am xournal-0.4.5_p20111022/src/Makefile.am
+--- xournal-0.4.5_p20111022.orig/src/Makefile.am	2012-06-24 12:57:21.453958621 +0200
+++ xournal-0.4.5_p20111022/src/Makefile.am	2012-06-24 12:58:07.696957705 +0200
+@@ -30,5 +30,5 @@
+   xournal_LDFLAGS = -mwindows
+   xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
+ else
+-  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz
+  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm
+ endif
--- a/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch
+++ b/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch
@ -1,24 +0,0 @@
-From 619691e135630c79f45e61a4126804c51ea52d42 Mon Sep 17 00:00:00 2001
-From: Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
-Date: Mon, 28 Nov 2011 23:36:16 +0100
-Subject: [PATCH] Add xournal_0.4.5-3.debian patch 1 (add_ldflags), should fix Gentoo bug 372119
-
---
- src/Makefile.am |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ba52740..3dea178 100644
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -30,6 +30,5 @@ if WIN32
-   xournal_LDFLAGS = -mwindows
-   xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
- else
-  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS)
-+  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz
- endif
-
-- 
-1.7.3.4
-
--- a/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild
+++ b/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild,v 1.4 2012/06/18 18:40:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild,v 1.5 2012/06/24 11:03:29 dilfridge Exp $

 EAPI=4

@ -40,7 +40,9 @@ DEPEND="${COMMONDEPEND}

 src_prepare() {
 	epatch "${WORKDIR}"/0*.patch
+	epatch "${FILESDIR}/${P}-underlinking-2.patch"
 	sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
+	rm -f "${S}/aclocal.m4"  # bug 423285
 	eautoreconf
 }

--- a/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild
@ -1,21 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild,v 1.6 2012/05/04 03:33:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.6-r1.ebuild,v 1.1 2012/06/24 11:08:44 dilfridge Exp $

 EAPI=4

 GCONF_DEBUG=no

-inherit base gnome2 autotools
+inherit gnome2 autotools

 DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
 HOMEPAGE="http://xournal.sourceforge.net/"

-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${P}-sjg-image-rev7.patch.gz"
+SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz"
 LICENSE="GPL-2"

 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+pdf"

 COMMONDEPEND="
@ -38,15 +38,9 @@ DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 "

-PATCHES=(
-	"${DISTDIR}"/${P}-sjg-image-rev7.patch.gz
-	"${FILESDIR}"/${P}-gtk-recent.patch
-	"${FILESDIR}"/${P}-aspectratio.patch
-	"${FILESDIR}"/${P}-underlinking.patch
-)
-
 src_prepare() {
-	base_src_prepare
+	epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch
+	sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
 	eautoreconf
 }

--- a/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
+++ b/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
@ -12,15 +12,19 @@ diff --git a/Makefile.am b/Makefile.am
 index 82ef261..e17fa5f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -421,7 +421,7 @@ else
+@@ -421,8 +421,10 @@ else
 ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
 endif
 
 -if HAS_PAX
+-ICEDTEA_PATCHES += patches/no-test_gamma.patch
 +if WITH_PAX
- ICEDTEA_PATCHES += patches/no-test_gamma.patch
+ICEDTEA_PATCHES += \
+	patches/no-test_gamma.patch \
+	patches/pax-mark-rmic-java.patch
 endif
 
+ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
@@ -450,7 +450,7 @@ ICEDTEA_ECJ_PATCHES += patches/ecj/cp40188-opengl.patch
 endif
 endif
@ -141,3 +145,19 @@ index 0000000..bdff735
 +               @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
 +       done
 +fi
+diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
+new file mode 100644
+index 0000000..ad80f3a
+--- /dev/null
+++ b/patches/pax-mark-rmic-java.patch
+@@ -0,0 +1,10 @@
+--- openjdk/jdk/make/com/sun/jmx/Makefile
++++ openjdk/jdk/make/com/sun/jmx/Makefile
+@@ -119,6 +119,7 @@
+ 
+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
+ 	$(prep-target)
++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
+                 -d $(CLASSDESTDIR)              \
+                 -v1.2                           \
--- a/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch
+++ b/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch
@ -0,0 +1,31 @@
+diff --git a/Makefile.am b/Makefile.am
+index 49d8bc4..85ac971 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
+ endif
+ 
+ if WITH_PAX
+-ICEDTEA_PATCHES += patches/test_gamma.patch
+ICEDTEA_PATCHES += \
+	patches/test_gamma.patch \
+	patches/pax-mark-rmic-java.patch
+ endif
+ 
+ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
+diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
+new file mode 100644
+index 0000000..ad80f3a
+--- /dev/null
+++ b/patches/pax-mark-rmic-java.patch
+@@ -0,0 +1,10 @@
+--- openjdk/jdk/make/com/sun/jmx/Makefile
++++ openjdk/jdk/make/com/sun/jmx/Makefile
+@@ -119,6 +119,7 @@
+ 
+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
+ 	$(prep-target)
++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
+                 -d $(CLASSDESTDIR)              \
+                 -v1.2                           \
--- a/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch
+++ b/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch
@ -0,0 +1,31 @@
+diff --git a/Makefile.am b/Makefile.am
+index 49d8bc4..85ac971 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
+ endif
+ 
+ if WITH_PAX
+-ICEDTEA_PATCHES += patches/test_gamma.patch
+ICEDTEA_PATCHES += \
+	patches/test_gamma.patch \
+	patches/pax-mark-rmic-java.patch
+ endif
+ 
+ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
+diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
+new file mode 100644
+index 0000000..ad80f3a
+--- /dev/null
+++ b/patches/pax-mark-rmic-java.patch
+@@ -0,0 +1,10 @@
+--- openjdk/jdk/make/com/sun/jmx/Makefile
++++ openjdk/jdk/make/com/sun/jmx/Makefile
+@@ -119,6 +119,7 @@
+ 
+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
+ 	$(prep-target)
++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
+                 -d $(CLASSDESTDIR)              \
+                 -v1.2                           \
--- a/dev-java/icedtea/icedtea-6.1.11.3.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.11.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.3.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.3.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)

 # *********************************************************
@ -142,7 +142,7 @@ java_prepare() {
 	# icedtea doesn't like some locales. #330433 #389717
 	export LANG="C" LC_ALL="C"

-	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751
+	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751 #422525
 	epatch "${FILESDIR}"/${PN}-${SLOT}-pass_javac_memory_args_to_vm.patch
 	eautoreconf
 }
--- a/dev-java/icedtea/icedtea-7.2.1.1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.1.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.1.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)

 # *********************************************************
@ -162,7 +162,7 @@ java_prepare() {
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
 	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
-
+	epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
 	eautoreconf
 }

--- a/dev-java/icedtea/icedtea-7.2.2.1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.2.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.2.1.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.2.1.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)

 # *********************************************************
@ -162,6 +162,7 @@ java_prepare() {
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
 	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
+	epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
 	eautoreconf
 }

--- a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
+++ b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/nailgun-0.7.1-r1.ebuild,v 1.1 2012/04/18 19:31:12 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/nailgun-0.7.1-r1.ebuild,v 1.2 2012/06/24 10:37:18 ago Exp $

 EAPI="2"

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="test"

 RDEPEND=">=virtual/jre-1.4
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`DIST hardlink++-0.02.tgz 12228 RMD160 249b91706b0203945786c6a0ae25d1d9350b4384 SHA1 7a9cf4f7711cb30c1d0a49f4e0e7e7d06cf27000 SHA256 1f5c80fa3e62d1d3281c2649fde38dfb7700e8b29fedab54e42e83f3d2959182`
				`@ -1 +0,0 @@`
				`DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099`
				`@ -1 +0,0 @@`
				`DIST kiwix-0.9-beta5-src.tar.bz2 3422705 RMD160 0997307c08fad60ca8d4e0ccc52dca8dc387d685 SHA1 7c9dd3d7c1f32544e837c80ce8057eff30caecff SHA256 5f9ff04e02114a95ca4849a8dc3cff91f54d01bc80ce9d2ca6dee1fcbba6a739`