Sync with portage [Wed Oct 1 16:52:21 MSK 2014].

app-admin/rsyslog/rsyslog-8.4.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.4.1.ebuild,v 1.1 2014/09/30 13:09:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.4.1.ebuild,v 1.2 2014/10/01 10:58:52 jer Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -15,7 +15,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm hppa ~x86"
 SLOT="0"
 IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq"
 

app-arch/dump/files/dump-0.4.44-fix-pointers-aliasing.patch

@@ -1,4 +1,4 @@
-https://sourceforge.net/tracker/?func=detail&aidhttps://sourceforge.net/tracker/?func=detail&aid=3322910&group_id=1306&atid=301306
+https://sourceforge.net/tracker/?func=detail&aid=3322910&group_id=1306&atid=301306
 
 === modified file 'dump/tape.c'
 --- dump/tape.c	2011-06-20 07:22:40 +0000
@@ -120,4 +120,7 @@ https://sourceforge.net/tracker/?func=detail&aidhttps://sourceforge.net/tracker/
 -                                                   comprbuf, &worklen2, NULL);
 +			cresult = lzo1x_decompress((lzo_bytep)tpbin->buf, blocklen,
 +                                                   (lzo_bytep)comprbuf, &worklen2, NULL);
- 			worklen = worklen2;
+ 			worklen = worklen2;
+ 			output = comprbuf;
+ 			switch (cresult) {
+

app-misc/mediacrush-cli/Manifest

@@ -1,2 +1 @@
 DIST mediacrush-cli-1.1.2.tar.gz 3299 SHA256 eaa8f7f7999246bc5cb2fb356cfb35263009b5a0f386000488e638e81fb5a72a SHA512 fa4c905e75ffe1d16a83a6c3cc29dd2e28eb9097d1bc95742ece2356ab6e219c15c75bab7a09443c98b18e438d1e6690968d24c35eb7a3dd0877dff36574761c WHIRLPOOL 3614a7afacb6edcfd7c589f0bbe2769143c0a3638331d0b64c2e25f2d2b0fe89c32c1281e91da4ca315df3f8b9e15a47009e9bcb6d750721ec98345cdac4ed76
-DIST mediacrush-cli-1.1.2.tar.gz 3299 SHA256 eaa8f7f7999246bc5cb2fb356cfb35263009b5a0f386000488e638e81fb5a72a SHA512 fa4c905e75ffe1d16a83a6c3cc29dd2e28eb9097d1bc95742ece2356ab6e219c15c75bab7a09443c98b18e438d1e6690968d24c35eb7a3dd0877dff36574761c WHIRLPOOL 3614a7afacb6edcfd7c589f0bbe2769143c0a3638331d0b64c2e25f2d2b0fe89c32c1281e91da4ca315df3f8b9e15a47009e9bcb6d750721ec98345cdac4ed76

app-misc/metromap/Manifest

@@ -1,2 +1 @@
 DIST metromap-0.1.4.tar.bz2 3419243 SHA256 7fc3b7dd92443ace8944429895c27b2d9bc6444d1eef973b5608cdba72b38fba SHA512 16407c9c8f2d3f608e9188e40b38d20530f552254dbe0c59d7c94ed913b8cb61deae23ffc6180d17fee0d98091c269f24eb04e624dedbb37cc6ece85b46e93ec WHIRLPOOL 5acd843dfa35b87b804c4e879253843f60c4c6df4e0d1dfa5975006b3d9cfe2d58a418f2255b88ab35f1052eeb6a929ba6b00ba1ae75b51d8129021051ee2516
-DIST metromap-0.1.4.tar.bz2 3419243 SHA256 7fc3b7dd92443ace8944429895c27b2d9bc6444d1eef973b5608cdba72b38fba SHA512 16407c9c8f2d3f608e9188e40b38d20530f552254dbe0c59d7c94ed913b8cb61deae23ffc6180d17fee0d98091c269f24eb04e624dedbb37cc6ece85b46e93ec WHIRLPOOL 5acd843dfa35b87b804c4e879253843f60c4c6df4e0d1dfa5975006b3d9cfe2d58a418f2255b88ab35f1052eeb6a929ba6b00ba1ae75b51d8129021051ee2516

app-misc/sleepyhead/sleepyhead-0.9.2.2-r1.ebuild

@@ -38,9 +38,16 @@ src_prepare() {
 	epatch "${FILESDIR}/gitfix.patch"
 	epatch "${FILESDIR}/prs1-64fix.patch"
 	epatch "${FILESDIR}/prs1-code8fix.patch"
-	epatch "${FILESDIR}/common_gui# Copyright 1999-2014 Gentoo Foundation
+	epatch "${FILESDIR}/common_gui.patch"
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sleepyhead/sleepyhead-0.9.2.2-r1.ebuild,v 1.5 2014/08/10 18:08:51 slyfox Exp $
 
-EAPI=4
+	sed -i '1i#define OF(x) x' quazip/ioapi.h quazip/unzip.c quazip/unzip.h \
-inherit eutils 
+	   quazip/zip.c quazip/zip.h quazip/zlib.h
+	eqmake4 SleepyHeadQT.pro
+}
+
+src_install() {
+	cd "{$S}"
+	dobin SleepyHead || die
+	dodoc README || die
+	dodoc docs/* || die
+}

app-misc/task/task-2.1.2.ebuild

@@ -31,22 +31,36 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.9.4-lua-automagic.patch
 }
 
-src_# Copyright 1999-2012 Gentoo Foundation
+src_configure() {
-# Distributed under the terms of the GNU General Public License v2
+	mycmakeargs=(
-# $Header: /var/cvsroot/gentoo-x86/app-misc/task/task-2.1.2.ebuild,v 1.3 2012/10/04 22:33:32 radhermit Exp $
+		$(cmake-utils_use_enable lua LUA)
+		-DTASK_DOCDIR=/usr/share/doc/${PF}
+	)
 
-EAPI=4
+	cmake-utils_src_configure
+}
 
-inherit eutils cmake-utils bash-completion-r1
+src_install() {
+	cmake-utils_src_install
 
-DESCRIPTION="Taskwarrior is a command-line todo list manager"
+	newbashcomp scripts/bash/task.sh task
-HOMEPAGE="http://taskwarrior.org/projects/show/taskwarrior/"
-SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
 
-LICENSE="MIT"
+	if use lua ; then
-SLOT="0"
+		insinto /usr/share/${PN}/extensions
-KEYWORDS="amd64 x86"
+		doins scripts/extensions/*
-IUSE="lua vim-syntax zsh-completion"
+	fi
 
-DEPEND="lua? ( dev-lang/lua )"
+	if use vim-syntax ; then
-RDEPEND="${DEPEND}
+		rm scripts/vim/README
+		insinto /usr/share/vim/vimfiles
+		doins -r scripts/vim/*
+	fi
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/zsh/*
+	fi
+
+	exeinto /usr/share/${PN}/scripts
+	doexe scripts/add-ons/*
+}

app-mobilephone/obexftp/obexftp-0.23-r2.ebuild

@@ -61,35 +61,46 @@ src_compile() {
 
 	if use python; then
 		pushd swig/python/
-		distutils# Copyright 1999-2014 Gentoo Foundation
+		distutils-r1_src_compile
-# Distributed under the terms of the GNU General Public License v2
+		popd
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild,v 1.5 2014/06/14 10:50:36 phajdan.jr Exp $
+	fi
+}
 
-EAPI="5"
+src_install() {
+	# -j1 because "make -fMakefile.ruby install" fails
+	# upstream added -j1 to that command so it should be removed
+	# from here in the next version bump
+	emake -j1 DESTDIR="${D}" INSTALLDIRS=vendor install
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+	if use python; then
-GENTOO_DEPEND_ON_PERL=no
+		pushd swig/python/
+		distutils-r1_src_install
+		popd
+	fi
 
-inherit distutils-r1 eutils perl-module flag-o-matic autotools
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+	dohtml doc/*.html
 
-DESCRIPTION="File transfer over OBEX for mobile phones"
+	# Install examples
-HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
+	insinto /usr/share/doc/${PF}/examples
-SRC_URI="mirror://sourceforge/openobex/${P}.tar.bz2"
+	doins examples/*.c
-SLOT="0"
+	use perl && doins examples/*.pl
+	use python && doins examples/*.py
+	use ruby && doins examples/*.rb
+	use tcl && doins examples/*.tcl
 
-LICENSE="GPL-2"
+	if use perl ; then
-KEYWORDS="amd64 hppa ppc ~sparc x86"
+		perl_delete_localpod
-IUSE="bluetooth debug perl python ruby tcl"
+		perl_delete_packlist
+	fi
+}
 
-RDEPEND="dev-libs/openobex
+pkg_postinst() {
-	bluetooth? ( net-wireless/bluez )
+	use perl && perl-module_pkg_postinst
-	perl? ( dev-lang/perl )
+	use python && distutils-r1_pkg_postinst
-	ruby? ( dev-lang/ruby:1.9 )
+}
-	tcl? ( dev-lang/tcl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
 
-src_prepare() {
+pkg_postrm() {
-	epatch "${FILESDIR}"/${P}-fixruby.pat
+	use perl && perl-module_pkg_postrm
+	use python && distutils-r1_pkg_postrm
+}

app-mobilephone/wammu/Manifest

@@ -1,4 +1,2 @@
 DIST wammu-0.35.tar.bz2 572550 SHA256 fba70bb0a067f20bb5da5f16061e6cc70a49761ca11f49a897af678271666d7a SHA512 c9c24a170d0a1b1507799f77719d544a04b0c894172e0158efc782f25ec894eaa65e2a89b53db431a96b5f88ccadf4dddc5025ba84ac09d54aa5d37b2e658461 WHIRLPOOL 8b6b4edc77c46f20b449077f198d4e51ad81edd6846c69a4945ebf207ae01431a3cb31541e8f07c1b8c90fa37c2034acec771e5d563e0bf756aba1f175f93a9f
 DIST wammu-0.36.tar.bz2 581781 SHA256 8107d69438adc5c9c24565f455cac31ecd5b9ef754f26a6b5ebab03b49131696 SHA512 08caaeb7ade5877b441baad2f3f1f653ed1c25c3fab213e093213525fe326f09ee8ccda4db834f82b00a9d7e9b2cb235da7be7f328c091b6067543d9cdbfb14c WHIRLPOOL 6b4b8aff5363bbf39bb9b67765c9373600642592bc910d3b4d83d09d88d5b5ad4945d4f27f2c75c383ae55f66cc71e21756fcd93e1adee3dfeeef5a766f449c8
-DIST wammu-0.35.tar.bz2 572550 SHA256 fba70bb0a067f20bb5da5f16061e6cc70a49761ca11f49a897af678271666d7a SHA512 c9c24a170d0a1b1507799f77719d544a04b0c894172e0158efc782f25ec894eaa65e2a89b53db431a96b5f88ccadf4dddc5025ba84ac09d54aa5d37b2e658461 WHIRLPOOL 8b6b4edc77c46f20b449077f198d4e51ad81edd6846c69a4945ebf207ae01431a3cb31541e8f07c1b8c90fa37c2034acec771e5d563e0bf756aba1f175f93a9f
-DIST wammu-0.36.tar.bz2 581781 SHA256 8107d69438adc5c9c24565f455cac31ecd5b9ef754f26a6b5ebab03b49131696 SHA512 08caaeb7ade5877b441baad2f3f1f653ed1c25c3fab213e093213525fe326f09ee8ccda4db834f82b00a9d7e9b2cb235da7be7f328c091b6067543d9cdbfb14c WHIRLPOOL 6b4b8aff5363bbf39bb9b67765c9373600642592bc910d3b4d83d09d88d5b5ad4945d4f27f2c75c383ae55f66cc71e21756fcd93e1adee3dfeeef5a766f449c8

app-office/geierlein/Manifest

@@ -1,4 +1,2 @@
 DIST geierlein-0.6.1.tar.gz 994969 SHA256 f7f66b3c4fba41b071cc5c7339ec76854d12e515f45be185f83a84e2ab015474 SHA512 6810baed24999c069922488fd2efa6b0095174621088f48245927b8a3a89dd6a683db76016649ba143e3cc0cff29ff3699c3afa12a00fce067ddcab61197bfe3 WHIRLPOOL 3b1358f2c71bf337179a0dee4259e3358d963be832ec9d8e4e4d328530cf729478543a990351a1b98eb58e3c885c4d3c46515ce86cdd843c0af340109613be7c
 DIST geierlein-0.6.2.tar.gz 994962 SHA256 1a247c95122758f86fdebd5b3f55bcdd9c6c04cdf58d33eb874c9cc4cc7dc731 SHA512 3eacf273d85fb23bd763cea9db0e09fecbf410b6e75eec30fd0a44df68a43d478e1555b6f64468b4a3acf26bc6cb5a9c67f7a39ed30ef3a42255ff740a883c5c WHIRLPOOL acb5375d03547be8a49e58f71011c485c88cc65b640a16d630a5fc773056744b53ff38766dddc91d2bc86f198c85f647a3b39b7adcbc05dfe2edb84d8760f21c
-DIST geierlein-0.6.1.tar.gz 994969 SHA256 f7f66b3c4fba41b071cc5c7339ec76854d12e515f45be185f83a84e2ab015474 SHA512 6810baed24999c069922488fd2efa6b0095174621088f48245927b8a3a89dd6a683db76016649ba143e3cc0cff29ff3699c3afa12a00fce067ddcab61197bfe3 WHIRLPOOL 3b1358f2c71bf337179a0dee4259e3358d963be832ec9d8e4e4d328530cf729478543a990351a1b98eb58e3c885c4d3c46515ce86cdd843c0af340109613be7c
-DIST geierlein-0.6.2.tar.gz 994962 SHA256 1a247c95122758f86fdebd5b3f55bcdd9c6c04cdf58d33eb874c9cc4cc7dc731 SHA512 3eacf273d85fb23bd763cea9db0e09fecbf410b6e75eec30fd0a44df68a43d478e1555b6f64468b4a3acf26bc6cb5a9c67f7a39ed30ef3a42255ff740a883c5c WHIRLPOOL acb5375d03547be8a49e58f71011c485c88cc65b640a16d630a5fc773056744b53ff38766dddc91d2bc86f198c85f647a3b39b7adcbc05dfe2edb84d8760f21c

app-office/glabels/Manifest

@@ -1,2 +1 @@
-DIST glabels-3.2.0.tar.xz 3359392 SHA256 c4c5b2c911be7b6513ee5cfeda6cd78434623c24dd741bd29cc3573f90b374c9 SHA512 67faab8eb9f4128b532bce55a9fab34462c008d0990ba87e4d555359bec1bb162489d4bdf5efbb86c4fcfc708c92da4d88a91d-----BEGIN PGP SIGNED MESSAGE-----
 DIST glabels-3.2.0.tar.xz 3359392 SHA256 c4c5b2c911be7b6513ee5cfeda6cd78434623c24dd741bd29cc3573f90b374c9 SHA512 67faab8eb9f4128b532bce55a9fab34462c008d0990ba87e4d555359bec1bb162489d4bdf5efbb86c4fcfc708c92da4d88a91dd2a85f0989c9133af6b011c3ff WHIRLPOOL f79e3d15ba32041133654fd67c7e05c4bba9e8d899344c52b503c1232ddc5cce8efcec20937c2d21d4f7fa3164a6d4c5ff8f1d9a770dea59c24fcc524b460673

app-office/pybliographer/pybliographer-1.2.14.ebuild

@@ -43,27 +43,32 @@ src_prepare() {
 		Makefile.am || die "sed failed"
 
 	# Install Python modules into site-packages directories.
-	find -name Makefile.am # Copyright 1999-2012 Gentoo Foundation
+	find -name Makefile.am | xargs sed -i \
-# Distributed under the terms of the GNU General Public License v2
+		-e "/^pybdir[[:space:]]*=[[:space:]]*/s:\$(datadir):$(python_get_sitedir):" || die "sed failed"
-# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/pybliographer-1.2.14.ebuild,v 1.3 2012/04/17 16:06:21 ranger Exp $
+	sed -i \
-
+		-e "s:\${datadir}/@PACKAGE@:$(python_get_sitedir)/@PACKAGE@:" \
-EAPI="3"
+		etc/installer.in || die "sed failed"
-PYTHON_DEPEND="2:2.6"
+	sed -i \
-
+		-e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" \
-inherit autotools gnome2 python
+		Pyblio/GnomeUI/glade/Makefile.am || die "sed failed"
+	eautoreconf
+}
 
-DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
+src_configure() {
-HOMEPAGE="http://pybliographer.org/"
+	gnome2_src_configure --disable-depchecks
-SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
+}
 
-LICENSE="GPL-2"
+src_install() {
-SLOT="0"
+	gnome2_src_install
-KEYWORDS="~amd64 ppc x86"
+	python_convert_shebangs -r 2 "${ED}usr/bin"
-IUSE=""
+}
 
-DOCS="AUTHORS ChangeLog* NEWS TODO README"
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_mod_optimize pybliographer
+}
 
-DEPEND=">=app-text/recode-3.6-r1
+pkg_postrm() {
-	app-text/scrollkeeper
+	gnome2_pkg_postrm
-	dev-libs/glib:2
+	python_mod_cleanup pybliographer
-	dev-python/gconf-pyt
+}

app-office/texmaker/texmaker-4.2.ebuild

@@ -6,14 +6,6 @@ EAPI=5
 
 inherit qt4-r2 versionator
 
-# The up# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.2.ebuild,v 1.1 2014/05/22 13:08:13 jlec Exp $
-
-EAPI=5
-
-inherit qt4-r2 versionator
-
 # The upstream version numbering is bad, so we have to remove a dot in the
 # minor version number
 MAJOR="$(get_major_version)"
