diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.2.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.2.2.ebuild
index 0f3313d8a85a..0da535413314 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.2.2.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.2.2.ebuild,v 1.2 2012/04/18 16:41:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.2.2.ebuild,v 1.3 2012/04/21 12:20:22 maekke Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
LICENSE="LGPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
IUSE=""
COMMON_DEPEND="
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild
index 43f91d1fe063..c9f6e57e57a7 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild,v 1.2 2012/04/18 16:08:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild,v 1.3 2012/04/21 12:18:02 maekke Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
LICENSE="LGPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
IUSE="doc +introspection"
RDEPEND=">=dev-libs/glib-2.28:2
diff --git a/app-backup/duplicity/duplicity-0.6.18-r1.ebuild b/app-backup/duplicity/duplicity-0.6.18-r1.ebuild
index 0e107f1cd068..894e02630ef2 100644
--- a/app-backup/duplicity/duplicity-0.6.18-r1.ebuild
+++ b/app-backup/duplicity/duplicity-0.6.18-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.18-r1.ebuild,v 1.1 2012/03/08 04:04:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.18-r1.ebuild,v 1.2 2012/04/21 09:12:23 ago Exp $
EAPI="4"
@@ -16,7 +16,7 @@ SRC_URI="http://code.launchpad.net/${PN}/0.6-series/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="s3"
DEPEND="
diff --git a/app-crypt/mit-krb5/mit-krb5-1.10.1-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.10.1-r3.ebuild
index 42a9e310acff..0002f3c8aa3c 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.10.1-r3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.10.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.10.1-r3.ebuild,v 1.2 2012/04/19 02:08:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.10.1-r3.ebuild,v 1.3 2012/04/21 12:14:24 maekke Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
RDEPEND="!!app-crypt/heimdal
diff --git a/app-crypt/seahorse-sharing/Manifest b/app-crypt/seahorse-sharing/Manifest
new file mode 100644
index 000000000000..bedd3c593e17
--- /dev/null
+++ b/app-crypt/seahorse-sharing/Manifest
@@ -0,0 +1 @@
+DIST seahorse-sharing-3.4.0.tar.xz 279904 RMD160 3889544e8d772d1b8ecb38b35357a6bb3b009f9b SHA1 6c3b77f9f9b11c2df8fb2f5611701b7c752d406a SHA256 559b94e4b6fd1e7777c1c9ecd86dd4049d815b8f6b8bf66948cba0346dd397bd
diff --git a/app-text/djview4/metadata.xml b/app-crypt/seahorse-sharing/metadata.xml
similarity index 57%
rename from app-text/djview4/metadata.xml
rename to app-crypt/seahorse-sharing/metadata.xml
index 17b5cf25f02e..da6fd63d0085 100644
--- a/app-text/djview4/metadata.xml
+++ b/app-crypt/seahorse-sharing/metadata.xml
@@ -1,9 +1,5 @@
-tex
-
- pva@gentoo.org
- Peter Volkov
-
+gnome
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.4.0.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.4.0.ebuild
new file mode 100644
index 000000000000..95838a8f3e36
--- /dev/null
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-sharing/seahorse-sharing-3.4.0.ebuild,v 1.1 2012/04/21 07:59:04 tetromino Exp $
+
+EAPI="4"
+
+inherit gnome2
+
+DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
+HOMEPAGE="http://projects.gnome.org/seahorse/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2
+ >=net-dns/avahi-0.6
+ net-libs/libsoup:2.4
+ >=x11-libs/gtk+-3:3
+
+ >=app-crypt/gpgme-1
+ || (
+ =app-crypt/gnupg-2.0*
+ =app-crypt/gnupg-1.4* )"
+RDEPEND="${COMMON_DEPEND}
+ !=dev-util/intltool-0.35
+ dev-util/pkgconfig
+ sys-devel/gettext"
+
+pkg_setup() {
+ DOCS="AUTHORS MAINTAINERS NEWS" # ChangeLog has nothing useful
+ # Do not pass --enable-tests to configure - package has no tests
+}
+
+src_prepare() {
+ gnome2_src_prepare
+ # Avoid eautoreconf
+ sed -e 's:$CFLAGS -g -O0:$CFLAGS:' -i configure || die "sed failed"
+}
+
+pkg_postinst() {
+ elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
+ elog "system, you can start the Avahi daemon by"
+ elog "# /etc/init.d/avahi-daemon start"
+ elog "To start Avahi automatically, add it to the default runlevel:"
+ elog "# rc-update add avahi-daemon default"
+}
diff --git a/app-editors/leechcraft-popishu/Manifest b/app-editors/leechcraft-popishu/Manifest
index 4eb4c41f47fc..11bbbff585a0 100644
--- a/app-editors/leechcraft-popishu/Manifest
+++ b/app-editors/leechcraft-popishu/Manifest
@@ -1,3 +1,4 @@
DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
+DIST leechcraft-0.5.65.tar.xz 4817008 RMD160 0ad33f984b9beade23ca81aadeb64f8a23e3400c SHA1 77cedc3ddadefa02e6be7ff50210e53e045880be SHA256 2fdb3d17fbcaa58793cf1c0046851d9e3d6ede25bd57562aae572c9f64e1b38a
diff --git a/app-editors/leechcraft-popishu/leechcraft-popishu-0.5.65.ebuild b/app-editors/leechcraft-popishu/leechcraft-popishu-0.5.65.ebuild
new file mode 100644
index 000000000000..45f8fd9774a7
--- /dev/null
+++ b/app-editors/leechcraft-popishu/leechcraft-popishu-0.5.65.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leechcraft-popishu/leechcraft-popishu-0.5.65.ebuild,v 1.1 2012/04/22 12:58:38 maksbotan Exp $
+
+EAPI="4"
+
+inherit leechcraft
+
+DESCRIPTION="Popishu, the text editor with IDE features for LeechCraft."
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="~net-misc/leechcraft-core-${PV}
+ x11-libs/qscintilla"
+RDEPEND="${DEPEND}"
diff --git a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild b/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
index 1ccf96f7f78b..96df0f3781a0 100644
--- a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
+++ b/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild,v 1.7 2012/01/28 14:50:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild,v 1.8 2012/04/21 12:19:12 maekke Exp $
EAPI=4
inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~signals/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes
skyhook yahoo-geo"
diff --git a/app-misc/sphinx/sphinx-2.0.4.ebuild b/app-misc/sphinx/sphinx-2.0.4.ebuild
index 81b2b66f4617..3f8d552fef2c 100644
--- a/app-misc/sphinx/sphinx-2.0.4.ebuild
+++ b/app-misc/sphinx/sphinx-2.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.4.ebuild,v 1.2 2012/04/14 11:39:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.4.ebuild,v 1.3 2012/04/21 12:22:45 maekke Exp $
EAPI=4
inherit eutils autotools
@@ -19,7 +19,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug id64 mysql odbc postgres stemmer test"
RDEPEND="mysql? ( virtual/mysql )
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.2.ebuild
index d03956d1d68b..fb92f1859028 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.2.ebuild,v 1.2 2012/04/20 13:31:56 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.2.ebuild,v 1.3 2012/04/22 14:19:48 phajdan.jr Exp $
EAPI=4
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.libreoffice.org"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="offlinehelp templates"
LANGUAGES_HELP="bg bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo es et eu
diff --git a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild
index 633564fe9a0a..27859a03b9f8 100644
--- a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.12 2012/04/20 13:32:22 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.13 2012/04/22 14:17:11 phajdan.jr Exp $
EAPI=4
@@ -75,7 +75,7 @@ jemalloc kde mysql nlpsolver +nsplugin odk opengl pdfimport postgres svg test
+vba +webdav +xmlsec"
LICENSE="LGPL-3"
SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
NSS_DEPEND="
>=dev-libs/nspr-4.8.8
diff --git a/app-office/orage/orage-4.8.3.ebuild b/app-office/orage/orage-4.8.3.ebuild
index 82a61966f04f..59c1d0ff1313 100644
--- a/app-office/orage/orage-4.8.3.ebuild
+++ b/app-office/orage/orage-4.8.3.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.8.3.ebuild,v 1.5 2012/02/13 21:34:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.8.3.ebuild,v 1.6 2012/04/21 11:24:38 ssuominen Exp $
EAPI=4
-inherit xfconf
+inherit multilib xfconf
DESCRIPTION="A time managing application (and panel plug-in) for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/orage/"
+HOMEPAGE="http://www.xfce.org/projects/"
SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
@@ -18,15 +18,16 @@ RDEPEND=">=dev-libs/libical-0.48
dev-libs/popt
>=x11-libs/gtk+-2.10:2
berkdb? ( >=sys-libs/db-4 )
- dbus? ( >=dev-libs/dbus-glib-0.90 )
+ dbus? ( >=dev-libs/dbus-glib-0.98 )
libnotify? ( >=x11-libs/libnotify-0.7 )
xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.8 )"
DEPEND="${RDEPEND}
- dev-util/pkgconfig
- dev-util/intltool"
+ dev-util/intltool
+ dev-util/pkgconfig"
pkg_setup() {
XFCONF=(
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)
--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
$(use_enable xfce_plugins_clock libxfce4panel)
$(use_enable dbus)
@@ -36,4 +37,16 @@ pkg_setup() {
)
DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+ # PM doesn't let directory to be replaced by a symlink, see src_install()
+ rm -rf "${EROOT}"/usr/share/${PN}/doc
+}
+
+src_install() {
+ xfconf_src_install \
+ docdir=/usr/share/doc/${PF}/html \
+ imagesdir=/usr/share/doc/${PF}/html/images
+
+ # Create compability symlink for retarded path hardcoding in src/{mainbox,parameters}.c
+ dosym /usr/share/doc/${PF}/html /usr/share/${PN}/doc/C
}
diff --git a/app-text/djview/djview-4.7.ebuild b/app-text/djview/djview-4.7.ebuild
index a701504251b3..c7adb56db1b2 100644
--- a/app-text/djview/djview-4.7.ebuild
+++ b/app-text/djview/djview-4.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.7.ebuild,v 1.7 2012/01/16 18:42:15 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.7.ebuild,v 1.8 2012/04/21 17:09:49 ssuominen Exp $
EAPI="4"
@@ -19,8 +19,7 @@ IUSE="debug nsplugin"
RDEPEND="
>=app-text/djvu-3.5.22-r1
- x11-libs/qt-gui:4
- !!app-text/djview4"
+ x11-libs/qt-gui:4"
DEPEND="${RDEPEND}
>=sys-devel/autoconf-2.67
dev-util/pkgconfig
diff --git a/app-text/djview/djview-4.8.ebuild b/app-text/djview/djview-4.8.ebuild
index 4b859efec67c..fd6ed5acf0ba 100644
--- a/app-text/djview/djview-4.8.ebuild
+++ b/app-text/djview/djview-4.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.8.ebuild,v 1.1 2011/12/12 07:50:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.8.ebuild,v 1.2 2012/04/21 17:09:49 ssuominen Exp $
-EAPI="4"
+EAPI=4
-inherit eutils autotools versionator toolchain-funcs multilib nsplugins fdo-mime flag-o-matic
+inherit autotools eutils gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
MY_P=${PN}-$(replace_version_separator 2 '-')
@@ -19,8 +19,7 @@ IUSE="debug nsplugin"
RDEPEND="
>=app-text/djvu-3.5.22-r1
- x11-libs/qt-gui:4
- !!app-text/djview4"
+ x11-libs/qt-gui:4"
DEPEND="${RDEPEND}
>=sys-devel/autoconf-2.67
dev-util/pkgconfig
@@ -29,6 +28,8 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
src_prepare() {
+ epatch "${FILESDIR}"/${P}-qt48.patch
+
# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
@@ -49,7 +50,7 @@ src_configure() {
}
src_compile() {
- emake CC=$(tc-getCC) CXX=$(tc-getCXX)
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
}
src_install() {
@@ -69,10 +70,16 @@ src_install() {
domenu djvulibre-djview4.desktop
}
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
pkg_postinst() {
fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
}
diff --git a/app-text/djview/files/djview-4.8-qt48.patch b/app-text/djview/files/djview-4.8-qt48.patch
new file mode 100644
index 000000000000..4db289291ede
--- /dev/null
+++ b/app-text/djview/files/djview-4.8-qt48.patch
@@ -0,0 +1,56 @@
+From: Leon Bottou
+Date: Mon, 2 Apr 2012 14:11:36 +0000 (-0700)
+Subject: removed swap (use qSwap instead).
+X-Git-Tag: release.4.9~5
+X-Git-Url: http://djvu.git.sourceforge.net/git/gitweb.cgi?p=djvu%2Fdjview.git;a=commitdiff_plain;h=7d4802964b9e74506c63f43505b632f6e7b5db3c;hp=6389dcba572c6439acd226d27872c2f0db583875
+
+removed swap (use qSwap instead).
+
+Fixes Gentoo bug 401517, compilation problems with qt-4.8.
+Unclear why is namespace std in scope at this point when using qt-4.8...
+---
+
+diff --git a/src/qdjvuwidget.cpp b/src/qdjvuwidget.cpp
+index 52ac366..8136d07 100644
+--- a/src/qdjvuwidget.cpp
++++ b/src/qdjvuwidget.cpp
+@@ -152,15 +152,6 @@ all_numbers(const char *s)
+ return true;
+ }
+
+-template static inline void
+-swap(T& x, T& y)
+-{
+- T tmp;
+- tmp = x;
+- x = y;
+- y = tmp;
+-}
+-
+ template static inline int
+ ksmallest(T *v, int n, int k)
+ {
+@@ -173,11 +164,11 @@ ksmallest(T *v, int n, int k)
+ /* Sort v[lo], v[m], v[hi] by insertion */
+ m = (lo+hi)/2;
+ if (v[lo]>v[m])
+- swap(v[lo],v[m]);
++ qSwap(v[lo],v[m]);
+ if (v[m]>v[hi]) {
+- swap(v[m],v[hi]);
++ qSwap(v[m],v[hi]);
+ if (v[lo]>v[m])
+- swap(v[lo],v[m]);
++ qSwap(v[lo],v[m]);
+ }
+ /* Extract pivot, place sentinel */
+ pivot = v[m];
+@@ -191,7 +182,7 @@ ksmallest(T *v, int n, int k)
+ do ++l; while (v[l]pivot);
+ if (l < h) {
+- swap(v[l],v[h]);
++ qSwap(v[l],v[h]);
+ goto loop;
+ }
+ /* Finish up */
diff --git a/app-text/djview4/Manifest b/app-text/djview4/Manifest
deleted file mode 100644
index d59b55e8e11c..000000000000
--- a/app-text/djview4/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST djview4-4.5.tar.gz 895611 RMD160 256abad9cc6d661ba19caf209b74d9937eec4bce SHA1 d2fd259aa88f80393767f6dec921463da7820143 SHA256 8dc1d8013d51d4026a05d7ef4289c4c9b27de9d9b7d6bf960e4a9636b3b71276
-DIST djview4-4.6.tar.gz 893657 RMD160 a9116466ba1dc2441ed385928b2f54d71fab525b SHA1 72d98fde9c6406ee714830118d06767b561941fd SHA256 036205cda1f134301bdbf2db69113a86f014ce47933e9a15da54687fe728d95b
diff --git a/app-text/djview4/djview4-4.5-r1.ebuild b/app-text/djview4/djview4-4.5-r1.ebuild
deleted file mode 100644
index 1adfc705e46f..000000000000
--- a/app-text/djview4/djview4-4.5-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/djview4-4.5-r1.ebuild,v 1.8 2010/08/18 04:03:18 jer Exp $
-
-EAPI=2
-
-inherit eutils autotools versionator qt4 toolchain-funcs multilib nsplugins fdo-mime flag-o-matic
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="Portable DjVu viewer using Qt4"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
- >=app-text/djvu-3.5.22-r1
- x11-libs/qt-gui:4"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nsplugin? ( dev-libs/glib:2 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_prepare() {
- # Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
- sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
- sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
- epatch "${FILESDIR}/${P}-libtool.patch"
- rm aclocal.m4 config/{libtool.m4,ltmain.sh,install-sh}
- AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
- # See config/acinclude.m4
- use debug || append-cppflags "-DNDEBUG"
-
- # QTDIR is needed because of kde3
- QTDIR=/usr \
- econf \
- --with-x \
- $(use_enable nsplugin nsdejavu) \
- --disable-desktopfiles
-}
-
-src_compile() {
- emake CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
- install || die "emake install failed"
-
- dodoc README TODO NEWS || die "dodoc failed"
-
- cd desktopfiles
- insinto /usr/share/icons/hicolor/32x32/apps
- newins hi32-djview4.png djvulibre-djview4.png
- insinto /usr/share/icons/hicolor/scalable/apps
- newins djview.svg djvulibre-djview4.svg
- domenu djvulibre-djview4.desktop
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-text/djview4/djview4-4.6-r1.ebuild b/app-text/djview4/djview4-4.6-r1.ebuild
deleted file mode 100644
index c3a4a48eef8d..000000000000
--- a/app-text/djview4/djview4-4.6-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/djview4-4.6-r1.ebuild,v 1.1 2011/03/01 21:53:28 pva Exp $
-
-EAPI="3"
-
-inherit eutils autotools versionator toolchain-funcs multilib nsplugins fdo-mime flag-o-matic
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="Portable DjVu viewer using Qt4"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
- >=app-text/djvu-3.5.22-r1
- x11-libs/qt-gui:4"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nsplugin? ( dev-libs/glib:2 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_prepare() {
- epatch "${FILESDIR}/djview4-4.6-segfault.patch"
- # Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
- sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
- sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
- rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
- AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
- # See config/acinclude.m4
- use debug || append-cppflags "-DNDEBUG"
-
- # QTDIR is needed because of kde3
- QTDIR=/usr \
- econf \
- --with-x \
- $(use_enable nsplugin nsdejavu) \
- --disable-desktopfiles
-}
-
-src_compile() {
- emake CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
- install || die "emake install failed"
-
- dodoc README TODO NEWS || die "dodoc failed"
-
- cd desktopfiles
- insinto /usr/share/icons/hicolor/32x32/apps
- newins hi32-djview4.png djvulibre-djview4.png
- insinto /usr/share/icons/hicolor/scalable/apps
- newins djview.svg djvulibre-djview4.svg
- domenu djvulibre-djview4.desktop
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-text/djview4/djview4-4.6.ebuild b/app-text/djview4/djview4-4.6.ebuild
deleted file mode 100644
index 1f8bf0b9db75..000000000000
--- a/app-text/djview4/djview4-4.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/djview4-4.6.ebuild,v 1.1 2010/10/15 14:08:07 pva Exp $
-
-EAPI="3"
-
-inherit eutils autotools versionator toolchain-funcs multilib nsplugins fdo-mime flag-o-matic
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="Portable DjVu viewer using Qt4"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
- >=app-text/djvu-3.5.22-r1
- x11-libs/qt-gui:4"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nsplugin? ( dev-libs/glib:2 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_prepare() {
- # Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
- sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
- sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
- rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
- AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
- # See config/acinclude.m4
- use debug || append-cppflags "-DNDEBUG"
-
- # QTDIR is needed because of kde3
- QTDIR=/usr \
- econf \
- --with-x \
- $(use_enable nsplugin nsdejavu) \
- --disable-desktopfiles
-}
-
-src_compile() {
- emake CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
- install || die "emake install failed"
-
- dodoc README TODO NEWS || die "dodoc failed"
-
- cd desktopfiles
- insinto /usr/share/icons/hicolor/32x32/apps
- newins hi32-djview4.png djvulibre-djview4.png
- insinto /usr/share/icons/hicolor/scalable/apps
- newins djview.svg djvulibre-djview4.svg
- domenu djvulibre-djview4.desktop
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-text/djview4/files/djview4-4.5-libtool.patch b/app-text/djview4/files/djview4-4.5-libtool.patch
deleted file mode 100644
index 546bea887336..000000000000
--- a/app-text/djview4/files/djview4-4.5-libtool.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=2960877&group_id=32953&atid=406585
-
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/djvu/djview/configure.ac,v
-retrieving revision 1.32
-diff -u -B -r1.32 configure.ac
---- configure.ac 12 Mar 2009 23:49:50 -0000 1.32
-+++ configure.ac 28 Feb 2010 21:42:27 -0000
-@@ -180,10 +180,10 @@
- fi
- fi
-
-+# need libtool
-+AC_DISABLE_STATIC
-+AC_PROG_LIBTOOL
- if test "$ac_nsdejavu" != no ; then
-- # need libtool
-- AC_DISABLE_STATIC
-- AC_PROG_LIBTOOL
- # prepare flags
- NSDEJAVU_CFLAGS=
- NSDEJAVU_LIBS=
diff --git a/app-text/djview4/files/djview4-4.6-segfault.patch b/app-text/djview4/files/djview4-4.6-segfault.patch
deleted file mode 100644
index e19d0961f24a..000000000000
--- a/app-text/djview4/files/djview4-4.6-segfault.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: leonb
-Date: Wed, 24 Nov 2010 01:57:04 +0000 (+0000)
-Subject: Fixed occasional segfault when flipping pages very quickly.
-X-Git-Tag: debian/4.6-2~27
-X-Git-Url: http://djvu.git.sourceforge.net/git/gitweb.cgi?p=djvu%2Fdjview.git;a=commitdiff_plain;h=108bbca677f58f820cf8ab8653fc41b25ce6436f
-
-Fixed occasional segfault when flipping pages very quickly.
----
-
-diff --git a/src/qdjvuwidget.cpp b/src/qdjvuwidget.cpp
-index 7635b52..281d12b 100644
---- a/src/qdjvuwidget.cpp
-+++ b/src/qdjvuwidget.cpp
-@@ -1711,14 +1711,17 @@ QDjVuPrivate::updatePosition(const QPoint &point, bool click, bool links)
- return;
- // emit pointerposition signal
- PageInfo info;
-- Page *p = pageMap[pos.pageNo];
-- info.pageno = pos.pageNo;
-- info.width = p->width;
-- info.height = p->height;
-- info.dpi = p->dpi;
-- info.segment = widget->getSegmentForRect(selectedRect, info.pageno);
-- info.selected = selectedRect;
-- emit widget->pointerPosition(pos, info);
-+ Page *p = pageMap.value(pos.pageNo,0);
-+ if (p != 0)
-+ {
-+ info.pageno = pos.pageNo;
-+ info.width = p->width;
-+ info.height = p->height;
-+ info.dpi = p->dpi;
-+ info.segment = widget->getSegmentForRect(selectedRect, info.pageno);
-+ info.selected = selectedRect;
-+ emit widget->pointerPosition(pos, info);
-+ }
- // check mapareas
- if (links)
- checkCurrentMapArea();
-@@ -5255,16 +5258,16 @@ QDjVuWidget::nextPage(void)
- int pageNo = page();
- const QRect &dr = priv->deskRect;
- const QRect &vr = priv->visibleRect;
-- const QRect &cr = priv->pageMap[pageNo]->rect;
-+ const Page *pg = priv->pageMap.value(pageNo,0);
- while (pageNo < priv->numPages - 1)
- {
- pageNo += 1;
-- if (priv->layoutChange || !priv->pageMap.contains(pageNo))
-+ if (priv->layoutChange || !priv->pageMap.contains(pageNo) || !pg)
- break;
- // Skip pages until we get a meaningful change.
- const QRect &pr = priv->pageMap[pageNo]->rect;
- if (! vr.contains(pr))
-- if (pr.top() != cr.top() || vr.width() < dr.width())
-+ if (pr.top() != pg->rect.top() || vr.width() < dr.width())
- break;
- }
- setPage(pageNo);
-@@ -5277,16 +5280,16 @@ QDjVuWidget::prevPage(void)
- int pageNo = page();
- const QRect &dr = priv->deskRect;
- const QRect &vr = priv->visibleRect;
-- const QRect &cr = priv->pageMap[pageNo]->rect;
-+ const Page *pg = priv->pageMap.value(pageNo,0);
- while (pageNo > 0)
- {
- pageNo -= 1;
-- if (priv->layoutChange || !priv->pageMap.contains(pageNo))
-+ if (priv->layoutChange || !priv->pageMap.contains(pageNo) || !pg)
- break;
- // Skip pages until we get a meaningful change.
- const QRect &pr = priv->pageMap[pageNo]->rect;
- if (! vr.contains(pr))
-- if (pr.top() != cr.top() || vr.width() < dr.width())
-+ if (pr.top() != pg->rect.top() || vr.width() < dr.width())
- break;
- }
- setPage(pageNo);
diff --git a/app-text/djvu/djvu-3.5.24-r1.ebuild b/app-text/djvu/djvu-3.5.24-r1.ebuild
index c35539f69c8f..9ab1056ab2f7 100644
--- a/app-text/djvu/djvu-3.5.24-r1.ebuild
+++ b/app-text/djvu/djvu-3.5.24-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.24-r1.ebuild,v 1.1 2012/03/13 22:00:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.24-r1.ebuild,v 1.2 2012/04/21 17:27:56 ssuominen Exp $
EAPI=4
inherit eutils fdo-mime autotools flag-o-matic
@@ -80,12 +80,9 @@ src_install() {
pkg_postinst() {
fdo-mime_mime_database_update
- if ! has_version app-text/djview4 || ! has_version app-text/djview; then
+ if ! has_version app-text/djview; then
elog "For djviewer or browser plugin, emerge app-text/djview."
fi
- if has_version app-text/djview4; then
- ewarn "Note, that app-text/djview4 has changed its name to app-text/djview."
- fi
}
pkg_postrm() {
diff --git a/app-text/epspdf/epspdf-0.5.3.ebuild b/app-text/epspdf/epspdf-0.5.3.ebuild
index 6f10fa4268ee..f34c5d5351cd 100644
--- a/app-text/epspdf/epspdf-0.5.3.ebuild
+++ b/app-text/epspdf/epspdf-0.5.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epspdf/epspdf-0.5.3.ebuild,v 1.3 2012/04/03 21:25:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/epspdf/epspdf-0.5.3.ebuild,v 1.4 2012/04/21 11:56:55 maekke Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~x86-fbsd"
IUSE="doc tk"
DEPEND="sys-apps/texinfo"
diff --git a/app-text/libexttextcat/libexttextcat-3.2.0.ebuild b/app-text/libexttextcat/libexttextcat-3.2.0.ebuild
index 06ee5121516d..5da0eae670b9 100644
--- a/app-text/libexttextcat/libexttextcat-3.2.0.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libexttextcat/libexttextcat-3.2.0.ebuild,v 1.3 2012/01/18 20:03:28 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libexttextcat/libexttextcat-3.2.0.ebuild,v 1.4 2012/04/22 14:20:12 phajdan.jr Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND=""
diff --git a/app-text/mythes/mythes-1.2.2.ebuild b/app-text/mythes/mythes-1.2.2.ebuild
index 2e86c66f4238..02f25f5ab356 100644
--- a/app-text/mythes/mythes-1.2.2.ebuild
+++ b/app-text/mythes/mythes-1.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mythes/mythes-1.2.2.ebuild,v 1.3 2012/03/26 15:48:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mythes/mythes-1.2.2.ebuild,v 1.4 2012/04/22 14:20:40 phajdan.jr Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
RDEPEND="app-text/hunspell"
diff --git a/app-text/poppler/poppler-0.18.4-r1.ebuild b/app-text/poppler/poppler-0.18.4-r1.ebuild
index 709b76f28704..fd781c75a673 100644
--- a/app-text/poppler/poppler-0.18.4-r1.ebuild
+++ b/app-text/poppler/poppler-0.18.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.4-r1.ebuild,v 1.1 2012/04/05 20:01:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.4-r1.ebuild,v 1.3 2012/04/21 19:07:33 jdhore Exp $
EAPI="4"
@@ -11,7 +11,7 @@ HOMEPAGE="http://poppler.freedesktop.org/"
SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~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"
IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils +xpdf-headers"
diff --git a/app-text/texlive/texlive-2011-r1.ebuild b/app-text/texlive/texlive-2011-r1.ebuild
index 25423152dfd6..f9116778009d 100644
--- a/app-text/texlive/texlive-2011-r1.ebuild
+++ b/app-text/texlive/texlive-2011-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2011-r1.ebuild,v 1.3 2012/04/03 21:26:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2011-r1.ebuild,v 1.4 2012/04/21 12:07:01 maekke Exp $
EAPI="2"
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~x86-fbsd"
IUSE="cjk context detex doc dvi2tty dvipdfm extra epspdf games graphics
humanities jadetex luatex music omega pdfannotextractor png pstricks publishers
science tex4ht truetype xetex xindy xml X"
diff --git a/app-text/wpd2odt/wpd2odt-0.8.1.ebuild b/app-text/wpd2odt/wpd2odt-0.8.1.ebuild
index 006da65d5ba4..a74520252176 100644
--- a/app-text/wpd2odt/wpd2odt-0.8.1.ebuild
+++ b/app-text/wpd2odt/wpd2odt-0.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wpd2odt/wpd2odt-0.8.1.ebuild,v 1.3 2011/10/26 15:34:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wpd2odt/wpd2odt-0.8.1.ebuild,v 1.4 2012/04/22 14:21:07 phajdan.jr Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libwpd/writerperfect-${PV}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 x86 ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="debug gsf +visio +wpg +wps"
RDEPEND="
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index dfd08525f73e..f526ab642b9a 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -27,5 +27,6 @@ DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d979
DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 RMD160 99b71ba2d567aef06fceda962d5d8d3ae8150b61 SHA1 91c28858bd3585ff7e1b3a5f199fdf2b28729d5b SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495
+DIST mysql-extras-20120421-2004Z.tar.bz2 1836159 RMD160 4471590e7b939f58fb534e6f8c3cb952257d5ef6 SHA1 c756c84373286df164015e50fdc842d9e7245ebd SHA256 11cbf44c5983adf496ea6e00c461ea54915ddb1baf527c05953284b409d8bc6d
DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index cb76fa27fb41..351eb3c6ff28 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -5,9 +5,7 @@