diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 92bcee05912f..882efc3b431f 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,3 +1,3 @@
DIST seahorse-2.32.0.tar.bz2 2491230 RMD160 5599cf02321be038d8aa5bc96174e2cf05c62945 SHA1 1469884b67483c876cfe5b986a76495739927a99 SHA256 f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d
-DIST seahorse-3.0.2.tar.bz2 2545909 RMD160 6a1fd6b00b8bce407ebf4add8e6361fb9fe3ea2e SHA1 420793a1f17af5fa982f15050bf5ea2656471fba SHA256 78b38d6e7220d1957af34eac79c21423f1f4be066853126d30cc030d8407a1bf
DIST seahorse-3.2.1.tar.xz 1963480 RMD160 2f48c7201abda484f21f84ea6d5715965bc18418 SHA1 e6819828bb2783566a91549cb5aab5286123965e SHA256 84f1df80055ca66179a023130e179de44053e7df91c1f6c7fd536563fac832b2
+DIST seahorse-3.2.2.tar.xz 1964064 RMD160 64f42c3c200c3dc83100cb8c63489a0814e0fec8 SHA1 08a231cbb1aac4103465dee45fd18583d44785ea SHA256 25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9
diff --git a/app-crypt/seahorse/seahorse-3.0.2.ebuild b/app-crypt/seahorse/seahorse-3.2.2.ebuild
similarity index 61%
rename from app-crypt/seahorse/seahorse-3.0.2.ebuild
rename to app-crypt/seahorse/seahorse-3.2.2.ebuild
index b45284d2c619..27d5d6b0a05e 100644
--- a/app-crypt/seahorse/seahorse-3.0.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.2.2.ebuild
@@ -1,35 +1,25 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.0.2.ebuild,v 1.1 2011/08/16 23:22:14 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.2.2.ebuild,v 1.1 2011/11/17 06:11:08 tetromino Exp $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="A GNOME application for managing encryption keys"
HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
LICENSE="GPL-2"
SLOT="0"
-IUSE="avahi debug doc +introspection ldap libnotify test"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+IUSE="avahi debug doc ldap test"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
COMMON_DEPEND="
- >=gnome-base/gconf-2:2
>=dev-libs/glib-2.10:2
- >=x11-libs/gtk+-2.90.0:3[introspection?]
- >=dev-libs/dbus-glib-0.72
- >=gnome-base/gnome-keyring-2.91.2
+ >=x11-libs/gtk+-2.90.0:3
+ >=gnome-base/gnome-keyring-3.1.5
net-libs/libsoup:2.4
x11-misc/shared-mime-info
@@ -40,9 +30,7 @@ COMMON_DEPEND="
=app-crypt/gnupg-1.4* )
avahi? ( >=net-dns/avahi-0.6 )
- introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
ldap? ( net-nds/openldap )
- libnotify? ( >=x11-libs/libnotify-0.7.0 )
"
DEPEND="${COMMON_DEPEND}
sys-devel/gettext
@@ -66,12 +54,9 @@ pkg_setup() {
--disable-scrollkeeper
--disable-update-mime-database
--enable-hkp
- --with-gtk=3.0
$(use_enable avahi sharing)
$(use_enable debug)
- $(use_enable introspection)
$(use_enable ldap)
- $(use_enable libnotify)
$(use_enable test tests)"
DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
}
@@ -80,11 +65,7 @@ src_prepare() {
# FIXME: Do not mess with CFLAGS with USE="debug"
sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
-e 's/-Werror//' \
- -i configure.in configure || die "sed 1 failed"
-
- # FIXME: Disable test not ported to gtk:3
- sed -e 's/^SUBDIRS = .*/SUBDIRS = /' \
- -i libcryptui/Makefile.am libcryptui/Makefile.in || die "sed 2 failed"
+ -i configure.ac configure || die "sed 1 failed"
gnome2_src_prepare
}
diff --git a/app-i18n/ibus-unikey/Manifest b/app-i18n/ibus-unikey/Manifest
index 8d493f0ce49d..4db137385e4d 100644
--- a/app-i18n/ibus-unikey/Manifest
+++ b/app-i18n/ibus-unikey/Manifest
@@ -1,2 +1,3 @@
DIST ibus-unikey-0.5.1.tar.gz 496451 RMD160 8176ccf1bff44450e48def487ab4196f806a42ae SHA1 01f34cf6d32d7bffc862e9c6d3531113eccd7b3c SHA256 c76cdb6e5eb789723f2f6036b72d78b62ae26c405bc567845accccc6f50fb19e
DIST ibus-unikey-0.5.tar.gz 494304 RMD160 baf583141f01af7836a4c30d47041cdb66cc92bd SHA1 525e8b8c8c0beb41f16d771c502098cf2d1fba9b SHA256 5c6a36ffcc7ea8a4dbfba0a96632bf860e9d524d818e553e1bf8d18702ba1910
+DIST ibus-unikey-0.6.0.tar.gz 509952 RMD160 d766792ee1165a97883b25d51640d920a789f5df SHA1 9cacf527273eb4f45f904e6b8fd3cc5f48a3e41a SHA256 007d5ee50dc6f31d4cac61235868063bc9ecf74fef942c0d5091b23dc5360303
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.0.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.6.0.ebuild
new file mode 100644
index 000000000000..1bb6fce4a60f
--- /dev/null
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.6.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.6.0.ebuild,v 1.1 2011/11/17 14:10:02 naota Exp $
+
+EAPI="4"
+inherit eutils
+
+DESCRIPTION="Vietnamese Input Method Engine for IBUS using Unikey IME"
+HOMEPAGE="http://code.google.com/p/ibus-unikey/"
+SRC_URI="http://ibus-unikey.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk3"
+
+RDEPEND="gtk3? ( >app-i18n/ibus-1.3.9[gtk3]
+ x11-libs/gtk+:3 )
+ !gtk3? ( app-i18n/ibus
+ >=x11-libs/gtk+-2.12:2 )
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+src_configure() {
+ use gtk3 && myconf="--with-gtk-version=3" || myconf=""
+ econf ${myconf}
+}
diff --git a/app-i18n/ibus-unikey/metadata.xml b/app-i18n/ibus-unikey/metadata.xml
index 6d8282b8fb42..9c80750ba73d 100644
--- a/app-i18n/ibus-unikey/metadata.xml
+++ b/app-i18n/ibus-unikey/metadata.xml
@@ -7,5 +7,8 @@ Ibus-unikey is a IM Engine for IBus
Use for type Vietnamese
Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85
+
diff --git a/app-i18n/scim/files/scim-1.4.11-type-module-use.patch b/app-i18n/scim/files/scim-1.4.11-type-module-use.patch
new file mode 100644
index 000000000000..ff19065281e0
--- /dev/null
+++ b/app-i18n/scim/files/scim-1.4.11-type-module-use.patch
@@ -0,0 +1,10 @@
+--- a/extras/gtk2_immodule/gtkimcontextscim.cpp 2011-11-09 17:08:21.000000000 -0800
++++ b/extras/gtk2_immodule/gtkimcontextscim.cpp 2011-11-09 17:07:51.000000000 -0800
+@@ -447,6 +447,7 @@
+ "GtkIMContextSCIM",
+ &im_context_scim_info,
+ (GTypeFlags) 0);
++ g_type_module_use (type_module);
+ }
+ }
+
diff --git a/app-i18n/scim/scim-1.4.11-r1.ebuild b/app-i18n/scim/scim-1.4.11-r1.ebuild
new file mode 100644
index 000000000000..da836d943d03
--- /dev/null
+++ b/app-i18n/scim/scim-1.4.11-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.11-r1.ebuild,v 1.1 2011/11/17 09:06:46 naota Exp $
+
+EAPI="3"
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="x11-libs/libX11
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ >=dev-libs/atk-1
+ >=x11-libs/pango-1
+ !app-i18n/scim-cvs"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen
+ >=app-text/docbook-xsl-stylesheets-1.73.1 )
+ dev-lang/perl
+ dev-util/pkgconfig
+ >=dev-util/intltool-0.33
+ sys-devel/libtool"
+
+update_gtk_immodules() {
+ local GTK2_CONFDIR="/etc/gtk-2.0"
+ # bug #366889
+ if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+ GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+ fi
+ mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+ if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+ "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-type-module-use.patch
+}
+
+src_configure() {
+ local myconf
+ # bug #83625
+ filter-flags -fvisibility-inlines-hidden
+ filter-flags -fvisibility=hidden
+
+ econf \
+ $(use_with doc doxygen) \
+ --enable-ld-version-script \
+ ${myconf} || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
+ insinto /etc/X11/xinit/xinput.d
+ doins "${T}/${PN}.conf" || die
+
+ dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg || die
+ use doc && dohtml -r docs/html/*
+}
+
+pkg_postinst() {
+ elog
+ elog "To use SCIM with both GTK2 and XIM, you should use the following"
+ elog "in your user startup scripts such as .gnomerc or .xinitrc:"
+ elog
+ elog "LANG='your_language' scim -d"
+ elog "export XMODIFIERS=@im=SCIM"
+ elog "export GTK_IM_MODULE=\"scim\""
+ elog "export QT_IM_MODULE=\"scim\""
+ elog
+ elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
+ elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
+ elog
+ elog "To use Chinese input methods:"
+ elog " # emerge app-i18n/scim-tables app-i18n/scim-pinyin"
+ elog "To use Korean input methods:"
+ elog " # emerge app-i18n/scim-hangul"
+ elog "To use Japanese input methods:"
+ elog " # emerge app-i18n/scim-anthy"
+ elog "To use various input methods (more than 30 languages):"
+ elog " # emerge app-i18n/scim-m17n"
+ elog
+ ewarn
+ ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
+ ewarn
+
+ update_gtk_immodules
+}
+
+pkg_postrm() {
+ update_gtk_immodules
+}
diff --git a/app-misc/g15macro/Manifest b/app-misc/g15macro/Manifest
index 25a63aae5b8c..d4be95165289 100644
--- a/app-misc/g15macro/Manifest
+++ b/app-misc/g15macro/Manifest
@@ -1,3 +1 @@
-DIST g15macro-1.0.0.tar.bz2 223563 RMD160 69627bcee91ab0e7cefcf861288d545e8b314253 SHA1 7545067405a54e213d6d26fdd3e4f57a59b4b894 SHA256 f77a5ee0d07e15431353012793533784cb46d7fdeab78a68ceaaf2232672f77d
-DIST g15macro-1.0.1.tar.gz 321459 RMD160 8adefc901d9b740f0ec670a68408813324f018a3 SHA1 b31b569bbfc9522438bb84a0ad8f437e91562807 SHA256 1d94911d5da6881fef1e6071d233533b4a3fe9b146c1a1566fdf6155a54ba51e
DIST g15macro-1.0.3.tar.gz 324859 RMD160 f96fb40e7b055b8d66eb0dfcfded3fec5a264803 SHA1 fa6758665f042c37bc1a27cf6a7cb4cf2e05dc2f SHA256 be4a5ba422777b330d09169fe505eae433aad7378c2eaf411ea591723b82ace2
diff --git a/app-misc/g15macro/g15macro-1.0.0.ebuild b/app-misc/g15macro/g15macro-1.0.0.ebuild
deleted file mode 100644
index 1fb2a16e99f1..000000000000
--- a/app-misc/g15macro/g15macro-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/g15macro-1.0.0.ebuild,v 1.3 2008/02/21 23:53:22 robbat2 Exp $
-
-DESCRIPTION="Macro recording plugin to G15daemon"
-HOMEPAGE="http://g15daemon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-misc/g15daemon-1.9.0
- dev-libs/libg15
- dev-libs/libg15render
- x11-libs/libX11
- x11-proto/xextproto
- x11-proto/xproto
- x11-libs/libXtst"
-
-RDEPEND="${DEPEND}
- sys-libs/zlib"
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- rm "$D"/usr/share/doc/${P}/{COPYING,NEWS}
-
- prepalldocs
-}
diff --git a/app-misc/g15macro/g15macro-1.0.1.ebuild b/app-misc/g15macro/g15macro-1.0.1.ebuild
deleted file mode 100644
index 749db5146c08..000000000000
--- a/app-misc/g15macro/g15macro-1.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/g15macro-1.0.1.ebuild,v 1.2 2008/02/21 23:53:22 robbat2 Exp $
-
-DESCRIPTION="Macro recording plugin to G15daemon"
-HOMEPAGE="http://g15daemon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-misc/g15daemon-1.9.0
- dev-libs/libg15
- dev-libs/libg15render
- x11-libs/libX11
- x11-proto/xextproto
- x11-proto/xproto
- x11-libs/libXtst"
-
-RDEPEND="${DEPEND}
- sys-libs/zlib"
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS}
-
- prepalldocs
-}
diff --git a/app-misc/g15macro/g15macro-1.0.3-r1.ebuild b/app-misc/g15macro/g15macro-1.0.3-r1.ebuild
index fbd23aff27ac..d4344672d378 100644
--- a/app-misc/g15macro/g15macro-1.0.3-r1.ebuild
+++ b/app-misc/g15macro/g15macro-1.0.3-r1.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/g15macro-1.0.3-r1.ebuild,v 1.1 2011/11/16 21:43:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/g15macro-1.0.3-r1.ebuild,v 1.2 2011/11/17 11:31:36 scarabeus Exp $
EAPI=4
+
DESCRIPTION="Macro recording plugin to G15daemon"
HOMEPAGE="http://g15daemon.sourceforge.net/"
SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.gz"
@@ -29,7 +30,5 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
- rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS}
-
- prepalldocs
+ rm "${ED}"/usr/share/doc/${P}/{COPYING,NEWS}
}
diff --git a/app-misc/g15macro/g15macro-1.0.3.ebuild b/app-misc/g15macro/g15macro-1.0.3.ebuild
deleted file mode 100644
index 29a02d3669d1..000000000000
--- a/app-misc/g15macro/g15macro-1.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/g15macro-1.0.3.ebuild,v 1.1 2008/09/13 22:35:35 robbat2 Exp $
-
-DESCRIPTION="Macro recording plugin to G15daemon"
-HOMEPAGE="http://g15daemon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-misc/g15daemon-1.9.0
- dev-libs/libg15
- dev-libs/libg15render
- x11-libs/libX11
- x11-proto/xextproto
- x11-proto/xproto
- x11-libs/libXtst"
-
-RDEPEND="${DEPEND}
- sys-libs/zlib"
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS}
-
- prepalldocs
-}
diff --git a/app-text/xournal/xournal-0.4.5_p20111022.ebuild b/app-text/xournal/xournal-0.4.5_p20111022.ebuild
index 047642556dce..1ecf92e4049e 100644
--- a/app-text/xournal/xournal-0.4.5_p20111022.ebuild
+++ b/app-text/xournal/xournal-0.4.5_p20111022.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022.ebuild,v 1.2 2011/11/16 23:40:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022.ebuild,v 1.3 2011/11/17 09:47:38 chainsaw Exp $
EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gento
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+pdf"
COMMONDEPEND="
diff --git a/app-vim/notes/Manifest b/app-vim/notes/Manifest
index b9a4418d6ad8..b081ae5dd475 100644
--- a/app-vim/notes/Manifest
+++ b/app-vim/notes/Manifest
@@ -1,2 +1,3 @@
DIST notes-0.11.3.tar.gz 32887 RMD160 468ee159e2a51b089cd578f031cde635c3ab6316 SHA1 6c9a0fe8c1237390b65c5016b35c528dde2b0916 SHA256 1202e2e48cdd74124f91bab0d7b35f60ca8da140843502aa3e7bcaab1c63f9ed
+DIST notes-0.12.10.tar.gz 35582 RMD160 4874e2e005367daa7e50922031f7121b88fbf509 SHA1 2c2a4f1b19612857913af2415a8f97331be50dc3 SHA256 0c9b82feb68360dcd5ea21432ec61901c6f132bedc30e0644a62d725cf559970
DIST notes-0.12.8.tar.gz 34893 RMD160 70fb5fed25beea10909d808d383a8d74f83e5fae SHA1 5c57b01c70679b1fcf028249b0471f217a299afe SHA256 4c77da6ac48e0323bff56bd19fc094b400c9ab3ddd4a546242df3bf3acf3e798
diff --git a/app-vim/notes/notes-0.12.10.ebuild b/app-vim/notes/notes-0.12.10.ebuild
new file mode 100644
index 000000000000..6afec9eaae83
--- /dev/null
+++ b/app-vim/notes/notes-0.12.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/notes/notes-0.12.10.ebuild,v 1.1 2011/11/17 16:33:23 radhermit Exp $
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easy note taking in vim"
+HOMEPAGE="http://peterodding.com/code/vim/notes/"
+SRC_URI="https://github.com/xolox/vim-${PN}/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-vim/xolox-misc-20110926
+ || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] )"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_unpack() {
+ unpack ${A}
+ mv *-${PN}-* "${S}"
+}
+
+src_prepare() {
+ # Remove unnecessary files
+ rm INSTALL.md README.md misc/notes/user/README || die
+ rm -r autoload/xolox/misc || die
+}
diff --git a/app-vim/session/Manifest b/app-vim/session/Manifest
index 5930a4e61925..443a296e330e 100644
--- a/app-vim/session/Manifest
+++ b/app-vim/session/Manifest
@@ -1,3 +1,4 @@
DIST session-1.4.11.tar.gz 20445 RMD160 39228f6ee64b30a71b6b46c8309ecc432765a5e0 SHA1 b18b6521b214530de201b9c0c138997f14fbfb21 SHA256 389b4be58ec7e8de416c288b7d7b86853ab0c4fd59b8d066d5e2bcd9ca66539d
DIST session-1.4.16.tar.gz 21080 RMD160 faddfa1927816d2c331e119ceb9431c19114855e SHA1 43e3ef45ed0054fa4d2c3704ca4c416559d544d4 SHA256 0d3ea39b56f8d0c3965a1897f921fe36c38981fce039aab5fad6209862480c1e
DIST session-1.4.21.tar.gz 22462 RMD160 1bc259044858b50400efe5795ad2453032e6ca18 SHA1 058700256685c923ac0decdffe21ceb770789f13 SHA256 91af44010a4d77d892f25273dcf6ce32829626c5049e3a3486f6e0878175861b
+DIST session-1.4.22.tar.gz 22843 RMD160 6b05ff6b353eb254963d7bf2df3db738d44f0060 SHA1 b8532c3bf5ebbd14236a1ad2bc0778bf9c87a1b0 SHA256 ba04634210a1a3644c84e3395721be9a2dbefa5b95180c1f8a3b6674753a10fa
diff --git a/app-vim/session/session-1.4.22.ebuild b/app-vim/session/session-1.4.22.ebuild
new file mode 100644
index 000000000000..347248c17da8
--- /dev/null
+++ b/app-vim/session/session-1.4.22.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/session/session-1.4.22.ebuild,v 1.1 2011/11/17 16:41:39 radhermit Exp $
+
+EAPI=4
+
+inherit vim-plugin
+
+MY_PN="vim-${PN}"
+DESCRIPTION="vim plugin: extended session management for vim"
+HOMEPAGE="http://peterodding.com/code/vim/session/"
+SRC_URI="https://github.com/xolox/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND=">=app-vim/xolox-misc-20110926"
+
+src_unpack() {
+ unpack ${A}
+ mv *-${MY_PN}-* "${S}"
+}
+
+src_prepare() {
+ # remove unneeded files
+ rm *.md || die
+ rm -r autoload/xolox/misc || die
+}
diff --git a/app-vim/vim-r/Manifest b/app-vim/vim-r/Manifest
index 188de884abc8..fab0e2138940 100644
--- a/app-vim/vim-r/Manifest
+++ b/app-vim/vim-r/Manifest
@@ -1,3 +1,3 @@
-DIST vim-r-110614.tar.gz 130533 RMD160 533cf53d6224e0197ac424ad952e007d61ff85fb SHA1 a2fa5328dfecdd9846fe326508344d5f237a043a SHA256 df9b672142346752cb31714fb91b76851c074e4a65b54ead1675c32a2c289f6d
DIST vim-r-110805.tar.gz 128963 RMD160 d84fc19189d3ba63c9effb31f7b0b4f2395cd054 SHA1 78884488c02c0bbeb55889e35bf49eee3472a5f9 SHA256 afec779e21358ffc21062a68ed11c4c74466a73360603dc3f47ae2b190839bd3
DIST vim-r-111014.tar.gz 132346 RMD160 d0187c07a8104aa25c8d56f96e778b8dabc98b07 SHA1 2119e7c934585e5515e41b83d3d6ec5479ae39a7 SHA256 2733fb7355da61d273481cb928ebab72ae9d89c616df379204c7a04aad50525e
+DIST vim-r-111114.tar.gz 132667 RMD160 eb5e4e68f5a04237a1808887049108797531787a SHA1 0465c3ea913ffd35da33eb792643d0cac496b35a SHA256 292d9d6b10c9d93e7d9c120dd1ad7ae98ee640fa3698687b94098363c9a2e335
diff --git a/app-vim/vim-r/vim-r-110614.ebuild b/app-vim/vim-r/vim-r-111114.ebuild
similarity index 82%
rename from app-vim/vim-r/vim-r-110614.ebuild
rename to app-vim/vim-r/vim-r-111114.ebuild
index 5928202e9f48..90192a8687d8 100644
--- a/app-vim/vim-r/vim-r-110614.ebuild
+++ b/app-vim/vim-r/vim-r-111114.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vim-r/vim-r-110614.ebuild,v 1.1 2011/06/25 09:48:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vim-r/vim-r-111114.ebuild,v 1.1 2011/11/17 16:36:24 radhermit Exp $
EAPI="4"
VIM_PLUGIN_VIM_VERSION="7.3"
@@ -26,5 +26,5 @@ src_unpack() {
}
src_prepare() {
- rm README
+ rm README || die
}
diff --git a/dev-lang/v8/v8-3.5.10.24.ebuild b/dev-lang/v8/v8-3.5.10.24.ebuild
index 257bd9e87bfb..832a02b9e7eb 100644
--- a/dev-lang/v8/v8-3.5.10.24.ebuild
+++ b/dev-lang/v8/v8-3.5.10.24.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.5.10.24.ebuild,v 1.1 2011/11/17 03:01:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.5.10.24.ebuild,v 1.2 2011/11/17 11:37:07 chainsaw Exp $
EAPI="3"
@@ -12,7 +12,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~x86 ~x64-macos ~x86-macos"
IUSE="readline"
RDEPEND="readline? ( >=sys-libs/readline-6.1 )"
diff --git a/dev-libs/libnl/libnl-1.1-r2.ebuild b/dev-libs/libnl/libnl-1.1-r2.ebuild
index b85bc1805e88..cf279531cec9 100644
--- a/dev-libs/libnl/libnl-1.1-r2.ebuild
+++ b/dev-libs/libnl/libnl-1.1-r2.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.1-r2.ebuild,v 1.14 2011/10/26 15:43:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.1-r2.ebuild,v 1.16 2011/11/17 16:52:22 jer Exp $
EAPI="2"
inherit eutils multilib
DESCRIPTION="A library for applications dealing with netlink socket"
-HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
-SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="1.1"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
diff --git a/dev-libs/libnl/libnl-3.2.1.ebuild b/dev-libs/libnl/libnl-3.2.1.ebuild
index f057a0f44cb1..724a82f76b74 100644
--- a/dev-libs/libnl/libnl-3.2.1.ebuild
+++ b/dev-libs/libnl/libnl-3.2.1.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.1.ebuild,v 1.2 2011/10/26 15:43:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.1.ebuild,v 1.4 2011/11/17 16:52:22 jer Exp $
EAPI="4"
inherit eutils multilib autotools-utils
DESCRIPTION="A library for applications dealing with netlink socket"
-HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
-SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
diff --git a/dev-libs/libnl/libnl-3.2.2.ebuild b/dev-libs/libnl/libnl-3.2.2.ebuild
index 97621964d3f2..8f164ad13eec 100644
--- a/dev-libs/libnl/libnl-3.2.2.ebuild
+++ b/dev-libs/libnl/libnl-3.2.2.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.2.ebuild,v 1.1 2011/10/31 00:24:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.2.ebuild,v 1.3 2011/11/17 16:52:22 jer Exp $
EAPI="4"
inherit eutils multilib autotools-utils
DESCRIPTION="A library for applications dealing with netlink socket"
-HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
-SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
diff --git a/dev-libs/libnl/libnl-3.2.3.ebuild b/dev-libs/libnl/libnl-3.2.3.ebuild
index 70a37d4bfe45..8c9c18cb6e27 100644
--- a/dev-libs/libnl/libnl-3.2.3.ebuild
+++ b/dev-libs/libnl/libnl-3.2.3.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.3.ebuild,v 1.1 2011/11/11 15:11:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.3.ebuild,v 1.3 2011/11/17 16:52:22 jer Exp $
EAPI="4"
inherit eutils multilib autotools-utils
DESCRIPTION="A library for applications dealing with netlink socket"
-HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
-SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 095afd093539..8f030c11d110 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1 +1,2 @@
DIST newt-0.52.12.tar.gz 178027 RMD160 0d34b278e72c1b1305fc110e491e3bc96b42a374 SHA1 6952115806c7b1dbc36858eb4ca0596b235cf6f4 SHA256 2ba88dc3d118daf509c58e3707c43ad57dd3415d8164054e93fe76439f348529
+DIST newt-0.52.13.tar.gz 183466 RMD160 c43d9b3acd800ba3590c85e9854ad7b7c8e9b34b SHA1 0891ad749560ea6071edd734a080c9d172d0da0e SHA256 01c254b00a3d27e22f13240b6db74df04e721ccec4d1d4fc7b45fee009efc05f
diff --git a/dev-libs/newt/files/newt-0.52.13-gold.patch b/dev-libs/newt/files/newt-0.52.13-gold.patch
new file mode 100644
index 000000000000..5781dbf550f4
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.52.13-gold.patch
@@ -0,0 +1,12 @@
+--- configure.ac~ 2011-11-09 23:50:21.000000000 +0900
++++ configure.ac 2011-11-09 23:54:54.139482817 +0900
+@@ -19,7 +19,8 @@
+ AC_MSG_CHECKING([for GNU ld])
+ LD=`$CC -print-prog-name=ld 2>&5`
+
+-if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0; then
++if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0 -a \
++ test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold"` = 0; then
+ # Not
+ GNU_LD=""
+ AC_MSG_RESULT([no])
diff --git a/dev-libs/newt/files/newt-0.52.13-python.patch b/dev-libs/newt/files/newt-0.52.13-python.patch
new file mode 100644
index 000000000000..0487186147d8
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.52.13-python.patch
@@ -0,0 +1,32 @@
+diff --git a/configure.ac b/configure.ac
+index b972805..1fe4bdf 100644
+--- a/configure.ac (revision 34e56d12931a25222d7debb22f95bb2f9fa696a0)
++++ b/configure.ac (revision 49d37f0cc7121a8386e4a8f21e5e0f7b614922b1)
+@@ -60,5 +60,5 @@
+ PYTHONVERS=
+ else
+- PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null)
++ PYTHONVERS=$(ls /usr/include/python2.*/Python.h 2> /dev/null | sed 's|/usr/include/\([[^/]]*\)/Python.h|\1|g' | tr '\n' ' ')
+ AC_MSG_RESULT([$PYTHONVERS])
+ fi
+diff --git a/Makefile.in b/Makefile.in
+index a448c5f..f9bbe1f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -79,11 +79,11 @@ showkey: showkey.o $(LIBNEWT)
+ _snackmodule.so: snackmodule.c $(LIBNEWTSH)
+ [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
+ mkdir -p $$ver ;\
+- PCFLAGS=`$$ver-config --cflags`; \
+- PIFLAGS=`$$ver-config --includes`; \
+- PLDFLAGS=`$$ver-config --ldflags`; \
+- PLFLAGS=`$$ver-config --libs`; \
+- $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
++ PCFLAGS=`python-config-$${ver#python} --cflags`; \
++ PIFLAGS=`python-config-$${ver#python} --includes`; \
++ PLDFLAGS=`python-config-$${ver#python} --ldflags`; \
++ PLFLAGS=`python-config-$${ver#python} --libs`; \
++ $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -fPIC -o $$ver/snackmodule.o snackmodule.c ;\
+ $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L. -lnewt $(LIBS);\
+ done || :
+ touch $@
diff --git a/dev-libs/newt/newt-0.52.13.ebuild b/dev-libs/newt/newt-0.52.13.ebuild
new file mode 100644
index 000000000000..6cd460fd2e37
--- /dev/null
+++ b/dev-libs/newt/newt-0.52.13.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.13.ebuild,v 1.1 2011/11/17 04:45:44 naota Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils multilib python autotools
+
+DESCRIPTION="Redhat's Newt windowing toolkit development files"
+HOMEPAGE="https://fedorahosted.org/newt/"
+SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gpm tcl nls"
+
+RDEPEND="=sys-libs/slang-2*
+ >=dev-libs/popt-1.6
+ elibc_uclibc? ( sys-libs/ncurses )
+ gpm? ( sys-libs/gpm )
+ tcl? ( =dev-lang/tcl-8.5* )
+ "
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ # bug 73850
+ if use elibc_uclibc; then
+ sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die
+ fi
+
+ sed -i Makefile.in \
+ -e 's|-ltcl8.4|-ltcl8.5|g' \
+ -e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
+ -e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
+ -e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
+ -e 's|instroot|DESTDIR|g' \
+ -e 's| make | $(MAKE) |g' \
+ || die "sed Makefile.in"
+
+ epatch "${FILESDIR}"/${P}-python.patch
+ epatch "${FILESDIR}"/${P}-gold.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with gpm gpm-support) \
+ $(use_with tcl) \
+ $(use_enable nls)
+}
+
+src_compile() {
+ emake PYTHONVERS="$(PYTHON)" || die "emake failed"
+}
+
+src_install () {
+ emake \
+ DESTDIR="${D}" \
+ PYTHONVERS="$(PYTHON)" \
+ install || die "make install failed"
+ dodoc peanuts.py popcorn.py tutorial.sgml
+ doman whiptail.1
+}
+
+pkg_postinst() {
+ python_mod_optimize snack.py
+}
+
+pkg_postrm() {
+ python_mod_cleanup snack.py
+}
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 210e82e3aeeb..fb5ac9da96ef 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1 +1,2 @@
DIST netifaces-0.5.tar.gz 9069 RMD160 0cc9cfffdc1abd057aea2ed27403b269e92dba69 SHA1 8b79e65bc6871bbb5d8160ae52fa4983e97ed347 SHA256 6348530ac1ea3af93547ffe5af83776e1f107efa86e8af082ea8c05975986b46
+DIST netifaces-0.6.tar.gz 14546 RMD160 755811579d24687f9422aaef8312340bc63d2c58 SHA1 5f1e696600be5627b7bd7a60d2104e57a88fe4f3 SHA256 6abb5e2d638a72415d730374bfc40fc4b0b9b2130d5a1f8b822e797ffd55a66f
diff --git a/dev-python/netifaces/netifaces-0.6.ebuild b/dev-python/netifaces/netifaces-0.6.ebuild
new file mode 100644
index 000000000000..42b0db74fa23
--- /dev/null
+++ b/dev-python/netifaces/netifaces-0.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/netifaces/netifaces-0.6.ebuild,v 1.1 2011/11/17 14:27:59 sbriesen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils python
+
+DESCRIPTION="Portable network interface information"
+HOMEPAGE="http://alastairs-place.net/netifaces/"
+SRC_URI="http://alastairs-place.net/projects/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools"
+RDEPEND=""
diff --git a/dev-python/papyon/papyon-0.5.6.ebuild b/dev-python/papyon/papyon-0.5.6.ebuild
index 4acf2d994233..dca4df940e5d 100644
--- a/dev-python/papyon/papyon-0.5.6.ebuild
+++ b/dev-python/papyon/papyon-0.5.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/papyon/papyon-0.5.6.ebuild,v 1.1 2011/11/13 07:22:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/papyon/papyon-0.5.6.ebuild,v 1.2 2011/11/17 09:33:47 chainsaw Exp $
EAPI="3"
PYTHON_DEPEND="2:2.5"
@@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-python/pygobject-2.10:2
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 5b41d1275be8..5f82221bf93f 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.9 2011/10/07 04:30:18 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.10 2011/11/17 16:04:02 dev-zero Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -640,7 +640,7 @@ mysql-v2_pkg_config() {
help_tables="${TMPDIR}/fill_help_tables.sql"
pushd "${TMPDIR}" &>/dev/null
- "${ROOT}/usr/bin/mysql_install_db --basedir=/usr" >"${TMPDIR}"/mysql_install_db.log 2>&1
+ "${ROOT}/usr/bin/mysql_install_db" --basedir=/usr >"${TMPDIR}"/mysql_install_db.log 2>&1
if [ $? -ne 0 ]; then
grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index 1eeacdf2000e..bc89df1fbc1a 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -1,19 +1,8 @@
-DIST mame0141s.zip 17092788 RMD160 c09ef461280dfd7e45ca638caaa66d8752a9794b SHA1 80225e2694469dac39a75815f227b864a4992f5e SHA256 27c8829c55041886edafaa459b83452b0a327df31ce922c0b6a2ee91877504f8
DIST mame0142s.zip 17657289 RMD160 20b7fc0af868521462e8081021acbfbe98bea16d SHA1 6d70b7a2a15abfdb7955772844ac4c6eae50ced4 SHA256 d5ccb987088522a203bf978a34eab8fa8c8560947a13373d48c11b2a496b6986
-DIST mame0143s.zip 17902802 RMD160 0cfffdf5939fb740abdb030256011a8e6ca6ee54 SHA1 dd7cf43ec9f31321ee698facce3b2d3b21cebf15 SHA256 677f04756ed7bc00e1adc6e68bbb174f89845887758dc287c7244a58e6ac266f
-DIST sdlmame-manpages.tar.gz 14400 RMD160 14660470488458a8897a8a924c12f7ab961d6729 SHA1 279fbf37668282c0e4e86d62a29f5ec53fa0ab1a SHA256 507240258dfb816fbfddc674c5995a126c7a975158c2aad1ada8cb064c5e3d08
+DIST mame0144s.zip 19676308 RMD160 579556131368d69c02692c21475213bbb5d81954 SHA1 f32bca0b4565a07764da1028c8f24331fe5b2a1d SHA256 8f0191b40f80f8a3393d341f411c5f02aca6933d6a9f347bec0d2f7206c38e06
DIST sdlmame-ui.bdf.gz 114727 RMD160 2311dbd3ae508619a8327ca8b9c0a7184f9b5b66 SHA1 ada88e613c0573bb5703a37f81790c176cb8c884 SHA256 f2ec11dd926bbeae8647e68607107516a30790239464939f3e99a0f62fc7f17e
-DIST sdlmame0136.zip 18936113 RMD160 1cb9b24ae6f97c0f223f13ed97a074de14e2892e SHA1 19c11abc3b3ab2633df62f3867921b3541bb582e SHA256 863c34af4850b7687de358601e5b13fbb4ed1c121e11654179e87fb39e7ede2d
-DIST sdlmame0141u1_diff.zip 1152125 RMD160 81d5a7ade7c83ee7302bf80d28cdbec132811090 SHA1 05cddd7c915833c6dbffd12a49f8999ca26cc036 SHA256 2576180d3e344d9a0963dffbbf3248b416a8f1f75aff8ea89b466f8356fcccc5
-DIST sdlmame0141u2_diff.zip 878752 RMD160 3c27330000dd8ab0f16d331159e38432f36fad7a SHA1 f277813cc67f78f5ac6e29a462147e7faa976ae7 SHA256 48901d03d9999a92d81fd90248c1fb00a4f44e444030dd5c0d3226553d39d614
-DIST sdlmame0141u3_diff.zip 1257622 RMD160 62c6a368a7949f6db766a4c40c5feb316570ad74 SHA1 4139b43620ae6148f4e1fa1d3159e0894f93a5b5 SHA256 d1c9cb608ddb34548245b7a3de91f6ccf5faf27db3cf751a37816fa308210b4b
DIST sdlmame0142u1_diff.zip 707350 RMD160 ee81bdcd7a77b4bd6f61d062f48b7aba5dcebd77 SHA1 edc84de9230669b5ef8b9b7d13f7f26a227375d7 SHA256 07be32275fc510b6b336cfd03de71e9c665914c41b0e8a39de694cc4e5fd3581
DIST sdlmame0142u2_diff.zip 246135 RMD160 e153edb7c87db0b70a71e6083c31954aabb4ac92 SHA1 3de457c91245087779bc23a2311c2194652e46c9 SHA256 decbf4ac431b802fe3b9d5f87141c6b1a5057d3ee8ec619af070dccbdfc89e42
DIST sdlmame0142u3_diff.zip 1282970 RMD160 698453bffee1d5982b83c748205336fbb60f8988 SHA1 054c82e47e456e4a292e7531be9fdbc37029653d SHA256 a43eff4e1e660e4f313f865be568c9a57670af79f326d7cfe947f982b0eaed3c
DIST sdlmame0142u4_diff.zip 628941 RMD160 2caf2fe4a59bccfe582d618a5c37209324d6fbfe SHA1 e4e8897ba40caed0d2ee6bfb23f7462562a6ee81 SHA256 13831921bb6bf3843245b9008c4443dbd825acf4fd5025fa0eb5fc22786c1fa4
DIST sdlmame0142u5_diff.zip 326906 RMD160 a8c43e1254cc9d159d499510a184396e45d39b42 SHA1 70be01a63038380fd96b18a6ea176743c08eb4cf SHA256 134a493bf215d6bf416ba992b4bc9976525f4e41c7f9ea308a793b47282dc666
-DIST sdlmame0143u1_diff.zip 250465 RMD160 332a7ebb50750bd628819e39d0ca6b9249d618b7 SHA1 57a9b9960b48c2a3377953c01bbb8540224e560c SHA256 307172c6956f58251590a5c30c454c99fbdf02ae554d0e3aaa0133fc9989eee8
-DIST sdlmame0143u2_diff.zip 679992 RMD160 28ed6b5910fd72a8cfd24d01e76a588b14eec3f5 SHA1 4fc015691392c6aac5798b7511dc28afdd0f3bdb SHA256 4f6fa5961fe9fe99dfd6d315daf5280b2516ac96213b2a2c0fcf849c284db086
-DIST sdlmame0143u3_diff.zip 492365 RMD160 1e03893fc17652e1c1cef65412612137e51e7b4d SHA1 ba9b6e2ff179e79a00715ced5fde655047718498 SHA256 243f8a23e7b36520c1bd0c73e6bdc5a35b0442d43719884ed8d388e0775ce5a7
-DIST sdlmame0143u4_diff.zip 858755 RMD160 88b7dad4c61ae3dbf740c179f69175763cbead17 SHA1 fc22f483645186edecf0cdb4102bbea30e8fa902 SHA256 a9d90392e123758003a6cc48eb1e295d9d69059b9014b6556cfd5fa2dfba2597
-DIST sdlmame0143u5_diff.zip 314547 RMD160 948e3f70d1e000a3df9433baa5089308546a9d03 SHA1 069efd5490523d03f5e16fd8fac290134eb24cf4 SHA256 290d61609b1ffff661ba9be32b61baeb187970fc9883471741f001d25decc8a6
diff --git a/games-emulation/sdlmame/files/joymap.dat b/games-emulation/sdlmame/files/joymap.dat
deleted file mode 100644
index ec6490d5e4b3..000000000000
--- a/games-emulation/sdlmame/files/joymap.dat
+++ /dev/null
@@ -1,9 +0,0 @@
-# Joystick mapping file
-# =====================
-#
-# Contains mapping between name and logical (i.e. mame) joystick index
-#
-# Index Name
-# ----- ----
-# 1 MOSIC USB 2A4K GamePad
-# 0 Logitech Logitech Attack 3
diff --git a/games-emulation/sdlmame/files/mame.ini.in b/games-emulation/sdlmame/files/mame.ini.in
deleted file mode 100644
index 9cc0351a9bf5..000000000000
--- a/games-emulation/sdlmame/files/mame.ini.in
+++ /dev/null
@@ -1,260 +0,0 @@
-#
-# CORE CONFIGURATION OPTIONS
-#
-readconfig 1
-
-#
-# CORE SEARCH PATH OPTIONS
-#
-rompath $HOME/.sdlmame/roms;@GAMES_SYSCONFDIR@/sdlmame/roms
-samplepath $HOME/.sdlmame/samples;@GAMES_SYSCONFDIR@/sdlmame/samples
-artpath $HOME/.sdlmame/artwork;@GAMES_SYSCONFDIR@/sdlmame/artwork
-ctrlrpath $HOME/.sdlmame/ctrlr;@GAMES_SYSCONFDIR@/sdlmame/ctrlr
-inipath $HOME/.sdlmame;@GAMES_SYSCONFDIR@/sdlmame
-fontpath $HOME/.sdlmame;@GAMES_DATADIR@/sdlmame
-
-#
-# CORE OUTPUT DIRECTORY OPTIONS
-#
-cfg_directory $HOME/.sdlmame/cfg
-nvram_directory $HOME/.sdlmame/nvram
-memcard_directory $HOME/.sdlmame/memcard
-input_directory $HOME/.sdlmame/inp
-state_directory $HOME/.sdlmame/sta
-snapshot_directory $HOME/.sdlmame/snap
-diff_directory $HOME/.sdlmame/diff
-comment_directory $HOME/.sdlmame/comments
-
-#
-# CORE FILENAME OPTIONS
-#
-cheat_file @GAMES_DATADIR@/sdlmame/cheat.dat
-
-#
-# CORE STATE/PLAYBACK OPTIONS
-#
-state
-autosave 0
-playback
-record
-mngwrite
-wavwrite
-
-#
-# CORE PERFORMANCE OPTIONS
-#
-autoframeskip 0
-frameskip 0
-seconds_to_run 0
-throttle 1
-sleep 1
-speed 1.0
-
-#
-# CORE ROTATION OPTIONS
-#
-rotate 1
-ror 0
-rol 0
-autoror 0
-autorol 0
-flipx 0
-flipy 0
-
-#
-# CORE ARTWORK OPTIONS
-#
-artwork_crop 0
-use_backdrops 1
-use_overlays 1
-use_bezels 1
-
-#
-# CORE SCREEN OPTIONS
-#
-brightness 1.0
-contrast 1.0
-gamma 1.0
-pause_brightness 0.65
-
-#
-# CORE VECTOR OPTIONS
-#
-antialias 1
-beam 1.0
-flicker 0
-
-#
-# CORE SOUND OPTIONS
-#
-sound 1
-samplerate 48000
-samples 1
-volume 0
-
-#
-# CORE INPUT OPTIONS
-#
-ctrlr
-mouse 1
-joystick 1
-lightgun 0
-multikeyboard 0
-multimouse 0
-steadykey 0
-offscreen_reload 0
-joystick_map auto
-joystick_deadzone 0.3
-joystick_saturation 0.85
-
-#
-# CORE INPUT AUTOMATIC ENABLE OPTIONS
-#
-paddle_device keyboard
-adstick_device keyboard
-pedal_device keyboard
-dial_device keyboard
-trackball_device keyboard
-lightgun_device keyboard
-positional_device keyboard
-mouse_device mouse
-
-#
-# CORE DEBUGGING OPTIONS
-#
-log 0
-verbose 0
-
-#
-# CORE MISC OPTIONS
-#
-bios default
-cheat 0
-skip_gameinfo 0
-
-#
-# DEBUGGING OPTIONS
-#
-oslog 0
-
-#
-# PERFORMANCE OPTIONS
-#
-multithreading 0
-sdlvideofps 0
-
-#
-# VIDEO OPTIONS
-#
-video soft
-numscreens 1
-window 0
-keepaspect 1
-unevenstretch 1
-effect none
-centerh 1
-centerv 1
-waitvsync 0
-yuvmode none
-
-#
-# OpenGL-SPECIFIC OPTIONS
-#
-filter 1
-prescale 1
-gl_forcepow2texture 0
-gl_notexturerect 0
-gl_vbo 1
-gl_pbo 1
-gl_glsl 0
-gl_glsl_filter 1
-glsl_shader_mame0 none
-glsl_shader_mame1 none
-glsl_shader_mame2 none
-glsl_shader_mame3 none
-glsl_shader_mame4 none
-glsl_shader_mame5 none
-glsl_shader_mame6 none
-glsl_shader_mame7 none
-glsl_shader_mame8 none
-glsl_shader_mame9 none
-glsl_shader_screen0 none
-glsl_shader_screen1 none
-glsl_shader_screen2 none
-glsl_shader_screen3 none
-glsl_shader_screen4 none
-glsl_shader_screen5 none
-glsl_shader_screen6 none
-glsl_shader_screen7 none
-glsl_shader_screen8 none
-glsl_shader_screen9 none
-gl_glsl_vid_attr 1
-
-#
-# PER-WINDOW VIDEO OPTIONS
-#
-screen auto
-aspect auto
-resolution auto
-view auto
-screen0 auto
-aspect0 auto
-resolution0 auto
-view0 auto
-screen1 auto
-aspect1 auto
-resolution1 auto
-view1 auto
-screen2 auto
-aspect2 auto
-resolution2 auto
-view2 auto
-screen3 auto
-aspect3 auto
-resolution3 auto
-view3 auto
-
-#
-# FULL SCREEN OPTIONS
-#
-switchres 0
-useallheads 0
-
-#
-# SOUND OPTIONS
-#
-audio_latency 3
-
-#
-# INPUT DEVICE OPTIONS
-#
-
-#
-# SDL KEYBOARD MAPPING
-#
-# If you are using one of the available non-us keyboard layouts
-# set keymap to 1 and uncomment the appropriate line below
-keymap 0
-#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-be.txt
-#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-ch.txt
-#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-de.txt
-#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-fr.txt
-#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km_it.txt
-
-#
-# SDL JOYSTICK MAPPING
-#
-remapjoys 0
-remapjoyfile @GAMES_SYSCONFDIR@/sdlmame/joymap.dat
-
-#
-# CORE COMMANDS
-#
-
-#
-# CONFIGURATION COMMANDS
-#
-
-#
-# FRONTEND COMMANDS
-#
diff --git a/games-emulation/sdlmame/files/sdlmame-0.136-nodebug.patch b/games-emulation/sdlmame/files/sdlmame-0.136-nodebug.patch
deleted file mode 100644
index 0779a907d51b..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.136-nodebug.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/osd/sdl/sdl.mak
-+++ src/osd/sdl/sdl.mak
-@@ -37,6 +37,10 @@
-
- # NO_X11 = 1
-
-+# comment next line to build with debugging support
-+
-+NO_DEBUGGER = 1
-+
- # uncomment and adapt next line to link against specific GL-Library
- # this will also add a rpath to the executable
- # MESA_INSTALL_ROOT = /usr/local/dfb_GL
-@@ -297,12 +301,17 @@
- # the new debugger relies on GTK+ in addition to the base SDLMAME needs
- # Non-X11 builds can not use the debugger
- ifndef NO_X11
-+ifndef NO_DEBUGGER
- OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
- CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
- LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
- CFLAGS += -DGTK_DISABLE_DEPRECATED
- else
- OSDCOREOBJS += $(SDLOBJ)/debugwin.o
-+DEFS += -DNO_DEBUGGER
-+endif # NO_DEBUGGER
-+else
-+OSDCOREOBJS += $(SDLOBJ)/debugwin.o
- endif # NO_X11
-
- # make sure we can find X headers
diff --git a/games-emulation/sdlmame/files/sdlmame-0.143_p4-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.143_p4-makefile.patch
deleted file mode 100644
index 444c5e9688b2..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.143_p4-makefile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- work.orig/makefile
-+++ work/makefile
-@@ -431,9 +431,6 @@
- CPPONLYFLAGS += -x c++ -std=gnu++98
- COBJFLAGS += -x objective-c++
-
--# this speeds it up a bit by piping between the preprocessor/compiler/assembler
--CCOMFLAGS += -pipe
--
- # add -g if we need symbols, and ensure we have frame pointers
- ifdef SYMBOLS
- CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
-@@ -449,23 +446,6 @@
- CCOMFLAGS += -pg
- endif
-
--# add the optimization flag
--CCOMFLAGS += -O$(OPTIMIZE)
--
--# if we are optimizing, include optimization options
--# and make all errors into warnings
--ifneq ($(OPTIMIZE),0)
--ifneq ($(TARGETOS),os2)
--ifndef NOWERROR
--CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
--else
--CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
--endif
--else
--CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
--endif
--endif
--
- # add a basic set of warnings
- CCOMFLAGS += \
- -Wall \
-@@ -524,16 +504,6 @@
- # linking flags
- #-------------------------------------------------
-
--# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
--# flags only used when linking the core emulator
--LDFLAGS =
--ifneq ($(TARGETOS),macosx)
--ifneq ($(TARGETOS),os2)
--ifneq ($(TARGETOS),solaris)
--LDFLAGS = -Wl,--warn-common
--endif
--endif
--endif
- LDFLAGSEMULATOR =
-
- # add profiling information for the linker
-@@ -541,13 +511,6 @@
- LDFLAGS += -pg
- endif
-
--# strip symbols and other metadata in non-symbols and non profiling builds
--ifndef SYMBOLS
--ifneq ($(TARGETOS),macosx)
--LDFLAGS += -s
--endif
--endif
--
- # output a map file (emulator only)
- ifdef MAP
- LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map
diff --git a/games-emulation/sdlmame/files/sdlmame-0.143_p5-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.143_p5-makefile.patch
deleted file mode 100644
index 444c5e9688b2..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.143_p5-makefile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- work.orig/makefile
-+++ work/makefile
-@@ -431,9 +431,6 @@
- CPPONLYFLAGS += -x c++ -std=gnu++98
- COBJFLAGS += -x objective-c++
-
--# this speeds it up a bit by piping between the preprocessor/compiler/assembler
--CCOMFLAGS += -pipe
--
- # add -g if we need symbols, and ensure we have frame pointers
- ifdef SYMBOLS
- CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
-@@ -449,23 +446,6 @@
- CCOMFLAGS += -pg
- endif
-
--# add the optimization flag
--CCOMFLAGS += -O$(OPTIMIZE)
--
--# if we are optimizing, include optimization options
--# and make all errors into warnings
--ifneq ($(OPTIMIZE),0)
--ifneq ($(TARGETOS),os2)
--ifndef NOWERROR
--CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
--else
--CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
--endif
--else
--CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
--endif
--endif
--
- # add a basic set of warnings
- CCOMFLAGS += \
- -Wall \
-@@ -524,16 +504,6 @@
- # linking flags
- #-------------------------------------------------
-
--# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
--# flags only used when linking the core emulator
--LDFLAGS =
--ifneq ($(TARGETOS),macosx)
--ifneq ($(TARGETOS),os2)
--ifneq ($(TARGETOS),solaris)
--LDFLAGS = -Wl,--warn-common
--endif
--endif
--endif
- LDFLAGSEMULATOR =
-
- # add profiling information for the linker
-@@ -541,13 +511,6 @@
- LDFLAGS += -pg
- endif
-
--# strip symbols and other metadata in non-symbols and non profiling builds
--ifndef SYMBOLS
--ifneq ($(TARGETOS),macosx)
--LDFLAGS += -s
--endif
--endif
--
- # output a map file (emulator only)
- ifdef MAP
- LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map
diff --git a/games-emulation/sdlmame/files/sdlmame-0.143_p5-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.143_p5-no-opengl.patch
deleted file mode 100644
index 87eeae5b50c7..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.143_p5-no-opengl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/osd/sdl/osdsdl.h.orig
-+++ ./src/osd/sdl/osdsdl.h
-@@ -225,6 +225,8 @@
- const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
- #if USE_OPENGL
- const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
-+#else
-+ const char *gl_lib() const { return NULL; }
- #endif
-
- private:
diff --git a/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
similarity index 77%
rename from games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch
rename to games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
index 09b34628d1b5..db0c141c9a70 100644
--- a/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch
+++ b/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
@@ -1,6 +1,6 @@
---- work.orig/makefile
-+++ work/makefile
-@@ -431,9 +431,6 @@
+--- work.orig/makefile 2011-11-09 22:40:30.000000000 -0500
++++ work/makefile 2011-11-16 19:24:24.615419949 -0500
+@@ -435,9 +435,6 @@
CPPONLYFLAGS += -x c++ -std=gnu++98
COBJFLAGS += -x objective-c++
@@ -10,7 +10,7 @@
# add -g if we need symbols, and ensure we have frame pointers
ifdef SYMBOLS
CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
-@@ -449,23 +446,6 @@
+@@ -453,23 +450,6 @@
CCOMFLAGS += -pg
endif
@@ -34,10 +34,14 @@
# add a basic set of warnings
CCOMFLAGS += \
-Wall \
-@@ -523,16 +503,6 @@
- # linking flags
- #-------------------------------------------------
+@@ -524,20 +504,6 @@
+ endif
+
+-#-------------------------------------------------
+-# linking flags
+-#-------------------------------------------------
+-
-# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
-# flags only used when linking the core emulator
-LDFLAGS =
@@ -51,7 +55,7 @@
LDFLAGSEMULATOR =
# add profiling information for the linker
-@@ -540,13 +510,6 @@
+@@ -545,13 +511,6 @@
LDFLAGS += -pg
endif
diff --git a/games-emulation/sdlmame/files/sdlmame-0.143_p4-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch
similarity index 100%
rename from games-emulation/sdlmame/files/sdlmame-0.143_p4-no-opengl.patch
rename to games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch
diff --git a/games-emulation/sdlmame/sdlmame-0.136.ebuild b/games-emulation/sdlmame/sdlmame-0.136.ebuild
deleted file mode 100644
index c0f2776a5c39..000000000000
--- a/games-emulation/sdlmame/sdlmame-0.136.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.136.ebuild,v 1.6 2010/08/17 19:59:29 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils flag-o-matic games
-
-MY_PV=${PV/.}
-MY_PV=${MY_PV/_p/u}
-MY_P=${PN}${MY_PV}
-MY_CONF_PN=${PN/sdl}
-DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
-HOMEPAGE="http://rbelmont.mameworld.info/?page_id=163"
-# Upstream doesn't allow fetching with unknown User-Agent such as wget
-SRC_URI="mirror://gentoo/${MY_P}.zip
- mirror://gentoo/${PN}-manpages.tar.gz"
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug opengl"
-
-RDEPEND=">=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video]
- dev-libs/expat
- x11-libs/libXinerama
- debug? (
- x11-libs/gtk+:2
- gnome-base/gconf
- )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- x11-proto/xineramaproto"
-
-S=${WORKDIR}/${MY_P}
-
-# Function to disable a makefile option
-disable_feature() {
- sed -i \
- -e "/$1.*=/s:^:# :" \
- "${S}"/makefile \
- || die "sed failed"
-}
-
-# Function to enable a makefile option
-enable_feature() {
- sed -i \
- -e "/^#.*$1.*=/s:^# ::" \
- "${S}"/makefile \
- || die "sed failed"
-}
-
-src_prepare() {
- sed -i \
- -e '/CFLAGS += -O$(OPTIMIZE)/s:^:# :' \
- -e '/CFLAGS += -pipe/s:^:# :' \
- -e '/LDFLAGS += -s/s:^:# :' \
- -e 's:-Werror::' \
- makefile \
- || die "sed failed"
- # Don't compile zlib and expat
- einfo "Disabling embedded libraries: zlib and expat"
- disable_feature BUILD_ZLIB
- disable_feature BUILD_EXPAT
-
- if use amd64; then
- einfo "Enabling 64-bit support"
- enable_feature PTR64
- fi
-
- if use ppc; then
- einfo "Enabling PPC support"
- enable_feature BIGENDIAN
- fi
-
- if ! use debug; then
- einfo "Disabling Debugging"
- epatch "${FILESDIR}"/${P}-nodebug.patch
- fi
-}
-
-src_compile() {
- local make_opts
-
- use opengl || make_opts="${make_opts} NO_OPENGL=1"
-
- emake \
- NAME="${PN}" \
- OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"'" ${CFLAGS}" \
- SUFFIX="" \
- ${make_opts} \
- || die "emake failed"
-}
-
-src_install() {
- dogamesbin ${PN} || die "dogamesbin ${PN} failed"
-
- # Follows xmame ebuild, avoiding collision on /usr/games/bin/jedutil
- exeinto "$(games_get_libdir)/${PN}"
- local f
- for f in chdman ldverify jedutil romcmp testkeys; do
- doexe "${f}" || die "doexe ${f} failed"
- done
-
- insinto "${GAMES_DATADIR}/${PN}"
- doins ui.bdf || die "doins ui.bdf failed"
- doins -r keymaps || die "doins -r keymaps failed"
-
- insinto "${GAMES_SYSCONFDIR}/${PN}"
- doins "${FILESDIR}"/{joymap.dat,vector.ini} || die "doins joymap.dat vector.ini failed"
-
- sed \
- -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
- -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
- "${FILESDIR}"/mame.ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/"mame.ini \
- || die "sed failed"
-
- dodoc docs/{config,mame,newvideo}.txt *.txt
- doman "${WORKDIR}/${PN}-manpages"/*
-
- keepdir \
- "${GAMES_DATADIR}/${PN}"/{roms,samples,artwork} \
- "${GAMES_SYSCONFDIR}/${PN}"/ctrlr
-
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
-
- elog "It's strongly recommended that you change either the system-wide"
- elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}"
-
- if use opengl; then
- echo
- elog "You built ${PN} with opengl support and should set"
- elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that"
- fi
-}
diff --git a/games-emulation/sdlmame/sdlmame-0.141_p3.ebuild b/games-emulation/sdlmame/sdlmame-0.141_p3.ebuild
deleted file mode 100644
index 3119266b1405..000000000000
--- a/games-emulation/sdlmame/sdlmame-0.141_p3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.141_p3.ebuild,v 1.2 2011/09/30 16:50:10 vapier Exp $
-
-EAPI=2
-inherit eutils flag-o-matic games
-
-MY_PV=${PV/.}
-MY_CONF_PN=${PN/sdl}
-MY_P=${PN}${MY_PV}
-MY_P=${MY_P%%_p*}
-MY_CONF_VER="0.139"
-DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
-HOMEPAGE="http://mamedev.org/"
-UPDATES="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "mirror://gentoo/${MY_P}u${PATCH_VER}_diff.zip"; done)"
-# Upstream doesn't allow fetching with unknown User-Agent such as wget
-SRC_URI="mirror://gentoo/${MY_P/sdl}s.zip $UPDATES
- http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug opengl"
-
-RDEPEND=">=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video]
- media-libs/sdl-ttf
- dev-libs/expat
- debug? (
- x11-libs/gtk+:2
- gnome-base/gconf
- x11-libs/libXinerama
- )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- debug? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}
-
-# Function to disable a makefile option
-disable_feature() {
- sed -i \
- -e "/$1.*=/s:^:# :" \
- "${S}"/makefile \
- || die "sed failed"
-}
-
-# Function to enable a makefile option
-enable_feature() {
- sed -i \
- -e "/^#.*$1.*=/s:^# ::" \
- "${S}"/${2:-makefile} \
- || die "sed failed"
-}
-
-src_unpack() {
- base_src_unpack
- unpack ./mame.zip
- rm -f mame.zip
-}
-
-src_prepare() {
- if [[ $PV == *_p* ]] ; then
- edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff
- einfo "Patching release with source updates"
- epatch ${MY_PV%%_p*}*.diff
- fi
- sed -i \
- -e '/CFLAGS += -O$(OPTIMIZE)/s:^:# :' \
- -e '/CFLAGS += -pipe/s:^:# :' \
- -e '/LDFLAGS += -s/s:^:# :' \
- -e '/LDFLAGS =/d' \
- -e 's:-Werror::' \
- makefile \
- || die "sed failed"
- # Don't compile zlib and expat
- einfo "Disabling embedded libraries: zlib and expat"
- disable_feature BUILD_ZLIB
- disable_feature BUILD_EXPAT
-
- if use amd64; then
- einfo "Enabling 64-bit support"
- enable_feature PTR64
- fi
-
- if use ppc; then
- einfo "Enabling PPC support"
- enable_feature BIGENDIAN
- fi
-
- if use debug; then
- einfo "Enabling debug support"
- enable_feature DEBUG
- else
- einfo "Disabling debug support"
- enable_feature NO_X11 src/osd/sdl/sdl.mak
- fi
-
- if ! use opengl ; then
- einfo "Disabling opengl support"
- enable_feature NO_OPENGL src/osd/sdl/sdl.mak
- fi
-}
-
-src_compile() {
- emake \
- NAME="${PN}" \
- OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"'" ${CXXFLAGS}" \
- CC="${CXX}" \
- all || die
-}
-
-src_install() {
- newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN} || die
-
- # Avoid collision on /usr/games/bin/jedutil
- exeinto "$(games_get_libdir)/${PN}"
- doexe chdman jedutil ldverify romcmp testkeys || die
- doman src/osd/sdl/man/{chdman,jedutil,ldverify,romcmp,testkeys}.1
- newman src/osd/sdl/man/mame.1 ${PN}.1
-
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r src/osd/sdl/keymaps || die "doins -r keymaps failed"
- newins sdlmame-ui.bdf ui.bdf || die "newins ui.bdf failed"
-
- insinto "${GAMES_SYSCONFDIR}/${PN}"
- doins "${FILESDIR}"/vector.ini || die "doins vector.ini failed"
-
- sed \
- -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
- -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
- "${FILESDIR}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".ini \
- || die "sed failed"
-
- dodoc docs/{config,mame,newvideo}.txt whatsnew*.txt
-
- keepdir \
- "${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
- "${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
-
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
-
- elog "It's strongly recommended that you change either the system-wide"
- elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}"
-
- if use opengl; then
- echo
- elog "You built ${PN} with opengl support and should set"
- elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that"
- fi
-}
diff --git a/games-emulation/sdlmame/sdlmame-0.142.ebuild b/games-emulation/sdlmame/sdlmame-0.142.ebuild
deleted file mode 100644
index 69eade905cba..000000000000
--- a/games-emulation/sdlmame/sdlmame-0.142.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.142.ebuild,v 1.5 2011/09/30 16:50:10 vapier Exp $
-
-EAPI=2
-inherit eutils flag-o-matic games
-
-MY_PV=${PV/.}
-MY_CONF_PN=${PN/sdl}
-MY_P=${PN}${MY_PV}
-MY_P=${MY_P%%_p*}
-MY_CONF_VER="0.139"
-DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
-HOMEPAGE="http://mamedev.org/"
-UPDATES="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "mirror://gentoo/${MY_P}u${PATCH_VER}_diff.zip"; done)"
-# Upstream doesn't allow fetching with unknown User-Agent such as wget
-SRC_URI="mirror://gentoo/${MY_P/sdl}s.zip $UPDATES
- http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug opengl"
-
-RDEPEND=">=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video]
- media-libs/sdl-ttf
- dev-libs/expat
- debug? (
- x11-libs/gtk+:2
- gnome-base/gconf
- x11-libs/libXinerama
- )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- debug? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}
-
-# Function to disable a makefile option
-disable_feature() {
- sed -i \
- -e "/$1.*=/s:^:# :" \
- "${S}"/makefile \
- || die "sed failed"
-}
-
-# Function to enable a makefile option
-enable_feature() {
- sed -i \
- -e "/^#.*$1.*=/s:^# ::" \
- "${S}"/${2:-makefile} \
- || die "sed failed"
-}
-
-src_unpack() {
- base_src_unpack
- unpack ./mame.zip
- rm -f mame.zip
-}
-
-src_prepare() {
- if [[ $PV == *_p* ]] ; then
- edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff
- einfo "Patching release with source updates"
- epatch ${MY_PV%%_p*}*.diff
- fi
- epatch "${FILESDIR}"/${P}-makefile.patch
-
- # Don't compile zlib and expat
- einfo "Disabling embedded libraries: zlib and expat"
- disable_feature BUILD_ZLIB
- disable_feature BUILD_EXPAT
-
- if use amd64; then
- einfo "Enabling 64-bit support"
- enable_feature PTR64
- fi
-
- if use ppc; then
- einfo "Enabling PPC support"
- enable_feature BIGENDIAN
- fi
-
- if use debug; then
- einfo "Enabling debug support"
- enable_feature DEBUG
- else
- einfo "Disabling debug support"
- enable_feature NO_X11 src/osd/sdl/sdl.mak
- fi
-
- if ! use opengl ; then
- einfo "Disabling opengl support"
- enable_feature NO_OPENGL src/osd/sdl/sdl.mak
- fi
-}
-
-src_compile() {
- emake \
- NAME="${PN}" \
- OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"'" ${CXXFLAGS}" \
- CC="${CXX}" \
- all || die
-}
-
-src_install() {
- newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN} || die
-
- # Avoid collision on /usr/games/bin/jedutil
- exeinto "$(games_get_libdir)/${PN}"
- doexe chdman jedutil ldverify romcmp testkeys || die
- doman src/osd/sdl/man/{chdman,jedutil,ldverify,romcmp,testkeys}.1
- newman src/osd/sdl/man/mame.1 ${PN}.1
-
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r src/osd/sdl/keymaps || die "doins -r keymaps failed"
- newins sdlmame-ui.bdf ui.bdf || die "newins ui.bdf failed"
-
- insinto "${GAMES_SYSCONFDIR}/${PN}"
- doins "${FILESDIR}"/vector.ini || die "doins vector.ini failed"
-
- sed \
- -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
- -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
- "${FILESDIR}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".ini \
- || die "sed failed"
-
- dodoc docs/{config,mame,newvideo}.txt whatsnew*.txt
-
- keepdir \
- "${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
- "${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
-
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
-
- elog "It's strongly recommended that you change either the system-wide"
- elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}"
-
- if use opengl; then
- echo
- elog "You built ${PN} with opengl support and should set"
- elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that"
- fi
-}
diff --git a/games-emulation/sdlmame/sdlmame-0.143_p5.ebuild b/games-emulation/sdlmame/sdlmame-0.143_p5.ebuild
deleted file mode 100644
index b7e9d6310952..000000000000
--- a/games-emulation/sdlmame/sdlmame-0.143_p5.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.143_p5.ebuild,v 1.2 2011/09/30 16:50:10 vapier Exp $
-
-EAPI=2
-inherit eutils flag-o-matic games
-
-MY_PV=${PV/.}
-MY_CONF_PN=${PN/sdl}
-MY_P=${PN}${MY_PV}
-MY_P=${MY_P%%_p*}
-MY_CONF_VER="0.139"
-DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
-HOMEPAGE="http://mamedev.org/"
-UPDATES="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "mirror://gentoo/${MY_P}u${PATCH_VER}_diff.zip"; done)"
-# Upstream doesn't allow fetching with unknown User-Agent such as wget
-SRC_URI="mirror://gentoo/${MY_P/sdl}s.zip $UPDATES
- http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug opengl"
-
-RDEPEND=">=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video]
- media-libs/sdl-ttf
- dev-libs/expat
- debug? (
- x11-libs/gtk+:2
- gnome-base/gconf
- x11-libs/libXinerama
- )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- debug? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}
-
-# Function to disable a makefile option
-disable_feature() {
- sed -i \
- -e "/$1.*=/s:^:# :" \
- "${S}"/makefile \
- || die "sed failed"
-}
-
-# Function to enable a makefile option
-enable_feature() {
- sed -i \
- -e "/^#.*$1.*=/s:^# ::" \
- "${S}"/${2:-makefile} \
- || die "sed failed"
-}
-
-src_unpack() {
- base_src_unpack
- unpack ./mame.zip
- rm -f mame.zip
-}
-
-src_prepare() {
- if [[ $PV == *_p* ]] ; then
- edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff
- einfo "Patching release with source updates"
- epatch ${MY_PV%%_p*}*.diff
- fi
- edos2unix src/osd/sdl/osdsdl.h
- epatch \
- "${FILESDIR}"/${P}-makefile.patch \
- "${FILESDIR}"/${P}-no-opengl.patch
-
- # Don't compile zlib and expat
- einfo "Disabling embedded libraries: zlib and expat"
- disable_feature BUILD_ZLIB
- disable_feature BUILD_EXPAT
-
- if use amd64; then
- einfo "Enabling 64-bit support"
- enable_feature PTR64
- fi
-
- if use ppc; then
- einfo "Enabling PPC support"
- enable_feature BIGENDIAN
- fi
-
- if use debug; then
- einfo "Enabling debug support"
- enable_feature DEBUG
- else
- einfo "Disabling debug support"
- enable_feature NO_X11 src/osd/sdl/sdl.mak
- fi
-
- if ! use opengl ; then
- einfo "Disabling opengl support"
- enable_feature NO_OPENGL src/osd/sdl/sdl.mak
- fi
-}
-
-src_compile() {
- emake \
- NAME="${PN}" \
- OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"'" ${CXXFLAGS}" \
- CC="${CXX}" \
- all || die
-}
-
-src_install() {
- newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN} || die
-
- # Avoid collision on /usr/games/bin/jedutil
- exeinto "$(games_get_libdir)/${PN}"
- doexe chdman jedutil ldverify romcmp testkeys || die
- doman src/osd/sdl/man/{chdman,jedutil,ldverify,romcmp,testkeys}.1
- newman src/osd/sdl/man/mame.1 ${PN}.1
-
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r src/osd/sdl/keymaps || die "doins -r keymaps failed"
- newins sdlmame-ui.bdf ui.bdf || die "newins ui.bdf failed"
-
- insinto "${GAMES_SYSCONFDIR}/${PN}"
- doins "${FILESDIR}"/vector.ini || die "doins vector.ini failed"
-
- sed \
- -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
- -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
- "${FILESDIR}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".ini \
- || die "sed failed"
-
- dodoc docs/{config,mame,newvideo}.txt whatsnew*.txt
-
- keepdir \
- "${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
- "${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
-
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
-
- elog "It's strongly recommended that you change either the system-wide"
- elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}"
-
- if use opengl; then
- echo
- elog "You built ${PN} with opengl support and should set"
- elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that"
- fi
-}
diff --git a/games-emulation/sdlmame/sdlmame-0.143_p4.ebuild b/games-emulation/sdlmame/sdlmame-0.144.ebuild
similarity index 98%
rename from games-emulation/sdlmame/sdlmame-0.143_p4.ebuild
rename to games-emulation/sdlmame/sdlmame-0.144.ebuild
index e86f0454d02f..c86af091fb5e 100644
--- a/games-emulation/sdlmame/sdlmame-0.143_p4.ebuild
+++ b/games-emulation/sdlmame/sdlmame-0.144.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.143_p4.ebuild,v 1.2 2011/09/30 16:50:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.144.ebuild,v 1.1 2011/11/17 06:47:50 mr_bones_ Exp $
EAPI=2
inherit eutils flag-o-matic games
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index f047a274068d..8cd6cc507b9a 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,3 +1,3 @@
DIST gnome-keyring-2.32.1.tar.bz2 1619245 RMD160 cb72f171f5918ff26f40feb7bba90dc7e2e120ec SHA1 3d0ecc3e29f426ecfcaa488ea17d3e330fe34eb6 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9
-DIST gnome-keyring-3.0.3.tar.bz2 1911499 RMD160 0cd4d6fcf82763f3d9cf754717a4c6a03ed14524 SHA1 93bc31442d2e298f89e94f4d424192faccbf382d SHA256 a06c34e474d93da62bf96a816e58cb5730e181d6523730f041f34c58a0d5e94e
DIST gnome-keyring-3.2.1.tar.xz 1580488 RMD160 76d657a926efa077f3303251bd872dbb1fce3cfa SHA1 77b035c91d387bd4982170b13d1268899e84ece7 SHA256 49872dad0c22e495f65be226d6effa053605df9cdc7cb06781aa37d3ff36b8a9
+DIST gnome-keyring-3.2.2.tar.xz 1579860 RMD160 190391c13d2a988801c023c0293bb56953901f3f SHA1 5b4a7868266d11855dea8aa488b730a4eaec3838 SHA256 f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch
deleted file mode 100644
index 2947af310827..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b75b9d5aa7f6207eca190b9d8e08059872c99365 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev
-Date: Fri, 20 May 2011 17:53:43 -0400
-Subject: [PATCH] Fix automagic libcap dependency (GNOME bug #649936)
-
-Backport of the patch by Saleem Abdulrasool
-to gnome-keyring-3.0.x
-
-Signed-off-by: Alexandre Rostovtsev
----
- configure.in | 29 +++++++++++++++++++++--------
- 1 files changed, 21 insertions(+), 8 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index b2d07a7..88f7e66 100644
---- a/configure.in
-+++ b/configure.in
-@@ -445,16 +445,29 @@ fi
- # libcap2
- #
-
--AC_CHECK_LIB([cap], [cap_get_proc], have_libcap="yes", have_libcap="no")
--
--if test $have_libcap = yes; then
-- AC_DEFINE(HAVE_LIBCAP, 1, [Have libcap2 package, libcap library])
-- DAEMON_LIBS="$DAEMON_LIBS -lcap"
--else
-- AC_MSG_WARN([libcap2 (or development headers) is not installed])
-+AC_ARG_WITH([libcap],
-+ [AC_HELP_STRING([--without-libcap],
-+ [build without libcap2 (disables Linux capabilities support)])],,
-+ [with_libcap=auto])
-+
-+if test x"$with_libcap" != x"no" ; then
-+ AC_CHECK_LIB([cap], [cap_get_proc],
-+ [
-+ with_libcap="yes"
-+ AC_DEFINE([HAVE_LIBCAP], [1], [Have libcap2 package, libcap library])
-+ DAEMON_LIBS="$DAEMON_LIBS -lcap"
-+ ],
-+ [
-+ if test x"$with_libcap" = x"yes" ; then
-+ AC_MSG_ERROR([libcap2 support requested, but package not found])
-+ else
-+ AC_MSG_WARN([libcap2 (or development headers) is not installed])
-+ fi
-+ with_libcap="no"
-+ ])
- fi
-
--libcap_status=$have_libcap
-+libcap_status=$with_libcap
-
- # --------------------------------------------------------------------
- # Debug mode
---
-1.7.5.rc3
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild
deleted file mode 100644
index b0cbc48eb204..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild,v 1.1 2011/08/14 15:13:25 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib pam virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="+caps debug doc pam test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
-
-# USE=valgrind is probably not a good idea for the tree
-
-RDEPEND=">=dev-libs/glib-2.25:2
- >=x11-libs/gtk+-2.20:2
- gnome-base/gconf:2
- >=sys-apps/dbus-1.0
- >=dev-libs/libgcrypt-1.2.2
- >=dev-libs/libtasn1-1
- caps? ( sys-libs/libcap )
- pam? ( virtual/pam )
-"
-# valgrind? ( dev-util/valgrind )
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/gtk-doc-am-1.9
- >=dev-util/intltool-0.35
- >=dev-util/pkgconfig-0.9
- doc? ( >=dev-util/gtk-doc-1.9 )"
-PDEPEND="gnome-base/libgnome-keyring"
-# eautoreconf needs:
-# >=dev-util/gtk-doc-am-1.9
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README"
- G2CONF="${G2CONF}
- $(use_enable debug)
- $(use_enable test tests)
- $(use_with caps libcap)
- $(use_enable pam)
- $(use_with pam pam-dir $(getpam_mod_dir))
- --with-root-certs=${EPREFIX}/etc/ssl/certs/
- --enable-ssh-agent
- --enable-gpg-agent
- --with-gtk=2.0"
-# $(use_enable valgrind)
-}
-
-src_prepare() {
- # Disable gcr tests due to weirdness with opensc
- # ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
- sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
- -i gcr/Makefile.* || die "sed failed"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=649936
- epatch "${FILESDIR}"/${PN}-3.0.2-automagic-libcap.patch
- eautoreconf
- gnome2_src_prepare
-}
-
-src_test() {
- # FIXME: /gkm/transaction/ tests fail
- unset DBUS_SESSION_BUS_ADDRESS
- Xemake check || die "emake check failed!"
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild
deleted file mode 100644
index 64041bd6c45c..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.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/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild,v 1.1 2011/08/14 15:13:25 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib pam virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="+caps debug doc pam test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
-
-# USE=valgrind is probably not a good idea for the tree
-#
-# XXX: ARGH: libgcr is slotted, but libgck is not.
-# Hence, gtk2/3 versions are not parallel installable.
-RDEPEND=">=dev-libs/glib-2.25:2
- >=x11-libs/gtk+-2.90.0:3
- gnome-base/gconf:2
- >=sys-apps/dbus-1.0
- >=dev-libs/libgcrypt-1.2.2
- >=dev-libs/libtasn1-1
- caps? ( sys-libs/libcap )
- pam? ( virtual/pam )
-"
-# valgrind? ( dev-util/valgrind )
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/gtk-doc-am-1.9
- >=dev-util/intltool-0.35
- >=dev-util/pkgconfig-0.9
- doc? ( >=dev-util/gtk-doc-1.9 )"
-PDEPEND="gnome-base/libgnome-keyring"
-# eautoreconf needs:
-# >=dev-util/gtk-doc-am-1.9
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README"
- G2CONF="${G2CONF}
- $(use_enable debug)
- $(use_enable test tests)
- $(use_with caps libcap)
- $(use_enable pam)
- $(use_with pam pam-dir $(getpam_mod_dir))
- --with-root-certs=${EPREFIX}/etc/ssl/certs/
- --enable-ssh-agent
- --enable-gpg-agent
- --with-gtk=3.0"
-# $(use_enable valgrind)
-}
-
-src_prepare() {
- # Disable gcr tests due to weirdness with opensc
- # ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
- sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
- -i gcr/Makefile.* || die "sed failed"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=649936
- epatch "${FILESDIR}"/${PN}-3.0.2-automagic-libcap.patch
- eautoreconf
- gnome2_src_prepare
-}
-
-src_test() {
- # FIXME: /gkm/transaction/ tests fail
- unset DBUS_SESSION_BUS_ADDRESS
- Xemake check || die "emake check failed!"
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
new file mode 100644
index 000000000000..70d49ea4de08
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.1 2011/11/17 06:09:12 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib pam virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="+caps debug doc pam test"
+KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
+
+# USE=valgrind is probably not a good idea for the tree
+RDEPEND=">=dev-libs/glib-2.25:2
+ >=x11-libs/gtk+-2.90.0:3
+ >=app-crypt/p11-kit-0.6
+ app-misc/ca-certificates
+ >=dev-libs/libgcrypt-1.2.2
+ >=dev-libs/libtasn1-1
+ >=sys-apps/dbus-1.0
+ caps? ( sys-libs/libcap-ng )
+ pam? ( virtual/pam )
+"
+# valgrind? ( dev-util/valgrind )
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.35
+ >=dev-util/pkgconfig-0.9
+ doc? ( >=dev-util/gtk-doc-1.9 )"
+PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
+# eautoreconf needs:
+# >=dev-util/gtk-doc-am-1.9
+
+# FIXME: tests are flaky and write to /tmp (instead of TMPDIR)
+RESTRICT="test"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog NEWS README"
+ G2CONF="${G2CONF}
+ $(use_enable debug)
+ $(use_enable test tests)
+ $(use_with caps libcap-ng)
+ $(use_enable pam)
+ $(use_with pam pam-dir $(getpam_mod_dir))
+ --with-root-certs=${EPREFIX}/etc/ssl/certs/
+ --enable-ssh-agent
+ --enable-gpg-agent
+ --disable-update-mime"
+# $(use_enable valgrind)
+}
+
+src_prepare() {
+ # Disable gcr tests due to weirdness with opensc
+ # ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
+ sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
+ -i gcr/Makefile.* || die "sed failed"
+
+ gnome2_src_prepare
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check
+}
+
+pkg_postinst() {
+ use caps && fcaps 0:0 755 cap_ipc_lock "${ROOT}"/usr/bin/gnome-keyring-daemon
+
+ gnome2_pkg_postinst
+}
+
+# borrowed from GSoC2010_Gentoo_Capabilities by constanze and Flameeyes
+# @FUNCTION: fcaps
+# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
+# @RETURN: 0 if all okay; non-zero if failure and fallback
+# @DESCRIPTION:
+# fcaps sets the specified capabilities in the effective and permitted set of
+# the given file. In case of failure fcaps sets the given file-mode.
+fcaps() {
+ local uid_gid=$1
+ local perms=$2
+ local capset=$3
+ local path=$4
+ local res
+
+ chmod $perms $path && \
+ chown $uid_gid $path
+ res=$?
+
+ use caps || return $res
+
+ #set the capability
+ setcap "$capset=ep" "$path" &> /dev/null
+ #check if the capabilitiy got set correctly
+ setcap -v "$capset=ep" "$path" &> /dev/null
+ res=$?
+
+ if [ $res -ne 0 ]; then
+ ewarn "Failed to set capabilities. Probable reason is missed kernel support."
+ ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and _FS_SECURITY"
+ ewarn "enabled (e.g. EXT3_FS_SECURITY) where is the filesystem to store"
+ ewarn "${path}"
+ ewarn
+ ewarn "Falling back to suid now..."
+ chmod u+s ${path}
+ fi
+ return $res
+}
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 5939d890c07b..3659c35165f7 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,3 +1,3 @@
DIST libgnome-keyring-2.32.0.tar.bz2 412592 RMD160 201df6c60a931a43edd58c994dea5bb20d5d378f SHA1 9d7c9dc923e03ed2f201cb563e28922e35b88ea0 SHA256 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c
-DIST libgnome-keyring-3.0.3.tar.bz2 423918 RMD160 c3c5ced166e1402e1a7a27b9bf7aa97f80406c34 SHA1 2191dcf06f3fa5412853106f20a95c33a499235e SHA256 a0cc08bcd431070d3f01c2741903c2bd8b0231ee73de709d28e722e28575fdf8
DIST libgnome-keyring-3.2.0.tar.xz 358448 RMD160 475fdc8c093f1039770f4e1102ec38bbfd4720b6 SHA1 709369de82598f04b91eb384511712063ee4cfa9 SHA256 0516403432b06ecc173c9f9dbe3eaa87b2c7a230806fcac4dfd73ad998e928f5
+DIST libgnome-keyring-3.2.2.tar.xz 358976 RMD160 ea1483361d3865b00f90d4ca24fc6f0af0329c35 SHA1 1c8c02bcfa68d8457437ac9ea8f5ad76e9a997d8 SHA256 2bcbe47b1960737866835a516056c36d1a3d82d5ad101c70d5a87e1ad616adb3
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.0.3-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild
similarity index 75%
rename from gnome-base/libgnome-keyring/libgnome-keyring-3.0.3-r1.ebuild
rename to gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild
index 83b55046c0bd..bae7185e2d85 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.0.3-r1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.0.3-r1.ebuild,v 1.2 2011/08/17 16:47:43 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild,v 1.1 2011/11/17 06:10:33 tetromino Exp $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -13,12 +13,12 @@ HOMEPAGE="http://live.gnome.org/GnomeKeyring"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE="debug doc test"
RDEPEND=">=sys-apps/dbus-1.0
gnome-base/gconf
- >=gnome-base/gnome-keyring-2.29[test?]"
+ >=gnome-base/gnome-keyring-3.1.92[test?]"
DEPEND="${RDEPEND}
sys-devel/gettext
>=dev-util/intltool-0.35
@@ -38,11 +38,11 @@ src_prepare() {
# FIXME: Remove silly CFLAGS
sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \
- -i configure.in configure || die "sed failed"
+ -i configure.ac configure || die "sed failed"
# FIXME: Remove DISABLE_DEPRECATED flags
sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
- -i configure.in configure || die "sed 2 failed"
+ -i configure.ac configure || die "sed 2 failed"
}
src_test() {
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 1d0d179d4001..6f32f762001d 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1 +1,2 @@
DIST asymptote-2.13.src.tgz 1732439 RMD160 c38a9224da74bb97a7b63e5ac56ba326b49625d9 SHA1 b4f2b72c0a4e7a02b716bfd0ad64bab45c567bbd SHA256 a0ac4815aaa367a8bc5cb3fb462267959f73e982d07fd96392c019c9fdfb7a13
+DIST asymptote-2.14.src.tgz 1763675 RMD160 31725c6900bc82dc1ba5c1d80e5e2ca5e9d60134 SHA1 124dba02bda6f1ef9cacda16783f0a8bb12992be SHA256 ba7604a7438f63a535fd3a36e90317e3c6761610d00801033e1fb1f881d8eec8
diff --git a/media-gfx/asymptote/asymptote-2.14.ebuild b/media-gfx/asymptote/asymptote-2.14.ebuild
new file mode 100644
index 000000000000..8a9e7d62a886
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.14.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.14.ebuild,v 1.1 2011/11/17 10:46:28 grozin Exp $
+
+EAPI=3
+SUPPORT_PYTHON_ABIS=1
+PYTHON_DEPEND="python? 2"
+RESTRICT_PYTHON_ABIS="3.*"
+inherit eutils autotools elisp-common latex-package multilib python
+
+DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
+HOMEPAGE="http://asymptote.sourceforge.net/"
+SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex python sigsegv vim-syntax X"
+
+RDEPEND=">=sys-libs/readline-4.3-r5
+ >=sys-libs/ncurses-5.4-r5
+ imagemagick? ( media-gfx/imagemagick[png] )
+ sigsegv? ( dev-libs/libsigsegv )
+ boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
+ fftw? ( >=sci-libs/fftw-3.0.1 )
+ gsl? ( sci-libs/gsl )
+ X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] )
+ latex? ( virtual/latex-base dev-texlive/texlive-latexextra )
+ emacs? ( virtual/emacs )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${RDEPEND}
+ doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] )"
+
+TEXMF=/usr/share/texmf-site
+
+src_prepare() {
+ # Fixing sigsegv enabling
+ epatch "${FILESDIR}/${P}-configure-ac.patch"
+ einfo "Patching configure.ac"
+ sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
+ -i configure.ac \
+ || die "sed configure.ac failed"
+
+ # Changing pdf, ps, image viewers to xdg-open
+ epatch "${FILESDIR}/${P}-xdg-utils.patch"
+
+ # Bug #322473
+ epatch "${FILESDIR}/${P}-info.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ # for the CPPFLAGS see
+ # http://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
+ econf CPPFLAGS=-DHAVE_SYS_TYPES_H \
+ CFLAGS="${CXXFLAGS}" \
+ --disable-gc-debug \
+ $(use_enable boehm-gc gc system) \
+ $(use_enable fftw) \
+ $(use_enable gsl) \
+ $(use_with sigsegv)
+}
+
+src_compile() {
+ emake || die "emake failed"
+
+ cd doc
+ emake asy.1 || die "emake asy.1 failed"
+ if use doc; then
+ # info
+ einfo "Making info"
+ emake ${PN}.info || die "emake ${PN}.info failed"
+ cd FAQ
+ emake || die "emake FAQ failed"
+ cd ..
+ # pdf
+ einfo "Making pdf docs"
+ export VARTEXFONTS="${T}"/fonts
+ # see bug #260606
+ emake -j1 asymptote.pdf || die "emake asymptote.pdf failed"
+ emake CAD.pdf || die "emake CAD.pdf failed"
+ fi
+ cd ..
+
+ if use emacs; then
+ einfo "Compiling emacs lisp files"
+ elisp-compile base/*.el || die "elisp-compile failed"
+ fi
+}
+
+src_install() {
+ # the program
+ exeinto /usr/bin
+ doexe asy
+
+ # .asy files
+ insinto /usr/share/${PN}
+ doins base/*.asy
+
+ # documentation
+ dodoc BUGS ChangeLog README ReleaseNotes TODO
+ doman doc/asy.1
+
+ # X GUI
+ if use X; then
+ exeinto /usr/share/${PN}/GUI
+ doexe GUI/xasy.py
+ rm GUI/xasy.py
+ insinto /usr/share/${PN}/GUI
+ doins GUI/*.py
+ dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
+ doman doc/xasy.1x
+ fi
+
+ # examples
+ if use examples; then
+ insinto /usr/share/${PN}/examples
+ doins examples/*.asy \
+ examples/*.eps \
+ doc/*.asy \
+ doc/*.csv \
+ doc/*.dat \
+ doc/extra/*.asy
+ if use X; then
+ doins GUI/*.asy
+ fi
+ insinto /usr/share/${PN}/examples/animations
+ doins examples/animations/*.asy
+ fi
+
+ # LaTeX style
+ if use latex; then
+ cd doc
+ insinto "${TEXMF}"/tex/latex/${PN}
+ doins ${PN}.sty asycolors.sty
+ if use examples; then
+ insinto /usr/share/${PN}/examples
+ doins latexusage.tex
+ fi
+ cd ..
+ fi
+
+ # asymptote.py
+ if use python; then
+ python_install() {
+ insinto "$(python_get_sitedir)"
+ doins base/${PN}.py
+ }
+ python_execute_function python_install
+ fi
+
+ # emacs mode
+ if use emacs; then
+ elisp-install ${PN} base/*.el base/*.elc
+ elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+ fi
+
+ # vim syntax
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins base/asy.vim
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}"/asy-ftd.vim
+ fi
+
+ # extra documentation
+ if use doc; then
+ cd doc
+ doinfo ${PN}.info*
+ cd FAQ
+ dodoc asy-faq.ascii
+ doinfo asy-faq.info
+ insinto /usr/share/doc/${PF}/html/FAQ
+ doins asy-faq.html/*
+ cd ..
+ insinto /usr/share/doc/${PF}
+ doins ${PN}.pdf CAD.pdf
+ fi
+}
+
+pkg_postinst() {
+ use python && python_mod_optimize ${PN}.py
+ use latex && latex-package_rehash
+ use emacs && elisp-site-regen
+
+ elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+ elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
+}
+
+pkg_postrm() {
+ use python && python_mod_cleanup ${PN}.py
+ use latex && latex-package_rehash
+ use emacs && elisp-site-regen
+}
diff --git a/media-gfx/asymptote/files/asymptote-2.14-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.14-configure-ac.patch
new file mode 100644
index 000000000000..cda852165501
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.14-configure-ac.patch
@@ -0,0 +1,32 @@
+Index: asymptote-2.14/configure.ac
+===================================================================
+--- asymptote-2.14.orig/configure.ac
++++ asymptote-2.14/configure.ac
+@@ -150,7 +150,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
+ fi
+ CPPFLAGS_SAVE=$CPPFLAGS
+ CPPFLAGS=$CPPFLAGS" $INCL"
+- AC_CHECK_HEADER(gc.h,
++ AC_CHECK_HEADER([gc/gc.h],
+ AC_CHECK_LIB([gc],[GC_malloc],[
+ LIBS=$LIBS"-lgc "
+ AC_MSG_NOTICE([enabling system $GCNAME])],[
+@@ -223,7 +223,17 @@ AC_MSG_ERROR([*** Please install libm on
+ AC_CHECK_LIB([z], [deflate],,
+ AC_MSG_ERROR([*** Please install libz on your system ***]))
+ AC_CHECK_LIB([pthread], [pthread_create])
+-AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
++
++AC_ARG_WITH(sigsegv,
++ [ --with-sigsegv use libsigsegv],
++ [with_sigsegv=$withval],
++ [with_sigsegv="no"])
++if test "$with_sigsegv" = "yes"; then
++AC_CHECK_HEADER([sigsegv.h],
++ AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]),
++ AC_MSG_NOTICE([*** Header file sigsegv.h not found ***]))
++fi
++
+ AC_CHECK_LIB([rt], [sched_yield])
+
+ AC_ARG_ENABLE(readline,
diff --git a/media-gfx/asymptote/files/asymptote-2.14-info.patch b/media-gfx/asymptote/files/asymptote-2.14-info.patch
new file mode 100644
index 000000000000..cb836fc1bf80
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.14-info.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.14/doc/asymptote.texi
+===================================================================
+--- asymptote-2.14.orig/doc/asymptote.texi
++++ asymptote-2.14/doc/asymptote.texi
+@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir
+
+ @dircategory Languages
+ @direntry
+-* asymptote: (asymptote/asymptote). Vector graphics language.
++* asymptote: (asymptote). Vector graphics language.
+ @end direntry
+
+ @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.14-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.14-xdg-utils.patch
new file mode 100644
index 000000000000..8bce2be44bd4
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.14-xdg-utils.patch
@@ -0,0 +1,22 @@
+Index: asymptote-2.14/settings.cc
+===================================================================
+--- asymptote-2.14.orig/settings.cc
++++ asymptote-2.14/settings.cc
+@@ -96,14 +96,14 @@ bool msdos=false;
+ string HOME="HOME";
+ string docdir=ASYMPTOTE_DOCDIR;
+ const char pathSeparator=':';
+-string defaultPSViewer="gv";
++string defaultPSViewer="xdg-open";
+ #ifdef __APPLE__
+ string defaultPDFViewer="open";
+ #else
+-string defaultPDFViewer="acroread";
++string defaultPDFViewer="xdg-open";
+ #endif
+ string defaultGhostscript="gs";
+-string defaultDisplay="display";
++string defaultDisplay="xdg-open";
+ string defaultAnimate="animate";
+ void queryRegistry() {}
+ const string dirsep="/";
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.22-freebsd.patch b/media-gfx/sane-backends/files/sane-backends-1.0.22-freebsd.patch
new file mode 100644
index 000000000000..a952ee065b61
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.22-freebsd.patch
@@ -0,0 +1,84 @@
+--- sanei/sanei_usb.c.orig 2009-07-26 21:29:33.000000000 +0200
++++ sanei/sanei_usb.c 2009-07-26 21:31:42.000000000 +0200
+@@ -96,7 +96,8 @@
+ }
+ #endif /* HAVE_USBCALLS */
+
+-#if defined (__FreeBSD__)
++#if (defined (__FreeBSD__) && (__FreeBSD_version < 800064))
++#include
+ #include
+ #endif /* __FreeBSD__ */
+ #if defined (__DragonFly__)
+@@ -273,7 +274,7 @@
+ *vendorID = vendor;
+ *productID = product;
+ }
+-#elif defined (__FreeBSD__) || defined (__DragonFly__)
++#elif (defined (__FreeBSD__) && __FreeBSD_version < 800064) || defined (__DragonFly__)
+ {
+ int controller;
+ int ctrl_fd;
+--- backend/epson2.c.orig 2010-04-05 22:18:04.000000000 +0900
++++ backend/epson2.c 2010-05-10 22:18:47.000000000 +0900
+@@ -57,6 +57,10 @@
+ #include
+ #include
+ #include
++#ifdef __FreeBSD__
++#include
++#include
++#endif
+
+ #include "sane/saneopts.h"
+ #include "sane/sanei_scsi.h"
+--- include/sane/sanei_tcp.h.orig 2006-11-30 14:23:19.000000000 -0900
++++ include/sane/sanei_tcp.h 2009-01-16 05:02:42.000000000 -0900
+@@ -20,6 +20,9 @@
+
+ #include
+
++#ifdef __FreeBSD__
++#include
++#endif
+ #include
+ #include
+
+--- backend/epson2-commands.c.orig 2010-04-05 22:18:04.000000000 +0900
++++ backend/epson2-commands.c 2010-05-10 22:24:33.000000000 +0900
+@@ -21,6 +21,9 @@
+
+ #include
+ #include
++#ifdef __FreeBSD__
++#include
++#endif
+
+ #include "epson2.h"
+ #include "epson2-io.h"
+--- backend/magicolor.c.orig 2011-01-31 03:49:46.000000000 +0900
++++ backend/magicolor.c 2011-08-02 02:38:15.000000000 +0900
+@@ -50,6 +50,10 @@
+ #include
+ #include
+ #include
++#ifdef __FreeBSD__
++#include
++#include
++#endif
+ #include
+ #include
+
+--- backend/xerox_mfp-tcp.c.orig 2010-12-02 08:49:58.000000000 +0900
++++ backend/xerox_mfp-tcp.c 2011-08-02 02:37:27.000000000 +0900
+@@ -27,6 +27,10 @@
+ #include
+ #include
+ #include
++#ifdef __FreeBSD__
++#include
++#include
++#endif
+
+ #include "sane/saneopts.h"
+ #include "sane/sanei_scsi.h"
diff --git a/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild
index be6d33279482..74fa76c6aa35 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild,v 1.1 2011/11/10 21:27:20 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild,v 1.2 2011/11/17 07:59:03 naota Exp $
EAPI="4"
@@ -138,7 +138,7 @@ SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2 public-domain"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
pkg_setup() {
enewgroup scanner
@@ -159,6 +159,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-libv4l-0.8.3.patch
# Bug #329047
epatch "${FILESDIR}"/niash_array_index.patch
+ epatch "${FILESDIR}"/${P}-freebsd.patch
}
src_configure() {
diff --git a/media-libs/lcms/lcms-2.2-r1.ebuild b/media-libs/lcms/lcms-2.2-r1.ebuild
index c28323166907..d8e59a59bbd2 100644
--- a/media-libs/lcms/lcms-2.2-r1.ebuild
+++ b/media-libs/lcms/lcms-2.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.2-r1.ebuild,v 1.3 2011/11/13 10:56:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.2-r1.ebuild,v 1.4 2011/11/17 15:46:17 jer Exp $
EAPI=4
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="doc jpeg static-libs test tiff zlib"
RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/media-sound/google-musicmanager/Manifest b/media-sound/google-musicmanager/Manifest
index a30d88ac0da6..e28fb2dc2af5 100644
--- a/media-sound/google-musicmanager/Manifest
+++ b/media-sound/google-musicmanager/Manifest
@@ -1,2 +1,2 @@
-DIST google-musicmanager-beta_1.0.18.6104-r0_amd64.deb 3005488 RMD160 c1dcf31da53b204c84cd950c2181a13073a64d4d SHA1 170659a8177cd6487554029d219802da51b3d732 SHA256 5a7d7e590d3deed589042222b8dca97326cbb789bccec396daaadd12cf62ae02
-DIST google-musicmanager-beta_1.0.18.6104-r0_i386.deb 2991982 RMD160 3d83549d2c49d584bf5d7068c1217add9a440527 SHA1 fb85e78ff259a7335cf5e1c449335150f4d06fdc SHA256 d17222dc6d037cff1ffcc6f1fe2f7fb4adff8de07ea7cba108ac82bd0f565995
+DIST google-musicmanager-beta_1.0.22.3409-r0_amd64.deb 3032382 RMD160 e30cce98c44f5b9467bae5f36c275b50dec271e0 SHA1 cb429e2ff484f5f085ec0422c65a7ffd1e51cd74 SHA256 f94aa250da8f493785221f0c333abf77b760a6da88006f172929d0cf33996b1d
+DIST google-musicmanager-beta_1.0.22.3409-r0_i386.deb 3022258 RMD160 eb341c43b7f9b300e5f0b99c0013fd2b8e3e2b45 SHA1 84388581cebffb3d6579d7e849b31d2fb34a4234 SHA256 5900e594816030b05f8d2c5d6b5310d1a19c67cded1daba71d82778fdc4431e6
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.18.6104_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.22.3409_beta.ebuild
similarity index 92%
rename from media-sound/google-musicmanager/google-musicmanager-1.0.18.6104_beta.ebuild
rename to media-sound/google-musicmanager/google-musicmanager-1.0.22.3409_beta.ebuild
index 1855dad224da..650ad34328bb 100644
--- a/media-sound/google-musicmanager/google-musicmanager-1.0.18.6104_beta.ebuild
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.22.3409_beta.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/google-musicmanager-1.0.18.6104_beta.ebuild,v 1.2 2011/10/04 15:10:52 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/google-musicmanager-1.0.22.3409_beta.ebuild,v 1.1 2011/11/17 15:13:10 ottxor Exp $
EAPI=4
@@ -75,7 +75,7 @@ src_install() {
#TODO unbundle this
doexe libaacdec.so libaudioenc.so.0 libmpgdec.so.0 libid3tag.so
- dosym /"${INSTALL_BASE}"/google-musicmanager /opt/bin/
+ dosym /"${INSTALL_BASE}"/google-musicmanager /opt/bin/google-musicmanager
make_desktop_entry "${PN}" "Google Music Manager" \
"/${INSTALL_BASE}/product_logo_32.xpm" "AudioVideo;Audio;Player;Music"
diff --git a/metadata/cache/app-crypt/seahorse-3.0.2 b/metadata/cache/app-crypt/seahorse-3.0.2
deleted file mode 100644
index 9dc049cc935e..000000000000
--- a/metadata/cache/app-crypt/seahorse-3.0.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=gnome-base/gconf-2:2 >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/dbus-glib-0.72 >=gnome-base/gnome-keyring-2.91.2 net-libs/libsoup:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) avahi? ( >=net-dns/avahi-0.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) ldap? ( net-nds/openldap ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) sys-devel/gettext >=app-text/gnome-doc-utils-0.3.2 >=app-text/scrollkeeper-0.3 >=dev-util/pkgconfig-0.20 >=dev-util/intltool-0.35 doc? ( >=dev-util/gtk-doc-1.9 ) >=sys-apps/sed-4
->=gnome-base/gconf-2:2 >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/dbus-glib-0.72 >=gnome-base/gnome-keyring-2.91.2 net-libs/libsoup:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) avahi? ( >=net-dns/avahi-0.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) ldap? ( net-nds/openldap ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) !=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.90.0:3 >=gnome-base/gnome-keyring-3.1.5 net-libs/libsoup:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) avahi? ( >=net-dns/avahi-0.6 ) ldap? ( net-nds/openldap ) sys-devel/gettext >=app-text/gnome-doc-utils-0.3.2 >=app-text/scrollkeeper-0.3 >=dev-util/pkgconfig-0.20 >=dev-util/intltool-0.35 doc? ( >=dev-util/gtk-doc-1.9 ) app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.90.0:3 >=gnome-base/gnome-keyring-3.1.5 net-libs/libsoup:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) avahi? ( >=net-dns/avahi-0.6 ) ldap? ( net-nds/openldap ) !app-i18n/ibus-1.3.9[gtk3] x11-libs/gtk+:3 ) !gtk3? ( app-i18n/ibus >=x11-libs/gtk+-2.12:2 ) x11-libs/libX11 dev-util/pkgconfig
+gtk3? ( >app-i18n/ibus-1.3.9[gtk3] x11-libs/gtk+:3 ) !gtk3? ( app-i18n/ibus >=x11-libs/gtk+-2.12:2 ) x11-libs/libX11
+0
+http://ibus-unikey.googlecode.com/files/ibus-unikey-0.6.0.tar.gz
+
+http://code.google.com/p/ibus-unikey/
+GPL-3
+Vietnamese Input Method Engine for IBUS using Unikey IME
+~amd64 ~x86
+eutils multilib portability toolchain-funcs user
+gtk3
+
+
+
+4
+
+configure
+
+
+
+
+
diff --git a/metadata/cache/app-i18n/scim-1.4.11-r1 b/metadata/cache/app-i18n/scim-1.4.11-r1
new file mode 100644
index 000000000000..bc23fd39d7af
--- /dev/null
+++ b/metadata/cache/app-i18n/scim-1.4.11-r1
@@ -0,0 +1,22 @@
+x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs doc? ( app-doc/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl dev-util/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
+0
+mirror://sourceforge/scim/scim-1.4.11.tar.gz
+
+http://www.scim-im.org/
+GPL-2
+Smart Common Input Method (SCIM) is an Input Method (IM) development platform
+~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
+doc
+
+
+
+3
+
+configure install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/app-misc/g15macro-1.0.0 b/metadata/cache/app-misc/g15macro-1.0.0
deleted file mode 100644
index f9f543864406..000000000000
--- a/metadata/cache/app-misc/g15macro-1.0.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render x11-libs/libX11 x11-proto/xextproto x11-proto/xproto x11-libs/libXtst
->=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render x11-libs/libX11 x11-proto/xextproto x11-proto/xproto x11-libs/libXtst sys-libs/zlib
-0
-mirror://sourceforge/g15daemon/g15macro-1.0.0.tar.bz2
-
-http://g15daemon.sourceforge.net/
-GPL-2
-Macro recording plugin to G15daemon
-~amd64 ~ppc ~ppc64 ~x86
-
-
-
-
-
-
-
-install
-
-
-
-
-
diff --git a/metadata/cache/app-misc/g15macro-1.0.1 b/metadata/cache/app-misc/g15macro-1.0.1
deleted file mode 100644
index 7e461648851c..000000000000
--- a/metadata/cache/app-misc/g15macro-1.0.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render x11-libs/libX11 x11-proto/xextproto x11-proto/xproto x11-libs/libXtst
->=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render x11-libs/libX11 x11-proto/xextproto x11-proto/xproto x11-libs/libXtst sys-libs/zlib
-0
-mirror://sourceforge/g15daemon/g15macro-1.0.1.tar.gz
-
-http://g15daemon.sourceforge.net/
-GPL-2
-Macro recording plugin to G15daemon
-~amd64 ~ppc ~ppc64 ~x86
-
-
-
-
-
-
-
-install
-
-
-
-
-
diff --git a/metadata/cache/app-misc/g15macro-1.0.3 b/metadata/cache/app-misc/g15macro-1.0.3
deleted file mode 100644
index 77c87a52b94b..000000000000
--- a/metadata/cache/app-misc/g15macro-1.0.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render x11-libs/libX11 x11-proto/xextproto x11-proto/xproto x11-libs/libXtst
->=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render x11-libs/libX11 x11-proto/xextproto x11-proto/xproto x11-libs/libXtst sys-libs/zlib
-0
-mirror://sourceforge/g15daemon/g15macro-1.0.3.tar.gz
-
-http://g15daemon.sourceforge.net/
-GPL-2
-Macro recording plugin to G15daemon
-~amd64 ~ppc ~ppc64 ~x86
-
-
-
-
-
-
-
-install
-
-
-
-
-
diff --git a/metadata/cache/app-text/xournal-0.4.5_p20111022 b/metadata/cache/app-text/xournal-0.4.5_p20111022
index 9107a70505aa..ea44b361c918 100644
--- a/metadata/cache/app-text/xournal-0.4.5_p20111022
+++ b/metadata/cache/app-text/xournal-0.4.5_p20111022
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022.tar.xz http:/
http://xournal.sourceforge.net/
GPL-2
Xournal is an application for notetaking, sketching, and keeping a journal using a stylus.
-~amd64 ~x86
+amd64 ~x86
autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
+pdf
diff --git a/metadata/cache/app-vim/notes-0.12.10 b/metadata/cache/app-vim/notes-0.12.10
new file mode 100644
index 000000000000..36ef1fa3f640
--- /dev/null
+++ b/metadata/cache/app-vim/notes-0.12.10
@@ -0,0 +1,22 @@
+|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+>=app-vim/xolox-misc-20110926 || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] ) || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+0
+https://github.com/xolox/vim-notes/tarball/0.12.10 -> notes-0.12.10.tar.gz
+
+http://peterodding.com/code/vim/notes/
+MIT
+vim plugin: easy note taking in vim
+~amd64 ~x86
+vim-doc vim-plugin
+
+
+
+
+4
+
+install postinst postrm prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/app-vim/session-1.4.22 b/metadata/cache/app-vim/session-1.4.22
new file mode 100644
index 000000000000..09adaed806f0
--- /dev/null
+++ b/metadata/cache/app-vim/session-1.4.22
@@ -0,0 +1,22 @@
+|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+>=app-vim/xolox-misc-20110926 || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+0
+https://github.com/xolox/vim-session/tarball/1.4.22 -> session-1.4.22.tar.gz
+
+http://peterodding.com/code/vim/session/
+MIT
+vim plugin: extended session management for vim
+~amd64 ~x86
+vim-doc vim-plugin
+
+
+
+
+4
+
+install postinst postrm prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/app-vim/vim-r-110614 b/metadata/cache/app-vim/vim-r-111114
similarity index 80%
rename from metadata/cache/app-vim/vim-r-110614
rename to metadata/cache/app-vim/vim-r-111114
index 4f1ffa6d21a6..725361098bde 100644
--- a/metadata/cache/app-vim/vim-r-110614
+++ b/metadata/cache/app-vim/vim-r-111114
@@ -1,7 +1,7 @@
|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
dev-lang/R || ( app-vim/conque app-vim/screen ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
0
-https://github.com/vim-scripts/Vim-R-plugin/tarball/110614 -> vim-r-110614.tar.gz
+https://github.com/vim-scripts/Vim-R-plugin/tarball/111114 -> vim-r-111114.tar.gz
http://www.vim.org/scripts/script.php?script_id=2628
public-domain
diff --git a/metadata/cache/dev-lang/v8-3.5.10.24 b/metadata/cache/dev-lang/v8-3.5.10.24
index bd6cf39489ad..8e8fc6c3187b 100644
--- a/metadata/cache/dev-lang/v8-3.5.10.24
+++ b/metadata/cache/dev-lang/v8-3.5.10.24
@@ -6,7 +6,7 @@ http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.5.10.24.t
http://code.google.com/p/v8
BSD
Google's open source JavaScript engine
-~amd64 ~arm ~x86 ~x64-macos ~x86-macos
+amd64 ~arm ~x86 ~x64-macos ~x86-macos
eutils flag-o-matic multilib pax-utils portability scons-utils toolchain-funcs user
readline
diff --git a/metadata/cache/dev-libs/libnl-1.1-r2 b/metadata/cache/dev-libs/libnl-1.1-r2
index fdeb29d36b15..4cb5d6380ebe 100644
--- a/metadata/cache/dev-libs/libnl-1.1-r2
+++ b/metadata/cache/dev-libs/libnl-1.1-r2
@@ -1,9 +1,9 @@
doc? ( app-doc/doxygen )
1.1
-http://people.suug.ch/~tgr/libnl/files/libnl-1.1.tar.gz
+http://www.infradead.org/~tgr/libnl/files/libnl-1.1.tar.gz
-http://people.suug.ch/~tgr/libnl/
+http://www.infradead.org/~tgr/libnl/
LGPL-2.1
A library for applications dealing with netlink socket
alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
diff --git a/metadata/cache/dev-libs/libnl-3.2.1 b/metadata/cache/dev-libs/libnl-3.2.1
index 7783a9a5c058..57a943ea814b 100644
--- a/metadata/cache/dev-libs/libnl-3.2.1
+++ b/metadata/cache/dev-libs/libnl-3.2.1
@@ -1,9 +1,9 @@
|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
3
-http://people.suug.ch/~tgr/libnl/files/libnl-3.2.1.tar.gz
+http://www.infradead.org/~tgr/libnl/files/libnl-3.2.1.tar.gz
-http://people.suug.ch/~tgr/libnl/
+http://www.infradead.org/~tgr/libnl/
LGPL-2.1
A library for applications dealing with netlink socket
~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
diff --git a/metadata/cache/dev-libs/libnl-3.2.2 b/metadata/cache/dev-libs/libnl-3.2.2
index 1b5ebb7d9ecf..2e028a795ba8 100644
--- a/metadata/cache/dev-libs/libnl-3.2.2
+++ b/metadata/cache/dev-libs/libnl-3.2.2
@@ -1,9 +1,9 @@
|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
3
-http://people.suug.ch/~tgr/libnl/files/libnl-3.2.2.tar.gz
+http://www.infradead.org/~tgr/libnl/files/libnl-3.2.2.tar.gz
-http://people.suug.ch/~tgr/libnl/
+http://www.infradead.org/~tgr/libnl/
LGPL-2.1
A library for applications dealing with netlink socket
~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
diff --git a/metadata/cache/dev-libs/libnl-3.2.3 b/metadata/cache/dev-libs/libnl-3.2.3
index fba446b81019..5bdd67822c50 100644
--- a/metadata/cache/dev-libs/libnl-3.2.3
+++ b/metadata/cache/dev-libs/libnl-3.2.3
@@ -1,9 +1,9 @@
|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
3
-http://people.suug.ch/~tgr/libnl/files/libnl-3.2.3.tar.gz
+http://www.infradead.org/~tgr/libnl/files/libnl-3.2.3.tar.gz
-http://people.suug.ch/~tgr/libnl/
+http://www.infradead.org/~tgr/libnl/
LGPL-2.1
A library for applications dealing with netlink socket
~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
diff --git a/metadata/cache/dev-libs/newt-0.52.13 b/metadata/cache/dev-libs/newt-0.52.13
new file mode 100644
index 000000000000..594d1c737b4e
--- /dev/null
+++ b/metadata/cache/dev-libs/newt-0.52.13
@@ -0,0 +1,22 @@
+=sys-libs/slang-2* >=dev-libs/popt-1.6 elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( =dev-lang/tcl-8.5* ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+=sys-libs/slang-2* >=dev-libs/popt-1.6 elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( =dev-lang/tcl-8.5* ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+https://fedorahosted.org/releases/n/e/newt/newt-0.52.13.tar.gz
+
+https://fedorahosted.org/newt/
+LGPL-2
+Redhat's Newt windowing toolkit development files
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+autotools eutils libtool multilib portability python toolchain-funcs user
+gpm tcl nls
+
+
+
+3
+
+compile configure install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-python/netifaces-0.6 b/metadata/cache/dev-python/netifaces-0.6
new file mode 100644
index 000000000000..e28da2bfdde7
--- /dev/null
+++ b/metadata/cache/dev-python/netifaces-0.6
@@ -0,0 +1,22 @@
+dev-python/setuptools >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+>=app-admin/eselect-python-20091230 =dev-lang/python-2* >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+http://alastairs-place.net/projects/netifaces/netifaces-0.6.tar.gz
+
+http://alastairs-place.net/netifaces/
+MIT
+Portable network interface information
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-python/papyon-0.5.6 b/metadata/cache/dev-python/papyon-0.5.6
index 5f9c7b3d3193..ed77b2a1bc54 100644
--- a/metadata/cache/dev-python/papyon-0.5.6
+++ b/metadata/cache/dev-python/papyon-0.5.6
@@ -6,7 +6,7 @@ http://www.freedesktop.org/software/papyon/releases/papyon-0.5.6.tar.gz
http://www.freedesktop.org/wiki/Software/papyon
GPL-2
Python MSN IM protocol implementation forked from pymsn
-~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
distutils multilib python toolchain-funcs
diff --git a/metadata/cache/dev-python/python-nss-0.8 b/metadata/cache/dev-python/python-nss-0.8
index ef29a631af73..34af5fc72c4a 100644
--- a/metadata/cache/dev-python/python-nss-0.8
+++ b/metadata/cache/dev-python/python-nss-0.8
@@ -3,7 +3,7 @@ dev-libs/nss dev-libs/nspr doc? ( dev-python/docutils dev-python/epydoc ) >=app-
0
http://rion-overlay.googlecode.com/files/python-nss-0.8.tar.lzma
-http://people.redhat.com/jdennis/python-nss/doc/api/html
+http://www.mozilla.org/projects/security/pki/python-nss/
|| ( MPL-1.1 GPL-2 LGPL-2 )
Python bindings for Network Security Services (NSS)
~amd64 ~x86
diff --git a/metadata/cache/dev-python/python-nss-0.8-r1 b/metadata/cache/dev-python/python-nss-0.8-r1
index ef29a631af73..34af5fc72c4a 100644
--- a/metadata/cache/dev-python/python-nss-0.8-r1
+++ b/metadata/cache/dev-python/python-nss-0.8-r1
@@ -3,7 +3,7 @@ dev-libs/nss dev-libs/nspr doc? ( dev-python/docutils dev-python/epydoc ) >=app-
0
http://rion-overlay.googlecode.com/files/python-nss-0.8.tar.lzma
-http://people.redhat.com/jdennis/python-nss/doc/api/html
+http://www.mozilla.org/projects/security/pki/python-nss/
|| ( MPL-1.1 GPL-2 LGPL-2 )
Python bindings for Network Security Services (NSS)
~amd64 ~x86
diff --git a/metadata/cache/games-emulation/sdlmame-0.136 b/metadata/cache/games-emulation/sdlmame-0.136
deleted file mode 100644
index 5f43b7b80669..000000000000
--- a/metadata/cache/games-emulation/sdlmame-0.136
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] dev-libs/expat x11-libs/libXinerama debug? ( x11-libs/gtk+:2 gnome-base/gconf ) app-arch/unzip x11-proto/xineramaproto
->=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] dev-libs/expat x11-libs/libXinerama debug? ( x11-libs/gtk+:2 gnome-base/gconf )
-0
-mirror://gentoo/sdlmame0136.zip mirror://gentoo/sdlmame-manpages.tar.gz
-
-http://rbelmont.mameworld.info/?page_id=163
-XMAME
-Multiple Arcade Machine Emulator (SDL)
-amd64 ppc x86
-base eutils flag-o-matic games multilib portability toolchain-funcs user
-debug opengl
-
-
-
-2
-
-compile configure install postinst preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/games-emulation/sdlmame-0.141_p3 b/metadata/cache/games-emulation/sdlmame-0.141_p3
deleted file mode 100644
index e54d21803445..000000000000
--- a/metadata/cache/games-emulation/sdlmame-0.141_p3
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] media-libs/sdl-ttf dev-libs/expat debug? ( x11-libs/gtk+:2 gnome-base/gconf x11-libs/libXinerama ) app-arch/unzip debug? ( x11-proto/xineramaproto )
->=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] media-libs/sdl-ttf dev-libs/expat debug? ( x11-libs/gtk+:2 gnome-base/gconf x11-libs/libXinerama )
-0
-mirror://gentoo/mame0141s.zip mirror://gentoo/sdlmame0141u1_diff.zip mirror://gentoo/sdlmame0141u2_diff.zip mirror://gentoo/sdlmame0141u3_diff.zip http://www.netswarm.net/misc/sdlmame-ui.bdf.gz
-
-http://mamedev.org/
-XMAME
-Multiple Arcade Machine Emulator (SDL)
-~amd64 ~ppc ~x86
-base eutils flag-o-matic games multilib portability toolchain-funcs user
-debug opengl
-
-
-
-2
-
-compile configure install postinst preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/games-emulation/sdlmame-0.143_p4 b/metadata/cache/games-emulation/sdlmame-0.143_p4
deleted file mode 100644
index 19ce239b8d7c..000000000000
--- a/metadata/cache/games-emulation/sdlmame-0.143_p4
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] media-libs/sdl-ttf dev-libs/expat debug? ( x11-libs/gtk+:2 gnome-base/gconf x11-libs/libXinerama ) app-arch/unzip debug? ( x11-proto/xineramaproto )
->=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] media-libs/sdl-ttf dev-libs/expat debug? ( x11-libs/gtk+:2 gnome-base/gconf x11-libs/libXinerama )
-0
-mirror://gentoo/mame0143s.zip mirror://gentoo/sdlmame0143u1_diff.zip mirror://gentoo/sdlmame0143u2_diff.zip mirror://gentoo/sdlmame0143u3_diff.zip mirror://gentoo/sdlmame0143u4_diff.zip http://www.netswarm.net/misc/sdlmame-ui.bdf.gz
-
-http://mamedev.org/
-XMAME
-Multiple Arcade Machine Emulator (SDL)
-~amd64 ~ppc ~x86
-base eutils flag-o-matic games multilib portability toolchain-funcs user
-debug opengl
-
-
-
-2
-
-compile configure install postinst preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/games-emulation/sdlmame-0.143_p5 b/metadata/cache/games-emulation/sdlmame-0.143_p5
deleted file mode 100644
index 4f3e6476ccc6..000000000000
--- a/metadata/cache/games-emulation/sdlmame-0.143_p5
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] media-libs/sdl-ttf dev-libs/expat debug? ( x11-libs/gtk+:2 gnome-base/gconf x11-libs/libXinerama ) app-arch/unzip debug? ( x11-proto/xineramaproto )
->=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] media-libs/sdl-ttf dev-libs/expat debug? ( x11-libs/gtk+:2 gnome-base/gconf x11-libs/libXinerama )
-0
-mirror://gentoo/mame0143s.zip mirror://gentoo/sdlmame0143u1_diff.zip mirror://gentoo/sdlmame0143u2_diff.zip mirror://gentoo/sdlmame0143u3_diff.zip mirror://gentoo/sdlmame0143u4_diff.zip mirror://gentoo/sdlmame0143u5_diff.zip http://www.netswarm.net/misc/sdlmame-ui.bdf.gz
-
-http://mamedev.org/
-XMAME
-Multiple Arcade Machine Emulator (SDL)
-~amd64 ~ppc ~x86
-base eutils flag-o-matic games multilib portability toolchain-funcs user
-debug opengl
-
-
-
-2
-
-compile configure install postinst preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/games-emulation/sdlmame-0.142 b/metadata/cache/games-emulation/sdlmame-0.144
similarity index 88%
rename from metadata/cache/games-emulation/sdlmame-0.142
rename to metadata/cache/games-emulation/sdlmame-0.144
index 650229935cb3..fcef488bc14e 100644
--- a/metadata/cache/games-emulation/sdlmame-0.142
+++ b/metadata/cache/games-emulation/sdlmame-0.144
@@ -1,12 +1,12 @@
>=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] media-libs/sdl-ttf dev-libs/expat debug? ( x11-libs/gtk+:2 gnome-base/gconf x11-libs/libXinerama ) app-arch/unzip debug? ( x11-proto/xineramaproto )
>=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] media-libs/sdl-ttf dev-libs/expat debug? ( x11-libs/gtk+:2 gnome-base/gconf x11-libs/libXinerama )
0
-mirror://gentoo/mame0142s.zip http://www.netswarm.net/misc/sdlmame-ui.bdf.gz
+mirror://gentoo/mame0144s.zip http://www.netswarm.net/misc/sdlmame-ui.bdf.gz
http://mamedev.org/
XMAME
Multiple Arcade Machine Emulator (SDL)
-amd64 ~ppc x86
+~amd64 ~ppc ~x86
base eutils flag-o-matic games multilib portability toolchain-funcs user
debug opengl
diff --git a/metadata/cache/gnome-base/gnome-keyring-3.0.3-r200 b/metadata/cache/gnome-base/gnome-keyring-3.0.3-r200
deleted file mode 100644
index 61e8062cef8a..000000000000
--- a/metadata/cache/gnome-base/gnome-keyring-3.0.3-r200
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.20:2 gnome-base/gconf:2 >=sys-apps/dbus-1.0 >=dev-libs/libgcrypt-1.2.2 >=dev-libs/libtasn1-1 caps? ( sys-libs/libcap ) pam? ( virtual/pam ) sys-devel/gettext >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.20:2 gnome-base/gconf:2 >=sys-apps/dbus-1.0 >=dev-libs/libgcrypt-1.2.2 >=dev-libs/libtasn1-1 caps? ( sys-libs/libcap ) pam? ( virtual/pam )
-0
-mirror://gnome/sources/gnome-keyring/3.0/gnome-keyring-3.0.3.tar.bz2
-
-http://www.gnome.org/
-GPL-2 LGPL-2
-Password and keyring managing daemon
-~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris
-autotools eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils libtool multilib pam portability toolchain-funcs user versionator virtualx
-+caps debug doc pam test test
-
-gnome-base/libgnome-keyring
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/gnome-base/gnome-keyring-3.0.3-r300 b/metadata/cache/gnome-base/gnome-keyring-3.0.3-r300
deleted file mode 100644
index a33658be7e9b..000000000000
--- a/metadata/cache/gnome-base/gnome-keyring-3.0.3-r300
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.90.0:3 gnome-base/gconf:2 >=sys-apps/dbus-1.0 >=dev-libs/libgcrypt-1.2.2 >=dev-libs/libtasn1-1 caps? ( sys-libs/libcap ) pam? ( virtual/pam ) sys-devel/gettext >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.90.0:3 gnome-base/gconf:2 >=sys-apps/dbus-1.0 >=dev-libs/libgcrypt-1.2.2 >=dev-libs/libtasn1-1 caps? ( sys-libs/libcap ) pam? ( virtual/pam )
-0
-mirror://gnome/sources/gnome-keyring/3.0/gnome-keyring-3.0.3.tar.bz2
-
-http://www.gnome.org/
-GPL-2 LGPL-2
-Password and keyring managing daemon
-~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris
-autotools eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils libtool multilib pam portability toolchain-funcs user versionator virtualx
-+caps debug doc pam test test
-
-gnome-base/libgnome-keyring
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/gnome-base/gnome-keyring-3.2.2 b/metadata/cache/gnome-base/gnome-keyring-3.2.2
new file mode 100644
index 000000000000..6b901ef8aa7b
--- /dev/null
+++ b/metadata/cache/gnome-base/gnome-keyring-3.2.2
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.90.0:3 >=app-crypt/p11-kit-0.6 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2 >=dev-libs/libtasn1-1 >=sys-apps/dbus-1.0 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) sys-devel/gettext >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1.9 ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.90.0:3 >=app-crypt/p11-kit-0.6 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2 >=dev-libs/libtasn1-1 >=sys-apps/dbus-1.0 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam )
+0
+mirror://gnome/sources/gnome-keyring/3.2/gnome-keyring-3.2.2.tar.xz
+test
+http://www.gnome.org/
+GPL-2 LGPL-2
+Password and keyring managing daemon
+~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris
+eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils libtool multilib pam portability toolchain-funcs user versionator virtualx
++caps debug doc pam test test
+
+>=gnome-base/libgnome-keyring-3.1.92
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/gnome-base/libgnome-keyring-3.0.3-r1 b/metadata/cache/gnome-base/libgnome-keyring-3.2.2
similarity index 56%
rename from metadata/cache/gnome-base/libgnome-keyring-3.0.3-r1
rename to metadata/cache/gnome-base/libgnome-keyring-3.2.2
index 45a336dda267..1734f0f8ced0 100644
--- a/metadata/cache/gnome-base/libgnome-keyring-3.0.3-r1
+++ b/metadata/cache/gnome-base/libgnome-keyring-3.2.2
@@ -1,18 +1,18 @@
->=sys-apps/dbus-1.0 gnome-base/gconf >=gnome-base/gnome-keyring-2.29[test?] sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1.9 ) >=sys-apps/sed-4
->=sys-apps/dbus-1.0 gnome-base/gconf >=gnome-base/gnome-keyring-2.29[test?]
+>=sys-apps/dbus-1.0 gnome-base/gconf >=gnome-base/gnome-keyring-3.1.92[test?] sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1.9 ) app-arch/xz-utils >=sys-apps/sed-4
+>=sys-apps/dbus-1.0 gnome-base/gconf >=gnome-base/gnome-keyring-3.1.92[test?]
0
-mirror://gnome/sources/libgnome-keyring/3.0/libgnome-keyring-3.0.3.tar.bz2
+mirror://gnome/sources/libgnome-keyring/3.2/libgnome-keyring-3.2.2.tar.xz
http://live.gnome.org/GnomeKeyring
LGPL-2
Compatibility library for accessing secrets
-~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris
+~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris
eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
debug doc test
-3
+4
compile configure install postinst postrm preinst prepare setup test unpack
diff --git a/metadata/cache/media-gfx/asymptote-2.14 b/metadata/cache/media-gfx/asymptote-2.14
new file mode 100644
index 000000000000..f56406067c90
--- /dev/null
+++ b/metadata/cache/media-gfx/asymptote-2.14
@@ -0,0 +1,22 @@
+>=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+>=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+0
+mirror://sourceforge/asymptote/asymptote-2.14.src.tgz
+
+http://asymptote.sourceforge.net/
+GPL-3
+A vector graphics language that provides a framework for technical drawing
+~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+autotools base elisp-common eutils latex-package libtool multilib portability python toolchain-funcs user
++boehm-gc doc emacs examples fftw gsl +imagemagick latex python sigsegv vim-syntax X
+
+
+
+3
+
+compile configure install postinst postrm prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/media-gfx/povray-3.7.0_rc3 b/metadata/cache/media-gfx/povray-3.7.0_rc3
index 29b25a544650..196e5772031b 100644
--- a/metadata/cache/media-gfx/povray-3.7.0_rc3
+++ b/metadata/cache/media-gfx/povray-3.7.0_rc3
@@ -1,5 +1,5 @@
->=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( >=media-libs/tiff-3.6.1 ) X? ( media-libs/libsdl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( >=media-libs/tiff-3.6.1 ) X? ( media-libs/libsdl )
+>=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl )
0
http://www.povray.org/redirect/www.povray.org/beta/source/povray-3.7.0.RC3.tar.bz2
diff --git a/metadata/cache/media-gfx/povray-3.7.0_rc3-r1 b/metadata/cache/media-gfx/povray-3.7.0_rc3-r1
index 36a59816b1dd..2aa174c0a140 100644
--- a/metadata/cache/media-gfx/povray-3.7.0_rc3-r1
+++ b/metadata/cache/media-gfx/povray-3.7.0_rc3-r1
@@ -1,5 +1,5 @@
->=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( >=media-libs/tiff-3.6.1 ) X? ( media-libs/libsdl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( >=media-libs/tiff-3.6.1 ) X? ( media-libs/libsdl )
+>=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl )
0
http://www.povray.org/redirect/www.povray.org/beta/source/povray-3.7.0.RC3.tar.bz2
diff --git a/metadata/cache/media-gfx/sane-backends-1.0.22-r2 b/metadata/cache/media-gfx/sane-backends-1.0.22-r2
index 1d8dc1c50edb..2de17f4ec643 100644
--- a/metadata/cache/media-gfx/sane-backends-1.0.22-r2
+++ b/metadata/cache/media-gfx/sane-backends-1.0.22-r2
@@ -6,7 +6,7 @@ ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.22/sane-backends-1.0.22.ta
http://www.sane-project.org/
GPL-2 public-domain
Scanner Access Now Easy - Backends
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
eutils flag-o-matic multilib portability toolchain-funcs user
avahi usb gphoto2 ipv6 v4l doc +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr +sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc25 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpsj5s +sane_backends_hpljm1005 +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kvs1025 +sane_backends_kvs20xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek +sane_backends_mustek_pp +sane_backends_mustek_usb +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax_pp +sane_backends_umax1220u +sane_backends_xerox_mfp
diff --git a/metadata/cache/media-libs/lcms-2.2-r1 b/metadata/cache/media-libs/lcms-2.2-r1
index 0aac85b4a316..3df4a24ce046 100644
--- a/metadata/cache/media-libs/lcms-2.2-r1
+++ b/metadata/cache/media-libs/lcms-2.2-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/lcms/lcms2-2.2.tar.gz
http://www.littlecms.com/
MIT
A lightweight, speed optimized color management engine
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
eutils multilib portability toolchain-funcs user
doc jpeg static-libs test tiff zlib
diff --git a/metadata/cache/media-sound/google-musicmanager-1.0.18.6104_beta b/metadata/cache/media-sound/google-musicmanager-1.0.22.3409_beta
similarity index 90%
rename from metadata/cache/media-sound/google-musicmanager-1.0.18.6104_beta
rename to metadata/cache/media-sound/google-musicmanager-1.0.22.3409_beta
index 6e8f1a87c011..5eeddc53016a 100644
--- a/metadata/cache/media-sound/google-musicmanager-1.0.18.6104_beta
+++ b/metadata/cache/media-sound/google-musicmanager-1.0.22.3409_beta
@@ -1,7 +1,7 @@
app-arch/xz-utils app-admin/chrpath
dev-libs/expat dev-libs/glib:2 media-libs/flac media-libs/fontconfig media-libs/freetype:2 media-libs/libogg media-libs/libvorbis net-dns/libidn sys-libs/glibc x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/qt-core x11-libs/qt-gui log? ( dev-libs/log4cxx )
0
-x86? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.18.6104-r0_i386.deb ) amd64? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.18.6104-r0_amd64.deb )
+x86? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.22.3409-r0_i386.deb ) amd64? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.22.3409-r0_amd64.deb )
strip mirror
http://music.google.com
google-talkplugin Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB as-is
diff --git a/metadata/cache/net-dns/bind-9.7.4_p1 b/metadata/cache/net-dns/bind-9.7.4_p1
new file mode 100644
index 000000000000..c689ea90771c
--- /dev/null
+++ b/metadata/cache/net-dns/bind-9.7.4_p1
@@ -0,0 +1,22 @@
+ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) threads? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) threads? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) selinux? ( sec-policy/selinux-bind ) resolvconf? ( net-dns/openresolv ) sys-process/psmisc
+0
+ftp://ftp.isc.org/isc/bind9/9.7.4-P1/bind-9.7.4-P1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://bind-geoip.googlecode.com//files/bind-geoip-1.3-9.7.2-P2.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 )
+
+http://www.isc.org/software/bind
+as-is
+BIND - Berkeley Internet Name Domain - Name Server
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
+ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads resolvconf urandom xml geoip gssapi sdb-ldap
+
+
+
+3
+
+config configure install postinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-dns/bind-9.8.1_p1 b/metadata/cache/net-dns/bind-9.8.1_p1
new file mode 100644
index 000000000000..dd406edc74bd
--- /dev/null
+++ b/metadata/cache/net-dns/bind-9.8.1_p1
@@ -0,0 +1,22 @@
+ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0 ) selinux? ( sec-policy/selinux-bind ) sys-process/psmisc
+0
+ftp://ftp.isc.org/isc/bind9/9.8.1-P1/bind-9.8.1-P1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://bind-geoip.googlecode.com//files/bind-9.8.0-P1-geoip-1.3.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 )
+
+http://www.isc.org/software/bind
+as-is
+BIND - Berkeley Internet Name Domain - Name Server
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
+berkdb caps dlz doc geoip gost gssapi idn ipv6 ldap mysql odbc pkcs11 postgres rpz sdb-ldap selinux ssl threads urandom xml
+postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) sdb-ldap? ( dlz ) gost? ( ssl )
+
+
+4
+
+config configure install postinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-irc/irssi-9999 b/metadata/cache/net-irc/irssi-9999
index ed0791a2172e..7043c0260d25 100644
--- a/metadata/cache/net-irc/irssi-9999
+++ b/metadata/cache/net-irc/irssi-9999
@@ -8,7 +8,7 @@ GPL-2
A modular textUI IRC client with IPv6 support
autotools base eutils libtool multilib perl-module portability subversion toolchain-funcs user
-ipv6 perl ssl socks5
+ipv6 +perl ssl socks5
diff --git a/metadata/cache/net-mail/dovecot-2.0.16 b/metadata/cache/net-mail/dovecot-2.0.16
new file mode 100644
index 000000000000..fdb1d47b1fc0
--- /dev/null
+++ b/metadata/cache/net-mail/dovecot-2.0.16
@@ -0,0 +1,22 @@
+caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv ssl? ( dev-libs/openssl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv >=net-mail/mailbase-0.00-r8
+0
+http://dovecot.org/releases/2.0/dovecot-2.0.16.tar.gz sieve? ( http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-pigeonhole-0.2.4.tar.gz ) managesieve? ( http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-pigeonhole-0.2.4.tar.gz )
+
+http://www.dovecot.org/
+LGPL-2.1 MIT
+An IMAP and POP3 server written with security primarily in mind
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+autotools autotools-utils base eutils libtool multilib portability ssl-cert toolchain-funcs user versionator
+bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve mbox mdbox mysql pam postgres sieve sqlite +ssl static-libs suid vpopmail zlib ssl
+
+
+
+4
+
+compile configure install postinst preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-p2p/bittorrent-4.4.0-r2 b/metadata/cache/net-p2p/bittorrent-4.4.0-r2
index 0dcee7efc66b..a16e91e155cd 100644
--- a/metadata/cache/net-p2p/bittorrent-4.4.0-r2
+++ b/metadata/cache/net-p2p/bittorrent-4.4.0-r2
@@ -6,7 +6,7 @@ http://www.bittorrent.com/dl/BitTorrent-4.4.0.tar.gz
http://www.bittorrent.com/
BitTorrent
Tool for distributing files via a distributed network of nodes
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
distutils eutils fdo-mime multilib portability python toolchain-funcs user
gtk
diff --git a/metadata/cache/sci-geosciences/mapserver-6.0.1 b/metadata/cache/sci-geosciences/mapserver-6.0.1
index c9fdede9959f..2c92cdb274e8 100644
--- a/metadata/cache/sci-geosciences/mapserver-6.0.1
+++ b/metadata/cache/sci-geosciences/mapserver-6.0.1
@@ -3,9 +3,9 @@
0
http://download.osgeo.org/mapserver/mapserver-6.0.1.tar.gz
-http://mapserver.org
+http://mapserver.org/
MIT
-OpenSource development environment for constructing spatially enabled Internet-web applications.
+OpenSource development environment for constructing spatially enabled Internet-web applications
~amd64 ~x86
autotools base depend.apache distutils eutils flag-o-matic libtool multilib perl-module php-ext-source-r2 portability python toolchain-funcs user webapp
bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt vhosts php_targets_php5-3
diff --git a/metadata/cache/sci-libs/hdf5-1.8.8 b/metadata/cache/sci-libs/hdf5-1.8.8
new file mode 100644
index 000000000000..3971addf20ad
--- /dev/null
+++ b/metadata/cache/sci-libs/hdf5-1.8.8
@@ -0,0 +1,22 @@
+fortran? ( virtual/fortran ) mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib ) sys-devel/libtool:2 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+fortran? ( virtual/fortran ) mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib )
+0
+http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.8/src/hdf5-1.8.8.tar.bz2
+
+http://www.hdfgroup.org/HDF5/
+NCSA-HDF
+General purpose library and file format for storing scientific data
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+autotools eutils fortran-2 libtool multilib portability toolchain-funcs user
+cxx debug examples fortran fortran2003 mpi static-libs szip threads zlib
+fortran2003? ( fortran )
+
+
+4
+
+configure install prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/gradm-2.2.0.201011061849 b/metadata/cache/sys-apps/gradm-2.2.0.201011061849
deleted file mode 100644
index f42ebe3eebd7..000000000000
--- a/metadata/cache/sys-apps/gradm-2.2.0.201011061849
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/bison sys-devel/flex pam? ( virtual/pam ) sys-apps/paxctl
-
-0
-mirror://gentoo/gradm-2.2.0-201011061849.tar.gz
-
-http://www.grsecurity.net/
-GPL-2
-Administrative interface for the grsecurity Role Based Access Control system
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86
-eutils flag-o-matic multilib portability toolchain-funcs user versionator
-pam
-
-
-
-2
-
-compile install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/sys-apps/gradm-2.2.2.201109281554 b/metadata/cache/sys-apps/gradm-2.2.2.201109281554
deleted file mode 100644
index 7d6ae732f157..000000000000
--- a/metadata/cache/sys-apps/gradm-2.2.2.201109281554
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/bison sys-devel/flex pam? ( virtual/pam ) sys-apps/paxctl
-
-0
-http://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-2.2.2-201109281554.tar.gz
-
-http://www.grsecurity.net/
-GPL-2
-Administrative interface for the grsecurity Role Based Access Control system
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
-eutils flag-o-matic multilib portability toolchain-funcs user versionator
-pam
-
-
-
-4
-
-compile install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/sys-apps/gradm-2.2.2.201111011031 b/metadata/cache/sys-apps/gradm-2.2.2.201111011031
index 8a2dc3c7bf11..064e0b9db93b 100644
--- a/metadata/cache/sys-apps/gradm-2.2.2.201111011031
+++ b/metadata/cache/sys-apps/gradm-2.2.2.201111011031
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-2.2.2-201111011031.
http://www.grsecurity.net/
GPL-2
Administrative interface for the grsecurity Role Based Access Control system
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
eutils flag-o-matic multilib portability toolchain-funcs user versionator
pam
diff --git a/metadata/cache/sys-apps/less-445-r1 b/metadata/cache/sys-apps/less-445-r1
index 3a8452d63c8c..6468ea89c57c 100644
--- a/metadata/cache/sys-apps/less-445-r1
+++ b/metadata/cache/sys-apps/less-445-r1
@@ -1,5 +1,5 @@
-app-misc/editor-wrapper >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre )
-app-misc/editor-wrapper >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre )
+>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre )
+>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre )
0
http://www.greenwoodsoftware.com/less/less-445.tar.gz http://www-zeuthen.desy.de/~friebel/unix/less/code2color
diff --git a/metadata/cache/sys-apps/portage-2.1.10.32 b/metadata/cache/sys-apps/portage-2.1.10.35
similarity index 93%
rename from metadata/cache/sys-apps/portage-2.1.10.32
rename to metadata/cache/sys-apps/portage-2.1.10.35
index 3b190eae118d..59eed3526933 100644
--- a/metadata/cache/sys-apps/portage-2.1.10.32
+++ b/metadata/cache/sys-apps/portage-2.1.10.35
@@ -1,7 +1,7 @@
python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 ) >=app-admin/eselect-python-20091230
python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-1.6 ) elibc_uclibc? ( >=sys-apps/sandbox-1.6 ) >=app-misc/pax-utils-0.1.17 selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] =app-admin/eselect-python-20091230
0
-mirror://gentoo/portage-2.1.10.32.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.10.32.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
+mirror://gentoo/portage-2.1.10.35.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.10.35.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
http://www.gentoo.org/proj/en/portage/index.xml
GPL-2
diff --git a/metadata/cache/sys-apps/portage-2.2.0_alpha72 b/metadata/cache/sys-apps/portage-2.2.0_alpha75
similarity index 86%
rename from metadata/cache/sys-apps/portage-2.2.0_alpha72
rename to metadata/cache/sys-apps/portage-2.2.0_alpha75
index b54bfbcd2777..7d423783be91 100644
--- a/metadata/cache/sys-apps/portage-2.2.0_alpha72
+++ b/metadata/cache/sys-apps/portage-2.2.0_alpha75
@@ -1,7 +1,7 @@
python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 ) >=app-admin/eselect-python-20091230
python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] =app-admin/eselect-python-20091230
0
-mirror://gentoo/portage-2.2.0_alpha72.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha72.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
+mirror://gentoo/portage-2.2.0_alpha74.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha74.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) mirror://gentoo/portage-2.2.0_alpha75.patch.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha75.patch.bz2
http://www.gentoo.org/proj/en/portage/index.xml
GPL-2
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r22 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r22
deleted file mode 100644
index 7af5f363be85..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r22
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.32-r22
-mirror://kernel/linux/kernel/v2.x/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) mirror://gentoo/hardened-patches-2.6.32-25.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-24.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-24.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 2.6)
-~alpha amd64 ~hppa ~ia64 -ppc -ppc64 ~sparc x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r23 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r23
deleted file mode 100644
index fadbfeca92d8..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r23
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.32-r23
-mirror://kernel/linux/kernel/v2.x/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) mirror://gentoo/hardened-patches-2.6.32-26.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-24.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-24.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 2.6)
-~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.34-r6 b/metadata/cache/sys-kernel/hardened-sources-2.6.34-r6
deleted file mode 100644
index c71591892553..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.34-r6
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.34-r6
-mirror://kernel/linux/kernel/v2.x/linux-2.6.34.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.34.N/deblob-2.6.34 mirror://gentoo/deblob-check-2.6.34 ) mirror://gentoo/hardened-patches-2.6.34-7.extras.tar.bz2 mirror://gentoo/genpatches-2.6.34-11.base.tar.bz2 mirror://gentoo/genpatches-2.6.34-11.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 2.6)
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.35-r7 b/metadata/cache/sys-kernel/hardened-sources-2.6.35-r7
deleted file mode 100644
index d7d046b251f4..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.35-r7
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.35-r7
-mirror://kernel/linux/kernel/v2.x/linux-2.6.35.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-2.6.35 mirror://gentoo/deblob-check-2.6.35 ) mirror://gentoo/hardened-patches-2.6.35-8.extras.tar.bz2 mirror://gentoo/genpatches-2.6.35-13.base.tar.bz2 mirror://gentoo/genpatches-2.6.35-13.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 2.6)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/chromium-15.0.874.121 b/metadata/cache/www-client/chromium-15.0.874.121
index b1c50ceab092..4e3bdcaa9f2c 100644
--- a/metadata/cache/www-client/chromium-15.0.874.121
+++ b/metadata/cache/www-client/chromium-15.0.874.121
@@ -6,7 +6,7 @@ http://commondatastorage.googleapis.com/chromium-browser-official/chromium-15.0.
http://chromium.org/
BSD
Open-source version of Google Chrome web browser
-~amd64 ~x86
+amd64 ~x86
eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python toolchain-funcs user versionator virtualx
bindist cups gnome gnome-keyring kerberos pulseaudio linguas_am linguas_ar linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fil linguas_fr linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_kn linguas_ko linguas_lt linguas_lv linguas_ml linguas_mr linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW test
diff --git a/metadata/cache/www-client/opera-11.60.1159 b/metadata/cache/www-client/opera-11.60.1159
new file mode 100644
index 000000000000..c3a6bd104b77
--- /dev/null
+++ b/metadata/cache/www-client/opera-11.60.1159
@@ -0,0 +1,22 @@
+>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
+media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
+0
+amd64? ( http://snapshot.opera.com/unix/china_11.60-1159/opera-11.60-1159.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/china_11.60-1159/opera-11.60-1159.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/china_11.60-1159/opera-11.60-1159.i386.freebsd.tar.xz )
+
+http://www.opera.com/
+OPERA-11 LGPL-2 LGPL-3
+A fast and secure web browser and Internet suite
+~amd64 ~x86 ~x86-fbsd
+eutils fdo-mime gnome2-utils multilib pax-utils portability toolchain-funcs user versionator
+elibc_FreeBSD gtk gtk3 kde +gstreamer linguas_af linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+
+
+
+4
+
+install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-libs/libcryptui-3.2.0 b/metadata/cache/x11-libs/libcryptui-3.2.0
index 81564b63ad1b..b0bbdff3373d 100644
--- a/metadata/cache/x11-libs/libcryptui-3.2.0
+++ b/metadata/cache/x11-libs/libcryptui-3.2.0
@@ -6,7 +6,7 @@ mirror://gnome/sources/libcryptui/3.2/libcryptui-3.2.0.tar.xz
http://www.gnome.org/projects/seahorse/index.html
GPL-2 LGPL-2
User interface components for OpenPGP
-~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+~amd64 ~x86 ~x86-fbsd
eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
debug doc +introspection libnotify test debug
diff --git a/metadata/cache/x11-libs/libcryptui-3.2.2 b/metadata/cache/x11-libs/libcryptui-3.2.2
new file mode 100644
index 000000000000..a4dde134cbc6
--- /dev/null
+++ b/metadata/cache/x11-libs/libcryptui-3.2.2
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/dbus-glib-0.72 >=gnome-base/gnome-keyring-2.91.2 >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) sys-devel/gettext >=app-text/scrollkeeper-0.3 >=dev-util/pkgconfig-0.20 >=dev-util/intltool-0.35 doc? ( >=dev-util/gtk-doc-1.9 ) app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/dbus-glib-0.72 >=gnome-base/gnome-keyring-2.91.2 >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) !=dev-lang/perl-5.8 x11-libs/gtk+:2 virtual/perl-Storable virtual/perl-IO virtual/perl-File-Spec virtual/perl-Test-Simple >=dev-perl/File-BaseDir-0.03 >=dev-perl/File-MimeInfo-0.12 >=dev-perl/File-DesktopEntry-0.03 >=dev-perl/gtk2-perl-1.040 x11-misc/xdg-utils dev-perl/extutils-pkgconfig virtual/perl-Module-Build test? ( virtual/perl-Test-Harness ) dev-lang/perl[-build]
->=dev-lang/perl-5.8 x11-libs/gtk+:2 virtual/perl-Storable virtual/perl-IO virtual/perl-File-Spec virtual/perl-Test-Simple >=dev-perl/File-BaseDir-0.03 >=dev-perl/File-MimeInfo-0.12 >=dev-perl/File-DesktopEntry-0.03 >=dev-perl/gtk2-perl-1.040 x11-misc/xdg-utils latex? ( virtual/latex-base app-text/dvipng ) screenshot? ( media-gfx/scrot ) spell? ( dev-perl/gtk2-spell ) dev-lang/perl[-build]
-0
-http://www.zim-wiki.org/downloads/Zim-0.28.tar.gz
-
-http://zim-wiki.org/
-GPL-2
-A desktop wiki
-~amd64 ~x86
-base eutils fdo-mime multilib perl-module portability toolchain-funcs user
-latex screenshot spell test
-
-
-
-2
-
-compile configure install postinst postrm prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-misc/zim-0.46 b/metadata/cache/x11-misc/zim-0.46
deleted file mode 100644
index 5543b8ceff51..000000000000
--- a/metadata/cache/x11-misc/zim-0.46
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( >=dev-lang/python-2.6 dev-python/simplejson ) dev-python/pygobject:2 dev-python/pygtk x11-libs/gtk+:2 x11-misc/xdg-utils graphviz? ( media-gfx/graphviz ) latex? ( virtual/latex-base app-text/dvipng ) screenshot? ( media-gfx/scrot ) spell? ( dev-python/gtkspell-python ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] =dev-lang/python-2.5*[sqlite] )
-|| ( >=dev-lang/python-2.6 dev-python/simplejson ) dev-python/pygobject:2 dev-python/pygtk x11-libs/gtk+:2 x11-misc/xdg-utils graphviz? ( media-gfx/graphviz ) latex? ( virtual/latex-base app-text/dvipng ) screenshot? ( media-gfx/scrot ) spell? ( dev-python/gtkspell-python ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] =dev-lang/python-2.5*[sqlite] )
-0
-http://zim-wiki.org/downloads/zim-0.46.tar.gz
-
-http://zim-wiki.org/
-GPL-2
-A desktop wiki
-~amd64 ~x86
-distutils eutils fdo-mime multilib portability python toolchain-funcs user virtualx
-graphviz latex screenshot spell test test
-
-
-
-3
-
-compile install postinst postrm prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/x11-misc/zim-0.47 b/metadata/cache/x11-misc/zim-0.47
deleted file mode 100644
index 69ac1f05829d..000000000000
--- a/metadata/cache/x11-misc/zim-0.47
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( >=dev-lang/python-2.6 dev-python/simplejson ) dev-python/pygtk x11-misc/xdg-utils >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] =dev-lang/python-2.5*[sqlite] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-graphviz? ( media-gfx/graphviz ) latex? ( virtual/latex-base app-text/dvipng ) screenshot? ( media-gfx/scrot ) spell? ( dev-python/gtkspell-python ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] =dev-lang/python-2.5*[sqlite] )
-0
-http://zim-wiki.org/downloads/zim-0.47.tar.gz
-
-http://zim-wiki.org/
-GPL-2
-A desktop wiki
-~amd64 ~x86
-distutils eutils fdo-mime multilib portability python toolchain-funcs user virtualx
-graphviz latex screenshot spell test test
-
-
-
-3
-
-compile install postinst postrm prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/x11-misc/zim-0.53 b/metadata/cache/x11-misc/zim-0.53
new file mode 100644
index 000000000000..dd24ef24a674
--- /dev/null
+++ b/metadata/cache/x11-misc/zim-0.53
@@ -0,0 +1,22 @@
+|| ( >=dev-lang/python-2.6 dev-python/simplejson ) dev-python/pygtk x11-misc/xdg-utils test? ( dev-vcs/bzr ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] =dev-lang/python-2.5*[sqlite] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+|| ( >=dev-lang/python-2.6 dev-python/simplejson ) dev-python/pygtk >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] =dev-lang/python-2.5*[sqlite] )
+0
+http://zim-wiki.org/downloads/zim-0.53.tar.gz
+
+http://zim-wiki.org/
+GPL-2
+A desktop wiki
+~amd64 ~x86
+distutils eutils fdo-mime multilib portability python toolchain-funcs user virtualx
+test test
+
+
+
+3
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 76561b90890e..a0025d93e9ea 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Nov 2011 04:36:43 +0000
+Thu, 17 Nov 2011 17:36:44 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 974845e7d296..8dd2e6dc6938 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Nov 2011 04:36:44 +0000
+Thu, 17 Nov 2011 17:36:45 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e3820007df55..45dd11854733 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Nov 2011 04:36:45 +0000
+Thu, 17 Nov 2011 17:36:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 08a0daa059f2..c5c282b4a36a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Nov 17 04:36:43 UTC 2011
+Thu Nov 17 17:06:54 UTC 2011
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 81750773447a..8e303c720250 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Nov 2011 05:00:01 +0000
+Thu, 17 Nov 2011 17:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3ffb8ea28556..4f9dbf08358f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1321504501 Thu Nov 17 04:35:01 2011 UTC
+1321549501 Thu Nov 17 17:05:01 2011 UTC
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 9add5e4aaa1e..133b97395a6d 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,6 +1,8 @@
DIST bind-9.7.3-P3.tar.gz 7586748 RMD160 456aed6a9c6e87de43d38860eaef2ee5d67e1f8e SHA1 90c5340daa94517e3bc7be89feef5ea6918fc390 SHA256 464e9aeeaf8d6964205621ead02898e076ebcfcbeef8c651dc695891c5622c37
+DIST bind-9.7.4-P1.tar.gz 8317704 RMD160 653b28820d81608f0e85d2321541902c8de2231f SHA1 bcc1dda52d1ba23f5b0e30ea3f7dd76c27f1c93f SHA256 e23ca1af22424d512094da2a175d8f9500e8b0b10cbd332714d211ea1abdd55d
DIST bind-9.7.4.tar.gz 8316839 RMD160 2da39514b7b79aa9a3c9ce10c239514dee610194 SHA1 a526bf9a7114988d895e7a9c5be175a8386c6904 SHA256 7cd5fbda1a7ea09914c8cdd04afbeb7d48617d02d9df0135cd9b0b7a1ca4a6bf
DIST bind-9.8.0-P1-geoip-1.3.patch 54084 RMD160 d695b9aea249f308525d0938504ad61685e4d17c SHA1 4c4e40fc448e9effe7f1190728d3b623fae75b0e SHA256 988dadad30c54becc388c925ede32647419e34ee0fc689699e54d5c0843e233b
+DIST bind-9.8.1-P1.tar.gz 8451969 RMD160 3183167d73a5da81e7e286a6eb123fc8684f4421 SHA1 1cff6594aa185d84942edd2f3cc06dff9cebb04b SHA256 867fdd52d3436c6ab6d357108d7f9eaaf03f1422652e6e61c742816ff7f87929
DIST bind-9.8.1.tar.gz 8450567 RMD160 a1a49ce0b1b6a5c6dd339fe160920cd4f39e2372 SHA1 7e6ed6ebc896b1de33a9f440233066c60539de4c SHA256 02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395ee7c92c
DIST bind-geoip-1.3-9.7.2-P2.patch 54084 RMD160 fcc2308bd2832df821f76aeb1ea1c5740fadb6f3 SHA1 786c2fd8dde40f235e292f5bd883094863976580 SHA256 c12c03fc25a679d8d4296142597c698ab934e18cc761113553062a66be2875dd
DIST bind-geoip-1.3-readme.txt 10040 RMD160 073956324ed4780e0e0cdbf40ae259f85ebef9d2 SHA1 e13ea2f458adfed3f1a20f9fe3eb2bfd484fc0b0 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845
diff --git a/net-dns/bind/bind-9.7.4_p1.ebuild b/net-dns/bind/bind-9.7.4_p1.ebuild
new file mode 100644
index 000000000000..c943c2ff2efa
--- /dev/null
+++ b/net-dns/bind/bind-9.7.4_p1.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.4_p1.ebuild,v 1.1 2011/11/17 17:20:34 idl0r Exp $
+
+EAPI="3"
+
+inherit eutils autotools toolchain-funcs flag-o-matic
+
+MY_PV="${PV/_p/-P}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+GEOIP_PV=1.3
+#GEOIP_PV_AGAINST="${MY_PV}"
+GEOIP_PV_AGAINST="9.7.2-P2"
+GEOIP_P="bind-geoip-${GEOIP_PV}"
+GEOIP_PATCH_A="${GEOIP_P}-${GEOIP_PV_AGAINST}.patch"
+GEOIP_DOC_A="${GEOIP_P}-readme.txt"
+GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
+ doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+ geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A}
+ ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} )
+ sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads
+ resolvconf urandom xml geoip gssapi sdb-ldap"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
+ mysql? ( >=virtual/mysql-4.0 )
+ odbc? ( >=dev-db/unixODBC-2.2.6 )
+ ldap? ( net-nds/openldap )
+ idn? ( net-dns/idnkit )
+ postgres? ( dev-db/postgresql-base )
+ threads? ( >=sys-libs/libcap-2.1.0 )
+ xml? ( dev-libs/libxml2 )
+ geoip? ( >=dev-libs/geoip-1.4.6 )
+ gssapi? ( virtual/krb5 )
+ sdb-ldap? ( net-nds/openldap )"
+
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-bind )
+ resolvconf? ( net-dns/openresolv )
+ sys-process/psmisc"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ use threads && {
+ ewarn
+ ewarn "If you're in vserver enviroment, you're probably want to"
+ ewarn "disable threads support because of linux capabilities dependency"
+ ewarn
+ }
+
+ ebegin "Creating named group and user"
+ enewgroup named 40
+ enewuser named 40 -1 /etc/bind named
+ eend ${?}
+}
+
+src_prepare() {
+ # Adjusting PATHs in manpages
+ for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+ sed -i \
+ -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+ -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+ -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+ "${i}" || die "sed failed, ${i} doesn't exist"
+ done
+
+ if use dlz; then
+ # bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse
+ # (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/)
+ if use mysql && has_version ">=dev-db/mysql-5"; then
+ epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
+ fi
+
+ if use odbc; then
+ epatch "${FILESDIR}/bind-9.7.3-odbc-dlz-detect.patch"
+ fi
+ fi
+
+ # should be installed by bind-tools
+ sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die
+
+ # sdb-ldap patch as per bug #160567
+ # Upstream URL: http://bind9-ldap.bayour.com/
+ # New patch take from bug 302735
+ if use sdb-ldap; then
+ epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+ cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named
+ cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools
+ cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools
+ fi
+
+ if use geoip; then
+ cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
+ sed -i -e 's:RELEASEVER=2:RELEASEVER=1:' \
+ ${GEOIP_PATCH_A} || die
+ epatch ${GEOIP_PATCH_A}
+ fi
+
+ # bug #220361
+ rm {aclocal,libtool}.m4
+ WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
+
+ # remove useless c++ checks
+ epunt_cxx
+}
+
+src_configure() {
+ local myconf=""
+
+ use dlz && {
+ myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
+ use postgres && myconf="${myconf} --with-dlz-postgres"
+ use mysql && myconf="${myconf} --with-dlz-mysql"
+ use berkdb && myconf="${myconf} --with-dlz-bdb"
+ use ldap && myconf="${myconf} --with-dlz-ldap"
+ use odbc && myconf="${myconf} --with-dlz-odbc"
+ }
+
+ if use threads; then
+ if use dlz && use mysql; then
+ ewarn
+ ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
+ ewarn "requires that each thread of an application execute a MySQL"
+ ewarn "\"thread initialization\" to setup the thread local storage."
+ ewarn "This is impossible to do safely while staying within the DLZ"
+ ewarn "driver API. This is a limitation caused by MySQL, and not"
+ ewarn "the DLZ API."
+ ewarn "Because of this BIND MUST only run with a single thread when"
+ ewarn "using the MySQL driver."
+ ewarn
+ myconf="${myconf} --disable-linux-caps --disable-threads"
+ ewarn "Threading support disabled"
+ else
+ myconf="${myconf} --enable-linux-caps --enable-threads"
+ einfo "Threading support enabled"
+ fi
+ else
+ myconf="${myconf} --disable-linux-caps --disable-threads"
+ fi
+
+ if use urandom; then
+ myconf="${myconf} --with-randomdev=/dev/urandom"
+ else
+ myconf="${myconf} --with-randomdev=/dev/random"
+ fi
+
+ use geoip && myconf="${myconf} --with-geoip"
+
+ # bug #158664
+ gcc-specs-ssp && replace-flags -O[23s] -O
+
+ export BUILD_CC=$(tc-getBUILD_CC)
+ econf \
+ --sysconfdir=/etc/bind \
+ --localstatedir=/var \
+ --with-libtool \
+ $(use_with ssl openssl) \
+ $(use_with idn) \
+ $(use_enable ipv6) \
+ $(use_with xml libxml2) \
+ $(use_with gssapi) \
+ ${myconf}
+
+ # bug #151839
+ echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ dodoc CHANGES FAQ README
+
+ if use idn; then
+ dodoc contrib/idn/README.idnkit || die
+ fi
+
+ if use doc; then
+ dodoc doc/arm/Bv9ARM.pdf || die
+
+ docinto misc
+ dodoc doc/misc/* || die
+
+ # might a 'html' useflag make sense?
+ docinto html
+ dohtml -r doc/arm/* || die
+
+ docinto draft
+ dodoc doc/draft/* || die
+
+ docinto rfc
+ dodoc doc/rfc/* || die
+
+ docinto contrib
+ dodoc contrib/named-bootconf/named-bootconf.sh \
+ contrib/nanny/nanny.pl || die
+
+ # some handy-dandy dynamic dns examples
+ cd "${D}"/usr/share/doc/${PF}
+ tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+ fi
+
+ use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
+
+ insinto /etc/bind
+ newins "${FILESDIR}"/named.conf-r5 named.conf || die
+
+ # ftp://ftp.rs.internic.net/domain/named.cache:
+ insinto /var/bind
+ doins "${FILESDIR}"/named.cache || die
+
+ insinto /var/bind/pri
+ newins "${FILESDIR}"/127.zone-r1 127.zone || die
+ newins "${FILESDIR}"/localhost.zone-r3 localhost.zone || die
+
+ newinitd "${FILESDIR}"/named.init-r11 named || die
+ newconfd "${FILESDIR}"/named.confd-r6 named || die
+
+ newenvd "${FILESDIR}"/10bind.env 10bind || die
+
+ # Let's get rid of those tools and their manpages since they're provided by bind-tools
+ rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
+ rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8*
+ rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+ rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+
+ dosym /var/bind/named.cache /var/bind/root.cache || die
+ dosym /var/bind/pri /etc/bind/pri || die
+ dosym /var/bind/sec /etc/bind/sec || die
+ dosym /var/bind/dyn /etc/bind/dyn || die
+ keepdir /var/bind/{pri,sec,dyn}
+
+ dodir /var/{run,log}/named || die
+
+ fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}
+ fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0750 /etc/bind /var/bind/pri
+ fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn}
+}
+
+pkg_postinst() {
+ if [ ! -f '/etc/bind/rndc.key' ]; then
+ if use urandom; then
+ einfo "Using /dev/urandom for generating rndc.key"
+ /usr/sbin/rndc-confgen -r /dev/urandom -a
+ echo
+ else
+ einfo "Using /dev/random for generating rndc.key"
+ /usr/sbin/rndc-confgen -a
+ echo
+ fi
+ chown root:named /etc/bind/rndc.key
+ chmod 0640 /etc/bind/rndc.key
+ fi
+
+ einfo
+ einfo "You can edit /etc/conf.d/named to customize named settings"
+ einfo
+ use mysql || use postgres || use ldap && {
+ elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+ elog "uncomment the specified rc_named_* lines in your"
+ elog "/etc/conf.d/named config to ensure they'll start before bind"
+ einfo
+ }
+ einfo "If you'd like to run bind in a chroot AND this is a new"
+ einfo "install OR your bind doesn't already run in a chroot:"
+ einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+ einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+ einfo
+
+ CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+ if [[ -n ${CHROOT} ]]; then
+ elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+ elog "To enable the old behaviour (without using mount) uncomment the"
+ elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+ elog "If you decide to use the new/default method, ensure to make backup"
+ elog "first and merge your existing configs/zones to /etc/bind and"
+ elog "/var/bind because bind will now mount the needed directories into"
+ elog "the chroot dir."
+ fi
+
+ ewarn
+ ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache"
+ ewarn "you may need to fix your named.conf!"
+ ewarn
+ ewarn "NOTE: If you upgrade from =dev-libs/openssl-0.9.6g )
+ mysql? ( >=virtual/mysql-4.0 )
+ odbc? ( >=dev-db/unixODBC-2.2.6 )
+ ldap? ( net-nds/openldap )
+ idn? ( net-dns/idnkit )
+ postgres? ( dev-db/postgresql-base )
+ caps? ( >=sys-libs/libcap-2.1.0 )
+ xml? ( dev-libs/libxml2 )
+ geoip? ( >=dev-libs/geoip-1.4.6 )
+ gssapi? ( virtual/krb5 )
+ sdb-ldap? ( net-nds/openldap )
+ gost? ( >=dev-libs/openssl-1.0.0 )"
+
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-bind )
+ sys-process/psmisc"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ ebegin "Creating named group and user"
+ enewgroup named 40
+ enewuser named 40 -1 /etc/bind named
+ eend ${?}
+}
+
+src_prepare() {
+ # Adjusting PATHs in manpages
+ for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+ sed -i \
+ -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+ -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+ -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+ "${i}" || die "sed failed, ${i} doesn't exist"
+ done
+
+ if use dlz; then
+ # bug 382269
+ epatch "${FILESDIR}/${P}-sdlz_helper.patch"
+
+ # bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse
+ # (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/)
+ if use mysql && has_version ">=dev-db/mysql-5"; then
+ epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
+ fi
+
+ if use odbc; then
+ epatch "${FILESDIR}/${PN}-9.7.3-odbc-dlz-detect.patch"
+ fi
+
+ # sdb-ldap patch as per bug #160567
+ # Upstream URL: http://bind9-ldap.bayour.com/
+ # New patch take from bug 302735
+ if use sdb-ldap; then
+ epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+ cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+ cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+ cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+ fi
+ fi
+
+ # should be installed by bind-tools
+ sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die
+
+ if use geoip; then
+ cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
+ epatch ${GEOIP_PATCH_A}
+ fi
+
+ # bug #220361
+ rm {aclocal,libtool}.m4
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=""
+
+ if use urandom; then
+ myconf="${myconf} --with-randomdev=/dev/urandom"
+ else
+ myconf="${myconf} --with-randomdev=/dev/random"
+ fi
+
+ use geoip && myconf="${myconf} --with-geoip"
+
+ # bug #158664
+# gcc-specs-ssp && replace-flags -O[23s] -O
+
+ export BUILD_CC=$(tc-getBUILD_CC)
+ econf \
+ --sysconfdir=/etc/bind \
+ --localstatedir=/var \
+ --with-libtool \
+ $(use_enable threads) \
+ $(use_with dlz dlopen) \
+ $(use_with dlz dlz-filesystem) \
+ $(use_with dlz dlz-stub) \
+ $(use_with postgres dlz-postgres) \
+ $(use_with mysql dlz-mysql) \
+ $(use_with berkdb dlz-bdb) \
+ $(use_with ldap dlz-ldap) \
+ $(use_with odbc dlz-odbc) \
+ $(use_with ssl openssl) \
+ $(use_with idn) \
+ $(use_enable ipv6) \
+ $(use_with xml libxml2) \
+ $(use_with gssapi) \
+ $(use_enable rpz rpz-nsip) \
+ $(use_enable rpz rpz-nsdname) \
+ $(use_with pkcs11) \
+ $(use_enable caps linux-caps) \
+ $(use_with gost) \
+ ${myconf}
+
+ # bug #151839
+ echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ dodoc CHANGES FAQ README
+
+ if use idn; then
+ dodoc contrib/idn/README.idnkit || die
+ fi
+
+ if use doc; then
+ dodoc doc/arm/Bv9ARM.pdf || die
+
+ docinto misc
+ dodoc doc/misc/* || die
+
+ # might a 'html' useflag make sense?
+ docinto html
+ dohtml -r doc/arm/* || die
+
+ docinto draft
+ dodoc doc/draft/* || die
+
+ docinto rfc
+ dodoc doc/rfc/* || die
+
+ docinto contrib
+ dodoc contrib/named-bootconf/named-bootconf.sh \
+ contrib/nanny/nanny.pl || die
+
+ # some handy-dandy dynamic dns examples
+ cd "${D}"/usr/share/doc/${PF}
+ tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+ fi
+
+ use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
+
+ insinto /etc/bind
+ newins "${FILESDIR}"/named.conf-r5 named.conf || die
+
+ # ftp://ftp.rs.internic.net/domain/named.cache:
+ insinto /var/bind
+ doins "${FILESDIR}"/named.cache || die
+
+ insinto /var/bind/pri
+ newins "${FILESDIR}"/127.zone-r1 127.zone || die
+ newins "${FILESDIR}"/localhost.zone-r3 localhost.zone || die
+
+ newinitd "${FILESDIR}"/named.init-r11 named || die
+ newconfd "${FILESDIR}"/named.confd-r6 named || die
+
+ if use gost; then
+ sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
+ else
+ sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
+ fi
+
+ newenvd "${FILESDIR}"/10bind.env 10bind || die
+
+ # Let's get rid of those tools and their manpages since they're provided by bind-tools
+ rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
+ rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8*
+ rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+ rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+
+ dosym /var/bind/named.cache /var/bind/root.cache || die
+ dosym /var/bind/pri /etc/bind/pri || die
+ dosym /var/bind/sec /etc/bind/sec || die
+ dosym /var/bind/dyn /etc/bind/dyn || die
+ keepdir /var/bind/{pri,sec,dyn}
+
+ dodir /var/{run,log}/named || die
+
+ fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}
+ fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0750 /etc/bind /var/bind/pri
+ fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn}
+}
+
+pkg_postinst() {
+ if [ ! -f '/etc/bind/rndc.key' ]; then
+ if use urandom; then
+ einfo "Using /dev/urandom for generating rndc.key"
+ /usr/sbin/rndc-confgen -r /dev/urandom -a
+ echo
+ else
+ einfo "Using /dev/random for generating rndc.key"
+ /usr/sbin/rndc-confgen -a
+ echo
+ fi
+ chown root:named /etc/bind/rndc.key
+ chmod 0640 /etc/bind/rndc.key
+ fi
+
+ einfo
+ einfo "You can edit /etc/conf.d/named to customize named settings"
+ einfo
+ use mysql || use postgres || use ldap && {
+ elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+ elog "uncomment the specified rc_named_* lines in your"
+ elog "/etc/conf.d/named config to ensure they'll start before bind"
+ einfo
+ }
+ einfo "If you'd like to run bind in a chroot AND this is a new"
+ einfo "install OR your bind doesn't already run in a chroot:"
+ einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+ einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+ einfo
+
+ CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+ if [[ -n ${CHROOT} ]]; then
+ elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+ elog "To enable the old behaviour (without using mount) uncomment the"
+ elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+ elog "If you decide to use the new/default method, ensure to make backup"
+ elog "first and merge your existing configs/zones to /etc/bind and"
+ elog "/var/bind because bind will now mount the needed directories into"
+ elog "the chroot dir."
+ fi
+
+ ewarn
+ ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache"
+ ewarn "you may need to fix your named.conf!"
+ ewarn
+ ewarn "NOTE: If you upgrade from =net-mail/mailbase-0.00-r8"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use managesieve && ! use sieve; then
+ ewarn "managesieve USE flag selected but sieve USE flag unselected"
+ ewarn "sieve USE flag will be turned on"
+ fi
+
+ # Add user and group for login process (same as for fedora/redhat)
+ # default internal user
+ enewgroup dovecot 97
+ enewuser dovecot 97 -1 /dev/null dovecot
+ # add "mail" group for suid'ing. Better security isolation.
+ if use suid; then
+ enewgroup mail
+ fi
+ # default login user
+ enewuser dovenull -1 -1 /dev/null
+}
+
+src_configure() {
+ local conf=""
+
+ if use postgres || use mysql || use sqlite; then
+ conf="${conf} --with-sql"
+ fi
+
+ local storages=""
+ for storage in cydir sdbox mdbox maildir mbox; do
+ use ${storage} && storages="${storage} ${storages}"
+ done
+ [ "${storages}" ] || storages="maildir"
+
+ # turn valgrind tests off. Bug #340791
+ VALGRIND=no econf \
+ --localstatedir="${EPREFIX}/var" \
+ --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+ $( use_with bzip2 bzlib ) \
+ $( use_with caps libcap ) \
+ $( use_with kerberos gssapi ) \
+ $( use_with ldap ) \
+ $( use_with mysql ) \
+ $( use_with pam ) \
+ $( use_with postgres pgsql ) \
+ $( use_with sqlite ) \
+ $( use_with ssl ) \
+ $( use_with vpopmail ) \
+ $( use_with zlib ) \
+ $( use_enable static-libs static ) \
+ --with-storages="${storages}" \
+ --disable-rpath \
+ --without-systemdsystemunitdir \
+ ${conf}
+
+ if use sieve || use managesieve ; then
+ # The sieve plugin needs this file to be build to determine the plugin
+ # directory and the list of libraries to link to.
+ emake dovecot-config || die "emake dovecot-config failed"
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ econf \
+ $( use_enable static-libs static ) \
+ --localstatedir="${EPREFIX}/var" \
+ --enable-shared \
+ --with-dovecot="../${MY_P}" \
+ $( use_with managesieve )
+ fi
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+ fi
+}
+
+src_test() {
+ default_src_test
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ default_src_test
+ fi
+}
+
+src_install () {
+ emake DESTDIR="${ED}" install
+
+ # insecure:
+ # use suid && fperms u+s /usr/libexec/dovecot/deliver
+ # better:
+ if use suid;then
+ einfo "Changing perms to allow deliver to be suided"
+ fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fi
+
+ newinitd "${FILESDIR}"/dovecot.init-r3 dovecot
+
+ rm -rf "${ED}"/usr/share/doc/dovecot
+
+ dodoc AUTHORS NEWS README TODO
+ dodoc doc/*.{txt,cnf,xml,sh}
+ docinto example-config
+ dodoc doc/example-config/*.{conf,ext}
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.{conf,ext}
+ docinto wiki
+ dodoc doc/wiki/*
+ doman doc/man/*.{1,7}
+
+ # Create the dovecot.conf file from the dovecot-example.conf file that
+ # the dovecot folks nicely left for us....
+ local conf="${ED}/etc/dovecot/dovecot.conf"
+ local confd="${ED}/etc/dovecot/conf.d"
+
+ insinto /etc/dovecot
+ doins doc/example-config/*.{conf,ext}
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/*.{conf,ext}
+ fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+ rm -f "${confd}/../README"
+
+ # .maildir is the Gentoo default
+ local mail_location="maildir:~/.maildir"
+ if ! use maildir; then
+ if use mbox; then
+ mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+ keepdir /var/dovecot
+ sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+ "${confd}/10-mail.conf" || die "sed failed"
+ elif use sdbox ; then
+ mail_location="sdbox:~/.sdbox"
+ elif use mdbox ; then
+ mail_location="mdbox:~/.mdbox"
+ fi
+ fi
+ sed -i -e \
+ "s|#mail_location =|mail_location = ${mail_location}|" \
+ "${confd}/10-mail.conf" \
+ || die "failed to update mail location settings in 10-mail.conf"
+
+ # We're using pam files (imap and pop3) provided by mailbase
+ if use pam; then
+ sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+ "${confd}/auth-system.conf.ext" \
+ || die "failed to update PAM settings in auth-system.conf.ext"
+ # mailbase does not provide a sieve pam file
+ use managesieve && dosym imap /etc/pam.d/sieve
+ sed -i -e \
+ 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update PAM settings in 10-auth.conf"
+ fi
+
+ # Disable ipv6 if necessary
+ if ! use ipv6; then
+ sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+ || die "failed to update listen settings in dovecot.conf"
+ fi
+
+ # Update ssl cert locations
+ if use ssl; then
+ sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+ || die "ssl conf failed"
+ sed -i -e 's:^ssl_cert =.*:ssl_cert = =dev-python/pycrypto-2.0
diff --git a/profiles/package.mask b/profiles/package.mask
index 22f370b088e1..7ea09e1aa53b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13249 2011/11/16 13:34:08 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13250 2011/11/17 16:11:03 jer Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -128,6 +128,7 @@ x11-themes/polyester
=www-client/opera-11.60.1144
=www-client/opera-11.60.1145
=www-client/opera-11.60.1150
+=www-client/opera-11.60.1159
# Alexis Ballier (04 Nov 2011)
# Pre-releases of vlc 1.2. Mask it until final version is out
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 81c0c58de262..5cfb2b5cf125 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -510,6 +510,7 @@ app-i18n/ibus-mozc:scim - Enable support for app-i18n/scim
app-i18n/ibus-pinyin:boost - Compile against dev-libs/boost libraries
app-i18n/ibus-pinyin:opencc - Enable support for app-i18n/opencc
app-i18n/ibus-table-xingma:extra-phrases - Add extra phrases into builded Engine
+app-i18n/ibus-unikey:gtk3 - Enable support for gtk+3
app-i18n/im-ja:anthy - Support for Anthy input method
app-i18n/im-ja:skk - Support for SKK input method
app-i18n/imsettings:xfconf - Enable integration in the Xfce desktop environment with xfce-base/xfconf
@@ -4280,6 +4281,7 @@ sci-libs/gerris:dx - Enable support for sci-visualization/opendx
sci-libs/getdata:fortran - Build fortran bindings
sci-libs/getdata:python - Build python bindings
sci-libs/gsl:cblas-external - Link gsl with external cblas provided by (virtual/cblas) instead of shipped internal version
+sci-libs/hdf5:fortran2003 - enable new features that require Fortran 2003 (http://www.hdfgroup.org/HDF5/doc/fortran/NewFeatures_F2003.pdf)
sci-libs/indilib:fits - Enable support for the FITS image format through cfitsio
sci-libs/indilib:nova - Enable support for nova celestial mechanics calculations
sci-libs/libcmatrix:atlas - Use of atlas blas implementation
diff --git a/sci-geosciences/mapserver/mapserver-6.0.1.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1.ebuild
index 4c0eec071786..680aa92dca17 100644
--- a/sci-geosciences/mapserver/mapserver-6.0.1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-6.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1.ebuild,v 1.1 2011/07/22 22:52:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1.ebuild,v 1.2 2011/11/17 11:33:21 jlec Exp $
EAPI=3
@@ -22,10 +22,10 @@ PYTHON_MODNAME="mapscript.py"
WEBAPP_MANUAL_SLOT=yes
-inherit eutils autotools depend.apache webapp distutils perl-module php-ext-source-r2 # ruby-ng
+inherit eutils autotools depend.apache webapp distutils perl-module php-ext-source-r2 multilib # ruby-ng
-DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications."
-HOMEPAGE="http://mapserver.org"
+DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications"
+HOMEPAGE="http://mapserver.org/"
SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
LICENSE="MIT"
@@ -135,7 +135,7 @@ src_configure() {
fi
# some scripts require configure time options so place it here
- use php && myopts+=" --with-php=${EPREFIX}/usr/lib64/php5.3/include/php/"
+ use php && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.3/include/php/"
# sde is ESRI package that you have to buy first
# oraclespatial needs oracle server for testing/usage
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
index 8fc68c6cf090..5ec7d05f679b 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -1,13 +1,13 @@
-sci-geosciences
-
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index d579d79289ef..3a800536cd90 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,2 +1,3 @@
DIST hdf5-1.8.4.tar.gz 7181176 RMD160 e448e2326b55aa89ff0bd7488cd4291d6c5485ee SHA1 37877e29c49a6af3e23aa9ad798ef12b8ba1c05c SHA256 a992fce9387a17f175b3b188dc2a42f545a3057aeb141beb3fc3361c7521f465
DIST hdf5-1.8.7.tar.bz2 5710170 RMD160 34641bf8e664c3b3382d1346a65e2f5c3eb485ee SHA1 be1daff26f066aca0b5be52d86dada6757fc4b95 SHA256 771761c9bec30b9a4137fa59ef88fdafdb0f4f35d1db0fd655f2591d19570fec
+DIST hdf5-1.8.8.tar.bz2 5827394 RMD160 077580c9828747473836cc39f8cb3fd4e5e045d9 SHA1 1bc16883ecd631840b70857bea637a06eb0155da SHA256 b0ebb0b5478c6c0427631d4ad08f96e39f1b09fde615aa98d2a1b8fb7f6dced3
diff --git a/sci-libs/hdf5/files/hdf5-1.8.8-buildsystem.patch b/sci-libs/hdf5/files/hdf5-1.8.8-buildsystem.patch
new file mode 100644
index 000000000000..0f85cf5ed245
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.8.8-buildsystem.patch
@@ -0,0 +1,33 @@
+Prevent build system with messing up LD_LIBRARY_PATH
+
+--- a/configure.in
++++ b/configure.in
+@@ -2328,8 +2328,6 @@
+ dnl
+ AC_MSG_CHECKING([how to print long long])
+ AC_CACHE_VAL([hdf5_cv_printf_ll],
+-LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $AM_LDFLAGS $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`"
+-export LD_LIBRARY_PATH
+
+ for hdf5_cv_printf_ll in l ll L q unknown; do
+ AC_TRY_RUN([
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -125,8 +125,6 @@
+ # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
+ # is set to ignore the error.
+ H5Tinit.c: H5detect$(EXEEXT)
+- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \
+- sed -e 's/-L/:/g' -e 's/ //g'`" \
+ $(RUNSERIAL) ./H5detect$(EXEEXT) > $@ || \
+ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
+ ($(RM) $@ ; exit 1)
+@@ -137,8 +135,6 @@
+ # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
+ # is set to ignore the error.
+ H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings
+- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \
+- sed -e 's/-L/:/g' -e 's/ //g'`" \
+ $(RUNSERIAL) ./H5make_libsettings$(EXEEXT) > $@ || \
+ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
+ ($(RM) $@ ; exit 1)
diff --git a/sci-libs/hdf5/hdf5-1.8.8.ebuild b/sci-libs/hdf5/hdf5-1.8.8.ebuild
new file mode 100644
index 000000000000..3310cb052610
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.8.8.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.8.ebuild,v 1.1 2011/11/17 12:19:37 xarthisius Exp $
+
+EAPI=4
+
+inherit autotools eutils fortran-2
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="http://www.hdfgroup.org/HDF5/"
+SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${P}/src/${P}.tar.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx debug examples fortran fortran2003 mpi static-libs szip threads zlib"
+REQUIRED_USE="fortran2003? ( fortran )"
+
+RDEPEND="
+ fortran? ( virtual/fortran )
+ mpi? ( virtual/mpi[romio] )
+ szip? ( >=sci-libs/szip-2.1 )
+ zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+ sys-devel/libtool:2"
+
+pkg_setup() {
+ if use fortran; then
+ use fortran2003 && FORTRAN_STANDARD=2003
+ fortran-2_pkg_setup
+ fi
+ if use mpi; then
+ if has_version 'sci-libs/hdf5[-mpi]'; then
+ ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
+ ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
+ fi
+ if use cxx; then
+ ewarn "Simultaneous mpi and cxx is not supported by ${PN}"
+ ewarn "Will disable cxx interface"
+ fi
+ export CC=mpicc
+ use fortran && export FC=mpif90
+ elif has_version 'sci-libs/hdf5[mpi]'; then
+ ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
+ ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-buildsystem.patch
+ # respect gentoo examples directory
+ sed \
+ -e "s:hdf5_examples:doc/${PF}/examples:g" \
+ -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
+ sed \
+ -e '/docdir/d' \
+ -i config/commence.am || die
+ eautoreconf
+ # enable shared libs by default for h5cc config utility
+ sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in || die
+}
+
+src_configure() {
+ # threadsafe incompatible with many options
+ local myconf="--disable-threadsafe"
+ use debug && myconf="${myconf} --enable-codestack"
+ use threads && ! use fortran && ! use cxx && ! use mpi \
+ && myconf="--enable-threadsafe"
+
+ if use mpi; then
+ myconf="${myconf} --disable-cxx"
+ else
+ # workaround for bug 285148
+ if use cxx; then
+ myconf="${myconf} $(use_enable cxx) CXX=$(tc-getCXX)"
+ fi
+ if use fortran; then
+ myconf="${myconf} FC=$(tc-getFC)"
+ fi
+ fi
+
+ econf \
+ --disable-sharedlib-rpath \
+ --enable-production \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --enable-deprecated-symbols \
+ --enable-shared \
+ --disable-silent-rules \
+ $(use_enable static-libs static) \
+ $(use_enable debug debug all) \
+ $(use_enable fortran) \
+ $(use_enable fortran2003) \
+ $(use_enable mpi parallel) \
+ $(use_with szip szlib) \
+ $(use_with threads pthread) \
+ $(use_with zlib) \
+ ${myconf}
+}
+
+src_install() {
+ default
+ use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+
+ if use examples; then
+ emake DESTDIR="${D}" install-examples
+ fi
+}
diff --git a/sci-libs/hdf5/metadata.xml b/sci-libs/hdf5/metadata.xml
index 2058812bfd6c..6b6f68735c02 100644
--- a/sci-libs/hdf5/metadata.xml
+++ b/sci-libs/hdf5/metadata.xml
@@ -2,10 +2,18 @@
sci
+
+ xarthisius@gentoo.org
+ Kacper Kowalik
+
- HDF5 is a file format and library for storing scientific data. HDF5
- was designed and implemented to address the deficiencies of HDF4.x. It
- has a more powerful and flexible data model, supports files larger
- than 2 GB, and supports parallel I/O.
-
+ HDF5 is a file format and library for storing scientific data. HDF5
+ was designed and implemented to address the deficiencies of HDF4.x. It
+ has a more powerful and flexible data model, supports files larger
+ than 2 GB, and supports parallel I/O.
+
+
+ enable new features that require Fortran 2003
+ (http://www.hdfgroup.org/HDF5/doc/fortran/NewFeatures_F2003.pdf)
+
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index 5b12859cbd90..345d1a379bcf 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,6 +1,4 @@
DIST gradm-2.1.14-201005041005.tar.gz 69437 RMD160 0696b1d10980afcb689f75eea5c06405387e9c40 SHA1 9825bd606f90f207392a99a00e685050a1cccb88 SHA256 0728581a7b42474e573188cafce29eaaddb0eca8bb0a6a851efcd001b5c5266f
-DIST gradm-2.2.0-201011061849.tar.gz 69493 RMD160 5d4fd5b1689150a92a7b5f46a9168d5383f98924 SHA1 63ad48ed785baf0ed3543300e826657877b9d9c2 SHA256 00f473105c6e09c1549de85266fbac0556acef271a5c544783bbf0ebdbb264d9
DIST gradm-2.2.1-201012301333.tar.gz 74036 RMD160 d342e6cc24e1cdef44ec1a345a3fd15c84b7a128 SHA1 6a8da5f9958effdd4c4f056c4a1f3c544bb5b5e2 SHA256 a55a6e0dda7a3575838dee136d34261f922d507fedda379f69a59b0806b4ab9e
-DIST gradm-2.2.2-201109281554.tar.gz 76076 RMD160 e359a33d3bfbb37afbe2f37f3b2c7afe80dfb67a SHA1 7c351c73bc6f6322b3c1458b2b012f60840d2d87 SHA256 b5bbd3c8a51ff1dbe4bf24fcfc1ab12684b9e68cb7be476701710d9cf0afe374
DIST gradm-2.2.2-201110180832.tar.gz 76675 RMD160 6da57614af8cbf17d13554202a0fafc0930db31c SHA1 e732e0b801935ac7fa94c858e40f0295afae4c71 SHA256 0e7fa1aae693e3e5825f666e27c087fd373b42b63b88fa9b85ee68dc2b69a791
DIST gradm-2.2.2-201111011031.tar.gz 76910 RMD160 0665892f454255ddd72e49c13de662052f10ca2a SHA1 852d4d2c84a6a976e61e510f2bddc86f98de477e SHA256 d2c95d9ddb41c23b313cd193b542d008453386914be8e4516a3f024d2306b441
diff --git a/sys-apps/gradm/files/gradm-2.2.2.201109281554.patch b/sys-apps/gradm/files/gradm-2.2.2.201109281554.patch
deleted file mode 100644
index cd878eee55f9..000000000000
--- a/sys-apps/gradm/files/gradm-2.2.2.201109281554.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur gradm2.orig/Makefile gradm2/Makefile
---- gradm2.orig/Makefile 2011-03-26 14:46:14.000000000 -0400
-+++ gradm2/Makefile 2011-03-27 11:11:36.000000000 -0400
-@@ -18,16 +18,16 @@
- BISON=/usr/bin/bison
- #YACC := $(shell if [ -x $(BYACC) ]; then echo $(BYACC); else echo $(BISON); fi)
- YACC=$(BISON)
--MKNOD=/bin/mknod
-+MKNOD=true
- #for dietlibc
- #CC=/usr/bin/diet /usr/bin/gcc
- CC=/usr/bin/gcc
- FIND=/usr/bin/find
--STRIP=/usr/bin/strip
-+STRIP=true
- LIBS := $(shell if [ "`uname -m`" != "sparc64" -a "`uname -m`" != "x86_64" ]; then echo "-lfl" ; else echo "" ; fi)
- OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi)
--CFLAGS := $(OPT_FLAGS) -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE
--LDFLAGS=
-+CFLAGS := $(OPT_FLAGS) -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE $(CFLAGS)
-+LDFLAGS+=
- INSTALL = /usr/bin/install -c
-
- # FHS
-@@ -134,6 +134,7 @@
- $(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 13 ; \
- fi \
- fi
-+ @mkdir -p $(DESTDIR)/etc/udev/rules.d
- @if [ -d $(DESTDIR)/etc/udev/rules.d ] ; then \
- echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
- echo "KERNEL==\"grsec\", MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
diff --git a/sys-apps/gradm/files/gradm-udev.patch b/sys-apps/gradm/files/gradm-udev.patch
deleted file mode 100644
index b8d892816582..000000000000
--- a/sys-apps/gradm/files/gradm-udev.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.orig 2010-08-13 21:39:07.000000000 -0400
-+++ Makefile 2010-08-13 21:40:54.000000000 -0400
-@@ -18,16 +18,16 @@
- BISON=/usr/bin/bison
- #YACC := $(shell if [ -x $(BYACC) ]; then echo $(BYACC); else echo $(BISON); fi)
- YACC=$(BISON)
--MKNOD=/bin/mknod
-+MKNOD=true
- #for dietlibc
- #CC=/usr/bin/diet /usr/bin/gcc
- CC=/usr/bin/gcc
- FIND=/usr/bin/find
--STRIP=/usr/bin/strip
-+STRIP=true
- LIBS := $(shell if [ "`uname -m`" != "sparc64" ]; then echo "-lfl" ; else echo "" ; fi)
- OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi)
- CFLAGS := $(OPT_FLAGS) -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE
--LDFLAGS=
-+LDFLAGS+=
- INSTALL = /usr/bin/install -c
-
- # FHS
-@@ -134,6 +134,7 @@
- $(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 13 ; \
- fi \
- fi
-+ @mkdir -p $(DESTDIR)/etc/udev/rules.d
- @if [ -d $(DESTDIR)/etc/udev/rules.d ] ; then \
- echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
- echo "KERNEL==\"grsec\", MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
diff --git a/sys-apps/gradm/gradm-2.2.0.201011061849.ebuild b/sys-apps/gradm/gradm-2.2.0.201011061849.ebuild
deleted file mode 100644
index d4ac900e94a5..000000000000
--- a/sys-apps/gradm/gradm-2.2.0.201011061849.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.2.0.201011061849.ebuild,v 1.3 2011/05/03 15:23:01 blueness Exp $
-
-EAPI=2
-
-inherit flag-o-matic toolchain-funcs versionator
-
-MY_PV="$(replace_version_separator 3 -)"
-
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND="sys-devel/bison
- sys-devel/flex
- pam? ( virtual/pam )
- sys-apps/paxctl"
-
-S="${WORKDIR}/${PN}2"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-udev.patch"
-}
-
-src_compile() {
- local target
- use pam || target="nopam"
-
- emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
- einstall DESTDIR="${D}" || die "einstall failed"
- fperms 711 /sbin/gradm
-}
-
-pkg_postinst() {
- local UDEVADM="/sbin/udevadm"
- if [[ -x ${UDEVADM} ]] ; then
- $UDEVADM trigger --action=add --sysname-match=grsec
- fi
- einfo
- ewarn
- ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
- ewarn "This version of gradm is only supported with hardened-sources >= 2.6.32-r10"
- ewarn
- einfo
-}
diff --git a/sys-apps/gradm/gradm-2.2.2.201109281554.ebuild b/sys-apps/gradm/gradm-2.2.2.201109281554.ebuild
deleted file mode 100644
index e52edf0b2077..000000000000
--- a/sys-apps/gradm/gradm-2.2.2.201109281554.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.2.2.201109281554.ebuild,v 1.2 2011/10/19 21:58:39 blueness Exp $
-
-EAPI=4
-
-inherit flag-o-matic toolchain-funcs versionator
-
-MY_PV="$(replace_version_separator 3 -)"
-
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="http://dev.gentoo.org/~blueness/hardened-sources/gradm/${PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND="sys-devel/bison
- sys-devel/flex
- pam? ( virtual/pam )
- sys-apps/paxctl"
-
-S="${WORKDIR}/${PN}2"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}.patch"
-}
-
-src_compile() {
- local target
- use pam || target="nopam"
-
- emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
- einstall DESTDIR="${D}"
- fperms 711 /sbin/gradm
-}
-
-pkg_postinst() {
- local UDEVADM="/sbin/udevadm"
- if [[ -x ${UDEVADM} ]] ; then
- $UDEVADM trigger --action=add --sysname-match=grsec
- fi
- einfo
- ewarn
- ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
- ewarn "This version of gradm is only supported with hardened-sources >= 2.6.32-r10"
- ewarn
- einfo
-}
diff --git a/sys-apps/gradm/gradm-2.2.2.201111011031.ebuild b/sys-apps/gradm/gradm-2.2.2.201111011031.ebuild
index 0b8328d4ad1f..e42c2d9c1709 100644
--- a/sys-apps/gradm/gradm-2.2.2.201111011031.ebuild
+++ b/sys-apps/gradm/gradm-2.2.2.201111011031.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.2.2.201111011031.ebuild,v 1.1 2011/11/02 09:40:59 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.2.2.201111011031.ebuild,v 1.2 2011/11/17 14:13:42 blueness Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~blueness/hardened-sources/gradm/${PN}-${MY_PV}.t
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
IUSE="pam"
RDEPEND=""
diff --git a/sys-apps/less/less-445-r1.ebuild b/sys-apps/less/less-445-r1.ebuild
index 88fe4b8f3439..a6109183bdec 100644
--- a/sys-apps/less/less-445-r1.ebuild
+++ b/sys-apps/less/less-445-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-445-r1.ebuild,v 1.1 2011/11/09 18:43:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-445-r1.ebuild,v 1.2 2011/11/17 16:24:26 ulm Exp $
EAPI="2"
@@ -16,7 +16,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="pcre unicode"
-DEPEND="app-misc/editor-wrapper
+DEPEND=">=app-misc/editor-wrapper-3
>=sys-libs/ncurses-5.2
pcre? ( dev-libs/libpcre )"
RDEPEND="${DEPEND}"
@@ -39,7 +39,7 @@ src_configure() {
econf \
--with-regex=${regex} \
- --with-editor=/usr/libexec/gentoo-editor
+ --with-editor=/usr/libexec/editor
}
src_install() {
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6d6f7f699ec6..8ca2eb8f9890 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,11 +1,11 @@
DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bfd31b4 SHA1 a0c35facd342cc32a4e713925809e72530b98ec9 SHA256 c9d47d2211fa5feec398bc155cf64ec911fb30eb11a32a9ae7ca38dbeb9b37de
-DIST portage-2.1.10.32.tar.bz2 907107 RMD160 69f6b34d051a1ba3bafe8c80b3cb4d376e334475 SHA1 ff1d7a47a6fc11f4ad95b11744decb8ebb523e00 SHA256 d67b3b9ae868e8e8087f43f146ae41431604cf0fcbd3a0495bd8167239c62da2
DIST portage-2.1.10.34.tar.bz2 909716 RMD160 2c0e20e61610455de0052d4838234afc5ba9686b SHA1 4503f44f6ff8697278ff43d7e765395866771d80 SHA256 4fae827653cc4a8848d37fcc2194af3ac35b5372dcfa599e494c79bdf5d491a5
+DIST portage-2.1.10.35.tar.bz2 910465 RMD160 0acdc29ccbb065d37982391e4f35fe87aafa5f64 SHA1 cc74e62678900bb8a500381e56946ae1887dbb07 SHA256 b7a2f5157a93ee819313955eba2fc60680e15e6d3bb0beb6f97de58d04274581
DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c
DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647
DIST portage-2.1.9.42.tar.bz2 764537 RMD160 7bfef7fb167c986e36532416a0ed4b914f0a9809 SHA1 d5593b09781dae537198197adc3c1d7f7fb466f7 SHA256 1bd238065eca36aaae11607482ae43b20c64f338db7401a46c11ab56d6ff72ba
DIST portage-2.2.0_alpha51.tar.bz2 848918 RMD160 84c771624d4f89d7017fd90d522a008e47b68345 SHA1 b8f09497e49af0e669014332511179c305fb4782 SHA256 3b695242c4a7f69d1b0863a82220ccd17512e018e404f279e2ddba7b7d29deb5
-DIST portage-2.2.0_alpha72.tar.bz2 906984 RMD160 d7af4b5e566d2706fc5bb6334de0cde1d8b3adb1 SHA1 cd1ffa7b5a50a6b6f747cb238c1535530b08d061 SHA256 ca30c06aa33be96d67a05032e6cf0a34fee4454d5e5bc525e18e96fc764be9a3
DIST portage-2.2.0_alpha74.tar.bz2 909710 RMD160 43bd737fed5afebdda6a9809e9ba7e442beb0357 SHA1 f70b309a80da4456663920eb21bc4219924895ba SHA256 9552511676e2b714631a1ef20073268bede65a073a0bde73b51d97b0dd9a0202
+DIST portage-2.2.0_alpha75.patch.bz2 4639 RMD160 801c8a8370f8f515da42237a5006a70cde86d182 SHA1 ec5ec045e9ff27689cb34f7c83ac3a48338b5c18 SHA256 41a1c047e83020bedc3f082fa0d53fc9baeb980917474663ac7c8931c8c5af5d
DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
diff --git a/sys-apps/portage/portage-2.1.10.32.ebuild b/sys-apps/portage/portage-2.1.10.35.ebuild
similarity index 94%
rename from sys-apps/portage/portage-2.1.10.32.ebuild
rename to sys-apps/portage/portage-2.1.10.35.ebuild
index 9a5dabda4091..abee4283b6b5 100644
--- a/sys-apps/portage/portage-2.1.10.32.ebuild
+++ b/sys-apps/portage/portage-2.1.10.35.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.32.ebuild,v 1.2 2011/11/12 16:16:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.35.ebuild,v 1.1 2011/11/17 06:19:41 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -329,8 +329,11 @@ pkg_preinst() {
chmod g+ws "${ROOT}var/log/portage"
fi
- [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
- REPO_LAYOUT_CONF_WARN=$?
+ [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
+ && REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
+
+ has_version "<${CATEGORY}/${PN}-2.1.10.34" \
+ && QUIET_BUILD_WARN=true || QUIET_BUILD_WARN=false
}
pkg_postinst() {
@@ -338,7 +341,7 @@ pkg_postinst() {
# will be identified and removed in postrm.
python_mod_optimize /usr/$(get_libdir)/portage/pym
- if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
+ if $REPO_LAYOUT_CONF_WARN ; then
ewarn
echo "If you want overlay eclasses to override eclasses from" \
"other repos then see the portage(5) man page" \
@@ -347,6 +350,17 @@ pkg_postinst() {
| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
ewarn
fi
+
+ if $QUIET_BUILD_WARN ; then
+ elog
+ echo "NOTE: Beginning with portage-2.1.10.34, the emerge" \
+ "--quiet-build option is enabled by default." \
+ "Set --quiet-build=n in EMERGE_DEFAULT_OPTS if" \
+ "you want to disable it by default. See the emerge(1)" \
+ "man page for more information about this option." \
+ | fmt -w 75 | while read -r ; do elog "$REPLY" ; done
+ elog
+ fi
}
pkg_postrm() {
diff --git a/sys-apps/portage/portage-2.2.0_alpha72.ebuild b/sys-apps/portage/portage-2.2.0_alpha75.ebuild
similarity index 94%
rename from sys-apps/portage/portage-2.2.0_alpha72.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha75.ebuild
index 6cafdff2ed38..d721f047d506 100644
--- a/sys-apps/portage/portage-2.2.0_alpha72.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha75.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha72.ebuild,v 1.3 2011/11/12 16:16:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha75.ebuild,v 1.1 2011/11/17 06:21:22 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -61,7 +61,7 @@ prefix_src_archives() {
PV_PL="2.1.2"
PATCHVER_PL=""
-TARBALL_PV=2.2.0_alpha72
+TARBALL_PV=2.2.0_alpha74
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
@@ -320,21 +320,21 @@ pkg_preinst() {
rm "${ROOT}/etc/make.globals"
fi
- has_version "<${CATEGORY}/${PN}-2.2_alpha"
- MINOR_UPGRADE=$?
+ has_version "<${CATEGORY}/${PN}-2.2_alpha" \
+ && MINOR_UPGRADE=true || MINOR_UPGRADE=false
- has_version "<=${CATEGORY}/${PN}-2.2_pre5"
- WORLD_MIGRATION_UPGRADE=$?
+ has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
+ && WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
# If portage-2.1.6 is installed and the preserved_libs_registry exists,
# assume that the NEEDED.ELF.2 files have already been generated.
has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
- ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \
- has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
- NEEDED_REBUILD_UPGRADE=$?
+ ! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
+ has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
+ && NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
- [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
- REPO_LAYOUT_CONF_WARN=$?
+ [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
+ && REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
}
pkg_postinst() {
@@ -342,14 +342,14 @@ pkg_postinst() {
# will be identified and removed in postrm.
python_mod_optimize /usr/$(get_libdir)/portage/pym
- if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then
+ if $WORLD_MIGRATION_UPGRADE ; then
einfo "moving set references from the worldfile into world_sets"
cd "${ROOT}/var/lib/portage/"
grep "^@" world >> world_sets
sed -i -e '/^@/d' world
fi
- if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then
+ if $NEEDED_REBUILD_UPGRADE ; then
einfo "rebuilding NEEDED.ELF.2 files"
for cpv in "${ROOT}/var/db/pkg"/*/*; do
if [ -f "${cpv}/NEEDED" ]; then
@@ -368,7 +368,7 @@ pkg_postinst() {
done
fi
- if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
+ if $REPO_LAYOUT_CONF_WARN ; then
ewarn
echo "If you want overlay eclasses to override eclasses from" \
"other repos then see the portage(5) man page" \
@@ -378,7 +378,7 @@ pkg_postinst() {
ewarn
fi
- if [ $MINOR_UPGRADE = 0 ] ; then
+ if $MINOR_UPGRADE ; then
elog "If you're upgrading from a pre-2.2 version of portage you might"
elog "want to remerge world (emerge -e world) to take full advantage"
elog "of some of the new features in 2.2."
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index d14385a327cd..35544a8c0543 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,21 +1,15 @@
DIST deblob-2.6.32 84094 RMD160 394f46ec5b869638a7bc2e87beb118167c9bd6cb SHA1 1a2a1efb72126609d9e3b9be99ae5be2751efd06 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d
-DIST deblob-2.6.34 88276 RMD160 12f83200b74a9d859b7241b1e8d8c0250d8bcb90 SHA1 985bd73ebca8e720f92eb01d11c22e25d21865b6 SHA256 9478ada7a36f3858ef9ba3dc5c9609fb45fa9b286a002ccfba09045c81b217ed
-DIST deblob-2.6.35 90643 RMD160 3ddd784a9be90b98f126345fc71b45bc711b66a6 SHA1 a8774f8e27c402701fb436e2bd3ea996d88178b6 SHA256 dda16c3b77c6159715ca05d8a45f509420f5fc708afee038a820e18751f537b7
DIST deblob-2.6.36 90559 RMD160 32cc73f2b3fa0304e7ebf8c35f0501570ad08ce7 SHA1 71c2cc4bcdb800d46deac61cb9ac8c2cc51b1faa SHA256 fe4fb0cb06d017d1ec70f50c1c06e184c31c9bba6c4b359e43d54125d60501df
DIST deblob-2.6.37 97431 RMD160 8880f01ec565b3d5093caeacf7b1ee2b93d6f586 SHA1 a34daada57dc6d73cfc61b25dfcb248eac245337 SHA256 8beee2feddd27230aac078017d4927b67296941c855720560e58ab520abe7e2e
DIST deblob-2.6.38 99773 RMD160 f52e78df8e819319d0aabf24fe471e2ef9e02140 SHA1 0d176aa88f0525123d293e26617f2d287fabdddc SHA256 ddabcd846baa19b7e82adec3ca8ff17f2f7425c292516889098559f639e763eb
DIST deblob-3.0 102531 RMD160 d3ea6f04cd4d6c7f652f4532e7558f931d3952d1 SHA1 3702cec9da20b8c1141e0fee2549fd475e203812 SHA256 4c9d98faabc226602891e6eb36634f1c228017bb90f0d3ceaa42d41d4b27df0f
DIST deblob-check-2.6.32 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
-DIST deblob-check-2.6.34 268995 RMD160 0186c8b3ef596feb0be938a7a75da620a7f425b2 SHA1 59f978b9455099c634947638ebf1ce6c82c1aead SHA256 2c995748c14bed50b93746a35a44b33138b2758031e3ef7d0159911cbab83c30
-DIST deblob-check-2.6.35 269127 RMD160 2143e3f0fc362d90b00f5f05cdd6dac811f352d0 SHA1 6f2b976d64ad375db641ca9220fc40df1c5e3d8f SHA256 2cf4a02ab3e06512fe16d75704ceca9bd4d97fe0985ea0a0a34f64ce7fc18527
DIST deblob-check-2.6.36 285794 RMD160 2e3232ec9cbbb4874e90a4995372e2f10c0036e1 SHA1 f06f75e3b96d8bce109aa30ccab491624602795c SHA256 5e6fcb7110da5fb62edb0b85f169090de714cba2aac3cbfafbd84b6a860c8641
DIST deblob-check-2.6.37 328720 RMD160 6739c283f68b9de253071d757991d41618722cb8 SHA1 65d202793837b916974de3e0d2dfa5312cbfe31e SHA256 113898a885fce63b367ea6b7ddcf1e7c3ae47bac01617c228252a061433b6d32
DIST deblob-check-2.6.38 345831 RMD160 1caea73e54a21cb1100a4ee8226201ddd8a89985 SHA1 44de3ac14d9a3e94b97553051aff0ebfada45274 SHA256 6f681dbd1c1c44cba2c9902dd77a5a51b2d1cc81567cffc60ba92bd0bdd4ff2f
DIST deblob-check-3.0 377076 RMD160 8a4f53f0a34c46fc6a2aae5878225851d7bf13e1 SHA1 b1b356f55f63746bba284644db8585d15f3da06f SHA256 72ab3f74cbcde9d453f8a4e30fd6a6339812806fe6dab3b632c1c68b90b0b104
DIST genpatches-2.6.32-13.base.tar.bz2 453968 RMD160 59af874b8e8ad37123dd4d1e6e27e80ed30fcf11 SHA1 fb09aee1d2ca954137a07a9d1d4398d521d13e97 SHA256 834aec1ea744a034235bed688ab45b115e065fc570e8e59271eb1ae02ea2c293
DIST genpatches-2.6.32-13.extras.tar.bz2 24934 RMD160 e3e1d60fb45a3e3c818ddda36b9180d4fc46679e SHA1 d16a34dfa35d163ea4042058b3865c389f3802e9 SHA256 50b70c76461aa52f7f2ad88175e7f08eb555f7f1dfd274759ec0c2a9748bde5e
-DIST genpatches-2.6.32-24.base.tar.bz2 686812 RMD160 c2b17ecb80ef0ca84bf35edca7501e2fef6258bb SHA1 502f1d0938bc7e14cd84e1c74b3460963dfc61a8 SHA256 988de026692524f9b8e2f0cad873c49bb4fa1cb5ea564c20bf52771f3eb8b9b1
-DIST genpatches-2.6.32-24.extras.tar.bz2 24934 RMD160 e3e1d60fb45a3e3c818ddda36b9180d4fc46679e SHA1 d16a34dfa35d163ea4042058b3865c389f3802e9 SHA256 50b70c76461aa52f7f2ad88175e7f08eb555f7f1dfd274759ec0c2a9748bde5e
DIST genpatches-2.6.32-29.base.tar.bz2 746312 RMD160 cf8453b7584e0f85fea65caabbd64e1329c8925d SHA1 fecb828d9a4daa82e431375c7d9b6e5f9c835f49 SHA256 ab60926090e662dafd7f4eb84b14ba31183a7fd0ab8ddde719d7264fa26b9bf1
DIST genpatches-2.6.32-29.extras.tar.bz2 24966 RMD160 36249adefc5e3637669bbdd3d72a568be051cba5 SHA1 b341f4f3a5179957a63fdce0586b6123805d770a SHA256 8118fbbf4a2d3f2f1f931970ee2fd6b1c78130850362e9750878b4ea8d25b835
DIST genpatches-2.6.32-30.base.tar.bz2 758516 RMD160 273fa9bc213307d4e870c54d6c408b31bea2b89e SHA1 801e7ffa7fbe63b6638640e4de9827184a5d1953 SHA256 89123461336add92d391526758ddebd98cf5296e78ce2a8aaef35a2aa3930aac
@@ -30,10 +24,6 @@ DIST genpatches-2.6.32-43.base.tar.bz2 979911 RMD160 d221c448adb8116fa328304f7cd
DIST genpatches-2.6.32-43.extras.tar.bz2 24897 RMD160 fac4ce9c15953ad811b2c500b0145f2eebea5e2d SHA1 8f9cdf4bc06dc5e806698d93c002798faa53fda1 SHA256 309841a94e96d7076bca7fb547caae9786e24258e032da242f64768a413ddbf0
DIST genpatches-2.6.32-44.base.tar.bz2 1012021 RMD160 37aae12613e8d5e0f3cb0ad5f6057a83846e5bdc SHA1 3f4a864c30fd445eff30b480b0b5654c5758b219 SHA256 f00a36ff4e30785eca0816bf1a698b358213e59c5786799b5bddd8322da1c633
DIST genpatches-2.6.32-44.extras.tar.bz2 24902 RMD160 9e8d686ce4e2bb36e6f6310835b96f64ad8d0f08 SHA1 29ed146cfcfb4470b0f2cea9b4dad07b359c31df SHA256 e105210bca94660f3292751fea0db38c7dea50ea2c5a729faa1dbc9fb348442f
-DIST genpatches-2.6.34-11.base.tar.bz2 197383 RMD160 34c58d50327c21e6c22338c0ee3b3f6c2e33daff SHA1 94d058939a99fcd0082516d88e1afbd89c79fc1c SHA256 9fcf0e28097d3fa8157c571a2651413ec50f4928810fb5bc12c776e2a9223324
-DIST genpatches-2.6.34-11.extras.tar.bz2 15531 RMD160 d53bc0b7ce3c87f254873008ad50b13f56612dc3 SHA1 b453eb91799a5954cc94bff0bc70cab897e8c6cc SHA256 45a49ab7eb9735569ce3960b213473bc904c0a7aea95adb1bcd8b12dd7191c6d
-DIST genpatches-2.6.35-13.base.tar.bz2 175222 RMD160 eeb5c1adcc97084cacd04f2918f0acf49cfd63f7 SHA1 585106acb743e7625fb6a82e3ca99968b46a3661 SHA256 7fd35a126d170118aa7b6979c46b2f1ea2ac820dfd28779151c96e527e432bfd
-DIST genpatches-2.6.35-13.extras.tar.bz2 15486 RMD160 bb61e34c295a5d562f78fe2ac0bc023c9badec2f SHA1 c832349cde052e368cb5ff8c8df296b7a05bd405 SHA256 9291df1cc0f48dba21fff9d5da59c7403ea29269561fca3c0e58658455f208de
DIST genpatches-2.6.36-10.base.tar.bz2 151203 RMD160 947433a0f6a032ffbbc9407faf0a9edb77db2968 SHA1 86beac7fd9462a06bb825c6cf250b82024427e06 SHA256 13afea01c02de13779fd24109a14bb5133a4007434af6c41e022db8993fc28b7
DIST genpatches-2.6.36-10.extras.tar.bz2 15786 RMD160 b949b2a3b5763ba30c381f0a01a6a15cde647377 SHA1 caf9cba79a8601bc55f60913cd6deb1bc433e1de SHA256 20192ce8275d9d938d56ca7b4fb5f9a38568b7e390238082f3457fdb6a0526c8
DIST genpatches-2.6.36-7.base.tar.bz2 107783 RMD160 d20deb72ce2a0092939a94416ed05bc5d2e8063a SHA1 c2318a67a589f5de462ac0b59c05e31dc799efd5 SHA256 7364766239e9c154157b4667a49e37d0eb3cbad09f665de66fe41bb026262a20
@@ -55,8 +45,6 @@ DIST genpatches-3.0-8.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19
DIST genpatches-3.0-9.base.tar.bz2 229050 RMD160 2c9832e195851a10b327a74de668d4f704d1909d SHA1 13e6ec91dad89ba264bba55d8670b77164821bbd SHA256 fe4ca0d112efa96bb940f67ada7d981537b536f95bb8c0330a19189049d9d2fe
DIST genpatches-3.0-9.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
DIST hardened-patches-2.6.32-12.extras.tar.bz2 338946 RMD160 ce283b495ee2f009d36b94aca840f6519fbe9bb6 SHA1 56da715d64c6e2c50e292b19d27006d82118a337 SHA256 bfa5e7d9653b793b2bd88c40b8b52464fe39e1e098f1c5bc95d8476247fd288f
-DIST hardened-patches-2.6.32-25.extras.tar.bz2 353143 RMD160 d16ce4880936ee2f38043d2f7035e266a4b32121 SHA1 ba369d782934837064137aca2163b6eadc5290d1 SHA256 ba68fccf49a34be472bc71d624f8d2f9b285f9bcb5583e81d3b33032b268b04e
-DIST hardened-patches-2.6.32-26.extras.tar.bz2 354210 RMD160 eaab82b1d4940f13ab68b60791326f7436c56eda SHA1 baed0b07dee67c641127a779db43f640aa639e07 SHA256 544d274410a4a802abff0278ff7655059b234f57be30144641ae871b92014ca7
DIST hardened-patches-2.6.32-34.extras.tar.bz2 367188 RMD160 6b08bf72f9a674a400a0045c7cff57059cfe8d03 SHA1 3c1b644fdccfd08260b946f71b7bdea871157b6a SHA256 fb46399e132037f79dd69f49139d5f01e74dc6c85d214880701011f39c6144a8
DIST hardened-patches-2.6.32-37.extras.tar.bz2 370969 RMD160 7870f13d540ec6e52c3bcc362012488198ac05e1 SHA1 86097cc8d4e18fa4184b77c9db799c3307272859 SHA256 50ef1747088471509bf3e1d75f053d9e8c1dd7b4c9e8c57b24f1973593295fba
DIST hardened-patches-2.6.32-45.extras.tar.bz2 378165 RMD160 f3a607fe2ee0afa3709524b29a2bf8cc89b82e31 SHA1 aff7340024bd53ae2237721dba1c489419da1f8f SHA256 04dd316b257644c104c7660a649abcd48a11fff59e7773988ace8e0da49b930c
@@ -69,8 +57,6 @@ DIST hardened-patches-2.6.32-74.extras.tar.bz2 504164 RMD160 6f57f6c8deb552de025
DIST hardened-patches-2.6.32-75.extras.tar.bz2 503981 RMD160 e1fd0769e595f15c8646b537b90c610d6e3f1726 SHA1 ccb4161fc4d1d2965df75d7f0975581a5bae196d SHA256 eb950ae795deda34a599cde01250270693aba782168dbb741f884da0db6ff3a2
DIST hardened-patches-2.6.32-76.extras.tar.bz2 504187 RMD160 a815fcb4e73cd649e7f2e7f1a27ba61d4eae3c5e SHA1 ef842cdb3dee907aac714d3e74f0caea9af2199f SHA256 f5daf2809abb28f8fa195fa0336bd5247a4825973a62c35fc3572de008b5a6e4
DIST hardened-patches-2.6.32-77.extras.tar.bz2 500970 RMD160 2ad6967945d3998f726e6a5f57391b940f166ca8 SHA1 f1847770f2d876c69ce4ead0d04785df7d0e7896 SHA256 a2fd401b9cc193a58ef93ba10b2e5ab32e96dafea55fb007364e5989ca57bff0
-DIST hardened-patches-2.6.34-7.extras.tar.bz2 337669 RMD160 7177ec91676644a863b94765a2b83d026d43a9dd SHA1 c96e2156f33aac21d4e1fa5950fe3098402714e0 SHA256 3fb2cda6fb2724296e0e1a946ca7b69293e04da9f21ecb563f2ba282f7a8099a
-DIST hardened-patches-2.6.35-8.extras.tar.bz2 349768 RMD160 6addf3007a5f4de95854fd4e93c65885b2494c7d SHA1 0cbabbcf7ab9b19214e583788b625330806d9898 SHA256 17f43e0b2203ac2020892164cbfd8b913c90cc3f8d1bae3ff88a8843f0bc56d7
DIST hardened-patches-2.6.36-10.extras.tar.bz2 363448 RMD160 a656acbca00a3f238f83a14566dbeade33c69092 SHA1 c53dd6aae4c779cb135a612c416f2f623f9a9ce5 SHA256 e818e8bd2066f32aa209309aa17a482e7a006ae748d850860b900226720ce8dc
DIST hardened-patches-2.6.36-7.extras.tar.bz2 359321 RMD160 63f60051e43380004ca7e48b4d6c1f9883baab9a SHA1 7f47113eb4e7fef17b6adbc68e5a9592941dfdbe SHA256 7fb6ca6a19102f2509aff3a2e28b7387c385d8049a7f77b81d6788bc553eee73
DIST hardened-patches-2.6.37-8.extras.tar.bz2 367417 RMD160 d2a3fa214047d8fd232557f5bc6383ab01132d1f SHA1 f8a39d414d63dfcaa408eed1d9f2d5ff4fd0f72e SHA256 2593fcfa4c8363bbf9ee95bd7fa1befb15ee830262664a163da58a975548682d
@@ -84,8 +70,6 @@ DIST hardened-patches-3.0.8-1.extras.tar.bz2 497133 RMD160 bcfa2b655e58f557f8c8c
DIST hardened-patches-3.0.8-2.extras.tar.bz2 498271 RMD160 9d3b1699a5e10f339b2e1af7f90d691cfcc9fb1a SHA1 ff657b45b3899221012f66667646ae6b573089b2 SHA256 b4a12799b2f1f88ce91b46210441e4067f921fe416f43ce37ed701dfa1ed7449
DIST hardened-patches-3.0.9-1.extras.tar.bz2 587044 RMD160 1b44b4ccd1d6134664aa0186cd17341d4f627bcb SHA1 57fe27a4bcc390798d30144d350c954a1b06f505 SHA256 f8fa6bac439bc6f577a92a44711d467f1594da396b331a1a8bc08668a1a1f135
DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
-DIST linux-2.6.34.tar.bz2 67633622 RMD160 dafd721b00c13e3652405b517b379eed10020bf4 SHA1 4188857ba71f301991dc56285f593e9c311e5824 SHA256 fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633
-DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e6f SHA1 4cb1fbfbeedcd658ca37739679c65dfaa136bf4e SHA256 18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf
DIST linux-2.6.36.tar.bz2 70277083 RMD160 d739da505a79e71a1370d36e1373b36be055c123 SHA1 b546ab66458d7d614151d80adbc03b4d28977ae2 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04
DIST linux-2.6.37.tar.bz2 73577826 RMD160 fced3801f3c94aa545c90e10981de616376a3b41 SHA1 eba83c89e71a86060ef6ff76aefff660aef819e2 SHA256 edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a
DIST linux-2.6.38.tar.bz2 74739098 RMD160 d1179be93f1309303b9aa6008a25b6247726e764 SHA1 02aade5ad3dedd70739c9b4a05de40edbe432d25 SHA256 72f0cfaefb8dc86b219d5a742dd0375332627641ecbdf5badd3158e2127b9304
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r22.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r22.ebuild
deleted file mode 100644
index 71dfcd67a253..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r22.ebuild,v 1.4 2010/10/24 10:24:23 blueness Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="24"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-25"
-HGPV_URI="mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE=""
-
-KEYWORDS="~alpha amd64 ~hppa ~ia64 -ppc -ppc64 ~sparc x86"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-2.2.0*"
-
- ewarn
- ewarn "Hardened Gentoo provides four different predefined grsecurity level:"
- ewarn "[server], [server no rbac] [workstation] [workstation no rbac]"
- ewarn
- ewarn "Those who intend to use one of these predefined grsecurity levels"
- ewarn "should read the help associated with the level. Users importing a"
- ewarn "kernel configuration from a kernel prior to ${PN}-2.6.32,"
- ewarn "should review their selected grsecurity/PaX options carefully."
- ewarn
- ewarn "Users of grsecurity's RBAC system must ensure they are using"
- ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
- ewarn "It is strongly recommended that the following command is issued"
- ewarn "prior to booting a ${PF} kernel for the first time:"
- ewarn
- ewarn "emerge -na =${GRADM_COMPAT}"
- ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r23.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r23.ebuild
deleted file mode 100644
index 634e1aa3d471..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r23.ebuild,v 1.2 2010/11/02 00:37:13 blueness Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="24"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-26"
-HGPV_URI="mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-2.2.0*"
-
- ewarn
- ewarn "Hardened Gentoo provides four different predefined grsecurity level:"
- ewarn "[server], [server no rbac] [workstation] [workstation no rbac]"
- ewarn
- ewarn "Those who intend to use one of these predefined grsecurity levels"
- ewarn "should read the help associated with the level. Users importing a"
- ewarn "kernel configuration from a kernel prior to ${PN}-2.6.32,"
- ewarn "should review their selected grsecurity/PaX options carefully."
- ewarn
- ewarn "Users of grsecurity's RBAC system must ensure they are using"
- ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
- ewarn "It is strongly recommended that the following command is issued"
- ewarn "prior to booting a ${PF} kernel for the first time:"
- ewarn
- ewarn "emerge -na =${GRADM_COMPAT}"
- ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.34-r6.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.34-r6.ebuild
deleted file mode 100644
index 854b6ef799c9..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.34-r6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.34-r6.ebuild,v 1.3 2011/02/08 19:22:53 blueness Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="11"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-7"
-HGPV_URI="mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-2.2.0*"
-
- ewarn
- ewarn "Hardened Gentoo provides four different predefined grsecurity level:"
- ewarn "[server], [server no rbac] [workstation] [workstation no rbac]"
- ewarn
- ewarn "Those who intend to use one of these predefined grsecurity levels"
- ewarn "should read the help associated with the level. Users importing a"
- ewarn "kernel configuration from a kernel prior to ${PN}-2.6.32,"
- ewarn "should review their selected grsecurity/PaX options carefully."
- ewarn
- ewarn "Users of grsecurity's RBAC system must ensure they are using"
- ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
- ewarn "It is strongly recommended that the following command is issued"
- ewarn "prior to booting a ${PF} kernel for the first time:"
- ewarn
- ewarn "emerge -na =${GRADM_COMPAT}"
- ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.35-r7.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.35-r7.ebuild
deleted file mode 100644
index 3e7021c1f941..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.35-r7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.35-r7.ebuild,v 1.1 2010/11/07 21:55:09 blueness Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="13"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-8"
-HGPV_URI="mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-2.2.0*"
-
- ewarn
- ewarn "Hardened Gentoo provides four different predefined grsecurity level:"
- ewarn "[server], [server no rbac] [workstation] [workstation no rbac]"
- ewarn
- ewarn "Those who intend to use one of these predefined grsecurity levels"
- ewarn "should read the help associated with the level. Users importing a"
- ewarn "kernel configuration from a kernel prior to ${PN}-2.6.32,"
- ewarn "should review their selected grsecurity/PaX options carefully."
- ewarn
- ewarn "Users of grsecurity's RBAC system must ensure they are using"
- ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
- ewarn "It is strongly recommended that the following command is issued"
- ewarn "prior to booting a ${PF} kernel for the first time:"
- ewarn
- ewarn "emerge -na =${GRADM_COMPAT}"
- ewarn
-}
diff --git a/www-client/chromium/chromium-15.0.874.121.ebuild b/www-client/chromium/chromium-15.0.874.121.ebuild
index 0d0842232151..1e08aa49f3fb 100644
--- a/www-client/chromium/chromium-15.0.874.121.ebuild
+++ b/www-client/chromium/chromium-15.0.874.121.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.121.ebuild,v 1.1 2011/11/17 03:15:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.121.ebuild,v 1.2 2011/11/17 11:38:23 chainsaw Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -14,7 +14,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio"
# en_US is ommitted on purpose from the list below. It must always be available.
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 3226268f7344..a4a1fc7ab36b 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -19,3 +19,6 @@ DIST opera-11.60-1147.x86_64.linux.tar.xz 12324564 RMD160 67c9627b18af59d1675246
DIST opera-11.60-1150.i386.freebsd.tar.xz 11518948 RMD160 82a734bf05b8feec8baff9ee01505261f93ba3f0 SHA1 e6402ac1ac09c37100b0b68f0fda70c59064d415 SHA256 e6f7212ba62736f15232960067604704f8cee899899d5b3bc9281a9ebc3f8e6d
DIST opera-11.60-1150.i386.linux.tar.xz 11465136 RMD160 62c7bcf4eb52c0ba3cb2adf2b4e85e256cae6c50 SHA1 3ff6d43f38ceec15b942c8636a9de5d14de5aa0a SHA256 08d020cb3ad8ddc3d47657f31bd40c53a665f6a991d4303b9afd9a80b06581b9
DIST opera-11.60-1150.x86_64.linux.tar.xz 12323256 RMD160 874cdb4e87f75c33366133da068844d2e4ab3e85 SHA1 3e2f3157b085634f04e9795d7986561bcc41ee37 SHA256 8dd6416cdd324c2b037c8fd251c5c0618d3c8fd02f41f92860cf42243ead2209
+DIST opera-11.60-1159.i386.freebsd.tar.xz 11519324 RMD160 893b92098023111d4fb825032f4508bbd7a10a1a SHA1 06775020b49ffc535b0e1d134dd86300ac4ca37d SHA256 e9caf6668bb5e479e17ec4ae89e993c1da3ed55a343a272f85016012ffee9fe1
+DIST opera-11.60-1159.i386.linux.tar.xz 11478400 RMD160 99a2703f19fb37458f517ae68a8ba868b69ec08b SHA1 8069a5392225f9dedc568696db3943646639bf95 SHA256 5ec1515a8bd7b9a5dabf700fbbd3c13e91c66f9611968f9715ea63645159b713
+DIST opera-11.60-1159.x86_64.linux.tar.xz 12320240 RMD160 921dad23643dc4e0fba1e4d698ff316513318f54 SHA1 771c7bf98f272df0557bc90a7dfbb9b390863672 SHA256 3cab7a15e0b400db3d771726abb1ac7d384c71bd6d3d3a5a926f2d7e3bb9967d
diff --git a/www-client/opera/opera-11.60.1159.ebuild b/www-client/opera/opera-11.60.1159.ebuild
new file mode 100644
index 000000000000..e7956fc15782
--- /dev/null
+++ b/www-client/opera/opera-11.60.1159.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.60.1159.ebuild,v 1.1 2011/11/17 16:08:50 jer Exp $
+
+EAPI="4"
+
+inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
+
+DESCRIPTION="A fast and secure web browser and Internet suite"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-11 LGPL-2 LGPL-3"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
+
+O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
+O_B="$(get_version_component_range 3)" # Build version, i.e. 1156
+
+O_D="china_${O_V}-${O_B}"
+O_P="${PN}-${O_V}-${O_B}"
+O_U="http://snapshot.opera.com/unix/"
+
+SRC_URI="
+ amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
+ x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
+ x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
+"
+
+OPREFIX="/usr/$(get_libdir)"
+
+QA_DT_HASH="${OPREFIX}/${PN}/.*"
+QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
+hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
+th tl tr uk uz vi zh-CN zh-TW zu"
+
+for O_LINGUA in ${O_LINGUAS}; do
+ IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
+done
+
+DEPEND="
+ >=sys-apps/sed-4
+ app-arch/xz-utils
+"
+GTKRDEPEND="
+ dev-libs/atk
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ gtk? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ x11-libs/pango
+ x11-libs/pixman
+"
+KDERDEPEND="
+ kde-base/kdelibs
+ x11-libs/qt-core
+ x11-libs/qt-gui
+"
+GSTRDEPEND="
+ dev-libs/glib:2
+ dev-libs/libxml2
+ media-libs/gst-plugins-base
+ media-libs/gstreamer
+ media-plugins/gst-plugins-meta
+"
+RDEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXrender
+ x11-libs/libXt
+ gtk? ( ${GTKRDEPEND} )
+ gtk3? ( ${GTKRDEPEND} )
+ kde? ( ${KDERDEPEND} )
+ gstreamer? ( ${GSTRDEPEND} )
+"
+
+pkg_setup() {
+ echo -e \
+ " ${GOOD}****************************************************${NORMAL}"
+ elog "If you seek support, please file a bug report at"
+ elog "https://bugs.gentoo.org and post the output of"
+ elog " \`emerge --info =${CATEGORY}/${P}'"
+ echo -e \
+ " ${GOOD}****************************************************${NORMAL}"
+}
+
+src_unpack() {
+ unpack ${A}
+ mv -v ${PN}* "${S}" || die
+}
+
+src_prepare() {
+ local LNGDIR="share/${PN}/locale"
+
+ # Count linguas
+ count() { echo ${#}; }
+ local lingua_count=$(count ${O_LINGUAS} en)
+ local locale_count=$(count ${LNGDIR}/*)
+ [[ ${lingua_count} = ${locale_count} ]] \
+ || die "Number of LINGUAS does not match number of locales"
+ unset count
+
+ # Remove unwanted linguas
+ einfo "Keeping these locales (linguas): ${LINGUAS}."
+ for LINGUA in ${O_LINGUAS}; do
+ if ! use linguas_${LINGUA/-/_}; then
+ LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+ rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
+ fi
+ done
+
+ # Remove doc directory but keep the LICENSE under another name (bug #315473)
+ mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
+ rm -rf share/doc
+ for locale in share/${PN}/locale/*; do
+ rm -f "${locale}/license.txt"
+ ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
+ || die
+ done
+
+ # Remove package directory
+ rm -rf share/${PN}/package
+
+ # Optional libraries
+ if ! use gtk; then
+ rm lib/${PN}/liboperagtk2.so || die
+ fi
+ if ! use gtk3; then
+ rm lib/${PN}/liboperagtk3.so || die
+ fi
+ if ! use kde; then
+ rm lib/${PN}/liboperakde4.so || die
+ fi
+ if ! use gstreamer; then
+ rm -r lib/${PN}/gstreamer || die
+ fi
+
+ # Unzip the man pages before sedding
+ gunzip share/man/man1/* || die
+
+ # Replace PREFIX, SUFFIX and PN in various files
+ sed -i \
+ -e "s:@@{PREFIX}:/usr:g" \
+ -e "s:@@{SUFFIX}::g" \
+ -e "s:@@{_SUFFIX}::g" \
+ -e "s:@@{USUFFIX}::g" \
+ -e "s:opera:${PN}:g" \
+ share/man/man1/* \
+ share/applications/${PN}-*.desktop \
+ || die
+
+ # Replace "Opera" with "Opera Next"
+ if [[ ${PN} = opera-next ]]; then
+ sed -i share/applications/${PN}-*.desktop \
+ -e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die
+ fi
+
+ # Create /usr/bin/opera wrapper
+ echo '#!/bin/sh' > ${PN}
+ echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
+ echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
+ >> ${PN}
+ echo 'export LD_PRELOAD="/usr/'$(get_libdir)'/libgtk-x11-2.0.so"' >> ${PN}
+ echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
+
+ # Change libz.so.3 to libz.so.1 for gentoo/freebsd
+ if use elibc_FreeBSD; then
+ scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
+ while read i; do
+ if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
+ then
+ export SANITY_CHECK_LIBZ_FAILED=1
+ break
+ fi
+ sed -i \
+ "$i" \
+ -e 's/libz\.so\.3/libz.so.1/g'
+ done
+ [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
+ fi
+}
+
+src_install() {
+ # We install into usr instead of opt as Opera does not support the latter
+ dodir /usr
+ mv lib/ "${D}/${OPREFIX}" || die
+ mv share/ "${D}/usr/" || die
+
+ # Install startup scripts
+ dobin ${PN}
+
+ # Stop revdep-rebuild from checking opera binaries
+ dodir /etc/revdep-rebuild
+ echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
+ > "${D}"/etc/revdep-rebuild/90${PN}
+
+ # Set PaX markings for hardened/PaX (bug #344267)
+ pax-mark m \
+ "${D}/${OPREFIX}/${PN}/${PN}" \
+ "${D}/${OPREFIX}/${PN}/operaplugincleaner" \
+ "${D}/${OPREFIX}/${PN}/operapluginwrapper"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use elibc_FreeBSD; then
+ elog
+ elog "To improve shared memory usage please set:"
+ elog "$ sysctl kern.ipc.shm_allow_removed=1"
+ fi
+
+ # Update desktop file database and gtk icon cache (bug #334993)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ # Update desktop file database and gtk icon cache (bug #334993)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest
index b1c11c2274d8..4b093c2089df 100644
--- a/x11-libs/libcryptui/Manifest
+++ b/x11-libs/libcryptui/Manifest
@@ -1 +1,2 @@
DIST libcryptui-3.2.0.tar.xz 1196232 RMD160 481d340e3147953dae8e43fde36a1ff4b5bb5964 SHA1 30966d33dbef023fbf42286493ea6b699a7d6c26 SHA256 a87d866a670bb8d6f0bb6017b52e6e809dcb5463cd4714156d3beccb369c0ff4
+DIST libcryptui-3.2.2.tar.xz 1196232 RMD160 a84f4b43844cb238b48772da4c3f5ecfc6cf614b SHA1 23bbb4915012ba6cc3eff72b2d91f0725f82a848 SHA256 76123c9d3ccdefc94f55b1726f1084a48a1a8c792ee641a39d415142fe4ac4eb
diff --git a/x11-libs/libcryptui/libcryptui-3.2.0.ebuild b/x11-libs/libcryptui/libcryptui-3.2.0.ebuild
index 0f620a3f5761..cd780b2f7c92 100644
--- a/x11-libs/libcryptui/libcryptui-3.2.0.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.2.0.ebuild,v 1.1 2011/10/30 07:47:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.2.0.ebuild,v 1.2 2011/11/17 06:09:57 tetromino Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
IUSE="debug doc +introspection libnotify test"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
COMMON_DEPEND="
diff --git a/x11-libs/libcryptui/libcryptui-3.2.2.ebuild b/x11-libs/libcryptui/libcryptui-3.2.2.ebuild
new file mode 100644
index 000000000000..15ab76c1f7ab
--- /dev/null
+++ b/x11-libs/libcryptui/libcryptui-3.2.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.2.2.ebuild,v 1.1 2011/11/17 06:09:57 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="User interface components for OpenPGP"
+HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="debug doc +introspection libnotify test"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
+COMMON_DEPEND="
+ >=dev-libs/glib-2.10:2
+ >=x11-libs/gtk+-2.90.0:3[introspection?]
+ >=dev-libs/dbus-glib-0.72
+ >=gnome-base/gnome-keyring-2.91.2
+
+ >=app-crypt/gpgme-1
+ || (
+ =app-crypt/gnupg-2.0*
+ =app-crypt/gnupg-1.4* )
+
+ introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+ libnotify? ( >=x11-libs/libnotify-0.7.0 )
+"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+ >=app-text/scrollkeeper-0.3
+ >=dev-util/pkgconfig-0.20
+ >=dev-util/intltool-0.35
+ doc? ( >=dev-util/gtk-doc-1.9 )
+"
+# Before 3.1.4, libcryptui was part of seahorse
+RDEPEND="${COMMON_DEPEND}
+ !=dev-lang/perl-5.8
- x11-libs/gtk+:2
- virtual/perl-Storable
- virtual/perl-IO
- virtual/perl-File-Spec
- virtual/perl-Test-Simple
- >=dev-perl/File-BaseDir-0.03
- >=dev-perl/File-MimeInfo-0.12
- >=dev-perl/File-DesktopEntry-0.03
- >=dev-perl/gtk2-perl-1.040
- x11-misc/xdg-utils"
-RDEPEND="${COMMON_DEPEND}
- latex? ( virtual/latex-base app-text/dvipng )
- screenshot? ( media-gfx/scrot )
- spell? ( dev-perl/gtk2-spell )"
-DEPEND="${COMMON_DEPEND}
- dev-perl/extutils-pkgconfig
- virtual/perl-Module-Build
- test? ( virtual/perl-Test-Harness )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-disable-updates.patch" )
-
-src_install() {
- doicon share/pixmaps/zim.png
- perl-module_src_install
-}
-
-pkg_postinst() {
- perl-module_pkg_postinst
- fdo-mime_desktop_database_update
- xdg-icon-resource install --context mimetypes --size 64 \
- "${ROOT}/usr/share/pixmaps/zim.png" \
- application-x-zim-notebook || die "xdg-icon-resource install failed"
-}
-
-pkg_postrm() {
- perl-module_pkg_postrm
- fdo-mime_desktop_database_update
- xdg-icon-resource uninstall --context mimetypes --size 64 \
- application-x-zim-notebook || die "xdg-icon-resource uninstall failed"
-
-}
diff --git a/x11-misc/zim/zim-0.46.ebuild b/x11-misc/zim/zim-0.46.ebuild
deleted file mode 100644
index a7426b6bdee7..000000000000
--- a/x11-misc/zim/zim-0.46.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.46.ebuild,v 1.5 2011/10/24 06:44:49 tetromino Exp $
-
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="2:2.5"
-
-EAPI="3"
-
-inherit eutils virtualx fdo-mime distutils
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz latex screenshot spell test"
-
-RDEPEND="|| ( >=dev-lang/python-2.6 dev-python/simplejson )
- dev-python/pygobject:2
- dev-python/pygtk
- x11-libs/gtk+:2
- x11-misc/xdg-utils
- graphviz? ( media-gfx/graphviz )
- latex? ( virtual/latex-base app-text/dvipng )
- screenshot? ( media-gfx/scrot )
- spell? ( dev-python/gtkspell-python )"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-disable-updates.patch"
- # remove unneeded variables
- sed -i "/^assert/s:^:#:g" "${S}"/zim/__init__.py
-}
-
-src_test() {
- VIRTUALX_COMMAND="$(PYTHON)" virtualmake test.py || die "src_test failed"
-}
-
-src_install () {
- doicon data/${PN}.png || die "doicon failed"
- distutils_src_install
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
- fdo-mime_desktop_database_update
- xdg-icon-resource install --context mimetypes --size 64 \
- "${ROOT}/usr/share/pixmaps/zim.png" \
- application-x-zim-notebook || die "xdg-icon-resource install failed"
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
- fdo-mime_desktop_database_update
- xdg-icon-resource uninstall --context mimetypes --size 64 \
- application-x-zim-notebook || die "xdg-icon-resource uninstall failed"
-}
diff --git a/x11-misc/zim/zim-0.47.ebuild b/x11-misc/zim/zim-0.53.ebuild
similarity index 63%
rename from x11-misc/zim/zim-0.47.ebuild
rename to x11-misc/zim/zim-0.53.ebuild
index dc9e2b4fa7ba..c2e18f27cc48 100644
--- a/x11-misc/zim/zim-0.47.ebuild
+++ b/x11-misc/zim/zim-0.53.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.47.ebuild,v 1.2 2011/03/27 22:56:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.53.ebuild,v 1.1 2011/11/17 13:04:40 xmw Exp $
PYTHON_USE_WITH="sqlite"
PYTHON_DEPEND="2:2.5"
@@ -16,16 +16,13 @@ SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="graphviz latex screenshot spell test"
+IUSE="test"
-RDEPEND="${DEPEND}
- graphviz? ( media-gfx/graphviz )
- latex? ( virtual/latex-base app-text/dvipng )
- screenshot? ( media-gfx/scrot )
- spell? ( dev-python/gtkspell-python )"
-DEPEND="|| ( >=dev-lang/python-2.6 dev-python/simplejson )
- dev-python/pygtk
- x11-misc/xdg-utils"
+RDEPEND="|| ( >=dev-lang/python-2.6 dev-python/simplejson )
+ dev-python/pygtk"
+DEPEND="${RDEPEND}
+ x11-misc/xdg-utils
+ test? ( dev-vcs/bzr )"
pkg_setup() {
python_set_active_version 2
@@ -51,6 +48,15 @@ pkg_postinst() {
xdg-icon-resource install --context mimetypes --size 64 \
"${ROOT}/usr/share/pixmaps/zim.png" \
application-x-zim-notebook || die "xdg-icon-resource install failed"
+ ewarn "Please emerge these packages for additional functionality"
+ ewarn " dev-lang/R"
+ ewarn " dev-python/gtkspell-python"
+ ewarn " dev-vcs/bzr"
+ ewarn " media-gfx/graphviz"
+ ewarn " media-gfx/imagemagick"
+ ewarn " media-gfx/scrot"
+ ewarn " sci-visualization/gnuplot"
+ ewarn " virtual/latex-base app-text/dvipng"
}
pkg_postrm() {