@@ -83,4 +75,13 @@ src_prepare() {
 
 src_configure() {
 	eqmake4 \
-		${PN}
+		${PN}.pro \
+		PREFIX="${EPREFIX}/usr" \
+		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}

app-portage/genlop/genlop-0.30.5.ebuild

@@ -4,16 +4,22 @@
 
 inherit bash-completion
 
-DESCRIPTION="A nic# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/genlop/genlop-0.30.5.ebuild,v 1.12 2010/10/19 11:47:35 leio Exp $
-
-inherit bash-completion
-
 DESCRIPTION="A nice emerge.log parser"
 HOMEPAGE="http://pollycoke.org/genlop.html"
 SRC_URI="http://gelo.dolcetta.net/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.8.0-r12
+	 >=dev-perl/DateManip-5.40"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin genlop || die
+	dodoc README Changelog
+	doman genlop.1
+	dobashcompletion genlop.bash-completion genlop
+}

app-portage/porthole/porthole-0.6.1-r2.ebuild

@@ -1,7 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /v# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.1-r2.ebuild,v 1.5 2013/01/11 19:21:12 zerochaos Exp $
 
 EAPI="2"
@@ -72,4 +70,7 @@ pkg_postinst() {
 	einfo "In this new way the user needs to set any 'Settings' menu emerge options"
 	einfo "Porthole automatically adds '--oneshot' for all upgrades selections"
 	einfo "Other options recommended are '--noreplace'  along with '--update'"
-	einfo "They allow for portage to skip any p
+	einfo "They allow for portage to skip any packages that might have already"
+	einfo "been upgraded as a dependency of another previously upgraded package"
+	einfo
+}

app-text/an/Manifest

@@ -1,4 +1,2 @@
 DIST an_1.1.orig.tar.bz2 13456 SHA256 4f7634b5b33daa1f5319ced3380d29de12f4b83486dc6a544949ac7c565a687f SHA512 12758bf38d5f2ea80d04449dab04b34b78dccea3512109cf73d6e0038d0483d245601c04a0d1bb90ff939e86ad1f88b3100070239607d9d6050523538f6714bb WHIRLPOOL 2cca4e3467e787f116a316383637c7c422c595a3d212dd1c3b979be4b7e4dfdcc4121eb1373642ff1f24ff2fb8c60df74dffdad0b5a915337d7db09596df8549
 DIST an_1.2.orig.tar.xz 13196 SHA256 b925d57d80bd0d83b755f5b8d78e6d5bf05eb059ec84a7d8fbb77b18c73b17a5 SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d WHIRLPOOL 45f4f39a2560b5db5457ac352d7617d04667f3d3ca17cc6a91172fe479f537ac69723b9e47b2fadc8446b6bf20b81920beb61669370378239361333eeb2de7a1
-DIST an_1.1.orig.tar.bz2 13456 SHA256 4f7634b5b33daa1f5319ced3380d29de12f4b83486dc6a544949ac7c565a687f SHA512 12758bf38d5f2ea80d04449dab04b34b78dccea3512109cf73d6e0038d0483d245601c04a0d1bb90ff939e86ad1f88b3100070239607d9d6050523538f6714bb WHIRLPOOL 2cca4e3467e787f116a316383637c7c422c595a3d212dd1c3b979be4b7e4dfdcc4121eb1373642ff1f24ff2fb8c60df74dffdad0b5a915337d7db09596df8549
-DIST an_1.2.orig.tar.xz 13196 SHA256 b925d57d80bd0d83b755f5b8d78e6d5bf05eb059ec84a7d8fbb77b18c73b17a5 SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d WHIRLPOOL 45f4f39a2560b5db5457ac352d7617d04667f3d3ca17cc6a91172fe479f537ac69723b9e47b2fadc8446b6bf20b81920beb61669370378239361333eeb2de7a1

app-text/catdoc/catdoc-0.94.2-r2.ebuild

@@ -40,13 +40,13 @@ src_compile() {
 	emake LIB_DIR="${EPREFIX}"/usr/share/catdoc || die
 }
 
-src# Copyright 1999-2010 Gentoo Foundation
+src_install() {
-# Distributed under the terms of the GNU General Public License v2
+	emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install || die
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r2.ebuild,v 1.3 2010/09/15 11:22:35 grobian Exp $
 
-EAPI=3
+	if [[ -e ${ED}/usr/bin/xls2csv ]]; then
-WANT_AUTOMAKE=none
+		einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
+		mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die
+	fi
 
-inherit autotools eutils
+	dodoc ${DOCS}
-
+}
-DES

app-text/cmigemo/cmigemo-1.3c.ebuild

@@ -42,21 +42,24 @@ src_install() {
 	rm -rf ${D}/usr/share/migemo/{cp932,euc-jp}
 
 	if has_version 'app-editors/vim-core' ; then
-		insinto /usr/share/vim/vim# Copyright 1999-2009 Gentoo Foundation
+		insinto /usr/share/vim/vimfiles/plugin
-# Distributed under the terms of the GNU General Public License v2
+		doins tools/migemo.vim
-# $Header: /var/cvsroot/gentoo-x86/app-text/cmigemo/cmigemo-1.3c.ebuild,v 1.7 2009/09/23 16:31:00 patrick Exp $
+	fi
-
-inherit eutils
-
-DESCRIPTION="C/Migemo -- Migemo library implementation in C"
-HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
-SRC_URI="http://www.kaoriya.net/dist/var/${P}.tar.bz2"
 
-LICENSE="cmigemo"
+	dodoc tools/migemo.vim
-SLOT="0"
+	dodoc doc/{README_j,TODO_j,vimigemo}.txt
-KEYWORDS="x86 alpha ppc"	# development branch
+}
-IUSE="emacs"
 
-DEPEND="app-i18n/qkc
+pkg_postinst() {
-	app-dicts/migemo-dict"
+	if use emacs ; then
-RDEPEND="app-dicts/mig
+		elog
+		elog "Please add to your ~/.emacs"
+		elog "    (setq migemo-command \"cmigemo\")"
+		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
+		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
+		elog "    (setq migemo-user-dictionary nil)"
+		elog "    (setq migemo-regex-dictionary nil)"
+		elog "to use cmigemo instead of migemo under emacs."
+		elog
+	fi
+}

app-text/convmv/Manifest

@@ -1,2 +1 @@
 DIST convmv-1.15.tar.gz 27180 SHA256 c315aec78490b588000467d1c51081b36e629de0537c5a17fd48b1acaf8a5135 SHA512 b809f103da48d43f9c7fb6cb3e08a88e1c9b2a2ad691f9fcc4422b4e597c247b86fd0446c777e4c9911b4fad551cdc9fc88eff3a1d8cb4b001e164cc8387b900 WHIRLPOOL d7c3e3fbe918472d96f1cbc40b70f280a179a3c99cef07953c0723dfcba0e81ff383d918382b196d0525724dde650c4a480e5cc91c07f9452308a3eebd1567cc
-DIST convmv-1.15.tar.gz 27180 SHA256 c315aec78490b588000467d1c51081b36e629de0537c5a17fd48b1acaf8a5135 SHA512 b809f103da48d43f9c7fb6cb3e08a88e1c9b2a2ad691f9fcc4422b4e597c247b86fd0446c777e4c9911b4fad551cdc9fc88eff3a1d8cb4b001e164cc8387b900 WHIRLPOOL d7c3e3fbe918472d96f1cbc40b70f280a179a3c99cef07953c0723dfcba0e81ff383d918382b196d0525724dde650c4a480e5cc91c07f9452308a3eebd1567cc

app-text/deplate/Manifest

@@ -1,2 +1 @@
 DIST deplate-0.8.5.gem 271360 SHA256 b1cc96083c752868e5559cd86e5c7a0c7765b127a8a39d6de239e47692a41c23 SHA512 52c0d323d19e08f9fa169eebd03871e4acc11539a73910bd6124a3328ccaeb077519d8a955a3d0035bbe5eea0479c44051e246944556dd1dea3ec4d7c451f840 WHIRLPOOL 29a539516fda86675c28fcb29f159d725a172d7578bc81c0b2dc707d544ed5162e1037db2e2b1c1aab4d6e80b8cc1dcfb4aabef3c590031118aeb243ad019cac
-DIST deplate-0.8.5.gem 271360 SHA256 b1cc96083c752868e5559cd86e5c7a0c7765b127a8a39d6de239e47692a41c23 SHA512 52c0d323d19e08f9fa169eebd03871e4acc11539a73910bd6124a3328ccaeb077519d8a955a3d0035bbe5eea0479c44051e246944556dd1dea3ec4d7c451f840 WHIRLPOOL 29a539516fda86675c28fcb29f159d725a172d7578bc81c0b2dc707d544ed5162e1037db2e2b1c1aab4d6e80b8cc1dcfb4aabef3c590031118aeb243ad019cac

app-text/dictd/dictd-1.12.1-r1.ebuild

@@ -43,50 +43,65 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/dictd-1.10.11-colorit-nopp-# Copyright 1999-2014 Gentoo Foundation
+	epatch "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
-# Distributed under the terms of the GNU General Public License v2
+	epatch "${FILESDIR}"/dictd-1.12.0-build.patch
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.12.1-r1.ebuild,v 1.8 2014/01/18 20:03:11 ago Exp $
 
-EAPI=5
+	[[ ${CHOST} == *-darwin* ]] && \
-inherit eutils readme.gentoo systemd user
+		sed -i -e 's:libtool:glibtool:g' Makefile.in
+}
 
-DESCRIPTION="Dictionary Client/Server for the DICT protocol"
+src_configure() {
-HOMEPAGE="http://www.dict.org/ http://sourceforge.net/projects/dict/"
+	econf \
-SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+		$(use_with dbi plugin-dbi) \
+		$(use_with judy plugin-judy) \
+		--sysconfdir="${EPREFIX}"/etc/dict
+}
 
-SLOT="0"
+src_compile() {
-# We install rfc so - ISOC-rfc
+	if use minimal; then
-LICENSE="GPL-2 ISOC-rfc"
+		emake dictfmt dictzip dictzip
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+	else
-IUSE="dbi judy minimal"
+		emake
+	fi
+}
 
-# <gawk-3.1.6 makes tests fail.
+src_test() {
-RDEPEND="
+	use minimal && return 0 # All tests are for dictd which we don't build...
-	sys-libs/zlib
+	if [[ ${EUID} -eq 0 ]]; then
-	dev-libs/libmaa
+		# If dictd is run as root user (-userpriv) it drops its privileges to
-	dbi? ( dev-db/libdbi )
+		# dictd user and group. Give dictd group write access to test directory.
-	judy? ( dev-libs/judy )
+		chown :dictd "${WORKDIR}" "${S}/test"
-	>=sys-apps/coreutils-6.10
+		chmod 770 "${WORKDIR}" "${S}/test"
-"
+	fi
-DEPEND="${RDEPEND}
+	emake test
-	>=sys-apps/gawk-3.1.6
+}
-	virtual/yacc
-"
 
-DOC_CONTENTS="
+src_install() {
-	To start and use ${PN} you need to emerge at least one dictionary from
+	if use minimal; then
-	the app-dicts category with the package name starting with 'dictd-'.
+		emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt
-	To install all available dictionaries, emerge app-dicts/dictd-dicts.
+	else
-	${PN} will NOT start without at least one dictionary.\n
+		emake DESTDIR="${D}" install
-	\nIf you are running systemd, you will need to review the instructions
-	explained in /etc/dict/dictd.conf comments.
-"
 
-pkg_setup() {
+		dodoc doc/{dicf.ms,rfc.ms,rfc.sh,rfc2229.txt}
-	enewgroup dictd # used in src_test()
+		dodoc doc/{security.doc,toc.ms}
-	enewuser dictd -1 -1 -1 dictd
+		newdoc examples/dictd1.conf dictd.conf.example
-}
 
-src_prepare() {
+		# conf files. For dict.conf see below.
-	epatch "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
+		insinto /etc/dict
-	epatch "${FILESDIR}"/dictd-1.12.0-build.p
+		for f in dictd.conf site.info colorit.conf; do
+			doins "${FILESDIR}/1.10.11/${f}"
+		done
+
+		# startups for dictd
+		newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd
+		newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd
+		systemd_dounit "${FILESDIR}"/${PN}.service
+	fi
+
+	insinto /etc/dict
+	doins "${FILESDIR}/1.10.11/dict.conf"
+	# Install docs
+	dodoc README TODO ChangeLog ANNOUNCE NEWS
+
+	readme.gentoo_create_doc
+}

app-text/fbreader/fbreader-0.99.4-r2.ebuild

@@ -57,19 +57,29 @@ src_prepare() {
 	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
 
 	echo "UI_TYPE = qt4" >> makefiles/target.mk
-	sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' # Copyright 1999-2014 Gentoo Foundation
+	sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
-# Distributed under the terms of the GNU General Public License v2
+		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.99.4-r2.ebuild,v 1.2 2014/08/06 07:09:31 patrick Exp $
 
-EAPI=5
+	if use debug; then
+		echo "TARGET_STATUS = debug" >> makefiles/target.mk
+	else
+		echo "TARGET_STATUS = release" >> makefiles/target.mk
+	fi
 
-inherit eutils multilib
+	# bug #452636
+	epatch "${FILESDIR}"/${P}.patch
+	# bug #515698
+	epatch "${FILESDIR}"/${P}-qreal-cast.patch
+	# bug #516794
+	epatch "${FILESDIR}"/${P}-mimetypes.patch
+}
 
-DESCRIPTION="E-Book Reader. Supports many e-book formats"
+src_compile() {
-HOMEPAGE="http://www.fbreader.org/"
+	# bug #484516
-SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+	emake -j1
+}
 
-LICENSE="GPL-2"
+src_install() {
-SLOT="0"
+	default
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	dosym /usr/bin/FBReader /usr/bin/fbreader
-IUSE="deb
+}

app-text/freepwing/Manifest

@@ -1,2 +1 @@
 DIST freepwing-1.4.3.tar.gz 129499 SHA256 34287268520b622ada5b1390dbec346e586e04509278eb2e3baad67f494f3796 SHA512 e363d2751410d6e39e786920faf63c4efee74e5004594f95157f700eb3a68a92a9e98635978f21f5da60f7bd9e1a3b4049f90c7b9da0b4bb0374081ab6738734 WHIRLPOOL 2133bba842d1c37139182ffd9aaf3b4d1a443edd296043dd5b9ffecd6e96e4d828748b4623f26d52404654bf37b277b655cd7dc70e552a32a30cee5c35808bd2
-DIST freepwing-1.4.3.tar.gz 129499 SHA256 34287268520b622ada5b1390dbec346e586e04509278eb2e3baad67f494f3796 SHA512 e363d2751410d6e39e786920faf63c4efee74e5004594f95157f700eb3a68a92a9e98635978f21f5da60f7bd9e1a3b4049f90c7b9da0b4bb0374081ab6738734 WHIRLPOOL 2133bba842d1c37139182ffd9aaf3b4d1a443edd296043dd5b9ffecd6e96e4d828748b4623f26d52404654bf37b277b655cd7dc70e552a32a30cee5c35808bd2

app-text/gv/Manifest

@@ -1,3 +1,2 @@
-DIST gv-3.7.3.90.tar.gz 757506 SHA256 2824aefb0cbced31def7a815e1d6f00e17f47a4cb5ed1be93e4d259c7b64b63f SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f-----BEGIN PGP SIGNED MESSAGE-----
 DIST gv-3.7.3.90.tar.gz 757506 SHA256 2824aefb0cbced31def7a815e1d6f00e17f47a4cb5ed1be93e4d259c7b64b63f SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50 WHIRLPOOL b9f3465f15ed7a6696e32a49f55942f0b18fe7b61c4dbec39a4fd97e4ff926bb4a8891b49010563b5959adda8f72e5cb1b802392086fb8dc44fb7f8b482f1334
 DIST gv-3.7.3.tar.gz 754282 SHA256 ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b SHA512 0c0339f023896016212bb1b8ef0185689dd669855c060d0491e1ac59c76ca19f3006b1b00b421cb40bb0beba8e2d35dad1da7d856ac9d33440cfbb07ff1e33c3 WHIRLPOOL 78e3e99a8065d42a84ba699256b8f1a366c74bc5c36eb5c79e0c7e0b6462e38711cd8eea6f474d9861feff92b4c84f38c5bf39b5df55f926443f3ce722cfb316

app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch

@@ -4,17 +4,27 @@ Subject: desktop file
 
 respect fd.o desktop entry spec
 
-# desktop-file-validate keepnote.desktop
-keepnote.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
-keepnote.desktop: warning: value "Note-taking Application" for key "Comment" in group "Desktop Entry" looks redundant with value "Note-taking Application" of key "GenericName"
-keepnote.desktop: warning: value "Program na spr?vu pozn?mok" for key "Comment[sk]" in group "Desktop Entry" lookFrom: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Aug 14 07:08:05 UTC 2012
-Subject: desktop file
-
-respect fd.o desktop entry spec
-
 # desktop-file-validate keepnote.desktop
 keepnote.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
 keepnote.desktop: warning: value "Note-taking Application" for key "Comment" in group "Desktop Entry" looks redundant with value "Note-taking Application" of key "GenericName"
 keepnote.desktop: warning: value "Program na spr?vu pozn?mok" for key "Comment[sk]" in group "Desktop Entry" looks redundant with value "Program na spr?vu pozn?mok" of key "GenericName[sk]"
-keepnote.desktop: error: value
+keepnote.desktop: error: value "Office" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
+
+--- desktop/keepnote.desktop
++++ desktop/keepnote.desktop
+@@ -1,14 +1,11 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Name=KeepNote
+ GenericName=Note-taking Application
+ GenericName[sk]=Program na správu poznámok
+-Comment=Note-taking Application
+-Comment[sk]=Program na správu poznámok
+ Icon=keepnote
+ Exec=keepnote %f
+-Categories=Office
++Categories=Office;
+ #MimeType=
+ Terminal=false
+ StartupNotify=false

app-text/kpaste/Manifest

@@ -1,4 +1,2 @@
 DIST kpaste-0.1.tar.gz 21031 SHA256 17d6d928dac531a310591d329ebc9ab335dadeea2f02f457eb9e38946359ebed SHA512 92afd613e94d413107a812ddd51de0a2b4de8ef2b6339ff236c822f15e93c1132cc8dbcfe6697f0d5083f8c168dae56b817e281b65f6d6a74d5fabd1484a56d1 WHIRLPOOL 65e2e6342bb08366894145308fcda3e98a611e10852aadff942c2ca45b778d58152a0dedace7e954c3bc7e02b8d9cfc747fa3373ae74a7136f29c6ef79b5b9f1
 DIST kpaste-1.0.tar.bz2 19607 SHA256 3fda8aa0efa8231b81ab863f6884999d0c1fbbc729f64979fd49a48c1651e801 SHA512 ba1e2b10192e3f5a2f8fa11ca57ec274a6b277195ba8ec41c64ea0ea4552f477c785c7894ea653137094cf3a6d041f04260006326978993d00cab1edd6c93918 WHIRLPOOL 98fa7c4d9e2eb753f1d49bf9f62dca1f80a4042a84cc3795773133b109cce95c9abf42ae080d9d2fe66448ff02d833aa6d19770f770ece618269b30f19d9d861
-DIST kpaste-0.1.tar.gz 21031 SHA256 17d6d928dac531a310591d329ebc9ab335dadeea2f02f457eb9e38946359ebed SHA512 92afd613e94d413107a812ddd51de0a2b4de8ef2b6339ff236c822f15e93c1132cc8dbcfe6697f0d5083f8c168dae56b817e281b65f6d6a74d5fabd1484a56d1 WHIRLPOOL 65e2e6342bb08366894145308fcda3e98a611e10852aadff942c2ca45b778d58152a0dedace7e954c3bc7e02b8d9cfc747fa3373ae74a7136f29c6ef79b5b9f1
-DIST kpaste-1.0.tar.bz2 19607 SHA256 3fda8aa0efa8231b81ab863f6884999d0c1fbbc729f64979fd49a48c1651e801 SHA512 ba1e2b10192e3f5a

app-text/libpaper/Manifest

@@ -1,2 +1 @@
 DIST libpaper_1.1.24.tar.gz 355272 SHA256 38ac28114673d4b175a939d981e0477a0ed9bcaab27033522ecb2ca78ee90c7e SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b WHIRLPOOL 74a7cb6dec146104988dd5c5e0b4bf7fb776bde086c4fecf658d949e17d6701fa1b23511a7be43f01a01dcfd7c0340f23c3c9ec1c51fb7718d6b0dbf1761e75d
-DIST libpaper_1.1.24.tar.gz 355272 SHA256 38ac28114673d4b175a939d981e0477a0ed9bcaab27033522ecb2ca78ee90c7e SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465

app-text/libspectre/Manifest

@@ -1,4 +1,2 @@
 DIST libspectre-0.2.6.tar.gz 358088 SHA256 2f637c62322c8040514284c00f63a5c310a28801e7dcfbe2ba2791be4fac0dd3 SHA512 4f99afe68293e188f70a5043f0c5199123d6ab0936f196b198f1c66eff980d54a6fba093be39839180dcef82db5fd9780a9d50887e453352d7b90b986829dfb6 WHIRLPOOL 0335575a7a5a5fa5724b35456105badcb845202b0d48b03a03f292aab10959e1a4ba9d94189c935667114878f20f7a5b8cbb892bf52533b4846a5afebb1eecb7
 DIST libspectre-0.2.7.tar.gz 387947 SHA256 e81b822a106beed14cf0fec70f1b890c690c2ffa150fa2eee41dc26518a6c3ec SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794 WHIRLPOOL b59a1fea4ebd0cac13d4b5c7e76247de214761929bd71cf7879832acc4779786d764ddf2d38c5dea070f6e05c41f0d8460b8a8b11a51c35492827228740fb604
-DIST libspectre-0.2.6.tar.gz 358088 SHA256 2f637c62322c8040514284c00f63a5c310a28801e7dcfbe2ba2791be4fac0dd3 SHA512 4f99afe68293e188f70a5043f0c5199123d6ab0936f196b198f1c66eff980d54a6fba093be39839180dcef82db5fd9780a9d50887e453352d7b90b986829dfb6 WHIRLPOOL 0335575a7a5a5fa5724b35456105badcb845202b0d48b03a03f292aab10959e1a4ba9d94189c935667114878f20f7a5b8cbb892bf52533b4846a5afebb1eecb7
-DIST libspectre-0.2.7.tar.gz 387947 SHA256 e81b822a106beed14cf0fec70f1b890c690c2ffa150fa2eee41dc26518a6c3ec SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794 WHIRLPOOL b59a1fea4ebd0cac13d4b5c7e76247de214761929bd71cf7879832acc4779786d764ddf2d38c5dea070f6e05c41f0d8460b8a8b11a51c35492827228740fb604

app-text/linuxdoc-tools/Manifest

@@ -1 +1 @@
-DIST linuxdoc-tools_0.9.68.tar.gz 619242 SHA256 3b8611683d61480a60cdd2497132f15ca15fb583c9fe5543f6750d187a5dee67 
+DIST linuxdoc-tools_0.9.68.tar.gz 619242 SHA256 3b8611683d61480a60cdd2497132f15ca15fb583c9fe5543f6750d187a5dee67 SHA512 a78c662f4bf69b68530af0176fb6b35328c004a80cc73e7ed1151d46da3a7868e4a8a61094f8c4081a686f1ed0c58bd19c2c5ad5a2b6677ddc7c686e67a71df7 WHIRLPOOL 966e47e081bf5eb35de546f7cd0522396aba306d8afbeeba55afb91f360c196b196c3271b84ae8a98d7f9a4d0460558986a8a32a824940b0340236c705490676

app-text/llpp/llpp-15.ebuild

@@ -36,45 +36,6 @@ DEPEND="${RDEPEND}
 
 RESTRICT="!ocamlopt? ( strip )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11-WM_C# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v 1.11 2014/01/19 08:51:00 pacho Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND="~app-text/mupdf-1.2:=[static-libs]
-	media-libs/openjpeg:0[static-libs]
-	media-libs/freetype:2[static-libs]
-	media-libs/jbig2dec[static-libs]
-	sys-libs/zlib[static-libs]
-	virtual/jpeg:0[static-libs]
-	x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
-	!static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND}
-		app-arch/bzip2[static-libs]
-		media-libs/libXcm[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libXmu[static-libs] )
-	dev-lang/ocaml[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
 }
@@ -87,4 +48,39 @@ src_compile() {
 	if use static ; then
 		local cclib=""
 		local slib=""
-		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g'
+		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
+		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do
+			case ${slib} in
+				-lm|-ldl|-lpthread)
+					einfo "${slib}: shared"
+					cclib+="${slib} " ;;
+				*)
+					local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
+					einfo "${slib}: use ${ccnew}"
+					cclib+="${ccnew} " ;;
+			esac
+		done
+	else
+		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose ocaml str.cma keystoml.ml < KEYS > help.ml
+	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
+	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
+	verbose ${ocaml} -c -o help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc KEYS README Thanks fixme
+}

app-text/metadata.xml

@@ -16,19 +16,19 @@
 	<longdescription lang="nl">
 		De app-text categorie bevat applicaties voor het werken met door mensen geschreven teksten.
 	</longdescription>
-	<longdescription lang="<?xml version="1.0" encoding="UTF-8"?>
+	<longdescription lang="vi">
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+		Nhóm app-text chứa các công cụ để làm việc với các tập
-<catmetadata>
+		tin văn bản có thể đọc hiểu.
-	<longdescription lang="en">
-		The app-text category contains tools for working with human-language
-		text files.
 	</longdescription>
-	<longdescription lang="de">
+	<longdescription lang="it">
-		Die Kategorie app-text enhält Werkzeuge für das Arbeiten mit menschenlesbaren
+		La categoria app-text contiene utilità per lavorare con file di testo.
-		Textdokumenten.
 	</longdescription>
-	<longdescription lang="es">
+	<longdescription lang="pt">
-		La categoría app-text contiene herramientas para trabajar con archivos
+		A categoria app-text contém ferramentas para trabalhar com
-		de texto en lenguaje humano.
+		arquivos de texto em linguagens humanas.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-text zawiera narzędzia do pracy ze zwykłymi plikami tekstowymi.
 	</longdescription>
-	<lon
+</catmetadata>
+

app-text/pandoc/files/pandoc-1.11.1-test.patch

@@ -21,26 +21,22 @@ index 5f290a9..ea9e850 100644
                   extensible-exceptions >= 0.1 && < 0.2,
 @@ -251,7 +251,7 @@ Library
                   tagsoup >= 0.12.5 && < 0.13,
-                  base64-bytestring >= 0.1 && < 1.commit fa978e13658f76be109243224f7491550db74240
+                  base64-bytestring >= 0.1 && < 1.1,
-Author: John MacFarlane <fiddlosopher@gmail.com>
+                  zlib >= 0.5 && < 0.6,
-Date:   Tue May 7 20:22:09 2013 -0700
+-                 highlighting-kate >= 0.5.3.7 && < 0.6,
-
++                 highlighting-kate >= 0.5.3.9 && < 0.6,
-    Use latest highlighting-kate and texmath.
+                  data-default >= 0.4 && < 0.6,
-    
+                  temporary >= 1.1 && < 1.2,
-    Closes #849.
+                  blaze-html >= 0.5 && < 0.7,
-
+diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex
-diff --git a/pandoc.cabal b/pandoc.cabal
+index 16e9a79..2a5025a 100644
-index 5f290a9..ea9e850 100644
+--- a/tests/lhs-test.latex
---- a/pandoc.cabal
++++ b/tests/lhs-test.latex
-+++ b/pandoc.cabal
+@@ -22,6 +22,7 @@
-@@ -241,7 +241,7 @@ Library
+ \IfFileExists{microtype.sty}{\usepackage{microtype}}{}
-                  old-locale >= 1 && < 1.1,
+ \usepackage{color}
-                  time >= 1.2 && < 1.5,
+ \usepackage{fancyvrb}
-                  HTTP >= 4000.0.5 && < 4000.3,
++\newcommand{\VerbBar}{|}
--                 texmath >= 0.6.1.3 && < 0.7,
+ \DefineShortVerb[commandchars=\\\{\}]{\|}
-+                 texmath >= 0.6.1.5 && < 0.7,
+ \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
-                  xml >= 1.3.12 && < 1.4,
+ % Add ',fontsize=\small' for more characters per line
-                  random >= 1 && < 1.1,
-                  extensible-exceptions >= 0.1 && < 0.2,
-@@ -251,7 +251,7 @@ Library
-                

app-text/pastebinit/pastebinit-1.3.1-r2.ebuild

@@ -8,19 +8,6 @@ PYTHON_REQ_USE="xml"
 
 inherit python-r1
 
-DESCRIPTION="A software that lets you send anything you want directly to a
-pastebin from the command line."
-HOMEPAGE="https://launchpad.net/pastebinit"
-SRC_URI="https://lau# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pastebinit/pastebinit-1.3.1-r2.ebuild,v 1.3 2013/12/24 12:56:08 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1
-
 DESCRIPTION="A software that lets you send anything you want directly to a
 pastebin from the command line."
 HOMEPAGE="https://launchpad.net/pastebinit"
@@ -45,4 +32,25 @@ src_prepare() {
 		fi
 	done
 
-	sed -i -e "/^build-mo/s/:.*/:${mo}
+	sed -i -e "/^build-mo/s/:.*/:${mo}/" po/Makefile
+}
+
+src_compile() {
+	emake -C po
+	xsltproc --nonet \
+		"${EROOT}"usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
+		pastebinit.xml || die
+}
+
+src_install() {
+	dobin pastebinit utils/pbput
+	python_replicate_script "${ED}usr/bin/${PN}"
+	dosym pbput /usr/bin/pbget
+	use crypt && dosym pbput /usr/bin/pbputs
+	dodoc README
+	doman pastebinit.1 utils/*.1
+	insinto /usr/share/locale
+	[[ -d po/mo ]] && doins -r po/mo/*
+	insinto /usr/share
+	doins -r pastebin.d
+}

app-text/pdfminer/Manifest

@@ -1,3 +1,2 @@
 DIST pdfminer-20131113.tar.gz 4080763 SHA256 1016246265f9d48645229164ef44483e9b9a1b3e6902783782f9ae4e1024ea19 SHA512 be598f9ca5cb87fcde91190f72ee77209a6f8ca9db93588c914e6ec666b2a3cc69abedd92ca73a53e714c3660065b7f2c1e9c770e46c838f6d3d489dd637203e WHIRLPOOL 91980937f332332591d31241c558176dcd3cdc5da065fa9e748463d39f582facbef8e64c10155e691bdd938589c6616136c2cd63bf91ad1f54852e116edc5cee
 DIST pdfminer-20140328.tar.gz 4081233 SHA256 ba187b93056586a14edd5e630cf63ae96b1cc84b611f55dcddbc997316d9f262 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a WHIRLPOOL 0f1e5e10936d2a6f02872699812e4b8449875330f1dbb668a15c5a85c94d3cb2cf5cb471fb280159df20fa454344b1256469180cdfb5ec3091df07e49c283264
-DIST pdfminer-20131113.tar.gz 4080763 SHA256 1016246265f9d48645229164ef44483e9b9a1b3e6902783782f9ae4e1024ea19 SHA512 be598f9ca5cb87fcde91190f72ee77209a6f8ca9db93588c914e6ec666b2a3cc69abedd92ca73a53

app-text/pelican/pelican-3.4.0.ebuild

@@ -16,23 +16,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples markdown"
 
-DEPEND="dev-python/feedgenerator[${PYT# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pelican/pelican-3.4.0.ebuild,v 1.3 2014/08/10 18:28:34 slyfox Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files"
-HOMEPAGE="http://pelican.notmyidea.org/ http://pypi.python.org/pypi/pelican"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples markdown"
-
 DEPEND="dev-python/feedgenerator[${PYTHON_USEDEP}]
-	>=dev-
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+DOCS=( README.rst )
+
+python_install_all() {
+	use examples && local EXAMPLES=( samples/. )
+	distutils-r1_python_install_all
+}
+
+# no tests: tests/content not in tarball for 2.8.1
+# for 3.0, should be based on tox (refer to virtualenvwrapper)
+
+#python_test() {
+#	esetup.py test
+#}

app-text/podofo/Manifest

@@ -1,4 +1,2 @@
 DIST podofo-0.9.2-freetype251.patch 1106 SHA256 324889c99eccafb5e4732d65d325453470ca659c5b43b2e9265f7e5d3fd8bbeb SHA512 185d9e16587fec922720042e7a604ae4b1c5b36c115beebf08ff73a46bf2859b25b0dda6b858f31e2fab3dfa88c79265e5d4e0da30091e83b22dff2bdaa2b6da WHIRLPOOL b9fb89a41be7ed16f1b0ca78e0ec95427133077c8b7b5c120a713d38624bb51eb8fe5dd08d1c9bf1b2ed5fd077222b6e40d224583c6436c7ee117caf7e310dbf
 DIST podofo-0.9.2.tar.gz 1092131 SHA256 465191618c57da9ae9230e7919e1985a242ddc7d1045cfdb6fb066140ed0a3f3 SHA512 e0bda743b192edfd42f381498edc56f30e6d89f45e7abd2b4351e15fd672a432d07f067ab8ed5cf378b0ecbab6d98abb32c22c1ce860c0021e31235fc5683a21 WHIRLPOOL f22c5ec0c3de1ef661198e8c94b2ac9faab88c6b12ebe27da14642c6eaed154f2e1fbf4f404807d7e33f895ffb64663eb7e403ec8a9e0f87b32e3470b7f5acfb
-DIST podofo-0.9.2-freetype251.patch 1106 SHA256 324889c99eccafb5e4732d65d325453470ca659c5b43b2e9265f7e5d3fd8bbeb SHA512 185d9e16587fec922720042e7a604ae4b1c5b36c115beebf08ff73a46bf2859b25b0dda6b858f31e2fab3dfa88c79265e5d4e0da30091e83b22dff2bdaa2b6da WHIRLPOOL b9fb89a41be7ed16f1b0ca78e0ec95427133077c8b7b5c120a713d38624bb51eb8fe5dd08d1c9bf1b2ed5fd077222b6e40d224583c6436c7ee117caf7e310dbf
-DIST podofo-0.9.2.tar.gz 1092131 SHA256 465191618c57da9ae9230e7919e1985a242ddc7d1045cfdb6fb066140ed0a3f3 SHA512 e0bda743b192edfd42f381498edc56f30e6d89f45e7abd2b4351e15fd672a432d07f067ab8ed5cf378b0ecbab6d98abb32c22c1ce860c0021e31235fc5683a21 WHIRLPOOL f22c5ec0c3de1ef661198e8c94b2ac9faab88c6b12ebe27da14642c6eaed154f2e1fbf4f404807d7e33f895ffb64663eb7e403ec8a9e0f87b32e3470b7f5acfb

app-text/poppler/poppler-0.24.5.ebuild

@@ -18,38 +18,6 @@ IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tif
 # No test data provided
 RESTRICT="test"
 
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.24.5.ebuild,v 1.10 2014/01/12 13:15:31 ago Exp $
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0/44"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
 COMMON_DEPEND="
 	>=media-libs/fontconfig-2.6.0
 	>=media-libs/freetype-2.3.9
@@ -82,4 +50,46 @@ DOCS=(AUTHORS NEWS README README-XPDF TODO)
 src_configure() {
 	# this is needed for multilib, see bug 459394
 	local ft_libdir ft_includedir
-	ft_libdir="$($(tc-
+	ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
+	ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
+	export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
+	einfo "Detected FreeType at ${FREETYPE_DIR}"
+
+	mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON
+		$(cmake-utils_use_with tiff)
+	)
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use cairo && use doc; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}

app-text/ps2pkm/Manifest

@@ -1,4 +1,2 @@
 DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57
 DIST texlive-20130530-source.tar.xz 179963948 SHA256 a905832e4c04dd1cb16db4bb7baacb78fbc19682bd33ac2697a3a85ce78d79d4 SHA512 4aa85273a675af2453f09777b7cb348c18add77410d72f562c6586f6814d4e7c34b6f3690e3453020654fb0a265339fcabf590d9155367d52846224499af334c WHIRLPOOL 3affaf25d3936505d971599092964b0f0e97d107d22dbac6a85ad547e1d2726a6a09c5075fecb0c6ff8c88bc1bd09d78f95902f76eb76c608f8a7bc42dd6bc33
-DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57
-DIST texlive-20130530-source.tar.xz 179963948 SHA256 a90583

app-text/sgml-common/Manifest

@@ -1,2 +1 @@
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 SHA256 c5f6668cb19e230df5c5adaf2704fa5225da0aab090b42a23f4247224c6523ee SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce WHIRLPOOL 18187f92fd4def6affdbb9e7c6de5f4a29f906b6f5199bb9db049ff106cc3fccd51144b83ad575caeb1ef8b6cb01d59db7a33563867fe14053019d93b9084772
-DIST sgml-common-0.6.3-gentoo.tar.gz 128903 SHA256 c5f6668cb19e230df5c5adaf2704fa5225da0aab090b42a23f4247224c6523ee SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce WHIRLPOOL 18187f92fd4def6affdbb9e7c6de5f4a29f906b6f5199bb9db049ff106cc3fccd51144b83ad575caeb1ef8b6cb01d59db7a33563867fe14053019d93b9084772

app-text/sgmltools-lite/Manifest

@@ -1,3 +1,2 @@
 DIST nw-eps-icons-0.0.1.tar.gz 8733 SHA256 15295129f1ddd3bc1d09775296bf0aacef722799394189b0755acb3d1725c012 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a WHIRLPOOL 8aba320641c652e38ad4e87a48ac5f5454ded681ec1d9fc4a2430e272e3a6b9d6f230c4ede9e02d8df2f4f711bee33b2e7929f96871a685d17aa52a5ef3cdbf5
 DIST sgmltools-lite-3.0.3.tar.gz 61342 SHA256 eb9d2270f9ac5f17b8bd2d27f53ae700937365079413843fe5089c9568d0f1d8 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81 WHIRLPOOL 46a94114a04c54a19f1d6a37a35bfb30804b1fde8defc931b9464980600b2707ca9ea970632d5d793dee1bbd0a388ef3e64a8be2806093e33dca4eb7bfd4c7d3
-DIST nw

app-text/sword/Manifest

@@ -1,3 +1,2 @@
-DIST sword-1.6.2.tar.gz 1965427 SHA256 af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4 WHIRLPOOL 50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e79-----BEGIN PGP SIGNED MESSAGE-----
 DIST sword-1.6.2.tar.gz 1965427 SHA256 af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4 WHIRLPOOL 50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e7935bf0af10c96e9c0b2f26c7e3088edf8311564620fb778fc1f63c0b78c449ad165fee9843fb753d
 DIST sword-1.7.2.tar.gz 2127944 SHA256 ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871 SHA512 1ee9565f36d113c9b21883a78004e895ab2f74d9c9f1909058c204e38647a96938de2e544a68858d2c4b048b67ba868049c1c09f0067bc9819a5a85f75285ebe WHIRLPOOL 894e4d96b2ff61ac19de853ff6b17aa2279fb7b5b571c1030ba18daefbea8997bd61d386ff3a1dff49d997c69d6acf2a83094ad6ec5c593acca3dc7fb1d488a0

app-vim/brainfuck-syntax/Manifest

@@ -1,4 +1,2 @@
 DIST brainfuck-syntax-1.0.1.tar.bz2 874 SHA256 86b25c5953e69cba70b310680f1a05465d90139352d97414566138b3f18d2a8d SHA512 2c18bffdb9255392f88d2155fe73300e13e50856d72a84424d52699572b7dbad658759d8e5ee16baa4eedd5ca666fcb0f8085d6cbd760c938b160b952999a29d WHIRLPOOL fd14de34633cd87a8cb3c5c807b6a87d62c39f8e06c62d421d71edbb11d607db97774401b93db981ffcd3779dddaf032050b3c480d6715923b87ab189d99c45e
-DIST brainfuck-syntax-1.0.2.tar.bz2 916 SHA256 256a0f43be2da9af5a3f7bc8af34083a374cf711186d9ca921b63-----BEGIN PGP SIGNED MESSAGE-----
-DIST brainfuck-syntax-1.0.1.tar.bz2 874 SHA256 86b25c5953e69cba70b310680f1a05465d90139352d97414566138b3f18d2a8d SHA512 2c18bffdb9255392f88d2155fe73300e13e50856d72a84424d52699572b7dbad658759d8e5ee16baa4eedd5ca666fcb0f8085d6cbd760c938b160b952999a29d WHIRLPOOL fd14de34633cd87a8cb3c5c807b6a87d62c39f8e06c62d421d71edbb11d607db97774401b93db981ffcd3779dddaf032050b3c480d6715923b87ab189d99c45e
 DIST brainfuck-syntax-1.0.2.tar.bz2 916 SHA256 256a0f43be2da9af5a3f7bc8af34083a374cf711186d9ca921b63a7dd5f9c84a SHA512 d01e544e45d4ada1c7ed8ca02e72d888fdcd374be8ee45c01d7797fc1e32457be94e0429dc3fc88f12fee063bd70d06af8ab4238795154a82793b6abb42dd974 WHIRLPOOL 71b8be951bd07d9df149a5ef4f205a196fb4153d33087414fc3df4d0436dae1526134a65de7dc6355ba3a34a25f92b3f2e82c02339f148b5076e4bf09f9bf9ed

dev-ada/gtkada/gtkada-2.8.0.ebuild

@@ -10,21 +10,6 @@ DESCRIPTION="Gtk+ bindings to the Ada language"
 HOMEPAGE="https://libre.adacore.com/GtkAda/"
 SRC_URI="mirror://gentoo/${Name}-${PV}.tgz"
 
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.8.0.ebuild,v 1.10 2009/08/01 22:56:55 flameeyes Exp $
-
-inherit eutils gnat versionator
-
-Name="GtkAda-gpl"
-MajorPV=$(get_version_component_range 1-2)
-DESCRIPTION="Gtk+ bindings to the Ada language"
-HOMEPAGE="https://libre.adacore.com/GtkAda/"
-SRC_URI="mirror://gentoo/${Name}-${PV}.tgz"
-
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~amd64 ~x86 ~ppc"
@@ -106,4 +91,20 @@ src_install() {
 	ps2pdf gtkada_ug/gtkada_ug.ps
 	ps2pdf gtkada_rm/gtkada_rm.ps
 	cp gtkada_ug.pdf gtkada_rm.pdf "${D}/usr/share/doc/${PF}"
-	dohtml -r gtkada_ug/{gtkada_ug.html,boxes.gif,hierarchy.jpg}
+	dohtml -r gtkada_ug/{gtkada_ug.html,boxes.gif,hierarchy.jpg}
+	cp -dPr gtkada_rm/gtkada_rm/ "${D}/usr/share/doc/${PF}/html"
+
+	# utility stuff
+	cd "${S}"
+	dodir "${AdalibDataDir}/${PN}"
+	insinto "${AdalibDataDir}/${PN}"
+	doins -r xml/gtkada.xml projects/
+}
+
+pkg_postinst() {
+	eselect gnat update
+	einfo "The environment has been set up to make gnat automatically find files for"
+	einfo "GtkAda. In order to immediately activate these settings please do:"
+	einfo "   env-update && source /etc/profile"
+	einfo "Otherwise the settings will become active next time you login"
+}

dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch

@@ -45,15 +45,12 @@ make the code work with all gcc targets
    void *pc = non_inline_func();
    const char *symbol = TrySymbolize(pc);
    CHECK(symbol != NULL);
-@@ -314,7 +314,7 @@ void ATTRIBUTE_NOINLINEhttp://code.google.com/p/google-glog/issues/detail?id=130
+@@ -314,7 +314,7 @@ void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() {
-
+ }
-make the code work with all gcc targets
+ 
-
+ void ATTRIBUTE_NOINLINE TestWithPCInsideInlineFunction() {
---- a/src/symbolize_unittest.cc
+-#if defined(TEST_X86_32_AND_64) && defined(HAVE_ALWAYS_INLINE)
-+++ b/src/symbolize_unittest.cc
++#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ALWAYS_INLINE)
-@@ -60,9 +60,7 @@ using namespace GOOGLE_NAMESPACE;
+   void *pc = inline_func();  // Must be inlined.
- #    endif  // __i386__
+   const char *symbol = TrySymbolize(pc);
- #  else
+   CHECK(symbol != NULL);
- #  endif  // __GNUC__ >= 4
--#  if defined(__i386__) || defined(__x86_64__)
--#    define TEST_X86_32_AND_64

dev-cpp/libbackend-elements/Manifest

@@ -1,2 +1 @@
-DIST libbackend-elements-1.7.2.tar.bz2 22501 SHA256 803c5a9ff7422da04a6d2802214cee09c2eeddf7608866c34eb23e73bb92d3f7 SHA512 480563aa55c317a417bd3326ae108ee6bd8fbd9d3e6757f9387d5c407b8f2f4ae8194e2ee90c3ec05fa8d05113251d9850c176919e4e8b322409ff6625c29355 WHIRLPOOL fdba6955119b02b8b623d6d427593577049ee163389b0d42a0f45f0da7b816d49a267c18c6beab32f62b3adc414d8e752944ec31e6bd77781269d35e3272e843-----BEGIN PGP SIGNED MESSAGE-----
 DIST libbackend-elements-1.7.2.tar.bz2 22501 SHA256 803c5a9ff7422da04a6d2802214cee09c2eeddf7608866c34eb23e73bb92d3f7 SHA512 480563aa55c317a417bd3326ae108ee6bd8fbd9d3e6757f9387d5c407b8f2f4ae8194e2ee90c3ec05fa8d05113251d9850c176919e4e8b322409ff6625c29355 WHIRLPOOL fdba6955119b02b8b623d6d427593577049ee163389b0d42a0f45f0da7b816d49a267c18c6beab32f62b3adc414d8e752944ec31e6bd77781269d35e3272e843

dev-cpp/pangomm/Manifest

@@ -1,4 +1,2 @@
 DIST pangomm-2.28.4.tar.xz 796212 SHA256 778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82 SHA512 85e327f5a85417c209cdffe52e5b776878233762e894d8bc6c353378cae9bec6d7f4181d21cf690c32d15ff7ac87272f1abd75352c3a73af9f98f1551df88a79 WHIRLPOOL 2b96088241a4430801d0811063a9710209522721fe83a66909bbf2ecca03304f894be9a544c2ed979dbee031d459cae9099d66c620934bec4842a94a35eda475
 DIST pangomm-2.34.0.tar.xz 516028 SHA256 0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41 SHA512 d8fddf52189da99a56289e3e1aa0579da2b48a62ffd00981db9da505ebc03a734c67151d8f4f3ca85dcd47c79218cdf503f23b8e69074fe99c052596320c8309 WHIRLPOOL 6ff34e0b71134ea4e40a9d103fbac03517f56ea323969dde290d632b87dd5d26013254ac3506ffbed5ec4b1a448815f630480ce179b6c6f070a0e277b56dba0e
-DIST pangomm-2.28.4.tar.xz 796212 SHA256 778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82 SHA512 85e327f5a85417c209cdffe52e5b776878233762e894d8bc6c353378cae9bec6d7f4181d21cf690c32d15ff7ac87272f1abd75352c3a73af9f98f1551df88a79 WHIRLPOOL 2b96088241a4430801d0811063a9710209522721fe83a66909bbf2ecca03304f894be9a544c2ed979dbee031d459cae9099d66c620934bec4842a94a35eda475
-DIST pangomm-2.34.0.tar.xz 516028 SHA256 0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41 SHA512 d8fddf52189da99a56289e3e1aa0579da2b48a62ffd00981db9da505ebc03a734c67151d8f4f3ca85dcd47c79218cdf503f23b8e69074fe99c052596320c8309 WHIRLPOOL 6ff34e0b71134ea4e40a9d103fbac03517f56ea323969dde290d632b87dd5d26013254ac3506ffbed5ec4b1a448815f630480ce179b6c6f070a0e277b56dba0e

dev-db/lib_mysqludf_fPROJ4/lib_mysqludf_fPROJ4-0.1.0.ebuild

@@ -37,18 +37,28 @@ src_prepare() {
 
 	# fix doc (BOM, CR/LF, soname)
 	sed -i -e '1 s|^\xEF\xBB\xBF||' \
-# Copyright 1999-2011 Gentoo Foundation
+		-e "s|'\(${PN}\).*'|'\1.so'|g" ${PN}.sql
-# Distributed under the terms of the GNU General Public License v2
+	echo >> ${PN}.sql  # add LF
-# $Header: /var/cvsroot/gentoo-x86/dev-db/lib_mysqludf_fPROJ4/lib_mysqludf_fPROJ4-0.1.0.ebuild,v 1.1 2011/10/19 12:12:02 sbriesen Exp $
+	edos2unix ${PN}.sql
-
+}
-EAPI=4
 
-inherit eutils toolchain-funcs
+src_compile() {
+	_compile ${CFLAGS} -Wall -fPIC ${MYSQL_INCLUDE} -lproj \
+		-shared ${LDFLAGS} -o ${PN}.so ${PN}.c
+}
 
-DESCRIPTION="MySQL UDFs which converts geographic/cartesian coordinates"
+src_install() {
-HOMEPAGE="http://www.mysqludf.org/lib_mysqludf_fPROJ4/"
+	exeinto "${MYSQL_PLUGINDIR}"
-SRC_URI="http://www.mysqludf.org/${PN}/${P}.tar.gz"
+	doexe ${PN}.so
+	dodoc ${PN}.sql
+}
 
-LICENSE="LGPL-2.1"
+pkg_postinst() {
-SLOT="0"
+	elog
-KEYWORDS="~amd64 ~
+	elog "Please have a look at the documentation, how to"
+	elog "enable/disable the UDF functions of ${PN}."
+	elog
+	elog "The documentation is located here:"
+	elog "/usr/share/doc/${PF}"
+	elog
+}

dev-db/lib_mysqludf_stat/lib_mysqludf_stat-0.0.3.ebuild

@@ -6,15 +6,6 @@ EAPI=4
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="MySQL UDFs with statistical functions"
-HOMEPAGE="http://www.mysqludf.org/lib_mysqludf_stat/# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/lib_mysqludf_stat/lib_mysqludf_stat-0.0.3.ebuild,v 1.1 2011/10/19 12:19:53 sbriesen Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
 DESCRIPTION="MySQL UDFs with statistical functions"
 HOMEPAGE="http://www.mysqludf.org/lib_mysqludf_stat/"
 SRC_URI="http://www.mysqludf.org/${PN}/${PN}_${PV}.tar.gz"
@@ -48,4 +39,22 @@ src_prepare() {
 }
 
 src_compile() {
-	_compile
+	_compile ${CFLAGS} -Wall -fPIC ${MYSQL_INCLUDE} \
+		-shared ${LDFLAGS} -o ${PN}.so ${PN}.c
+}
+
+src_install() {
+	exeinto "${MYSQL_PLUGINDIR}"
+	doexe ${PN}.so
+	dodoc ${PN}.sql
+}
+
+pkg_postinst() {
+	elog
+	elog "Please have a look at the documentation, how to"
+	elog "enable/disable the UDF functions of ${PN}."
+	elog
+	elog "The documentation is located here:"
+	elog "/usr/share/doc/${PF}"
+	elog
+}

dev-db/lib_mysqludf_stem/Manifest

@@ -1,2 +1 @@
 DIST lib_mysqludf_stem-0.9.1.tar.gz 953171 SHA256 a98394b8275ea91eae0bd34703c0a686c5b8c3df039128b0487db757646d1f37 SHA512 d15736da91dc5a6f2b0289694efeb531337ff6a001d39aafca02c9f165ba5901163855b8f03d13a50c2ab9bee58e7fc03d19e893d086ec0022de9dd6921f93b7 WHIRLPOOL 26c670424a092052d0ce33b25ba094afa67bb9e1fc6609a3467778f498bf15c0dfe59ce54c29f056a0c33785a32ff36b643217f1768acf624f304e5ef0c79f59
-DIST lib_mysqludf_stem-0.9.1.tar.gz 953171 SHA256 a98394b8275ea91eae0bd34703c0a686c5b8c3df039128b0487db757646d1f37 SHA512 d15736da91dc5a6

dev-db/lib_mysqludf_str/Manifest

@@ -1,2 +1 @@
 DIST lib_mysqludf_str-0.3.tar.gz 353717 SHA256 6a11bcfba19f97dfc696d0871779eba67e2a6badc20364403a9f68a9bb8a398b SHA512 a63ffbfd352db087da5a3e70f713845a88c6f4db47511a5b359bb8bcb466070d34b5e2b16d2bde38bd617ed209e2dc4553bbccfb406820e7669aa688652332b8 WHIRLPOOL 42712c9dc2948819680b1afb8f76f3ac3ad1b644c2215ae245afdc94c9f0be0eae5c27e799a336000a6865ac40cd467bf3e49b728ec27373698532b21416fb85
-DIST lib_mysqludf_str-0.3.tar.gz 353717 SHA256 6a11bcfba19f97dfc696d0871779eba67e2a6badc20364403a9f68a9bb8a398b SHA512 a63ffbfd352db087da5a3e70f713845a88c6f4db47511a5b359bb8bcb466070d34b5e2b16d2bde38bd617ed209e2dc4553bbccfb406820e7669aa688652332b8 WHIRLPOOL 42712c9dc2948819680b1afb8f76f3ac3ad1b644c2215ae245afdc94c9f0be0eae5c27e799a336000a6865ac40cd467bf3e49b728ec27373698532b21416fb85

dev-db/myodbc/myodbc-5.2.7.ebuild

@@ -9,18 +9,6 @@ MAJOR="$(get_version_component_range 1-2 $PV)"
 MY_PN="mysql-connector-odbc"
 MY_P="${MY_PN}-${PV/_p/r}-src"
 
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="http://www.mysql# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7.ebuild,v 1.2 2014/08/20 18:52:50 grknight Exp $
-
-EAPI=5
-inherit cmake-utils eutils flag-o-matic versionator
-
-MAJOR="$(get_version_component_range 1-2 $PV)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-src"
-
 DESCRIPTION="ODBC driver for MySQL"
 HOMEPAGE="http://www.mysql.com/products/myodbc/"
 SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
@@ -109,4 +97,20 @@ pkg_config() {
 	msg='sample MySQL ODBC DSN'
 	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
 		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.in
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+
+	elog "If this is a new install, please run the following command"
+	elog "to configure the MySQL ODBC drivers and sources:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
+}

dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d

@@ -44,26 +44,36 @@ STOP_TIMEOUT=120
 
 # Depending on your usage of MySQL, you may also wish to start it after some
 # other services are up. Uncomment the lines below as needed. If these aren't
-# enough for you, we encourage you to file a bug, and help us und# Copyright 1999-2011 Gentoo Foundation
+# enough for you, we encourage you to file a bug, and help us understand how
-# Distributed under the terms of the GNU General Public License v2
+# you are using MySQL.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d,v 1.2 2011/01/15 17:54:31 robbat2 Exp $
 
-# If you want a non-stock location for the config file, uncomment or update
+# Do your MySQL ACLs refer to hostnames not in your /etc/hosts?
-# either of these as needed. If you do use it, you must make sure that none of
+# If so, you need DNS before you can accept connections.
-# your socket, pidfile, datadir, logfiles, binary logs, relay logs or InnoDB
+# Avoid dependency circular loops if you use MySQL to power a local DNS server.
-# files collide with each other.
+#rc_use="dns"
-MY_CNF="/etc/mysql/my.cnf"
+#rc_after="dns"
-#MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
-#MY_CNF="${MY_CNF:-/etc/mysql/my-${SVCNAME/mysql.}.cnf}"
 
-# Place any additional arguments here that you might need
+# Does your MySQL bind to an IP on an interface other than net.lo?
-# Common/useful options:
+# Alternatively you might wish to specify the exact interface here.
-# --skip-slave-start=1 - For bringing up replication initially
+#rc_use="net"
-# --server-id=NNN - Server ID for replication
+#rc_after="net"
-# --skip-networking - lock it down to UNIX sockets only
-MY_ARGS=""
 
-# This setting (in seconds) should be high enough to allow InnoDB to do a full
+# Do you store your MySQL files on a SAN or other network filesystem, that is
-# checkpoint recovery. 900 is the default used in the upstream RPM startup
+# provided by the netmount init script?
-# scripts. 30 seconds should be sufficent if you just have a tiny <1GiB
+#rc_need="netmount"
-# database. After the core startup is done, we wait this lon
+
+# Or from NFS? P.S. This is not a good idea in most cases, but does have some
+# valid usage cases, so we provide the option.
+#rc_need="nfsmount"
+
+# Should any one of the instances satisfy the requirement for MySQL coming up?
+# By default, we say no.
+[ "${SVCNAME}" != mysql ] && rc_provide="!mysql"
+# But uncomment this next instead if you think it should.
+#rc_provide="mysql"
+
+# The conditional above has a false-positive "failure" return value as a
+# side-effect, and since it's the last statement, without the next line, this
+# script returns failure.
+return 0
+# vim: ft=gentoo-conf-d et ts=4 sw=4:

dev-db/odbtp/Manifest

@@ -1,2 +1 @@
-DIST odbtp-1.1.4.tar.gz 1049975 SHA256 c4f4e0b01610d0e547dfe70e9e2184fc35c8944a44be6a70ec8c8fc28dffe705 SHA512 4b87c8733fc1f017546024901874b0ea2f410646ef39f9581cc170773639077c3f885-----BEGIN PGP SIGNED MESSAGE-----
 DIST odbtp-1.1.4.tar.gz 1049975 SHA256 c4f4e0b01610d0e547dfe70e9e2184fc35c8944a44be6a70ec8c8fc28dffe705 SHA512 4b87c8733fc1f017546024901874b0ea2f410646ef39f9581cc170773639077c3f885813550422966e8797489c66b32b75de85fa658e3bb84da285b96c0a7b70 WHIRLPOOL b5443d5639e9d1f938d3708153cdc10a92ba6c2f8e4a1615c897ac05aebb88d59903ddde59092130373abcf8daefe59086c6eac9f686dce753be03cd68012d4a

dev-db/opendbx/opendbx-1.4.6.ebuild

@@ -15,26 +15,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bindist firebird +mysql oracle postgres sqlite sqlite3"
 
-DEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( <dev-db/sqlite-3 )
-	sqlite3? ( =d# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.4.6.ebuild,v 1.3 2014/03/10 21:15:06 swegener Exp $
-
-EAPI="5"
-
-inherit flag-o-matic multilib
-
-DESCRIPTION="OpenDBX - A database abstraction layer"
-HOMEPAGE="http://www.linuxnetworks.de/doc/index.php/OpenDBX"
-SRC_URI="http://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bindist firebird +mysql oracle postgres sqlite sqlite3"
-
 DEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
 	sqlite? ( <dev-db/sqlite-3 )
@@ -59,4 +39,30 @@ pkg_setup() {
 
 	use mysql && append-cppflags -I/usr/include/mysql
 	use firebird && append-cppflags -I/opt/firebird/include
-	use o
+	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+}
+
+src_configure() {
+	local backends=""
+
+	use !bindist && use firebird && backends="${backends} firebird"
+	use mysql && backends="${backends} mysql"
+	use oracle && backends="${backends} oracle"
+	use postgres && backends="${backends} pgsql"
+	use sqlite && backends="${backends} sqlite"
+	use sqlite3 && backends="${backends} sqlite3"
+
+	econf --with-backends="${backends}" || die "econf failed"
+}
+
+src_compile() {
+	# bug #322221
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+
+	rm -f "${D}"/usr/$(get_libdir)/opendbx/*.{a,la}
+}

dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild

@@ -7,18 +7,6 @@ inherit eutils multilib
 MY_P_x86="${PN/oracle-/}-linux32-${PV}-20061115"
 MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20070103"
 
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux: SQL*Plus"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="amd64? ( ${MY_P_# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild,v 1.8 2012/06/04 06:43:20 zmedico Exp $
-
-inherit eutils multilib
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}-20061115"
-MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20070103"
-
 S=${WORKDIR}
 DESCRIPTION="Oracle 10g client installation for Linux: SQL*Plus"
 HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
@@ -65,4 +53,17 @@ src_install() {
 	doexe sqlplus
 
 	dodir /usr/bin
-	d
+	dosym "${D}"/usr/$(get_libdir)/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
+}
+
+pkg_postinst() {
+	elog "The SQL*Plus package for Oracle 10g has been installed."
+	elog "You may wish to install the oracle-instantclient-jdbc (for"
+	elog "the supplemental JDBC functionality) package as well."
+	elog
+	elog "If you have any questions, be sure to read the README:"
+	elog "http://otn.oracle.com/docs/tech/sql_plus/10102/readme_ic.htm"
+	elog
+	elog "oracle-instantclient-* packages aren't installed in different"
+	elog "SLOTs any longer. You may want to uninstall older versions."
+}

dev-db/postgis/files/postgis-1.5-ldflags.patch

@@ -1,7 +1,5 @@
 diff -Naurw postgis-1.5.8.orig/loader/Makefile.in postgis-1.5.8/loader/Makefile.in
 --- postgis-1.5.8.orig/loader/Makefile.in	2010-09-10 20:44:05.000000000 +0000
-+++ postgis-1.5diff -Naurw postgis-1.5.8.orig/loader/Makefile.in postgis-1.5.8/loader/Makefile.in
---- postgis-1.5.8.orig/loader/Makefile.in	2010-09-10 20:44:05.000000000 +0000
 +++ postgis-1.5.8/loader/Makefile.in	2013-01-30 14:31:01.189692941 +0000
 @@ -79,16 +79,16 @@
  	$(CC) $(CFLAGS) $(ICONV_CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
@@ -19,4 +17,12 @@ diff -Naurw postgis-1.5.8.orig/loader/Makefile.in postgis-1.5.8/loader/Makefile.
  
  $(SHP2PGSQL-GUI): stringbuffer.o shpopen.o dbfopen.o safileio.o shp2pgsql-core.o shp2pgsql-gui.o getopt.o $(LIBLWGEOM) $(GTK_WIN32_RES)
 -	$(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm 
-+	$(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(LDFLAGS) $(GTK_LIBS) $(IC
++	$(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm
+ 
+ installdir:
+ 	@mkdir -p $(DESTDIR)$(bindir)
+@@ -106,4 +106,3 @@
+ 
+ clean:
+ 	@rm -f *.o $(SHP2PGSQL-CLI) $(PGSQL2SHP) $(GTK_WIN32_RES)
+-

dev-db/tora/tora-9999.ebuild

@@ -65,20 +65,24 @@ src_configure() {
 	if use oracle || use oci8-instant-client ; then
 		mycmakeargs=(-DENABLE_ORACLE=ON)
 	else
-		mycmakeargs=(-D# Copyright 1999-2013 Gentoo Foundation
+		mycmakeargs=(-DENABLE_ORACLE=OFF)
-# Distributed under the terms of the GNU General Public License v2
+	fi
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-9999.ebuild,v 1.3 2013/03/08 16:40:24 haubi Exp $
+	mycmakeargs+=(
-
+		-DWANT_RPM=OFF
-EAPI=2
+		-DWANT_BUNDLE=OFF
-
+		-DWANT_BUNDLE_STANDALONE=OFF
-inherit cmake-utils eutils
+		-DWANT_INTERNAL_QSCINTILLA=OFF
-
+		-DWANT_INTERNAL_LOKI=OFF
-if [[ ${PV} == 9999 ]]; then
+		$(cmake-utils_use_enable postgres PGSQL)
-	ESVN_REPO_URI="https://tora.svn.sourceforge.net/svnroot/tora/trunk/tora"
+		$(cmake-utils_use_want debug)
-	inherit subversion
+		# path variables
-	SRC_URI=""
+		-DTORA_DOC_DIR=share/doc/${PF}
-else
+	)
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	cmake-utils_src_configure
-fi
+}
 
-D
+src_install() {
+	cmake-utils_src_install
+	doicon src/icons/${PN}.xpm || die
+	domenu debian/${PN}.desktop || die
+}

dev-db/virtuoso-server/virtuoso-server-6.1.6.ebuild

@@ -28,35 +28,59 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gperf-2.7.2
 	sys-apps/gawk
-	>=sys-devel/bison-# Copyright 1999-2014 Gentoo Foundation
+	>=sys-devel/bison-2.3
-# Distributed under the terms of the GNU General Public License v2
+	>=sys-devel/flex-2.5.33
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.6.ebuild,v 1.7 2014/03/07 03:28:22 creffett Exp $
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	~dev-db/virtuoso-odbc-${PV}:${SLOT}
+"
 
-EAPI=4
+VOS_EXTRACT="
+	libsrc/Dk
+	libsrc/Thread
+	libsrc/Tidy
+	libsrc/Wi
+	libsrc/Xml.new
+	libsrc/langfunc
+	libsrc/odbcsdk
+	libsrc/plugin
+	libsrc/util
+	binsrc/virtuoso
+	binsrc/tests
+"
 
-inherit virtuoso
+DOCS=( AUTHORS ChangeLog CREDITS INSTALL NEWS README )
 
-DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
+PATCHES=(
+	"${FILESDIR}/${PN}-6.1.4-unbundle-minizip.patch"
+	"${FILESDIR}/${PN}-6.1.6-am_config_header.patch"
+)
 
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+src_prepare() {
-IUSE="kerberos ldap readline"
+	sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
+		|| die "failed to disable installation of static lib"
 
-# Bug 305077
+	virtuoso_src_prepare
-RESTRICT="test"
+}
 
-# zeroconf support looks like broken - disabling - last checked around 5.0.12
+src_configure() {
-# mono support fetches mono source and compiles it manually - disabling for now
+	myconf+="
-# mono? ( dev-lang/mono )
+		$(use_enable kerberos krb)
-COMMON_DEPEND="
+		$(use_enable ldap openldap)
-	dev-libs/libxml2:2
+		$(use_with readline)
-	>=dev-libs/openssl-0.9.7i:0
+		--disable-static
-	>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+		--disable-hslookup
-	kerberos? ( app-crypt/mit-krb5 )
+		--disable-rendezvous
-	ldap? ( net-nds/openldap )
+		--without-iodbc
-	readline? ( sys-libs/readline:0 )
+		--program-transform-name="s/isql/isql-v/"
-"
+	"
-DEPEND="${COMMON_DEPEND}
+
-	>=dev-util/gperf-2.7.2
+	virtuoso_src_configure
-	sys-apps/gawk
+}
-	>=sys-devel/bison-2.3
+
-	>=sys
+src_install() {
+	default_src_install
+
+	keepdir /var/lib/virtuoso/db
+}

dev-dotnet/atk-sharp/Manifest

@@ -1,3 +1,2 @@
 DIST gtk-sharp-2.12.10.tar.bz2 1638263 SHA256 aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770 SHA512 232137dfef327f664a941e96edb8e87a18e7def8bccf64e352e846fbd14fe4b93a0725f43b1167c05d597de10ce50c546935810e28681457d5eaba172fc457e0 WHIRLPOOL 3a8a12744ba09ba5b30da8b51b35a9d9cfccfa52e0493bafd71935a7cb6af855bf5860477569a5c17a6416a495e9a9cd4f74c61b8d25b7aedeaab1119fb16cc1
-DIST gtk-sharp-2.12.7.patch.bz2 1069 SHA256 f9db539471450d7cd17406573db117584d10c76bdbc36e11147335e93d6d10c8 SHA512 900a0c63308881b09d51bbd319c917f79ee638e82d2bbc3f7ffad6c15ad21fa22593895907caf76330511c0aa232e44ab6540bb417a2fc1963ea449b2339e427 WHIRLPOOL d3ffbe7e7189516862f64cbb7119484cf8f0d2bd6fd92e3afc839091c525a9cc4e1f8b8981b6cf9bfc52af46156e3f4DIST gtk-sharp-2.12.10.tar.bz2 1638263 SHA256 aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770 SHA512 232137dfef327f664a941e96edb8e87a18e7def8bccf64e352e846fbd14fe4b93a0725f43b1167c05d597de10ce50c546935810e28681457d5eaba172fc457e0 WHIRLPOOL 3a8a12744ba09ba5b30da8b51b35a9d9cfccfa52e0493bafd71935a7cb6af855bf5860477569a5c17a6416a495e9a9cd4f74c61b8d25b7aedeaab1119fb16cc1
 DIST gtk-sharp-2.12.7.patch.bz2 1069 SHA256 f9db539471450d7cd17406573db117584d10c76bdbc36e11147335e93d6d10c8 SHA512 900a0c63308881b09d51bbd319c917f79ee638e82d2bbc3f7ffad6c15ad21fa22593895907caf76330511c0aa232e44ab6540bb417a2fc1963ea449b2339e427 WHIRLPOOL d3ffbe7e7189516862f64cbb7119484cf8f0d2bd6fd92e3afc839091c525a9cc4e1f8b8981b6cf9bfc52af46156e3f43940536d812d4b68ffcf01559bd3dfb74

dev-dotnet/ikvm/files/ikvm-0.46.0.1-key.patch

@@ -13,22 +13,6 @@ Index: ikvm/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in
  	#pragma warning disable 1699
 -	[assembly: AssemblyKeyName("ikvm-key")]
 +	[assembly: AssemblyDelaySign(false)]
-+	[assembly: AssemblyKeyFile("../mono.snk")]
- #endif
Author: Jo Shields
-Description: This patch ensures that rather than trying to use the Mono Crypto
-Description: Service Provider to retrieve a signing key (CSP is not safe to
-Description: run with fakeroot), we simply hard-code the path to a bundled key
-Description: file
-Index: ikvm/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in
-===================================================================
---- ikvm.orig/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in	2011-07-05 01:24:45.000000000 +0100
-+++ ikvm/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in	2011-07-05 01:28:22.000000000 +0100
-@@ -33,5 +33,6 @@
- 
- #if SIGNCODE
- 	#pragma warning disable 1699
--	[assembly: AssemblyKeyName("ikvm-key")]
-+	[assembly: AssemblyDelaySign(false)]
 +	[assembly: AssemblyKeyFile("../mono.snk")]
  #endif
 Index: ikvm/ikvm-0.46.0.1/ikvm.build
@@ -55,4 +39,23 @@ Index: ikvm/ikvm-0.46.0.1/runtime/runtime.build
      <target name="signed">
          <property name="signed" value="SIGNCODE" />
 -        <property name="signoption" value="-key:ikvm-key" />
--       
+-        <property name="ilasm_signoption" value="/key:@ikvm-key" />
++        <property name="signoption" value="-keyfile:../../mono.snk" />
++        <property name="ilasm_signoption" value="/key:../../mono.snk" />
+         <call target="IKVM.Runtime" />
+     </target>
+ 
+Index: ikvm/ikvm-0.46.0.1/tools/pubkey.cs
+===================================================================
+--- ikvm.orig/ikvm-0.46.0.1/tools/pubkey.cs	2011-07-05 01:24:45.000000000 +0100
++++ ikvm/ikvm-0.46.0.1/tools/pubkey.cs	2011-07-05 01:28:22.000000000 +0100
+@@ -29,7 +29,8 @@
+ 
+ #if SIGNCODE
+     #pragma warning disable 1699
+-    [assembly: AssemblyKeyName("ikvm-key")]
++	[assembly: AssemblyDelaySign(false)]
++	[assembly: AssemblyKeyFile("../mono.snk")]
+ #endif
+ 
+ class PublicKey

dev-embedded/bitbake/bitbake-9999.ebuild

@@ -25,14 +25,15 @@ SLOT="0"
 IUSE="doc"
 
 RDEPEND="dev-python/ply
-	dev-python/progress# Copyright 1999-2013 Gentoo Foundation
+	dev-python/progressbar"
-# Distributed under the terms of the GNU General Public License v2
+DEPEND="doc? ( dev-libs/libxslt )"
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.14 2013/09/05 19:44:53 mgorny Exp $
+
-
+src_prepare() {
-EAPI="5"
+	if ! use doc ; then
-PYTHON_COMPAT=( python{2_6,2_7} )
+		sed -i -e 's:doctype = "html":doctype = "none":' \
-PYTHON_REQ_USE="sqlite"
+			-e 's:("share/doc/bitbake-%s/manual.*))::' setup.py || die
-
+		echo "none:" >> doc/manual/Makefile || die
-inherit distutils-r1 vcs-snapshot
+	else
-
+	    sed -i -e "s:\(share/doc/bitbake-%s.* %\) __version__:\1 \"${PV}\":" setup.py || die
-if [[ ${PV} =
+	fi
+}

dev-embedded/libftdi/libftdi-0.19.ebuild

@@ -12,21 +12,6 @@ else
 	KEYWORDS="amd64 arm ppc ppc64 sparc x86"
 fi
 
-DESCRIPTION="Userspace access to FTDI USB interface chips"
-HOMEPAGE="http://www.int# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-0.19.ebuild,v 1.3 2011/10/20 15:40:57 vapier Exp $
-
-EAPI="2"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-	inherit git-2 autotools
-else
-	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm ppc ppc64 sparc x86"
-fi
-
 DESCRIPTION="Userspace access to FTDI USB interface chips"
 HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
 
@@ -38,4 +23,35 @@ RDEPEND="virtual/libusb:0
 	cxx? ( dev-libs/boost )
 	python? ( dev-lang/python )"
 DEPEND="${RDEPEND}
-	doc? ( app-d
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	if [[ ${PV} == 9999* ]] ; then
+		mkdir -p m4
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable cxx libftdipp) \
+		$(use_with doc docs) \
+		$(use_with examples) \
+		$(use_enable python python-binding) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	use static-libs || find "${D}" -name '*.la' -delete
+	dodoc ChangeLog README
+
+	if use doc ; then
+		doman doc/man/man3/*
+		dohtml doc/html/*
+	fi
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+}

dev-embedded/libftdi/libftdi-1.0.ebuild

@@ -56,6 +56,11 @@ src_install() {
 		# Clean up crap man pages. #356369
 		rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}*
 
-		doma# Copyright 1999-2013 Gentoo Foundation
+		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
-# Distributed under the terms of the GNU General Public License v2
+		dohtml "${CMAKE_BUILD_DIR}"/doc/html/*
-# $Header: /var/cvsroot/gentoo-x86/dev-embedde
+	fi
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+}

dev-embedded/lpc21isp/Manifest

@@ -1,2 +1 @@
 DIST lpc21isp_185.tar.gz 54735 SHA256 b85f10265fa83cdaab5b975e7bd53bb47289f1207b45e99cd753ea7a75fb7088 SHA512 585c8f02771fc68719c8a5e6cc4253854dce4f4e0047df8a1d57db273cb51c9d4fcbe1066b079aaec54d7ca189e90710647b95fdb320729753967c265b1ac954 WHIRLPOOL 2fe84d48d355b64939e291f0557f6d8023df5b1a1c8f4152659eb25a9341b809cddcd1d9ff97fa52d6f459ddd4b80972b894421495d8a9705b7bec211c55375a
-DIST lpc21isp_185.tar.gz 54735 SHA256 b85f10265fa83cdaab5b975e7bd53bb47289f1207b45e99cd753ea7a75fb7088 SHA512 585c8f02771fc68719c8a5e6cc4253854dce4f4e0047df8a1d57db273cb51c9d4fcbe1066b079aaec54d7ca189e90710647b95fdb320729753967c265b1ac954 WHIRLPOOL 2fe84d48d355b64939e291f0557f6d8023df5b1a1c8f4152659eb25a9341b809cddcd1d9ff97fa52d6f459ddd4b80972b894421495d8a9705b7bec211c55375a

dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch

@@ -47,28 +47,31 @@ index 28e8885..5e1af6f 100644
  luaif/libluaif.a: override LIBS := 
  
 @@ -24,5 +24,5 @@ luaif/liblua.a: override CFLAGS := -O2 -g -fPIC -Wall -W $(CFLAGS)
- luaif/liblua.a: override LDFLdiff --git a/Makefile b/Makefile
+ luaif/liblua.a: override LDFLAGS := $(LDFLAGS)
-index c5b26cc..da48ea0 100644
+ luaif/liblua.a: override LIBS :=
---- a/Makefile
-+++ b/Makefile
-@@ -60,7 +60,7 @@ subdirs = luaif preload utils
- -include config.mak
  
- CFLAGS += -I$(OBJDIR)/include -I$(SRCDIR)/include
+-targets := $(targets) $(D)/libluaif.a $(D)/liblua.a
--CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src
++targets := $(targets) $(D)/libluaif.a
-+# CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src
- CFLAGS += -D_GNU_SOURCE=1 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1
- CFLAGS += -DSCRATCHBOX_ROOT="$(prefix)"
- CFLAGS += $(MACH_CFLAG)
-@@ -103,10 +103,7 @@ regular: .configure .version
- 	@$(MAKE) -f $(SRCDIR)/Makefile --include-dir=$(SRCDIR) SRCDIR=$(SRCDIR) do-all
  
- multilib:
+diff --git a/preload/Makefile b/preload/Makefile
--	@mkdir -p obj-32
+index 9f785ba..5094dbc 100644
--	@mkdir -p obj-64
+--- a/preload/Makefile
--	@$(MAKE) MACH_CFLAG=-m32 -C obj-32 --include-dir=.. -f ../Makefile SRCDIR=.. regular
++++ b/preload/Makefile
--	@$(MAKE) MACH_CFLAG=-m64 -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. regular
+@@ -8,7 +8,7 @@ LIBSB2_LDFLAGS = -Wl,-soname=$(LIBSB2_SONAME) \
-+	@$(MAKE) MACH_CFLAG=-m64 regular
+ # DO NOT add any libraries that depend on libpthread to
+ # LIBSB2_LIBS or LIBS!! see the comments in luaif.c.
+ 
+-LIBSB2_LIBS =
++LIBSB2_LIBS = -llua
+ SHLIBEXT = so
+ else
+ LIBSB2_LIBS =
+@@ -17,7 +17,7 @@ endif
  
  
- gcc_bins = addr2line ar as cc c++ c++filt
+ $(D)/libsb2.$(SHLIBEXT): $(call O,$(objs))
+-$(D)/libsb2.$(SHLIBEXT): luaif/libluaif.a luaif/liblua.a
++$(D)/libsb2.$(SHLIBEXT): luaif/libluaif.a
+ $(D)/libsb2.$(SHLIBEXT): CFLAGS := $(CFLAGS) -fPIC -Wall -W \
+ 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS)
+ $(D)/libsb2.$(SHLIBEXT): LDFLAGS := $(LDFLAGS) $(LIBSB2_LDFLAGS)

dev-embedded/sdcc/sdcc-2.6.0.ebuild

@@ -18,26 +18,6 @@ RDEPEND="!dev-embedded/sdcc-svn"
 
 S=${WORKDIR}/${PN}
 
-sr# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.6.0.ebuild,v 1.3 2014/08/10 20:06:17 slyfox Exp $
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.gz
-	doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-embedded/gputils-0.13.2
-	dev-libs/boehm-gc"
-RDEPEND="!dev-embedded/sdcc-svn"
-
-S=${WORKDIR}/${PN}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -45,4 +25,23 @@ src_unpack() {
 	# Fix conflicting variable names between Gentoo and sdcc
 	find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g  {} \; || die "sed failed"
 	find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g  {} \; || die "sed failed"
-	find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDC
+	find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g  {} \; || die "sed failed"
+
+	# --as-needed fix :
+	sed -i -e "s/= @CURSES_LIBS@ @LIBS@/= @CURSES_LIBS@ @LIBS@ -lcurses/" sim/ucsim/gui.src/serio.src/Makefile.in || die "sed failed"
+}
+
+src_compile() {
+	econf --enable-libgc docdir=/usr/share/doc/${PF} || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed"
+	dodoc ChangeLog
+	if use doc ; then
+		cp -pPR "${WORKDIR}"/doc/* "${D}"/usr/share/doc/${PF}/
+	fi
+	find "${D}"/usr/share/doc/${PF}/ -name *.txt -exec gzip -f -9 {} \;
+	find "${D}"/usr/share/doc/${PF}/ -name */*.txt -exec gzip -f -9 {} \;
+}

dev-embedded/sdcc/sdcc-2.8.0.ebuild

@@ -36,30 +36,40 @@ src_unpack() {
 	# We'll install doc manually
 	sed -i -e '/SDCC_DOC/d' Makefile.in || die "sed failed"
 	sed -i -e 's/all install-doc/all/' as/Makefile.in || die "sed failed"
-	sed -i -e 's/ doc//' s# Copyright 1999-2014 Gentoo Foundation
+	sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die "sed failed"
-# Distributed under the terms of the GNU General Public License v2
+
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.8.0.ebuild,v 1.4 2014/08/10 20:06:17 slyfox Exp $
+	eautoreconf
-
+}
-inherit eutils autotools
+
-
+src_compile() {
-DESCRIPTION="Small device C compiler (for various microprocessors)"
+	econf \
-HOMEPAGE="http://sdcc.sourceforge.net/"
+		$(use_enable boehm-gc libgc) \
-SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
+		--disable-doc \
-	doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
+		|| die "configure failed"
-
+	emake || die "emake failed"
-LICENSE="GPL-2"
+}
-SLOT="0"
+
-KEYWORDS="~amd64 ~ppc ~x86"
+src_install() {
-IUSE="boehm-gc doc"
+	make DESTDIR="${D}" install || die "Install failed"
-
+
-DEPEND=">=dev-embedded/gputils-0.13.2
+	insinto /usr/share/doc/${PF}
-	boehm-gc? ( dev-libs/boehm-gc )"
+	if use doc ; then
-RDEPEND="!dev-embedded/sdcc-svn"
+		cd "${WORKDIR}"/doc
-
+		dohtml -r *.html ucsim
-S=${WORKDIR}/${PN}
+		rm -rf *.html ucsim
-
+		dohtml as/asxhtm.html
-src_unpack() {
+		rm -f as/asxhtm.html
-	unpack ${A}
+		rm -f INSTALL.txt
-	cd "${S}"
+	else
-
+		dohtml as/doc/asxhtm.html
-	# Fix conflicting variable names between Gent
+		rm -f as/doc/asxhtm.html
+		mv as/doc as/as || die "Failed to rename as/doc"
+		doins -r as/as
+		mv sim/ucsim/doc sim/ucsim/ucsim || die "Failed to rename sim/ucsim/doc"
+		dohtml -r sim/ucsim/ucsim
+		rm -f INSTALL.txt Makefile* *.mk
+		cd doc
+	fi
+	doins -r *
+	prepalldocs
+}

dev-embedded/sgpp-lite-arm-eabi-bin/Manifest

@@ -1,2 +1 @@
 DIST arm-2010.09-51-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 36851462 SHA256 d9d2bfa9eeeab3c6da808ca4ada18b75ddb29a62c3ac73016c89e0b8ef8116ed SHA512 0de319596f83e62be9a786ebf02fb2830d0ea97acb1f01ba4f7f99f4aadfa12731bd1121bc885a4d97a948bc8131b66c91c62614b4ea8223553bf9a60a551002 WHIRLPOOL c4779887fc6fcbe11ba514a4533287ff13bb1b75e6b420db2836443684027bb3c694ccb5b40c72eaccff06542a623854bfbbc11418c87cfc5490a07f7c7ed6ba
-EBUILD sgpp-lite-arm-eabi-bin-2010.09.51.ebuild 1332 SHA256 6bfb5ec95b7838e3e714d7863603dabf005f9401ffd846ad5d0faee39c611c40 SHA512 521eea398893a60426914e03cad264c36b6cDIST arm-2010.09-51-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 36851462 SHA256 d9d2bfa9eeeab3c6da808ca4ada18b75ddb29a62c3ac73016c89e0b8ef8116ed SHA512 0de319596f83e62be9a786ebf02fb2830d0ea97acb1f01ba4f7f99f4aadfa12731bd1121bc885a4d97a948bc8131b66c91c62614b4ea8223553bf9a60a551002 WHIRLPOOL c4779887fc6fcbe11ba514a4533287ff13bb1b75e6b420db2836443684027bb3c694ccb5b40c72eaccff06542a623854bfbbc11418c87cfc5490a07f7c7ed6ba

dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch

@@ -40,29 +40,27 @@ index 4e2d238..e76e607 100644
  
  	return 0;
  }
-From ed9e5da97fdb40082aca7acbdce5286b530fb2ba Mon Sep 17 00:00:00 2001
+@@ -180,9 +188,9 @@ int main(int argc, char **argv)
-From: Maurus Cuelenaere <mcuelenaere@gmail.com>
+ 	usb_dev_handle *devh;
-Date: Mon, 11 Jan 2010 01:55:34 +0100
+ 	int ret;
-Subject: [PATCH] Add S3C64xx support
-
-Author: unknown
-URL: http://dev.odroid.com/frs/download.php/22/Linux-dltool.tar.gz
----
- dltool/dltool.c |   19 ++++++++++++++-----
- 1 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/dltool/dltool.c b/dltool/dltool.c
-index 4e2d238..e76e607 100644
---- a/dltool/dltool.c
-+++ b/dltool/dltool.c
-@@ -26,6 +26,8 @@ char *dl_file = "download.dat";
- char *dl_udev = NULL;
- char *dl_ubus = NULL;
  
-+int ep_out = 0;
+-	printf("SMDK42XX USB Download Tool\n");
-+
++	printf("SMDK42XX,S3C64XX USB Download Tool\n");
- #define DBG(x) if (debug) { printf x; }
+ 	printf("Version 0.20 (c) 2004,2005,2006"
+-	       "Ben Dooks <ben-linux@fluff.org>\n");
++	       " Ben Dooks <ben-linux@fluff.org>\n");
+ 	printf("\n");
  
- void write_u32(unsigned char *dp, unsigned long val)
+ 	while (1) {
-@@ -120,9 +122,15 @@ int verify_device(struct usb_device *dev)
+@@ -309,7 +317,8 @@ int main(int argc, char **argv)
- 	DBG(("\t=> idVe
+ 	write_header(dl_data, dl_addr, dl_size);
+ 	calc_cksum(dl_data, dl_size);
+ 
+-	ret = usb_bulk_write(devh, 3, (void *)dl_data, dl_size, 5*1000*1000);
++	//ret = usb_bulk_write(devh, 3, (void *)dl_data, dl_size, 5*1000*1000);
++	ret = usb_bulk_write(devh, ep_out, (void *)dl_data, dl_size, 5*1000*1000);
+ 	printf("=> usb_bulk_write() returned %d\n", ret);
+ 
+ 	if (ret != dl_size) {
+-- 
+1.7.0.4

dev-games/mygui/files/mygui-3.2.0-build.patch

@@ -4,28 +4,6 @@ Date: Fri Jun 15 21:58:45 UTC 2012
 use proper destinations and allow Gentoo build type
 rename demo targets to avoid confusion
 
---- CMake/Utils/MyGUIConfigTargets.cmake
-+++ CMake/Utils/MyGUIConfigTargets.cmake
-@@ -1,6 +1,8 @@
- # Configure settings and install targets
- # FIXME: Copypasted from Ogre and need lots of changes
- 
-+include(GNUInstallDirs)
-+
- if (WIN32)
- 	set(MYGUI_RELEASE_PATH "/Release")
- 	set(MYGUI_RELWDBG_PATH "/RelWithDebInfo")
-@@ -56,6 +58,12 @@
- # install targets according to current build type
- function(mygui_install_target TARGETNAME SUFFIX)
- 	install(TARGETS ${TARGETNAME}
-+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" CONFIGURATIONS Gentoo ""
-+	From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jun 15 21:58:45 UTC 2012
-
-use proper destinations and allow Gentoo build type
-rename demo targets to avoid confusion
-
 --- CMake/Utils/MyGUIConfigTargets.cmake
 +++ CMake/Utils/MyGUIConfigTargets.cmake
 @@ -1,6 +1,8 @@
@@ -72,4 +50,23 @@ rename demo targets to avoid confusion
 -endfunction(mygui_config_sample)
 \ No newline at end of file
 +endfunction(mygui_config_sample)
---- CMake/Confi
+--- CMake/ConfigureBuild.cmake
++++ CMake/ConfigureBuild.cmake
+@@ -4,6 +4,8 @@
+ # also prepare package files for pkg-config and CMake.
+ #######################################################################
+ 
++include(GNUInstallDirs)
++
+ # should we build static libs?
+ if (MYGUI_STATIC)
+   set(MYGUI_LIB_TYPE STATIC)
+@@ -47,7 +49,7 @@
+   else ()
+     configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
+   endif ()
+-  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
++  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+   # configure additional packages
+   

dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild

@@ -1,7 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gento# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild,v 1.2 2014/07/25 09:16:30 slyfox Exp $
 
 EAPI=5
@@ -25,4 +23,10 @@ RDEPEND="dev-haskell/bits-atomic:=[profile?]
 		dev-haskell/primitive:=[profile?]
 		>=dev-lang/ghc-7.4.1:="
 DEPEND="${RDEPEND}
-		profile? 
+		profile? ( !<dev-haskell/cabal-1.17 )
+		>=dev-haskell/cabal-1.8"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug)
+}

dev-haskell/attoparsec-conduit/attoparsec-conduit-1.0.1.2.ebuild

@@ -24,5 +24,8 @@ RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
 		>=dev-haskell/transformers-0.2.2:=[profile?]
 		<dev-haskell/transformers-0.4:=[profile?]
 		>=dev-lang/ghc-6.10.4:="
-DEP# Copyright 1999-2014 Gentoo Foundation
+DEPEND="${RDEPEND}
-# Distributed under the terms of the GNU General Public License v2
+		>=dev-haskell/cabal-1.8
+		test? ( >=dev-haskell/hspec-1.3
+			dev-haskell/resourcet
+		)"

dev-haskell/basic-prelude/basic-prelude-0.3.5.0.ebuild

@@ -11,16 +11,21 @@ inherit haskell-cabal
 
 DESCRIPTION="An enhanced core prelude; a common foundation for alternate preludes"
 HOMEPAGE="https://github.com/snoyberg/basic-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${P# Copyright 1999-2014 Gentoo Foundation
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-# Distributed under the terms of the GNU General Public License v2
+
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/basic-prelude/basic-prelude-0.3.5.0.ebuild,v 1.2 2014/07/25 09:16:39 slyfox Exp $
+LICENSE="MIT"
-
+SLOT="0/${PV}"
-EAPI=5
+KEYWORDS="~amd64 ~x86"
-
+IUSE=""
-# ebuild generated by hackport 0.3.2.9999
+
-
+RDEPEND="dev-haskell/hashable:=[profile?]
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+		dev-haskell/lifted-base:=[profile?]
-inherit haskell-cabal
+		=dev-haskell/readargs-1.2*:=[profile?]
-
+		=dev-haskell/system-filepath-0.4*:=[profile?]
-DESCRIPTION="An enhanced core prelude; a common foundation for alternate preludes"
+		dev-haskell/text:=[profile?]
-HOMEPAGE="https://githu
+		dev-haskell/transformers:=[profile?]
+		dev-haskell/unordered-containers:=[profile?]
+		dev-haskell/vector:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8"

dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild

@@ -19,12 +19,17 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2:=[profile?]
-		>=dev-haskell/# Copyright 1999-2014 Gentoo Foundation
+		>=dev-haskell/transformers-0.2.2:=[profile?]
-# Distributed under the terms of the GNU General Public License v2
+		dev-haskell/split:=[profile?]
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild,v 1.8 2014/06/28 20:29:26 slyfox Exp $
+		dev-haskell/syb:=[profile?]
-
+		>=dev-lang/ghc-6.10.4:="
-EAPI=5
+DEPEND="${RDEPEND}
-
+		>=dev-haskell/cabal-1.6"
-# ebuild generated by hackport 0.3.2.9999
+
-
+PATCHES=("${FILESDIR}/${PN}-0.3.4-ghc-6.12.patch")
-CABAL_FEATURES="bin lib pr
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=mtl2 \
+		--flag=-test
+}

dev-haskell/connection/Manifest

@@ -1,5 +1,3 @@
 DIST connection-0.1.3.1.tar.gz 6921 SHA256 dc84b6b9d068a0fd843e94e1cb3544a1c7fb9b5e6e29f2113d8f1a4380583bfd SHA512 556dbbc1ec3fc3af5ef9fdfbcf648bdef8a99e13061f515c32c95094c181aae7fc40e2b0aa6d57933d04998cb4aa9b20a2f7083286fa6046a81d4437ce05842f WHIRLPOOL 66221dedd6c97698890f60eadfc8b08dcac96c1f024737ceebca6f96feb19c4a5491c9fdfc8239c9661a030cc63dc8ab0a4e8f93e3de467366dc60078a4ff9b0
 DIST connection-0.2.0.tar.gz 7017 SHA256 7782f6d5b96b7ef650b481db302836ee7269429f4f1d291becac6e25f39bdf9d SHA512 2b1e9fe18d4614b7acdd97d05f7b5aeed2f0af17575a45b10de5251b25ec75704c3502182a978a2a57532f5a87a474c5c7102768590218d7ff54460acd4e540f WHIRLPOOL f0a98bf859a529f46577bed3600a23ddfc978b3b7d01149fd6dc19d13bd27c90ffa323416ee3b2fecee40460f30059985dd7540b8a9390cb5ba7fab6c09c4512
 DIST connection-0.2.1.tar.gz 7207 SHA256 9e771a5e0784fc68ab876cd04a52bae45ccc73fd7a4a664f9e7c344a1373b2f1 SHA512 6d162cac7934af067a1bdbbcf2b7210fb5820034cc712512f0e986a509b53557552e75fd391a528d37c2a008565ba30a7f039e0fab7a24b5f8555237ec51ee90 WHIRLPOOL 70f066ed774936f58bdcb61edddf8f53e308d4d87203ecb412271179b768dc91dbc4116c0869a0458229e98fb0f6952b42759175939f99a1e639e7032de56882
-DIST connection-0.1.3.1.tar.gz 6921 SHA256 dc84b6b9d068a0fd843e94e1cb3544a1c7fb9b5e6e29f2113d8f1a4380583bfd SHA512 556dbbc1ec3fc3af5ef9fdfbcf648bdef8a99e13061f515c32c95094c181aae7fc40e2b0aa6d57933d04998cb4aa9b20a2f7083286fa6046a81d4437ce05842f WHIRLPOOL 66221dedd6c97698890f60eadfc8b08dcac96c1f024737ceebca6f96feb19c4a5491c9fdfc8239c9661a030cc63dc8ab0a4e8f93e3de467366dc60078a4ff9b0
-DIST connection-0.2.0.tar.gz 7017 SHA256 7782f6d5b96b7ef650b481db302836ee7269429f4f1d291becac6e25f39bdf9d SHA512 2b1e9fe18d4614b7acdd97d05f7b5aeed2f0af17575a45b10de5251b25ec75704c3502182a978a2a57532f5a87a474c5c7102768590218d7ff54460acd4e540f WHIRLPOOL f0a98bf859a529f46577bed3600a23ddfc978b3b7d01149fd6dc19d13bd27c90ffa323416ee3b2fecee40460f30059985d

dev-haskell/curl/Manifest

@@ -1,2 +1 @@
 DIST curl-1.3.8.tar.gz 47704 SHA256 9087c936bfcdb865bad3166baa3f12bf37acf076fa76010e3b5f82a1d485446e SHA512 00012fc9b0a80b0d306f688bfb9cfbde8aa72045e6a139c0d8a0cdd7832b5e86ab06c6ea95803665f4bb8ec4e9af3dbc6e405f100985c2cfbaead8527ba7a382 WHIRLPOOL 2e4b8717836fe6c501d60866bb6f555625fc51e001039d08743d92bce082f469ee13591619d2aa0a6f3a2f3a37c35b66dce6798dbc98fcd4419ee474188210c7
-DIST curl-1.3.8.tar.gz 47704 SHA256 9087c936bfcdb865bad3166baa3f12bf37acf076fa76010e3b5f82a1d485446e SHA512 00012fc9b0a80b0d306f688bfb9cfbde8aa72045e6a139c0d8a0cdd7832b5e86ab06c6ea95803665f4bb8ec4e9af3dbc6e405f100985c2cfbaead8527ba7a382 WHIRLPOOL 2e4b8717836fe6c501d60866bb6f555625fc51e001039d08743d92bce082f469ee13591619d2aa0a6f3a2f3a37c35b66dce6798dbc98fcd4419ee474188210c7

dev-haskell/data-default-instances-old-locale/Manifest

@@ -1,2 +1 @@
 DIST data-default-instances-old-locale-0.0.1.tar.gz 1519 SHA256 60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802 SHA512 bbaf4626c922820dca8cc230585fef80b6f6bd6278d335cc7abd4e5b7a857f0626ca9937ea95066e7655387dfcc684e6fbb0f6f5bc6905e539fbd1176ddd99ec WHIRLPOOL 0ddb2e72d5cb8e1a2617e6e259694398fc35b674d45b2721de4759ab1923c2c8439c0884019ecba61753aa0e8309276ad1e70634b52ddec1e437971826b46bbb
-DIST data-default-instances-old-locale-0.0.1.tar.gz 1519 SHA256 60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802 SHA512 bbaf4626c922820dca8cc230585fef80b6f6bd6278d335cc7abd4e5b7a857f0626ca9937ea95066e7655387dfcc684e6fbb0f6f5bc6905e539fbd1176ddd99ec WHIRLPOOL 0ddb2e72d5cb8e1a2617e6e259694398fc35b674d45b2721de4759ab1923c2c8439c0884019ecba61753aa0e8309276ad1e70634b52ddec1e437971826b46bbb

dev-haskell/date-cache/Manifest

@@ -1,2 +1 @@
 DIST date-cache-0.3.0.tar.gz 2126 SHA256 abce44f11dd9da4abaca9e33da2c74bd32b42fea027d171c03b6c10cda62303f SHA512 12e048dbd163929acf1b2e51eb81f83382dfbaee00f506a89c5477c0acccbcc29ec24c6d5d85340ea540430c2c1c4c62ad00d1f36196ae8a6fd3f9ae826f39be WHIRLPOOL 1990fad013069eb63817c4cc1c199a7361ec4b62c922e80faf41196dd3c0ac45bafe716ae6581a5cdc81b68c7133d32cdb9fa42a3a9e41def34cf8d7df55b6aa
-DIST date-cache-0.3.0.tar.gz 2126 SHA256 abce44f11dd9da4abaca9e33da2c74bd32b42fea027d171c03b6c10cda62303f SHA512 12e048dbd163929acf1b2e51eb81f83382dfbaee00f506a89c5477c0acccbcc29ec24c6d5d85340ea540430c2c1c4c62ad00d1f36196ae8a6fd3f9ae826f39be WHIRLPOOL 1990fad013069eb63817c4cc1c199a7361ec4b62c922e80faf41196dd3c0ac45bafe716ae6581a5cdc81b68c7133d32cdb9fa42a3a9e41def34cf8d7df55b6aa

dev-haskell/filesystem-conduit/filesystem-conduit-1.0.0.1.ebuild

@@ -9,17 +9,6 @@ EAPI=5
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
-DESCRIPTION="Use system-filepath data t# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/filesystem-conduit/filesystem-conduit-1.0.0.1.ebuild,v 1.2 2014/07/25 09:16:43 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
 DESCRIPTION="Use system-filepath data types with conduits"
 HOMEPAGE="http://github.com/snoyberg/conduit"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
@@ -31,4 +20,16 @@ IUSE=""
 
 RDEPEND="=dev-haskell/conduit-1.0*:=[profile?]
 		>=dev-haskell/system-fileio-0.3.3:=[profile?]
-		<dev-haskel
+		<dev-haskell/system-fileio-0.4:=[profile?]
+		>=dev-haskell/system-filepath-0.4.3:=[profile?]
+		<dev-haskell/system-filepath-0.5:=[profile?]
+		>=dev-haskell/text-0.11:=[profile?]
+		>=dev-haskell/transformers-0.2.2:=[profile?]
+		<dev-haskell/transformers-0.4:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( dev-haskell/blaze-builder
+			>=dev-haskell/hspec-1.3
+			dev-haskell/quickcheck
+		)"

dev-haskell/glib/glib-0.12.5.0-r1.ebuild

@@ -12,16 +12,23 @@ inherit haskell-cabal
 
 DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
 HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/$# Copyright 1999-2014 Gentoo Foundation
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-# Distributed under the terms of the GNU General Public License v2
+
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.5.0-r1.ebuild,v 1.2 2014/07/25 09:16:22 slyfox Exp $
+LICENSE="LGPL-2.1"
-
+SLOT="0/${PV}"
-EAPI=5
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
+IUSE="+closure_signals"
-# ebuild generated by hackport 0.3.5.9999
+
-
+RDEPEND=">=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
-#nocabaldep is for the fancy cabal-detection feature at build-time
+	>=dev-lang/ghc-6.10.4:=
-CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
+	dev-libs/glib:2
-inherit haskell-cabal
+"
-
+DEPEND="${RDEPEND}
-DESCRIPTION="Binding to
+	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
+	virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag closure_signals closure_signals)
+}

dev-haskell/groupoids/Manifest

@@ -1,3 +1,2 @@
 DIST groupoids-3.0.1.1.tar.gz 2935 SHA256 c35c27bdee4f43f86e649356a41635911e8c66c9701da19515a5b178b0979d64 SHA512 ebb8976a43f1486871a5ebcb5c3abef85bf95725e9f75e12396feadd8f9a883432f66bc65da5efe18b2455d8a6386e2b7e262f6c33467b0d22e2667312911e82 WHIRLPOOL 971d45bd16bf7393f84b025e8752548892001c7cb51911c23d89e593ef896d479aa8caa7b560350897b95efb7a594542f77a3b455eca178854706bf2b8e09009
 DIST groupoids-4.0.tar.gz 2414 SHA256 6671953fa0970c13ac8014278fcd6227b4c07e1a69d5a23965e2df1418218a22 SHA512 d0aacc582a1d03ab42ce900992e9f9c3cec47da653c5a472934361c5656cbad6b81b18065cf3968ccc6c4d8f239329f7f0213745d2b0d78e2c74ad3d59bec289 WHIRLPOOL ada1bb75fefa84f14c699cddee974c10bb2712af56bb86bd4ee316635e3e68822702521b26b1aefac32b9957d6a117d9da80dd31955de35a197452cc98fb2388
-DIST groupoids-3.0.1.1.tar.gz 2935 SHA256 c35c27bdee4f4

dev-haskell/libxml/Manifest

@@ -1,2 +1 @@
 DIST libxml-0.1.1.tar.gz 3959 SHA256 d1e92affb41e7abe1c7b692aa24ae47dbcf3636f2753bb85a3469c370d9afb07 SHA512 59a52200e7c7ab17a60a89e4a3aefdf6356e868be6be53696e5708a4d30863ae879834404ccfecb91b6d4b93a7ce0e147a3cc04bc4d5838c2aa990a290af5c5c WHIRLPOOL 615582108edc8ad82c3d06bc54401689b7d28cb0562b1cdb7167d7d3ec0a888367a9fa8ce668eaca3eb4ec4bc951e7c7d9acfe113001d21dfbb67a4d3dc0cd2a
-DIST libxml-0.1.1.tar.gz 3959 SHA256 d1e92affb41e7abe1c7b692aa24ae47dbcf3636f2753bb85a3469c370d9afb07 SHA512 59a52200e7c7ab17a60a89e4a3aefdf6356e868be6be53696e5708a4d30863ae879834404ccfecb91b6d4b93a7ce0e147a3cc04bc4d5838c2aa990a290af5c5c WHIRLPOOL 615582108edc8ad82c3d06bc54401689b7d28cb0562b1cdb7167d7d3ec0a888367a9fa8ce668eaca3eb4ec4bc951e7c7d9acfe113001d21dfbb67a4d3dc0cd2a

dev-haskell/pem/pem-0.2.0.ebuild

@@ -28,4 +28,5 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/quickcheck-2.4.0.1
 		>=dev-haskell/test-framework-0.3.3
 		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quic# Copyright 
+		dev-haskell/test-framework-quickcheck2 )
+"

dev-haskell/persistent-template/persistent-template-1.3.1.1.ebuild

@@ -23,8 +23,12 @@ RDEPEND="dev-haskell/aeson:=[profile?]
 	dev-haskell/monad-logger:=[profile?]
 	>=dev-haskell/persistent-1.3:=[profile?] <dev-haskell/persistent-1.4:=[profile?]
 	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-has# Copyright 1999-2014 Gentoo Foundation
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-# Distributed under the terms of the GNU General Public License v2
+	dev-haskell/unordered-containers:=[profile?]
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/persistent-template/persistent-template-1.3.1.1.ebuild,v 1.2 2014/07/25 09:16:23 slyfox Exp $
+	>=dev-lang/ghc-6.10.4:=
-
+"
-EAPI=5
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/quickcheck )
+"

dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild

@@ -6,14 +6,6 @@ EAPI=5
 
 # ebuild generated by hackport 0.3.3.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscol# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild,v 1.1 2013/08/26 10:35:25 qnikst Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
@@ -26,4 +18,13 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/comonad-3:=[profile
+RDEPEND=">=dev-haskell/comonad-3:=[profile?]
+		>=dev-haskell/profunctors-3.2:=[profile?]
+		>=dev-haskell/semigroupoid-extras-3:=[profile?]
+		>=dev-haskell/semigroupoids-3:=[profile?]
+		>=dev-haskell/tagged-0.4.4:=[profile?]
+		>=dev-haskell/transformers-0.2:=[profile?]
+		<dev-haskell/transformers-0.4:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"

dev-haskell/project-template/Manifest

@@ -1,3 +1,2 @@
 DIST project-template-0.1.3.tar.gz 3930 SHA256 b5b6251ce85f1e2bcd3a99c7b85257e0a793eda61e72adbd05eda8a447244cdb SHA512 e39aad03bfee9b78ac0a0a59388cf0001dab941986ad284561a3ffbb6ce6aa0b8fc6ee20a676bb0bf4c1b5d452644e8dae4f10d5fe7070e074a5140fc6d292a0 WHIRLPOOL fefdd2bf92556ce327ba33071f63152dc02434a98ce4b36af818ea9984c20835fa9a3e047a600e7c60bb52c4da56e1aee7d320416060625ff3c37c62edd804ca
 DIST project-template-0.1.4.1.tar.gz 4483 SHA256 8b16b378f3852d9ba8f2531a8c97515a2a2bc6e762c1437c5b9cb53f89425def SHA512 bab39792688fec9f3c1d279dd5d24d75fed443d39da2126c05acd1ee98b736fbed87f7a0b342f0a4c1a3f55db1fbb2cd5f4be7ed646ea0202fe590705e342100 WHIRLPOOL cb8c13c0ebe7932e51ef02d1974e0e9b8ed4a2b4fc218c05becd4ee6eda5169a59bc6a29b93cbc7dbaca48422ee14a7700fdcf93f5be53291fea5ea647673467
-DIST project-template-0.1.3.tar.gz 3930 SHA256 b5b6251ce85f1e2bcd3a99c7b85257e0a793eda61e72adbd05eda8a447244cdb SHA512 e39aad03bfee9b78ac0a0a59388cf0001dab941986ad284561a3ffbb6ce6aa0b8fc6ee20a676bb0bf4c1b5d452644e8dae4f10d5fe7070e074a5140fc6d292a0 WHIRLPOOL fefdd2bf92556ce327ba33071f63152dc02434a98ce4b36af818ea9

dev-haskell/quickcheck-instances/Manifest

@@ -1,2 +1 @@
 DIST quickcheck-instances-0.3.8.tar.gz 5725 SHA256 6fbe5a3ec9358b3a0a159528b568af6c0541320caabfa754f80a86f8cf506204 SHA512 c8ec49fdc4cc34ea1538c0e49945ede7b6e65897b80c4b9bbc28b3da420458e2731259344e3df02ab0d1afb757a0416dd8697c165af56bf899388491117b6287 WHIRLPOOL 5888baf24fbd40886150ae40877bd179c4eb79b592e689f3c29d9eac3a9cf77c7aaf47bc1eb4a3a5dd79b65c93507999510de3c436cd186e18dd119308f7ac59
-DIST quickcheck-instances-0.3.8.tar.gz 5725 SHA256 6fbe5a3ec9358b3a0a159528b568af6c0541320caabfa754f80a86f8cf506204 SHA512 c8ec49fdc4cc34ea1538c0e49945ede7b6e65897b80c4b9bbc28b3da420458e2731259344e3df02ab0d1afb757a0416dd8697c165af56bf899388491117b6287 WHIRLPOOL 5888baf24fbd40886150ae40877bd179c4eb79b

dev-haskell/shakespeare/shakespeare-2.0.1.ebuild

@@ -9,17 +9,6 @@ EAPI=5
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
-DESCRIPTION="A toolkit for making compile-time interpolated tem# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/shakespeare/shakespeare-2.0.1.ebuild,v 1.1 2014/07/02 13:33:17 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
 DESCRIPTION="A toolkit for making compile-time interpolated templates"
 HOMEPAGE="http://www.yesodweb.com/book/shakespearean-templates"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
@@ -34,4 +23,21 @@ RDEPEND="dev-haskell/aeson:=[profile?]
 	dev-haskell/blaze-markup:=[profile?]
 	dev-haskell/exceptions:=[profile?]
 	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/system-fileio-0.
+	>=dev-haskell/system-fileio-0.3:=[profile?]
+	>=dev-haskell/system-filepath-0.4:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag test_coffee test_coffee) \
+		$(cabal_flag test_export test_export) \
+		$(cabal_flag test_roy test_roy)
+}

dev-haskell/shelly/Manifest

@@ -1,2 +1 @@
 DIST shelly-1.5.4.1.tar.gz 27926 SHA256 62dd57cfa5ffb5280cbb9c77ec3307bcc8b622f7be65d58f6c4dbd36b7916840 SHA512 8c8519a8a1ac9f02e51211ce8c70aa60590cb6edb5a8de376cf3da2deb8e429ff7e4d31321971660b71f0778a7037fde4f9506efd028de6d8581fbc6b5afe310 WHIRLPOOL 04b6b128dff61e2c3ca8986509bab69a519bdc6a7e1f598c446460fd0922ba26fb5860bd28dcc23e2c69d178d22db2ac273f307f7d7786e4bedefb6e159b1466
-DIST shelly-1.5.4.1.tar.gz 27926 SHA256 62dd57cfa5ffb5280cbb9c77ec3307bcc8b622f7be65d58f6c4dbd36b7916840 SHA512 8c8519a8a1ac9f02e51211ce8c70aa60590cb6edb5a8de376cf3da2deb8e42

dev-haskell/simple-sendfile/simple-sendfile-0.2.15.ebuild

@@ -6,15 +6,6 @@ EAPI=5
 
 # ebuild generated by hackport 0.4.2.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/simple-sendfile/simple-sendfile-0.2.15.ebuild,v 1.1 2014/07/02 13:39:26 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
@@ -27,4 +18,22 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+allow-bsd"
 
-RESTRICT=test # openBinaryFile: does not exist (No such file or director
+RESTRICT=test # openBinaryFile: does not exist (No such file or directory)
+
+RDEPEND="dev-haskell/network:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/conduit
+		dev-haskell/conduit-extra
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/network-conduit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag allow-bsd allow-bsd)
+}

dev-haskell/skein/skein-1.0.3.ebuild

@@ -9,23 +9,28 @@ EAPI=5
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
-DESCRIPTION="Skein, a family of cryptographic hash functions.  Includes Skein-MAC as well"
-HOMEPAGE="https://github.com/meteficha/skein"
-SRC_URI="mirror://hackage/# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/skein/skein-1.0.3.ebuild,v 1.2 2014/07/25 09:16:17 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
 DESCRIPTION="Skein, a family of cryptographic hash functions.  Includes Skein-MAC as well"
 HOMEPAGE="https://github.com/meteficha/skein"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-K
+KEYWORDS="~amd64 ~x86"
+IUSE="big-endian force-endianness"
+
+RDEPEND="=dev-haskell/cereal-0.3*:=[profile?]
+		>=dev-haskell/crypto-api-0.6:=[profile?]
+		<dev-haskell/crypto-api-0.13:=[profile?]
+		>=dev-haskell/tagged-0.2:=[profile?]
+		<dev-haskell/tagged-0.7:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( >=dev-haskell/hspec-1.3
+		)"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag big-endian big-endian) \
+		$(cabal_flag force-endianness force-endianness)
+}

dev-haskell/streaming-commons/Manifest

@@ -1,2 +1 @@
 DIST streaming-commons-0.1.3.tar.gz 75947 SHA256 0366bdbf4da59cf823f34a31cce93992771fc9fc6096deeb7aabec8a6902637f SHA512 bc08e52564cdc07163113105c61ce03828ad10b40ff10fcc12cc7181054cff7853bbb2e1aef543bbd8972ea2aad9ff293fddb238251d13114e2287f39682bf2b WHIRLPOOL 8d91fca02611b46a952b98456b154373154c84b2a18bb17512abf0368bb10ad36d653dbc5a46c0d203d12cb26d2f3cfb4647fea1e94a83164ff4111ade39b22b
-DIST streaming-commons-0.1.3.tar.gz 75947 SHA256 0366bdbf4da59cf823f34a31cce93992771fc9fc6096deeb7aabec8a6902637f SHA512 bc08e52564cdc07163113105c61ce03828ad10b40ff10fcc12cc7181054cff7853bbb2e1aef543bbd8972ea2aad9ff293fddb238251d13114e2287f39682bf2b WHIRLPOOL 8d91fca02611b46a952b98456b154373154c84b2a18bb17512abf0368bb10ad36d653dbc5a46c0d203d12cb26d2f3cfb4647fea1e94a83164ff4111ade39b22b

dev-haskell/tagstream-conduit/tagstream-conduit-0.5.4.1.ebuild

@@ -4,12 +4,6 @@
 
 EAPI=5
 
-# ebuild generated # Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.4.1.ebuild,v 1.1 2013/12/11 06:30:32 gienah Exp $
-
-EAPI=5
-
 # ebuild generated by hackport 0.3.4.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -29,4 +23,14 @@ RDEPEND="dev-haskell/attoparsec:=[profile?]
 	dev-haskell/blaze-builder:=[profile?]
 	>=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?]
 	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/conduit-0.5:=[pr
+	>=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?]
+	>=dev-lang/ghc-6.10.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/quickcheck )
+"

dev-haskell/tasty-ant-xml/Manifest

@@ -1,2 +1 @@
 DIST tasty-ant-xml-1.0.0.8.tar.gz 3761 SHA256 75fa0d386eefa41c6f06632912009e5bc55aa6b618b6c90d64c3dc6ed5e8124e SHA512 280acbd679c911932ee0e501db7621eaf777c70ddfcd42e80ddf4ed39d7c9f5bf917fa081ac47e55a4e2d5230984f553f7daf8a6651bab9b7e3ece83315a5006 WHIRLPOOL 02a83561107c82600b35d75813590b758554c8531eb58451665b24149c2a906a30464bcbb1a77c056e12d2b43c71904dd3cf080b6e7db78a38b42bb35cc72f97
-DIST tasty-ant-xml-1.0.0.8.tar.gz 3761 SHA256 75fa0d386eefa41c6f06632912009e5bc55aa6b618b6c90d64c3dc6ed5e8124e SHA512 280acbd679c911932ee0e501db7621eaf777c70ddfcd42e80ddf4ed39d7c9f5bf917fa081ac47e55a4e2d

dev-haskell/tasty-golden/Manifest

@@ -1,2 +1 @@
 DIST tasty-golden-2.2.2.3.tar.gz 6925 SHA256 5ca0186aae5b09bcb60dc393b57674cae442c104a923b8fb280ff485498df06e SHA512 34cc40a217d8bb34a2263a1eace31f49590698968aacc795e21dfed24a666388bf9536eb5a360e7b4e1a2228324470e9193e27f1cea0863e5ac13ba5ae7e673f WHIRLPOOL ebe9c9b6fc2f4753c0f64fda24a85fd5c3dbba76d5fdfe3caba7b18ea51f7f0cf064f50cb950afeb623468fefa350ea431ebc15a8808036cbe7fde22c9994615
-DIST tasty-golden-2.2.2.3.tar.gz 6925 SHA256 5ca0186aae5b09bcb60dc393b57674cae442c104a923b8fb280ff485498df06e SHA512 34cc40a217d8bb34a2263a1eace31f49590698968aacc795e21dfed24a666388bf9536eb5a360e7b4e1a2228324470e9193e27f1cea0863e5ac13ba5ae7e673f WHIRLPOOL 

dev-haskell/terminfo/files/terminfo-0.3.2.5-tinfo.patch

@@ -1,12 +1,5 @@
 http://bugs.gentoo.org/454216
 
-Mon Jan  7 16:34:47 FET 2013  Judah Jacobson <judah.jacobson@gmail.com>
-  * Search for terminfo in libtinfo; fixes GHC #7281.
-  
-  Patch from Paul Johnson.
-diff -rN -u old-terminfo/configure.ac new-terminfo/configure.ac
---- old-terminfo/configure.ac	2013-02http://bugs.gentoo.org/454216
-
 Mon Jan  7 16:34:47 FET 2013  Judah Jacobson <judah.jacobson@gmail.com>
   * Search for terminfo in libtinfo; fixes GHC #7281.
   
@@ -24,4 +17,9 @@ diff -rN -u old-terminfo/configure.ac new-terminfo/configure.ac
 -      HaveLibCurses=NO; LibCurses=not-installed)])])
 +AC_CHECK_LIB(tinfo, setupterm, HaveLibCurses=YES; LibCurses=tinfo,
 +  [AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw,
-+    [AC_CHECK_LIB(ncurses, setupterm, HaveLibCur
++    [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
++      [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
++        HaveLibCurses=NO; LibCurses=not-installed)])])])
+ 
+ if test "x$HaveLibCurses" = "xNO" ; then
+     AC_MSG_FAILURE([curses library not found, so this package cannot be built])

dev-haskell/test-framework-th/Manifest

@@ -1,2 +1 @@
 DIST test-framework-th-0.2.4.tar.gz 2977 SHA256 8b780d9e3edd8d91e24f72d9fa1f80420e52959428ad7c22d0694901a43f9c8a SHA512 0e8b6898eb7bf481bafb0c9ff9caa615dbf768e538e26b15ab899c5c9a1ad6bd6ed76ef93cf9a823706046d41f49fbb0cbe660bf846e59a608a0e5d21e89686b WHIRLPOOL 37718161ec8be33a7dda311beb4de15eeecec2712bdfd16c848830149d4aec5df47f0d402d9967b0f4552eb1602277efe2a6d7f7d2279063dbd9986501155dc5
-DIST test-framework-th-0.2.4.tar.gz 2977 SHA256 8b780d9e3edd8d91e24f72d9fa1f80420e52959428ad7c22d0694901a43f9c8a SHA512 0e8b6898eb7bf481bafb0c9ff9caa615dbf768e538e26b15ab899c5c9a1ad6bd6ed76ef93cf9a823706046d41f49fbb0cbe660bf846e59a608a0e5d21e89686b WHIRLPOOL 37718161ec8be33a7dda311beb4de15eeecec2712bdfd16c848830149d4aec5df47f0d402d9967b0f4552eb1602277efe2a6d7f7d2279063dbd9986501155dc5

dev-haskell/test-framework/test-framework-0.8.ebuild

@@ -9,17 +9,6 @@ EAPI=5
 CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCR# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework/test-framework-0.8.ebuild,v 1.8 2013/08/03 07:30:21 ago Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
 DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
 HOMEPAGE="http://batterseapower.github.com/test-framework/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
@@ -29,4 +18,13 @@ SLOT="0/${PV}"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-haskell/ansi-te
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
+		>=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?]
+		>=dev-haskell/extensible-exceptions-0.1.1:=[profile?]
+		>=dev-haskell/hostname-1.0:=[profile?]
+		>=dev-haskell/random-1.0:=[profile?]
+		>=dev-haskell/regex-posix-0.72:=[profile?]
+		>=dev-haskell/xml-1.3.5:=[profile?]
+		>=dev-lang/ghc-6.12.1:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2.3"

dev-haskell/text/metadata.xml

@@ -17,18 +17,21 @@
 		provides a range of functions for converting 'Text' values to and from
 		'ByteStrings', using several standard encodings.
 		
-		Efficient locale-sensitive<?xml version="1.0" encoding="UTF-8"?>
+		Efficient locale-sensitive support for text IO is also supported.
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>haskell</herd>
-	<longdescription>
 		
-		An efficient packed, immutable Unicode text type (both strict and
+		These modules are intended to be imported qualified, to avoid name
-		lazy), with a powerful loop fusion optimization framework.
+		clashes with Prelude functions, e.g.
 		
-		The &#39;Text&#39; type represents Unicode character strings, in a time and
+		&gt; import qualified Data.Text as T
-		space-efficient manner. This package provides text processing
+		
-		capabilities that are optimized for performance critical use, both
+		To use an extended and very rich family of functions for working
-		in terms of large data quantities and high speed.
+		with Unicode text (including normalization, regular expressions,
+		non-standard encodings, text breaking, and locales), see
+		the @text-icu@ package:
+		&lt;http://hackage.haskell.org/package/text-icu&gt;
 		
-		The &#39;Text&#39; type provides c
+	</longdescription>
+        <use>
+          <flag name='developer'>operate in developer mode</flag>
+        </use>
+</pkgmetadata>

dev-haskell/text/text-1.1.0.1.ebuild

@@ -27,6 +27,11 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/quickcheck-2.4
 		dev-haskell/random
 		>=dev-haskell/test-framework-0.4
-		>=dev# Copyright 1999-2014 Gentoo Foundation
+		>=dev-haskell/test-framework-hunit-0.2
-# Distributed under the terms of the GNU General Public License v2
+		>=dev-haskell/test-framework-quickcheck2-0.2 )
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/text-1.1.0.1.e
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag developer developer)
+}

dev-haskell/timezone-olson/timezone-olson-0.1.2-r2.ebuild

@@ -26,5 +26,9 @@ RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?]
 		<dev-haskell/timezone-series-0.2:=[profile?]
 		>=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
-		>=dev-haskel# Copyright 1999-2013 Gentoo Foundation
+		>=dev-haskell/cabal-1.2"
-# Distributed under the terms of the GNU General Public License 
+
+src_prepare() {
+	cabal_chdeps \
+		'binary >= 0.4.1 && < 0.6' 'binary >= 0.4.1 && < 0.8'
+}