Sync with portage [Tue Jul 30 13:03:08 MSK 2013].

11 years ago · 141167bc3c
parent 880cfd99c0
commit 141167bc3c
1264 changed files with 8961 additions and 4993 deletions
--- a/app-accessibility/speechd-el/Manifest
+++ b/app-accessibility/speechd-el/Manifest
@ -1,4 +1,4 @@
 DIST speechd-el-0.4.tar.gz 131535 SHA256 a34e3093a788e948420965144f6f79fffbe15e64e611eb2a2278e9004199c5cd SHA512 6c144c464d94d9bc278b92097e893d473d4c5c64004a10cbf522a5cc20cb3a5ebc55fa5a5f40cd4b325567556bac4790b3f92bea02c25b0476221bc55bcb16c1 WHIRLPOOL 39ca8fc5cca7ec994ef0b8279365e8ddd6cce5ab2432ccf1b1ddd178f093443e9ce77b5d009dc1a3a5db5390801a0f9ea8178937d44c13474defb300a199db63
-DIST speechd-el-1.0.tar.gz 145875 SHA256 30373c44b843052b8e25b80ec8433b23a743dc92302e3d6fb1b5888131ac665f SHA512 6c2f63e126f25c498c4e036a6486f93cdca08ffdb94d979fe4bdcfc69393c63c6ff44dd21dbac635cd98b9e99cbe2965fb7d4a5ac98965c0a2557862c0620789 WHIRLPOOL 15c11a065c5cae715f09e4c8b66c230186f9021249be46246bb10271068b5eb2f1e4d60d1e736eb769ce1b286c6fe6c052a71c60a9f45fd6a955d197a3b6cf99
 DIST speechd-el-2.2.tar.gz 177968 SHA256 6d57638fb20ef09207bea02b5d6cd65834aa4bbaf9b1b24833ae43c883298657 SHA512 f444f9b553ecfad82218f8d41f9928ff990b55ebed99a9fedffa6ad6273bca87fff2e3464ed934db3d60088c69eb2ba0db61526aa32d8e831129ba4dc5243eaf WHIRLPOOL 9522191c06b055b711135932e603632dddedca1b39d67346eb01d4df92f7d8a84d7f650f6c4785dc2c9c39c3103a7f1782707893a8fe7b9f820b88b41fd61f4c
 DIST speechd-el-2.4.tar.gz 182959 SHA256 bccf6a26cdb6123001473b5a618dc658fef6630014eddaf12fde4b7628458fda SHA512 394c94c32a91ef8a4914b19b57060de42368842a0fb1470d3e478c9b22c591ac05e908490b7da91a279f0c09643e0581bdcc260d4b329b923b4a5b75ebf062bd WHIRLPOOL 34a5c482b9eb7ee52e7922ba7be3bce847152a2d40a864016e7b2926b604b2984ef0777d746db8c742e1eec75775b7be481e5b8594175e0951883e9a7b63fdff
+DIST speechd-el-2.5.tar.gz 183278 SHA256 1ec52b27248e1c68d3ac37bee78842f3e124dc78e63891a1b706519349e4824e SHA512 b4e5d00d3a86be9c42172ab48c5b0c0f5f25817cb542302f04e29f594422247e4b008428dfaaa1bb2e208a71f126b9c86d25186974606bf5764212a0d6a1a09f WHIRLPOOL 3063e34e19e239653455ebe51bbc0e2e8630c21d5bd2342a24e39c1c8d6a831bb595165611cfa9b441fb6e9ccab50d956b81e63bb4235a86a03464812ffbe4ac
--- a/app-accessibility/speechd-el/speechd-el-1.0.ebuild
+++ b/app-accessibility/speechd-el/speechd-el-1.0.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-1.0.ebuild,v 1.4 2009/10/17 22:01:46 halcy0n Exp $
-
-inherit elisp
-
-DESCRIPTION="Emacs speech support"
-HOMEPAGE="http://www.freebsoft.org/speechd-el"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-DEPEND=">=app-emacs/elib-1.0
-	>=app-accessibility/speech-dispatcher-0.5"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	elisp-install ${PN} *.el
-	exeinto /usr/bin
-	doexe speechd-log-extractor
-	dodoc ANNOUNCE ChangeLog EMACSPEAK* NEWS README speechd-speak.pdf
-	doinfo speechd-el.info
-}
-
-pkg_postinst() {
-	elog "Execute the following command from within emacs to get it to speak:"
-	elog "  M-x load-library RET speechd-speak RET"
-}
--- a/app-accessibility/speechd-el/speechd-el-2.5.ebuild
+++ b/app-accessibility/speechd-el/speechd-el-2.5.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-2.5.ebuild,v 1.1 2013/07/30 03:31:46 teiresias Exp $
+
+EAPI="4"
+NEED_EMACS=23
+inherit elisp
+
+DESCRIPTION="Emacs speech support"
+HOMEPAGE="http://www.freebsoft.org/speechd-el"
+SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="brltty"
+
+DEPEND=""
+RDEPEND=">=app-accessibility/speech-dispatcher-0.7
+	brltty? ( app-accessibility/brltty )"
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	elisp-install ${PN} *.el *.elc
+	dobin speechd-log-extractor
+	dodoc ANNOUNCE NEWS README speechd-speak.pdf
+	doinfo speechd-el.info
+}
+
+pkg_postinst() {
+	elog "Execute the following commands from within emacs to get it to speak:"
+	elog "  M-x load-library RET speechd-speak RET"
+	elog "  M-x speechd-speak RET"
+	elog
+	elog "or add the following to your ~/.emacs file:"
+	elog
+	elog "(autoload 'speechd-speak \"speechd-speak\" nil t)"
+	elog '(speechd-speak)'
+}
--- a/app-admin/eselect-postgresql/Manifest
+++ b/app-admin/eselect-postgresql/Manifest
@ -1,2 +1,3 @@
 DIST eselect-postgresql-1.0.10.tbz2 3323 SHA256 9772bd58942fbabb77f3884c9ebcd669347c052be388d15b58d2b1c9b2fb8139 SHA512 2448fdcd0c4679a6e563e8985c2c9a6eff8efd6774fa99b975791c00b17753a69cdf554597841667353122f935b63e7980ad9a7754e4cc4f911061c69aaf9f9a WHIRLPOOL 7b848bb67fca02557304ea93fa5bd3b2407274d6d3290f85bd4a7dfa9a213c6bf3fb24c1583bdb6190788cbc32f81e964cd81abf77f72e171c23c7ea9274def1
 DIST eselect-postgresql-1.1.2.tbz2 3514 SHA256 b034d57744b178cce881cd0d35a343e80ffcb53119cf022f8b854eddc57fd773 SHA512 70791e9196d4805d0d0513c9edad9042b8f6021f0ac7dae30a1870e5f89b1c84b5283e57e0c11821baeeafe06c3eb9b8a007f3c2479c9c4f59d0f2a0d8e689eb WHIRLPOOL 31cf052ab469e8975ecf2dc6af75811fd78009d7199fde32f36c75bf4ab1e8d647a682dc87815f6daf0144631e2a87268c8bb62295fdddf9427319585c7aacc8
+DIST eselect-postgresql-1.2.0.tbz2 3587 SHA256 53cd59e4851c60c6744fe5b5b9149103355f47152cc30265dc066ffe5eb31020 SHA512 6f8a3dcefd41d1da29e980f162ba0ae0ce412812e8e015275bcce383a91e62331e3168edc24ff287b25aa80d56469da8f7c785d80472e767e54b8e26b17c0ed5 WHIRLPOOL adb3eb969222835d14bdd61771ec850b84a060707c22da43f14a816d31ba9f6249c7691c871a1c8f74c064554926e333e15af63becf46aedfd09bea788deacad
--- a/app-admin/eselect-postgresql/eselect-postgresql-1.2.0.ebuild
+++ b/app-admin/eselect-postgresql/eselect-postgresql-1.2.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-1.2.0.ebuild,v 1.1 2013/07/29 11:32:19 titanofold Exp $
+
+EAPI="5"
+
+DESCRIPTION="Utility to select the default PostgreSQL slot"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://dev.gentoo.org/~titanofold/${P}.tbz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-admin/eselect"
+
+src_install() {
+	keepdir /etc/eselect/postgresql
+
+	insinto /usr/share/eselect/modules
+	doins postgresql.eselect
+
+	dosym /usr/bin/eselect /usr/bin/postgresql-config
+}
+
+pkg_postinst() {
+	postgresql-config update
+}
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -1,10 +1,7 @@
 DIST rsyslog-5.10.1.tar.gz 2390048 SHA256 2f643a2c613d5b09f242affd32a90cf4fb7a9ac4557dc80f218e6f3e5affb4c8 SHA512 5f70e97c60103c1f3198cd04cb1fb402d67c2e0232ff09c0aa0cd578667924e0a77a34529bcf4f530c0ef5b8da4f42b98bd5be029d1c2669dd04003e59c1b092 WHIRLPOOL 3f14b25dfca61bdcbdc954f0cd54f5e71481a8ebcbfbd45abceafac9185a51dfd67990e936dd3368c9944aabc9653435fbefc270aabcf925e1a2afda9d09e7ea
 DIST rsyslog-5.8.11.tar.gz 2393222 SHA256 f75b39cf22506f7a28d986d0a446a09a0806f253dba661f125a241a1b47d6285 SHA512 545db333efd136c2ae26131ad400e69f41aaa4fa458a5d586c73e9063f0acb044dbcfe3a13e48b3db77a72f471e87b3b8f9ab2bff008b1166b836dbdddb7974a WHIRLPOOL 2ab8ae35179dcade3953c612cb8bdbd48e7bce6c0cca54278d2949ff3c7c29311341855778511acc38328db4ebeca5599e632c94def038f7134cdd2df78e53e8
 DIST rsyslog-5.8.12.tar.gz 2393679 SHA256 18a408c92fa299773d26a8d6f324eec66282a148b0989c66d94b94318dd0a514 SHA512 18080b09a5e80d3a2dc4b04976c3470eb096560ebc038815dfaec73ef3e53ffbad74b2586d0247aeb318a6e2463e072fe84dad5a2040a9320f37b55511d890ae WHIRLPOOL 80b429beb88014c862fc74f0b9ff0b78bd54764b3c01a4b3f7595d4863eb2f8996d29e9db70b472c30c7cac02793a5290319f51b6eaab4b28dea4ca16246c030
-DIST rsyslog-5.8.5.tar.gz 2364874 SHA256 a519704c06de1026847f69d99f31a2a32783e9547f5249dddefe805bfbc3ea50 SHA512 0e38bd03d0dd681f68ab11ef2f9d0633958a49d50379721f807fc9d31441b192c331ff56df0c8f8b5c319e0d9c65072402559ace665e80cce4f251dd24e45715 WHIRLPOOL 4afd89d1512e3164d809b5ab8480423936f27c0819aab1a8e4064c13b0b017db898d269439d310c30ec53d8b8ca40b6e60b326ef17ecace8a958a9b73fa10ccd
-DIST rsyslog-6.2.2.tar.gz 2432745 SHA256 c54b51f9f26d16e623d664c765268f3696721ceddfbee4e76b0dd89f04a6f471 SHA512 b90690c0abf20d08ccfe0f47ad417070d006dc25005301d68c62ef784f7b303689e920af24a11aca071439bd3d3f57c5a3c58fbad11578fffe7c374918c15ebd WHIRLPOOL 08e52fec63a934783812dfc071a7ccf55323f0a826dc006b0b5eabbfd827e91482a7b9c4ff34589f85598d8d94c22672b68daaeeea7e316a7d239cc992744576
 DIST rsyslog-6.6.0.tar.gz 2672981 SHA256 80aabccf5945d7e26152a2ad29100e147d1fecb300397dc4ccda41acaf2ec33d SHA512 3f244e9dbde136cebb7b41534af5ab795f7c2ea6e9adf207b9a50547bc0f303b535dfd0a8a62cefcfca02554fcea0a2d4f22f134d39e313abf1ca0b5252b9ecd WHIRLPOOL f2800cb6ba499c3ea904d1b6c5ceafa8a2aeff79f92dfc37f35762dec4a1f7583f0285317800a393153ef56dd81bc0609441132d899eff7e44e6d442bec2f737
-DIST rsyslog-7.2.2.tar.gz 2742404 SHA256 9b407b9cd7069081c553f69ada6a3246c822ffc0c53a05e14af096e6b50c9333 SHA512 a7c79eb2dfbd45a97f7e467d29e2f7f0569fcc92b37a714d14f48e5d8da6073707a0b45f32b9ac7fc2eceb9e70c4c325d87ef2dd27ec91c5764a7c66d2a440b2 WHIRLPOOL 80bb16324c9d845587a73d2e6ac502f849df3a6b27f842ffea642b7e116385345dc13118f4a213a3a1a4f8b9d1f066ec236f46b6e9b76466f8bc97fd69d3ee7c
-DIST rsyslog-7.2.5.tar.gz 2704775 SHA256 8cce8c61610bde4eb09dc379281362650cced4c75097c9756acce8bfaac96bfb SHA512 950416860e1d21ed2e74959c420b196da7df208ad841a36b149278420bfbda6ed7850ea20e97a05cb268ff52d85c4671eebe6b05b01d57a724a2442a74296cef WHIRLPOOL 19ec26d15e3ad3485ea574dbc83b098d859a8fa2524abc77a825efa01efe4779434275cfee54ab55933895c2b4097bde7c3644e14f8e15e12906dfe2abece079
 DIST rsyslog-7.2.7.tar.gz 2761741 SHA256 4833533a140c1aebed069082ad579ac25e488b647d4d508167dc6e4de75af96d SHA512 4489de8f0fa63d2c9296695faacb653b43ee7a779fcc29bcb8ce0ca0442554b832e3d491248d15a6f3d9b6982cfcc669cfae750fccb58c52ad847c3a7df94e3c WHIRLPOOL d59a433c82153ad52297b05dc2422e20d90b2398f6cf4e11f0408b8565ace7d559bf80fc8e2f5fc086a693311f97ed09a5c004cd356d210c14aef9bd848d00f1
+DIST rsyslog-7.4.3.tar.gz 2908523 SHA256 d96fcb733452177f5f06789507e06f5c01434d83001c130c9fcdf21e0fffe382 SHA512 bf840b59c4fb6e0978ca55df5ef48cb6898e0c6ec633efce8e148c0d8af5497346c98290df388811b2f94425119dd0bf28dd272418a35f958ed59a3f5946d25a WHIRLPOOL b57acc662e232c27293c2836d5547e0cc7e7902fdd3ed5d2bfcbf85a747ecdb6c984b25da1a38196f485e2473d2de3f5ae8d9d764cdd86778d4bc99b9a3f574d
 DIST rsyslog-zeromq.tar.gz 22223 SHA256 3cca6ce8722ec5035744a9b88e65b89b35f6b2e6bbdbc9c9bba89d22addd2753 SHA512 d0fd6705d1fbbfd8c2932df281ef30ebfcc83085a62026ffd192bdfefaca5abef415183f958eee4f7421804ca59d8c20d8cf7fbc5b4105f86c297c6fbbcdd760 WHIRLPOOL 17d189dfe12ef5525f103d6ee202cfafe019bca11856da9d206004a9377b682b09d76816e2e2d1ca5aff2394b8cc8baec13f4961d32c74a377a9b6041ff398b1
--- a/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-fix-runtime.patch
+++ b/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-fix-runtime.patch
@ -0,0 +1,21 @@
+diff --git a/runtime/Makefile.am b/runtime/Makefile.am
+index dea06fe..34384be 100644
+--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
+@@ -97,12 +97,13 @@ librsyslog_la_SOURCES = \
+ #
+ 
+ if WITH_MODDIRS
+-librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\" $(PTHREADS_CFLAGS) -I\$(top_srcdir)/tools
+librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\"
+ else
+-librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I$(top_srcdir) $(PTHREADS_CFLAGS) -I\$(top_srcdir)/tools -I\$(top_srcdir)/grammar
+librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I\$(top_srcdir) -I\$(top_srcdir)/grammar
+ endif
+ #librsyslog_la_LDFLAGS = -module -avoid-version
+-librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS)
+librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
+librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
+ 
+ #
+ # regular expression support
--- a/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch
+++ b/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch
@ -0,0 +1,154 @@
+diff --git a/action.c b/action.c
+index 259fb66..6b52d70 100644
+--- a/action.c
+++ b/action.c
+@@ -98,7 +98,7 @@
+ #include <strings.h>
+ #include <time.h>
+ #include <errno.h>
+-#include <json/json.h>
+#include <json.h>
+ 
+ #include "dirty.h"
+ #include "template.h"
+diff --git a/configure.ac b/configure.ac
+index d6d5c92..1970f60 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -33,7 +33,9 @@ PKG_PROG_PKG_CONFIG
+ 
+ # modules we require
+ PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.5)
+-PKG_CHECK_MODULES([JSON_C], [json])
+PKG_CHECK_MODULES([JSON_C], [json],, [
+	PKG_CHECK_MODULES([JSON_C], [json-c])
+])
+ 
+ case "${host}" in
+   *-*-linux*)
+@@ -821,7 +823,7 @@ if test "x$enable_rsyslogrt" = "xyes"; then
+   RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la"
+ fi
+ AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
+-RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_FLAGS)"
+RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"
+ RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
+ AC_SUBST(RSRT_CFLAGS1)
+ AC_SUBST(RSRT_LIBS1)
+diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c
+index 822d3db..172ff4d 100644
+--- a/plugins/imkmsg/kmsg.c
+++ b/plugins/imkmsg/kmsg.c
+@@ -34,7 +34,7 @@
+ #include <ctype.h>
+ #include <sys/klog.h>
+ #include <sys/sysinfo.h>
+-#include <json/json.h>
+#include <json.h>
+ 
+ #include "rsyslog.h"
+ #include "srUtils.h"
+diff --git a/plugins/mmaudit/mmaudit.c b/plugins/mmaudit/mmaudit.c
+index 6b6b804..c7cff2c 100644
+--- a/plugins/mmaudit/mmaudit.c
+++ b/plugins/mmaudit/mmaudit.c
+@@ -43,7 +43,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <ctype.h>
+-#include <json/json.h>
+#include <json.h>
+ #include "conf.h"
+ #include "syslogd-types.h"
+ #include "template.h"
+diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c
+index 35f69aa..b16aef0 100644
+--- a/plugins/mmjsonparse/mmjsonparse.c
+++ b/plugins/mmjsonparse/mmjsonparse.c
+@@ -35,7 +35,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <ctype.h>
+-#include <json/json.h>
+#include <json.h>
+ #include "conf.h"
+ #include "syslogd-types.h"
+ #include "template.h"
+diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
+index fcadc32..f93974a 100644
+--- a/plugins/mmnormalize/mmnormalize.c
+++ b/plugins/mmnormalize/mmnormalize.c
+@@ -40,7 +40,7 @@
+ #include <unistd.h>
+ #include <libestr.h>
+ #include <libee/libee.h>
+-#include <json/json.h>
+#include <json.h>
+ #include <liblognorm.h>
+ #include "conf.h"
+ #include "syslogd-types.h"
+diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c
+index dd99741..64d501d 100644
+--- a/plugins/ommongodb/ommongodb.c
+++ b/plugins/ommongodb/ommongodb.c
+@@ -33,7 +33,7 @@
+ #include <stdint.h>
+ #include <time.h>
+ #include <mongo.h>
+-#include <json/json.h>
+#include <json.h>
+ /* For struct json_object_iter, should not be necessary in future versions */
+ #include <json/json_object_private.h>
+ 
+diff --git a/runtime/msg.c b/runtime/msg.c
+index a227567..e683cdb 100644
+--- a/runtime/msg.c
+++ b/runtime/msg.c
+@@ -41,7 +41,7 @@
+ #endif
+ #include <netdb.h>
+ #include <libestr.h>
+-#include <json/json.h>
+#include <json.h>
+ /* For struct json_object_iter, should not be necessary in future versions */
+ #include <json/json_object_private.h>
+ #if HAVE_MALLOC_H
+diff --git a/runtime/msg.h b/runtime/msg.h
+index 6faf066..ac220b6 100644
+--- a/runtime/msg.h
+++ b/runtime/msg.h
+@@ -30,7 +30,7 @@
+ 
+ #include <pthread.h>
+ #include <libestr.h>
+-#include <json/json.h>
+#include <json.h>
+ #include "obj.h"
+ #include "syslogd-types.h"
+ #include "template.h"
+diff --git a/template.c b/template.c
+index b675255..9cefa05 100644
+--- a/template.c
+++ b/template.c
+@@ -34,7 +34,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <assert.h>
+-#include <json/json.h>
+#include <json.h>
+ #include "stringbuf.h"
+ #include "syslogd-types.h"
+ #include "template.h"
+diff --git a/template.h b/template.h
+index 318db6f..87a1c77 100644
+--- a/template.h
+++ b/template.h
+@@ -30,7 +30,7 @@
+ #ifndef	TEMPLATE_H_INCLUDED
+ #define	TEMPLATE_H_INCLUDED 1
+ 
+-#include <json/json.h>
+#include <json.h>
+ #include <libestr.h>
+ #include "regexp.h"
+ #include "stringbuf.h"
--- a/app-admin/rsyslog/rsyslog-5.8.5.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.5.ebuild
@ -1,254 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.5.ebuild,v 1.12 2012/08/19 19:07:06 armin76 Exp $
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-	zeromq?	( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3"
-KEYWORDS="amd64 ~arm hppa x86"
-SLOT="0"
-IUSE="dbi debug doc extras gnutls kerberos mysql oracle postgres relp snmp static-libs zeromq zlib"
-
-RDEPEND="dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
-	gnutls? ( net-libs/gnutls dev-libs/libgcrypt )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-0.1.3 )
-	snmp? ( net-analyzer/net-snmp )
-	zeromq? ( net-libs/zeromq )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="5-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
-
-src_prepare() {
-	# Maintainer notes:
-	# ZeroMQ support, for now it is done by hand until upstream process bug.
-	# Bugzilla : http://bugzilla.adiscon.com/show_bug.cgi?id=277
-	if use zeromq; then
-		local ZEROPATH=${WORKDIR}/aggregateknowledge-rsyslog-zeromq-44b551a
-		epatch ${ZEROPATH}/rsyslog-zeromq.patch
-		cp -r ${ZEROPATH}/{i,o}mzeromq "${S}/plugins"
-	fi
-
-	# Don't force '-g' CFLAG
-	sed -i 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * rfc3195 needs a library and development of that library
-	#   is suspended, so we disable it
-	# * About the java GUI:
-	#   The maintainer says there is no real installation support
-	#   for the java GUI, so we disable it for now.
-	local myeconfargs=(
-		--disable-gui
-		--disable-rfc3195
-		--enable-largefile
-		--enable-unlimited-select
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imtemplate
-		--enable-imptcp
-		--enable-mail
-		--enable-omprog
-		--enable-omstdout
-		--enable-omtemplate
-		--enable-omdbalerting
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		$(use_enable extras omudpspoof)
-		$(use_enable zlib)
-		$(use_enable mysql)
-		$(use_enable dbi libdbi)
-		$(use_enable postgres pgsql)
-		$(use_enable oracle oracle)
-		$(use_enable gnutls)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable relp)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable debug)
-		$(use_enable debug rtinst)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug valgrind)
-	)
-
-	use zeromq && myeconfargs=(
-		${myeconfargs[@]-}
-		$(use_enable zeromq imzeromq)
-		$(use_enable zeromq omzeromq)
-	)
-
-	systemd_to_myeconfargs
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(doc/)
-	autotools-utils_src_install
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-}
-
-pkg_postinst() {
-	if use mysql || use postgres; then
-		echo
-		elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-		elog "  /usr/share/doc/${PF}/scripts"
-	fi
-
-	if use gnutls; then
-		echo
-		elog "To create a default CA and certificates for your server and clients, run:"
-		elog "  emerge --config =${PF}"
-		elog "on your logging server. You can run it several times,"
-		elog "once for each logging client. The client certificates will be signed"
-		elog "using the CA certificate generated during the first run."
-	fi
-}
-
-pkg_config() {
-	if ! use gnutls ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=gnutls to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	CERTDIR="${ROOT}/etc/ssl/${PN}"
-	if [ ! -d "${CERTDIR}" ]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<_EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<_EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<_EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-6.2.2.ebuild
+++ b/app-admin/rsyslog/rsyslog-6.2.2.ebuild
@ -1,261 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-6.2.2.ebuild,v 1.3 2012/07/23 20:57:31 maekke Exp $
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-	zeromq?	( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
-
-RDEPEND="
-	dev-libs/libee
-	dev-libs/libestr
-	dev-libs/liblognorm
-	dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-0.1.3 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
-	zeromq? ( net-libs/zeromq )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="6-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
-
-src_prepare() {
-	# Maintainer notes:
-	# ZeroMQ support,upstream bug #277
-	if use zeromq; then
-		local ZEROPATH=${WORKDIR}/aggregateknowledge-rsyslog-zeromq-44b551a
-		epatch "${FILESDIR}/${BRANCH}/rsyslog6-zeromq.patch"
-		cp -r ${ZEROPATH}/{i,o}mzeromq "${S}/plugins"
-	fi
-
-	# Don't force '-g' CFLAG
-	sed -e 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' -i configure.ac || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * rfc3195 needs a library and development of that library
-	#   is suspended, so we disable it
-	# * About the java GUI:
-	#   The maintainer says there is no real installation support
-	#   for the java GUI, so we disable it for now.
-	# * mongodb : no plugin in the sources, we'll wait for bug #330 upstream
-	local myeconfargs=(
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imtemplate
-		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-omprog
-		--enable-omstdout
-		--enable-omtemplate
-		--disable-omdbalerting
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		$(use_enable dbi libdbi)
-		$(use_enable debug)
-		$(use_enable debug rtinst)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug valgrind)
-		$(use_enable extras omudpspoof)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable mysql)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable relp)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable zlib)
-	)
-
-	use zeromq && myeconfargs=(
-		${myeconfargs[@]-}
-		$(use_enable zeromq imzeromq)
-		$(use_enable zeromq omzeromq)
-	)
-
-	systemd_to_myeconfargs
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(doc/)
-	autotools-utils_src_install
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-}
-
-pkg_postinst() {
-	if use mysql || use postgres; then
-		echo
-		elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-		elog "  /usr/share/doc/${PF}/scripts"
-	fi
-
-	if use ssl; then
-		echo
-		elog "To create a default CA and certificates for your server and clients, run:"
-		elog "  emerge --config =${PF}"
-		elog "on your logging server. You can run it several times,"
-		elog "once for each logging client. The client certificates will be signed"
-		elog "using the CA certificate generated during the first run."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	CERTDIR="${ROOT}/etc/ssl/${PN}"
-	if [ ! -d "${CERTDIR}" ]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-7.2.2-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.2.2-r1.ebuild
@ -1,253 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.2-r1.ebuild,v 1.1 2012/11/27 11:45:32 ultrabug Exp $
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
-
-RDEPEND="
-	dev-libs/json-c
-	dev-libs/libee
-	dev-libs/libestr
-	dev-libs/liblognorm
-	net-misc/curl
-	dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-1.0.1 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
-	zeromq? ( net-libs/czmq )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="7-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
-
-src_prepare() {
-	# Don't force '-g' CFLAG
-	sed -e 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' -i configure.ac || die
-
-	# Fix runtime UUID/JSON libs linking
-	epatch "${FILESDIR}/6-stable/${PN}-6.6.0-fix-runtime.patch"
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * rfc3195 needs a library and development of that library
-	#   is suspended, so we disable it
-	# * About the java GUI:
-	#   The maintainer says there is no real installation support
-	#   for the java GUI, so we disable it for now.
-	# * mongodb : doesnt work with mongo-c-driver ?
-	local myeconfargs=(
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-mmjsonparse
-		--enable-mmaudit
-		--enable-omprog
-		--enable-omstdout
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		--enable-uuid
-		$(use_enable dbi libdbi)
-		$(use_enable debug)
-		$(use_enable debug rtinst)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug valgrind)
-		$(use_enable extras omudpspoof)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable mysql)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable relp)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable zlib)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omzmq3)
-	)
-	systemd_to_myeconfargs
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(doc/)
-	autotools-utils_src_install
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-	touch "${D}"/etc/${PN}.d/00_gentoo.conf
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-}
-
-pkg_postinst() {
-	if use mysql || use postgres; then
-		echo
-		elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-		elog "  /usr/share/doc/${PF}/scripts"
-	fi
-
-	if use ssl; then
-		echo
-		elog "To create a default CA and certificates for your server and clients, run:"
-		elog "  emerge --config =${PF}"
-		elog "on your logging server. You can run it several times,"
-		elog "once for each logging client. The client certificates will be signed"
-		elog "using the CA certificate generated during the first run."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	CERTDIR="${ROOT}/etc/ssl/${PN}"
-	if [ ! -d "${CERTDIR}" ]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-7.4.3.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.4.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.5.ebuild,v 1.2 2013/02/12 12:06:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v 1.1 2013/07/29 22:00:38 ultrabug Exp $

 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@ -19,7 +19,7 @@ IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-l
 RDEPEND="
 	dev-libs/json-c
 	dev-libs/libee
-	dev-libs/libestr
+	>=dev-libs/libestr-0.1.5
 	dev-libs/liblognorm
 	net-misc/curl
 	dbi? ( dev-db/libdbi )
@ -48,17 +48,9 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)

 PATCHES=(
-	"${FILESDIR}"/${P}-json-c-pkgconfig.patch
-
-	# Fix runtime UUID/JSON libs linking
-	"${FILESDIR}"/6-stable/${PN}-6.6.0-fix-runtime.patch	)
-
-src_prepare() {
-	# Don't force '-g' CFLAG
-	sed -e 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' -i configure.ac || die
-
-	autotools-utils_src_prepare
-}
+	"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-json-c-pkgconfig.patch
+	"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-fix-runtime.patch
+)

 src_configure() {
 	# Maintainer notes:
@ -69,6 +61,7 @@ src_configure() {
 	#   for the java GUI, so we disable it for now.
 	# * mongodb : doesnt work with mongo-c-driver ?
 	local myeconfargs=(
+		--enable-cached-man-pages
 		--disable-gui
 		--disable-rfc3195
 		--enable-imdiag
@ -80,6 +73,7 @@ src_configure() {
 		--enable-mmnormalize
 		--enable-mmjsonparse
 		--enable-mmaudit
+		--enable-mmanon
 		--enable-omprog
 		--enable-omstdout
 		--enable-omuxsock
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@ -1,2 +1,3 @@
 DIST unrarsrc-4.2.4.tar.gz 164641 SHA256 9432bf798e5f7123f3060f37b75b7c07f36f0091305f46473dcae9154f8cd686 SHA512 54bdc16c940deb6e5759ddec9739381f0e1b5e2279548ac367eb32c4ff79cd496712692feaf46f4ce3b2ccfa8d622b7c45fb8070420b16315226627c45fef850 WHIRLPOOL 197310c41725280d6a5c4fa3da9d8411e419f20e41f6c645534b37d206ce67474c8b320811a7c7f2acbc375ef0341ec57adfe82a6be7f6bdabe2871841669739
 DIST unrarsrc-5.0.7.tar.gz 208034 SHA256 7c7f6c0920a2ece2b832cd3975eb64643966269a3aefc0e4568e1be0ffb66cf9 SHA512 c33ee1cab531581276aec0df7c57960f0052f7af5dd419c18e7c00129907fc63474a1111cbfd732366fe4072143319971a6b9f0a16e06f20b41ea00c9dc98ec4 WHIRLPOOL 35c5e694d18bfd17192f2c483a4f4b1fbbdbe0579ac889d344d0f860af097954f1d52d8156a1ed78bd2d563d41c392a079404e996f4a6cc6e1b4977c1a9dd9bf
+DIST unrarsrc-5.0.8.tar.gz 207917 SHA256 865a6520568c6490a1c8fe4132659c0b6a6131797154869367d6d5e63a80c047 SHA512 563004f117e1d8cf0b134f1d030ff23ad5ccca2faf10aca8f271fd1f4be1ce3b723435482610e9a8ee454097e32a4d01712f4e442439100f4c12aaf363376f49 WHIRLPOOL bc6a5509624479b3cd152c230e6e030e97daa4bfc0528c525a419dbf478a642e429bd02a8ff641a74f001aee6a977a4b306eb7e27e978177ff06501079f2a374
--- a/app-arch/unrar/unrar-5.0.8.ebuild
+++ b/app-arch/unrar/unrar-5.0.8.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.0.8.ebuild,v 1.1 2013/07/29 17:13:46 ssuominen Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="http://www.rarlab.com/rar_add.htm"
+SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="unRAR"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
+	sed -i \
+		-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
+		-e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
+		makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname)
+	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname ${PV})
+
+	# The stupid code compiles a lot of objects differently if
+	# they're going into a lib (-DRARDLL) or into the main app.
+	# So for now, we can't link the main app against the lib.
+	unrar_make clean
+	unrar_make
+}
+
+src_install() {
+	dobin unrar
+	dodoc readme.txt
+
+	dolib.so libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@ -0,0 +1 @@
+DIST codecrypt-1.2.tar.gz 438752 SHA256 007f8f7f00659f618f3f733f5895ee56baa1d6e55df0a62e0f07ac50bfc5df0b SHA512 29ecec99c2c89ab169bb11ece4b6726ef1b9dd5ae7580c0ee5a3598779bf5e8734f0771f31c408a0b4e36047036f976d65b0400d21bbe589c437f28a793912da WHIRLPOOL 49c0689cfaa064747c22be1830b69c1753f851f59af818063f9771c1930bdb25a4da14939045d0e8886b19351dd030ff58fb0ba6a7bd2f6d61ec022f6acfb112
--- a/app-crypt/codecrypt/codecrypt-1.2.ebuild
+++ b/app-crypt/codecrypt/codecrypt-1.2.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/codecrypt/codecrypt-1.2.ebuild,v 1.1 2013/07/29 14:48:48 yac Exp $
+
+EAPI=5
+
+DESCRIPTION="Post-quantum cryptography tool"
+HOMEPAGE="http://e-x-a.org/codecrypt/"
+SRC_URI="http://e-x-a.org/codecrypt/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="dev-libs/gmp"
+RDEPEND="${DEPEND}"
--- a/app-crypt/codecrypt/metadata.xml
+++ b/app-crypt/codecrypt/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>exa.exa@gmail.com</email>
+		<name>Mirek Kratochvil</name>
+		<description>Proxied Maintainer</description>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
+
--- a/app-emacs/d-mode/Manifest
+++ b/app-emacs/d-mode/Manifest
@ -0,0 +1 @@
+DIST d-mode-2.0.6.tar.gz 5465 SHA256 303ede6d2555ab935676ec4576d36c79bc880af86f37838a3b651b39f20a8f38 SHA512 8706459af61e49b3ca1ef6d4021abff752706b4dca9385c4fbe2b7c29ecb028dc3df558b1e9b3a358e5c38e3d2ab7121505583f95d3afdd9a06bc9449ed678f2 WHIRLPOOL 6f86955536c68fdc6da917c453d0e2ab9603de661abb6b2c504a298a8f76ad4111a0afa2ac0e5b585f8f7acb7a8a688fd3a3089726aa4150476acdd4364ae09c
--- a/app-emacs/d-mode/d-mode-2.0.6.ebuild
+++ b/app-emacs/d-mode/d-mode-2.0.6.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/d-mode/d-mode-2.0.6.ebuild,v 1.1 2013/07/29 21:19:15 ulm Exp $
+
+EAPI=5
+NEED_EMACS=23
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing D code"
+HOMEPAGE="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode
+	http://www.emacswiki.org/emacs/DMode"
+SRC_URI="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/Emacs-D-Mode-2.0.6"
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/d-mode/files/50d-mode-gentoo.el
+++ b/app-emacs/d-mode/files/50d-mode-gentoo.el
@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'd-mode "d-mode" "Major mode for editing D code" t)
+(add-to-list 'auto-mode-alist '("\\.d[i]?\\'" . d-mode))
--- a/app-emacs/d-mode/metadata.xml
+++ b/app-emacs/d-mode/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>emacs</herd>
+</pkgmetadata>
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r9.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r9.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r6.ebuild,v 1.1 2013/07/28 21:36:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r9.ebuild,v 1.1 2013/07/30 00:01:12 aballier Exp $

 EAPI=5
 inherit emul-linux-x86
@ -31,6 +31,11 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
 		>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)]
 		>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)]
 		>=media-sound/musepack-tools-465-r1[abi_x86_32(-)]
+		>=media-libs/libsndfile-1.0.25-r1[abi_x86_32(-)]
+		>=media-libs/libsamplerate-0.1.8-r1[abi_x86_32(-)]
+		>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)]
+		>=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)]
+		>=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)]
 	)"

 src_prepare() {
--- a/app-emulation/emul-linux-x86-soundlibs/files/remove-native
+++ b/app-emulation/emul-linux-x86-soundlibs/files/remove-native
@ -177,3 +177,38 @@ usr/lib32/pkgconfig/wavpack.pc
 usr/lib32/libmpcdec.so
 usr/lib32/libmpcdec.so.7
 usr/lib32/libmpcdec.so.7.0.1
+usr/lib32/libsndfile.so
+usr/lib32/libsndfile.so.1
+usr/lib32/libsndfile.so.1.0.25
+usr/lib32/pkgconfig/sndfile.pc
+usr/lib32/libsamplerate.so
+usr/lib32/libsamplerate.so.0
+usr/lib32/libsamplerate.so.0.1.7
+usr/lib32/pkgconfig/samplerate.pc
+usr/lib32/libtwolame.so
+usr/lib32/libtwolame.so.0
+usr/lib32/libtwolame.so.0.0.0
+usr/lib32/pkgconfig/twolame.pc
+usr/lib32/jack/a2j_in.so
+usr/lib32/jack/inprocess.so
+usr/lib32/jack/intime.so
+usr/lib32/jack/jack_alsa.so
+usr/lib32/jack/jack_alsa_midi.so
+usr/lib32/jack/jack_dummy.so
+usr/lib32/jack/jack_net.so
+usr/lib32/jack/jack_oss.so
+usr/lib32/libjack.so
+usr/lib32/libjack.so.0
+usr/lib32/libjack.so.0.0.28
+usr/lib32/libjackserver.so
+usr/lib32/libjackserver.so.0
+usr/lib32/libjackserver.so.0.0.28
+usr/lib32/pkgconfig/jack.pc
+usr/lib32/libportaudio.so
+usr/lib32/libportaudio.so.2
+usr/lib32/libportaudio.so.2.0.0
+usr/lib32/libportaudiocpp.so
+usr/lib32/libportaudiocpp.so.0
+usr/lib32/libportaudiocpp.so.0.0.12
+usr/lib32/pkgconfig/portaudio-2.0.pc
+usr/lib32/pkgconfig/portaudiocpp.pc
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -1,4 +1,5 @@
 DIST libvirt-1.0.5.2.tar.gz 23953774 SHA256 79ba3ade0646c5500a333d2abfe52d3bfc1eeae8986c0ed433eeae2edd4799ef SHA512 00a369502a7ff4be17c547feca13b88419c55b0a6abec6dc83e7ea2306a17fe495e217e1b759aaea962b44da44cb7cad64f3866ae41a059820ed48c2144f7b21 WHIRLPOOL c7cff2f603a676c6810e0b3f95a91e3d8887ec5b9e3799afd13f025aebed52e43948ecf0a8e50b2bc955083fd62ef52be1dc4384086fa98e84283e4d7963b925
 DIST libvirt-1.0.5.4.tar.gz 23972364 SHA256 fe51da9d5c3d5e8521d0c89a3379ec3b19083a31e30bc4eb54a860aa6ccf2771 SHA512 f44006f5cf00e4682266a306c819075471abb52cd9816bd75e0b83962bcb4a085fc0ffc94b688bedbc4042489a2997b77ebd1aad6f1560abe808140a24682865 WHIRLPOOL 0d6609f9d437e344f6c5b74f1c34c24004e256efd784b61f35fa68483086213a47fe27e2ec5f5f4e2ce7bbb7a02c2dabe75511e8686221b6b9be6d2719dccd0e
+DIST libvirt-1.1.0-4785c033.tar.xz 24372 SHA256 20350a9ebd378306560674b77371f6d56a13f3d1f5275d5f38bc30729e8d56f4 SHA512 dc2cb5536462854a138ecbd7e7694c743ca3d762e4d6d845ad447fcb18efa7c46d82adc435d09a865de161ec11723202f491b44654104c44c26988caf9ff6bfb WHIRLPOOL 5d1dd80451dcb4ec8afb604bda1c8a99f82a3d85b488d8e8e83ac4609072a100d95b8395b31dd26f7c683392252dd7e725513330fe4c1fc69faf55d7296c68b3
 DIST libvirt-1.1.0-cafcec2f.tar.xz 8284 SHA256 ce68c2e6e54d1d3190c45cfe644d6af6c32dd8c4f661276868f90feeb8020b46 SHA512 95637c6577ac1cfbdfe087d5e5ad2671026f9ed35231780821a86db9ce610daceaeae55ce750ab345052cbbdeef030265e293de03c4a2add51d77b206df5586c WHIRLPOOL 5e21511ae6e0c4498c053133b4041aa9dab86b5638455639da97e05d177f2986c123b5c0cb61c41c7a60efe8d78592b789a06e25cf89ac0bbf5143c2ffacc167
 DIST libvirt-1.1.0.tar.gz 24397962 SHA256 ce9e765697ecb595469489665043ce221d9b70babc16fec77ee938fe37676928 SHA512 0ac9c8b02a182ad4c66609bc949282455b362fc2aa576d1c2413366dfb1ce70d3737caad0101128f8629c34e0ca47295128bafe5608e3ac60e764c3f8178c7f0 WHIRLPOOL a526350aeef2d72cb079750bda0f18f9f9ebc4b2cf56e7655c9ee0e8a744b0fb540089f64da0820628779c1456435043bf8c6dc2c18bdba65c0e705a43777f90
--- a/app-emulation/libvirt/libvirt-1.1.0-r4.ebuild
+++ b/app-emulation/libvirt/libvirt-1.1.0-r4.ebuild
@ -0,0 +1,427 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.0-r4.ebuild,v 1.1 2013/07/29 19:49:14 cardoe Exp $
+
+EAPI=5
+
+BACKPORTS=4785c033
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit eutils python-single-r1 user autotools linux-info systemd
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	AUTOTOOLIZE=yes
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
+		${BACKPORTS:+
+			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~x86"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
+	nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
+	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
+	systemd"
+REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )
+	virt-network? ( libvirtd )
+	firewalld? ( virt-network )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	dev-libs/libgcrypt
+	>=dev-libs/libxml2-2.7.6
+	dev-libs/libnl:3
+	>=net-libs/gnutls-1.0.25
+	net-libs/libssh2
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	>=net-analyzer/netcat6-1.0-r2
+	app-misc/scrub
+	audit? ( sys-process/audit )
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	fuse? ( >=sys-fs/fuse-2.8.6 )
+	iscsi? ( sys-block/open-iscsi )
+	lxc? ( sys-power/pm-utils )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	openvz? ( sys-kernel/openvz-sources )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	python? ( ${PYTHON_DEPS} )
+	qemu? (
+		>=app-emulation/qemu-0.13.0
+		dev-libs/yajl
+		sys-power/pm-utils
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	xen? ( app-emulation/xen-tools app-emulation/xen )
+	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
+	virt-network? ( net-dns/dnsmasq
+		>=net-firewall/iptables-1.4.10
+		net-misc/radvd
+		net-firewall/ebtables
+		sys-apps/iproute2[-minimal]
+		firewalld? ( net-firewall/firewalld )
+	)
+	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+# one? ( dev-libs/xmlrpc-c )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt"
+
+LXC_CONFIG_CHECK="
+	~CGROUPS
+	~CGROUP_FREEZER
+	~CGROUP_DEVICE
+	~CGROUP_CPUACCT
+	~CGROUP_SCHED
+	~CGROUP_PERF
+	~BLK_CGROUP
+	~NET_CLS_CGROUP
+	~NETPRIO_CGROUP
+	~CPUSETS
+	~RESOURCE_COUNTERS
+	~NAMESPACES
+	~UTS_NS
+	~IPC_NS
+	~PID_NS
+	~NET_NS
+	~DEVPTS_MULTIPLE_INSTANCES
+	~VETH
+	~MACVLAN
+	~POSIX_MQUEUE
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+"
+
+VIRTNET_CONFIG_CHECK="
+	~BRIDGE_NF_EBTABLES
+	~BRIDGE_EBT_MARK_T
+	~NETFILTER_ADVANCED
+	~NETFILTER_XT_TARGET_CHECKSUM
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MARK
+"
+
+MACVTAP_CONFIG_CHECK="~MACVTAP"
+
+pkg_setup() {
+	enewgroup qemu 77
+	enewuser qemu 77 -1 -1 qemu kvm
+
+	# Some people used the masked ebuild which was not adding the qemu
+	# user to the kvm group originally. This results in VMs failing to
+	# start for some users. bug #430808
+	egetent group kvm | grep -q qemu
+	if [[ $? -ne 0 ]]; then
+		gpasswd -a qemu kvm
+	fi
+
+	python-single-r1_pkg_setup
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
+	use macvtap && CONFIG_CHECK+="${MACVTAP}"
+	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	if [[ ${PV} = *9999* ]]; then
+
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	epatch_user
+
+	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
+
+	# Tweak the init script
+	local avahi_init=
+	local iscsi_init=
+	local rbd_init=
+	local firewalld_init=
+	cp "${FILESDIR}/libvirtd.init-r12" "${S}/libvirtd.init"
+	use avahi && avahi_init='avahi-daemon'
+	use iscsi && iscsi_init='iscsid'
+	use rbd && rbd_init='ceph'
+	use firewalld && firewalld_init='need firewalld'
+
+	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
+}
+
+src_configure() {
+	local myconf=""
+
+	## enable/disable daemon, otherwise client only utils
+	myconf="${myconf} $(use_with libvirtd)"
+
+	## enable/disable the daemon using avahi to find VMs
+	myconf="${myconf} $(use_with avahi)"
+
+	## hypervisors on the local host
+	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
+	myconf+=" --without-xenapi"
+	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
+		myconf+=" --with-libxl"
+	else
+		myconf+=" --without-libxl"
+	fi
+	myconf="${myconf} $(use_with openvz)"
+	myconf="${myconf} $(use_with lxc)"
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
+	else
+		myconf="${myconf} $(use_with virtualbox vbox)"
+	fi
+	myconf="${myconf} $(use_with uml)"
+	myconf="${myconf} $(use_with qemu)"
+	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
+	myconf="${myconf} $(use_with phyp)"
+	myconf="${myconf} --with-esx"
+	myconf="${myconf} --with-vmware"
+
+	## additional host drivers
+	myconf="${myconf} $(use_with virt-network network)"
+	myconf="${myconf} --with-storage-fs"
+	myconf="${myconf} $(use_with lvm storage-lvm)"
+	myconf="${myconf} $(use_with iscsi storage-iscsi)"
+	myconf="${myconf} $(use_with parted storage-disk)"
+	myconf="${myconf} $(use_with lvm storage-mpath)"
+	myconf="${myconf} $(use_with rbd storage-rbd)"
+	myconf="${myconf} $(use_with numa numactl)"
+	myconf="${myconf} $(use_with numa numad)"
+	myconf="${myconf} $(use_with selinux)"
+	myconf="${myconf} $(use_with fuse)"
+
+	# udev for device support details
+	myconf="${myconf} $(use_with udev)"
+
+	# linux capability support so we don't need privileged accounts
+	myconf="${myconf} $(use_with caps capng)"
+
+	## auth stuff
+	myconf="${myconf} $(use_with policykit polkit)"
+	myconf="${myconf} $(use_with sasl)"
+
+	# network bits
+	myconf="${myconf} $(use_with macvtap)"
+	myconf="${myconf} $(use_with pcap libpcap)"
+	myconf="${myconf} $(use_with vepa virtualport)"
+	myconf="${myconf} $(use_with firewalld)"
+
+	## other
+	myconf="${myconf} $(use_enable nls)"
+	myconf="${myconf} $(use_with python)"
+
+	# user privilege bits fir qemu/kvm
+	if use caps; then
+		myconf="${myconf} --with-qemu-user=qemu"
+		myconf="${myconf} --with-qemu-group=qemu"
+	else
+		myconf="${myconf} --with-qemu-user=root"
+		myconf="${myconf} --with-qemu-group=root"
+	fi
+
+	# audit support
+	myconf="${myconf} $(use_with audit)"
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-netcf"
+
+	# we use udev over hal
+	myconf="${myconf} --without-hal"
+
+	# locking support
+	myconf="${myconf} --without-sanlock"
+
+	# systemd unit files
+	use systemd && myconf="${myconf} --with-init-script=systemd"
+
+	# this is a nasty trick to work around the problem in bug
+	# #275073. The reason why we don't solve this properly is that
+	# it'll require us to rebuild autotools (and we don't really want
+	# to do that right now). The proper solution has been sent
+	# upstream and should hopefully land in 0.7.7, in the mean time,
+	# mime the same functionality with this.
+	case ${CHOST} in
+		*cygwin* | *mingw* )
+			;;
+		*)
+			ac_cv_prog_WINDRES=no
+			;;
+	esac
+
+	econf \
+		${myconf} \
+		--disable-static \
+		--docdir=/usr/share/doc/${PF} \
+		--with-remote \
+		--localstatedir=/var
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		HTML_DIR=/usr/share/doc/${PF}/html \
+		DOCS_DIR=/usr/share/doc/${PF} \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
+		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
+		|| die "emake install failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
+
+	keepdir /var/lib/libvirt/images
+
+	use python && python_optimize
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	# We really don't want to use or support old PolicyKit cause it
+	# screws with the new polkit integration
+	if has_version sys-auth/policykit; then
+		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
+	fi
+
+	# Only sysctl files ending in .conf work
+	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	# support for dropped privileges
+	if use qemu; then
+		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
+		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
+	fi
+
+	if use caps && use qemu; then
+		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
+	elif use qemu; then
+		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
+	fi
+
+	if ! use policykit; then
+		elog "To allow normal users to connect to libvirtd you must change the"
+		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	elog
+	elog "For the basic networking support (bridged and routed networks)"
+	elog "you don't need any extra software. For more complex network modes"
+	elog "including but not limited to NATed network, you can enable the"
+	elog "'virt-network' USE flag."
+	elog
+	if has_version net-dns/dnsmasq; then
+		ewarn "If you have a DNS server setup on your machine, you will have"
+		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
+		ewarn " bind-interfaces"
+		ewarn " interface or except-interface"
+		ewarn
+		ewarn "Otherwise you might have issues with your existing DNS server."
+	fi
+
+	if use caps && use qemu; then
+		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
+		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
+	fi
+}
--- a/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch
+++ b/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch
@ -0,0 +1,15 @@
+fix invalid installs of docs/man and config into /usr/local
+
+--- xen-4.2.2-orig/tools/Makefile	2013-04-23 18:42:55.000000000 +0200
+++ xen-4.2.2/tools/Makefile	2013-07-29 17:01:33.764093405 +0200
+@@ -199,6 +199,9 @@
+ 		--bindir=$(LIBEXEC) \
+ 		--datadir=$(SHAREDIR)/qemu-xen \
+ 		--disable-kvm \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc/xen \
+		--sysconfdir=/etc \
+ 		--python=$(PYTHON) \
+ 		$(IOEMU_CONFIGURE_CROSS); \
+ 	$(MAKE) all
+
--- a/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild,v 1.2 2013/07/21 16:09:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild,v 1.4 2013/07/30 07:08:35 idella4 Exp $

 EAPI=5

@ -202,6 +202,9 @@ src_prepare() {
 	# Set dom0-min-mem to kb; Bug #472982
 	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch

+	# Bug #
+	epatch "${FILESDIR}"/${P}-install.patch
+
 	#Security patches, currently valid
 	epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \
 		"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \
@ -228,6 +231,9 @@ src_prepare() {
 	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
 		-i Config.mk || die

+	# Bug 445986
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
+
 	epatch_user
 }

@ -327,14 +333,6 @@ src_install() {
 	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
 	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
 		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	if use qemu; then
-		mv "${D}"usr/local/etc/qemu "${D}"etc/ || die
-		mv "${D}"usr/local/share/doc/qemu "${D}"usr/share/doc/{$PF}/ || die
-		mv "${D}"usr/local/share/man/man1/* "${D}"usr/share/man/man1/ || die
-		mv "${D}"usr/local/share/man/man8/* "${D}"usr/share/man/man8/ || die
-		rm -r "${D}"usr/local/ || die
-	fi
 }

 pkg_postinst() {
--- a/app-emulation/xen-tools/xen-tools-4.3.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.3.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild,v 1.14 2013/07/27 17:33:03 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild,v 1.16 2013/07/30 06:38:21 idella4 Exp $

 EAPI=5

@ -221,7 +221,7 @@ src_prepare() {

 	use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die
 	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C &:' -i tools/firmware/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die

 	epatch_user
 }
@ -242,7 +242,7 @@ src_compile() {

 	unset LDFLAGS
 	unset CFLAGS
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}

 	use doc && emake -C docs txt html
 	emake -C docs man-pages
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@ -6,7 +6,9 @@
    M17N engine for IBus input platform. It allows input of many
    launguaes using the input table maps from m17n-db.
  </longdescription>
-
+  <upstream>
+    <remote-id type="cpe">cpe:/a:ibus_project:ibus-m17n</remote-id>
+  </upstream>
  <use>
    <flag name='gtk'>
      Build the preference interfaces, based on
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@ -15,4 +15,7 @@ developers to develop input method easily.
    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
    <flag name="deprecated">install the deprecated ibus python library</flag>
  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:ibus_project:ibus</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@ -1,3 +1,2 @@
-DIST librime-0.9.7.tar.gz 2538868 SHA256 894ba70dea2eb47b02cdcce1f971917020a866cd1eccdf9f218cc1f4eae806ec SHA512 105283bfec37575b6c111b7bac2466c4d52b83cee3dc1d3bda06e8b7847d1dc4f21c2911cd93ca96f98f563885b6a8df33a26eeea8959c1554bc45bde3c94bf6 WHIRLPOOL fc0297bb4f45627c8cce3d4107a02703b1f109ec0bb0883886df95d38f73e085bec0dd446ff3d7407c4fab7a5c0c085fe38eb05505ef90bc8fdf5ed9c23cbbd6
 DIST librime-0.9.8.tar.gz 2538890 SHA256 94092a7d1990b949efe6b4bcf8e8351cee64a3abe7838770a775ecb02a1ef065 SHA512 73bfdd0febaffcd1fc08fa17aef609c07d24beff0fe7d188b71562b4b778564f9c908a811d11fde567164d3a0e651fd8ea1b1f36a1d55bf22927667ccbf99b43 WHIRLPOOL 53993122b58dbad41f85997ee159ed8abf5d90da4d260e705f4363fd7edf3cd8ca0996ec4ba370eb596c0162eade4ca5d37456216eef98be3a2e713dcaa8bf85
 DIST librime-0.9.9.tar.gz 2548968 SHA256 e828acc853a5d9e3ca191d065112c410183aadb5bd1d021704f82a8644ff6fd8 SHA512 71b39e713d5bbb73441dfb3038be6dc04518d2169df336e7fcb19b4c3b19a48d7db7c230fb1107148f3b7d95342851d23569617ff8138200c7ef1d750060c00f WHIRLPOOL fb5798491352eb1682a2bed7a73486df153a2479eef0adadc00726ab958b50606e32d59bfa8ded86c3aa35bac5e120e4251903fcb54326936251f1f3af726f92
--- a/app-i18n/librime/files/librime-data-option.patch
+++ b/app-i18n/librime/files/librime-data-option.patch
@ -1,27 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9027f82..e67b0f0 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,6 +8,7 @@ set(LIBRIME_VERSION 0.9.2)
- set(LIBRIME_SOVERSION 0)
- 
- option(BUILD_STATIC "Build static version of Rime" OFF)
-+option(BUILD_DATA "Build data for Rime" OFF)
- 
- if(WIN32)
-   set(EXT ".exe")
-@@ -107,12 +108,14 @@ if (NOT BUILD_STATIC)
-   install(FILES ${PROJECT_BINARY_DIR}/rime.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-   install(FILES cmake/RimeConfig.cmake DESTINATION share/cmake/rime)
-   # data files
-+  if (BUILD_DATA)
-   install(FILES ${PROJECT_SOURCE_DIR}/data/default.yaml DESTINATION ${pkgdatadir})
-   install(FILES ${PROJECT_SOURCE_DIR}/data/essay.kct DESTINATION ${pkgdatadir})
-   file(GLOB preset_schema ${PROJECT_SOURCE_DIR}/data/preset/*.yaml)
-   install(FILES ${preset_schema} DESTINATION ${pkgdatadir})
-   file(GLOB supplement_schema ${PROJECT_SOURCE_DIR}/data/supplement/*.yaml)
-   install(FILES ${supplement_schema} DESTINATION ${pkgdatadir})
-+  endif(NOT BUILD_DATA)
- endif (NOT BUILD_STATIC)
- 
- add_subdirectory(src)
--- a/app-i18n/librime/librime-0.9.7.ebuild
+++ b/app-i18n/librime/librime-0.9.7.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-0.9.7.ebuild,v 1.1 2013/01/30 10:05:35 yngwin Exp $
-
-EAPI=4
-
-inherit cmake-utils multilib vcs-snapshot
-
-DESCRIPTION="Rime Input Method Engine library"
-HOMEPAGE="http://code.google.com/p/rimeime/"
-SRC_URI="https://github.com/lotem/${PN}/tarball/rime-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="app-i18n/opencc
-	dev-cpp/glog
-	dev-cpp/yaml-cpp
-	dev-db/kyotocabinet
-	>=dev-libs/boost-1.46.0[threads(+)]
-	sys-libs/zlib
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC)
-		-DBUILD_DATA=OFF
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@ -3,3 +3,4 @@ DIST byobu_5.41.orig.tar.gz 603878 SHA256 d81222475d9f51e8bb4cc00593e8d1386d94e4
 DIST byobu_5.43.orig.tar.gz 604092 SHA256 0e115dd834053ce68e2f0e33f11f942c3e6321576c9cb47f45694b09f9f77823 SHA512 bbcbf5b4d290c73f7fc786120f0e5c373b25b15542f37f9e4845a8ae8eb61cd62297e9c861ae76841805d3c44b5eaf87a3f05ce6fd0a2c01c86f1271037eb11a WHIRLPOOL 01abde79e688ded68c01999b4fa1479897450d911ff537917a07ab499d76f46a75d1cf51dcaab8c307d134b1204ffc84893cd3e99d4ba9a5072c89e299691858
 DIST byobu_5.45.orig.tar.gz 598626 SHA256 98c4f658fcff90b4e800eac478202ed199cd757b7e0e2e4c821864c4446c0414 SHA512 e9186bf908eb6da28cf7da57e58eaf8843dcb9525ea4704ad9541b688441d2386ab1944c972ecbc0c11c83984bea23292e63e06a935e77df9a13f1fc217ab0e0 WHIRLPOOL 2dfdbaf778501fa6836b306a8ca81b085e799757b9d1cf6558d9bce6419ecb831391620b063f7db77d274950b084cf63c2e8268714187155f8764d98b86f9075
 DIST byobu_5.47.orig.tar.gz 599237 SHA256 a36ddc1a52ba21892d7d15d855bac698f59c6f406e0e7645a3ba099df697f466 SHA512 9952106bbab8482d95deaa9b7565a392b7de4d5f728caceafc60ca5a003a0e5686745fa4764476a526810756a986b702e140496e779b22525d4481cd140a6ac5 WHIRLPOOL c1551e43837fac5f6f4a690607364c41a1bef79f8687e022e4207254e1854a0cdb263ee52cf7cb5ff5b1f06771a49c595f1925e7c0015fde173dc020af4be407
+DIST byobu_5.49.orig.tar.gz 603524 SHA256 7bd8d1de30de56c1541c581585baf370941d8e907d157fe071976bbbbfa2c66f SHA512 009e1a0a9689b29a34ed80f5a74e24169d2755fa2d6f851599a4fb1f8d9ff7282d38be39f4dff9d596cc10a837d8c7a64cb160037fa9b990854d1b91d715115c WHIRLPOOL 424cf01d62b28f393f7d28a3d3e70d76e595627e5f7ee6d4fb5828304242f13aefb55b7a278f903aa0d6681e1a1d9df2581cbb0c2f509422516678126b90e808
--- a/app-misc/byobu/byobu-5.49.ebuild
+++ b/app-misc/byobu/byobu-5.49.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.49.ebuild,v 1.1 2013/07/30 06:21:07 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/newt[${PYTHON_USEDEP}]
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
--- a/app-misc/nut/Manifest
+++ b/app-misc/nut/Manifest
@ -1,2 +1,3 @@
+DIST nut-18.10.tar.gz 1339561 SHA256 81a74e4777dcfd11e2ac44616399619b84773ab26a995aac2a0aa048fb305c93 SHA512 077a94dcc16ec9dea4e6d2bc95845bc1688309c0cca7077093129237ea019e6feff70cf61db839690ea8cec6ac2ae99c6330e54bd24e3aa56c4d15ff09d68088 WHIRLPOOL aa250b5ec439c0f7912ab8e352cb6168e63bcc2916e5d9750241e19a5d536171f75b146ac390fca8d46b267df90f5c24d44a19e1f5190eec4436c80517de1766
 DIST nut-18.8.tar.gz 1337141 SHA256 1bd8d8ecd49318552399b467c550805784cca0c78eeee73b8c285c66ed79f182 SHA512 a6bcfb5c4550d6c9b3129e96fd21f46137130d79861b81d766eaaf6b2bc29cb7819bc9af5557476c2ec301dbcd16dbd102c5d14ac13300b79dc649991839765a WHIRLPOOL f21a793bec8d26ff4865e8297a8b7f53027f87aee60bec2a03d2c1e8b64f3e2ec38fdd1dc4a75ca558f9cc887168bf5f7d6771e8f455ddcad629b6d4ab54ba27
 DIST nut-18.9.tar.gz 1338133 SHA256 e0b5f5552ae2c0b9075163f33069d165de2d5cb686357055eef81955054ebc6f SHA512 396c5a09008313a3314b2c52eeca29b96f84593d2695dacd3b6ae7ac1f3d0a860a93f09fdbc519a24e86f7c886e4aacdaf22f657c19dbb70699aac59519df5a6 WHIRLPOOL 765303be1fea49a06069ace93292cddd4f9c2107d00e82f8071c6eeb31119388a1fc953f00554af5edabc0d7e0f5a6deba0f6d07e592d3a9d44797cc2344cdc7
--- a/app-misc/nut/nut-18.10.ebuild
+++ b/app-misc/nut/nut-18.10.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-18.10.ebuild,v 1.1 2013/07/30 06:23:14 radhermit Exp $
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Record what you eat and analyze your nutrient levels"
+HOMEPAGE="http://nut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\" \
+		nut
+}
+
+src_install() {
+	insinto /usr/share/nut
+	doins raw.data/*
+
+	dobin nut
+	doman nut.1
+}
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.187 2013/07/29 09:28:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.188 2013/07/29 13:26:35 scarabeus Exp $

 EAPI=5

@ -71,7 +71,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC

-IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
+IUSE="bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk
 gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav"

 LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
@ -140,6 +140,7 @@ COMMON_DEPEND="
 	cups? ( net-print/cups )
 	dbus? ( >=dev-libs/dbus-glib-0.92 )
 	eds? ( gnome-extra/evolution-data-server )
+	firebird? ( >=dev-db/firebird-2.5 )
 	gnome? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gdk-pixbuf[X]
@ -479,6 +480,7 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable dbus) \
 		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
 		$(use_enable gnome gconf) \
 		$(use_enable gnome gio) \
 		$(use_enable gnome lockdown) \
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@ -1,2 +1,3 @@
 DIST texmaker-4.0.1.tar.bz2 13065488 SHA256 7ef9a5e1e24e734bfb7edb084ec6574fa3fc61b31685ca5402d6649a53a4e12d SHA512 85db34f670cad7d39c7acea5eefd61a9985f183277ddf758a3216dd322c0e43c21f94d2659fbe7dbcbf8f25d5df7c8c1408172214080d9234f4048499fbb8c4b WHIRLPOOL f24b1d0a9e79b18ef4a69bb1965827f1dd9cc75df1f36cfa2caacaf8686d08d78be9b2cf54edc939bbe700506428aa76f9b0daa144acfe8bb49c8b07f5729730
 DIST texmaker-4.0.2.tar.bz2 13676919 SHA256 a0a81b65b8aede12f0a7bbc303374fd910f39976db68b4035d7f1d69c2276b45 SHA512 0e7f36ee2b3c18e2367aed78f377f959750bfe43112f8fbc1aa7055cb965f227674121bd6de4ab4ee69c3a6165f742acfc4b4aa3f474f8e7f5dad928fd5cf15a WHIRLPOOL a511d846d35a8dd4b434c7109a553f692b5726a66afa06d161e6f76b93fe501968a7c8b6288029538b28977c8c4e2e594555fd9db04ca9a7d3e0895affd0d5ca
+DIST texmaker-4.0.3.tar.bz2 9697288 SHA256 7b157645914fcb8ad4475c2c6010ffeb52a6547a8ee17bcfdcf720369bbb24bd SHA512 8c91ce920f7a828a3e1e78123fa4464c7b826c37343a009cbb70b1d4ce7cd3fd3e3ddea7e9b2b2c0235ddf6280e18ca3844b9ccaaa577d28f76e1a12e76d551f WHIRLPOOL 65a7413f3c727b495cdde6aefb7448b61818b3409ec2e727258c210bad7e5e10a6a88cdf50508e2b2f367fa7c1c8c0a3a3cf4b53ea34c1409bac15b77fc1a476
--- a/app-office/texmaker/files/texmaker-4.0.3-hunspell.patch
+++ b/app-office/texmaker/files/texmaker-4.0.3-hunspell.patch
@ -0,0 +1,165 @@
+ configdialog.cpp   |  2 +-
+ latexeditor.h      |  2 +-
+ latexeditorview.h  |  2 +-
+ latexhighlighter.h |  2 +-
+ spellerdialog.h    |  2 +-
+ texmaker.cpp       |  4 ++--
+ texmaker.h         |  2 +-
+ texmaker.pro       | 37 +++----------------------------------
+ 8 files changed, 11 insertions(+), 42 deletions(-)
+
+diff --git a/configdialog.cpp b/configdialog.cpp
+index e596a2c..3660429 100644
+--- a/configdialog.cpp
+++ b/configdialog.cpp
+@@ -220,7 +220,7 @@ void ConfigDialog::browseAspell()
+ QDir spelldir(QCoreApplication::applicationDirPath());
+ #else
+ #ifdef DEBIAN_SPELLDIR
+-QDir spelldir(PREFIX"/share/myspell/dicts");
+QDir spelldir(PREFIX"/share/myspell");
+ #else
+ QDir spelldir(PREFIX"/share/texmaker");
+ #endif
+diff --git a/latexeditor.h b/latexeditor.h
+index 29b01f8..1db88ad 100644
+--- a/latexeditor.h
+++ b/latexeditor.h
+@@ -33,7 +33,7 @@
+ 
+ #include "latexhighlighter.h"
+ #include "textblockselection.h"
+-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
+ 
+ typedef  int UserBookmarkList[3];
+ 
+diff --git a/latexeditorview.h b/latexeditorview.h
+index 9809d86..adca0b2 100644
+--- a/latexeditorview.h
+++ b/latexeditorview.h
+@@ -23,7 +23,7 @@
+ #include "gotolinewidget.h"
+ #include "replacewidget.h"
+ #include "minisplitter.h"
+-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
+ 
+ class LatexEditorView : public QWidget  {
+    Q_OBJECT
+diff --git a/latexhighlighter.h b/latexhighlighter.h
+index e0b91b1..74ec42a 100644
+--- a/latexhighlighter.h
+++ b/latexhighlighter.h
+@@ -20,7 +20,7 @@
+ #include <QColor>
+ #include <QTextBlockUserData>
+ //#include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
+ 
+ class QTextDocument;
+ class LatexEditor;
+diff --git a/spellerdialog.h b/spellerdialog.h
+index 83248ae..cd16dad 100644
+--- a/spellerdialog.h
+++ b/spellerdialog.h
+@@ -13,7 +13,7 @@
+ 
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
+ 
+ #include <QTextCursor>
+ 
+diff --git a/texmaker.cpp b/texmaker.cpp
+index 51d2082..607f66e 100644
+--- a/texmaker.cpp
+++ b/texmaker.cpp
+@@ -4363,7 +4363,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
+ QString dicDir=QCoreApplication::applicationDirPath() + "/";
+ #else
+ #ifdef DEBIAN_SPELLDIR
+-QString dicDir=PREFIX"/share/myspell/dicts/";
+QString dicDir=PREFIX"/share/myspell/";
+ #else
+ QString dicDir=PREFIX"/share/texmaker/";
+ #endif
+@@ -10835,4 +10835,4 @@ if (singlemode && currentEditorView())
+ 	    UpdateBibliography();
+ 	    }
+ 	}
+-}
+\ No newline at end of file
+}
+diff --git a/texmaker.h b/texmaker.h
+index f7e278c..e80d9e5 100644
+--- a/texmaker.h
+++ b/texmaker.h
+@@ -48,7 +48,7 @@
+ #include "usertagslistwidget.h"
+ #include "xmltagslistwidget.h"
+ #include "logeditor.h"
+-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
+ #include "browser.h"
+ #include "pdfviewerwidget.h"
+ #include "pdfviewer.h"
+diff --git a/texmaker.pro b/texmaker.pro
+index d2312d1..0009663 100644
+--- a/texmaker.pro
+++ b/texmaker.pro
+@@ -87,25 +87,6 @@ HEADERS	+= texmaker.h \
+	versiondialog.h \
+	unicodedialog.h \
+	unicodeview.h \
+-	hunspell/affentry.hxx \
+-	hunspell/affixmgr.hxx \
+-	hunspell/atypes.hxx \
+-	hunspell/baseaffix.hxx \
+-	hunspell/csutil.hxx \
+-	hunspell/dictmgr.hxx \
+-	hunspell/hashmgr.hxx \
+-	hunspell/htypes.hxx \
+-	hunspell/hunspell.hxx \
+-	hunspell/hunspell.h \
+-	hunspell/langnum.hxx \
+-	hunspell/license.hunspell \
+-	hunspell/phonet.hxx \
+-	hunspell/suggestmgr.hxx \
+-	hunspell/license.myspell \
+-	hunspell/filemgr.hxx \
+-	hunspell/hunzip.hxx \
+-	hunspell/replist.hxx \
+-	hunspell/w_char.hxx \
+ 	singleapp/qtlocalpeer.h \
+ 	singleapp/qtlockedfile.h \
+ 	singleapp/qtsingleapplication.h \
+@@ -196,18 +174,6 @@ SOURCES	+= main.cpp \
+ 	versiondialog.cpp \
+ 	unicodedialog.cpp \
+ 	unicodeview.cpp \
+-	hunspell/affentry.cxx \
+-	hunspell/affixmgr.cxx \
+-	hunspell/csutil.cxx \
+-	hunspell/dictmgr.cxx \
+-	hunspell/hashmgr.cxx \
+-	hunspell/hunspell.cxx \
+-	hunspell/phonet.cxx \
+-	hunspell/suggestmgr.cxx \
+-	hunspell/utf_info.cxx \
+-	hunspell/filemgr.cxx \
+-	hunspell/replist.cxx \
+-	hunspell/hunzip.cxx \
+ 	singleapp/qtlocalpeer.cpp \
+ 	singleapp/qtlockedfile.cpp \
+ 	singleapp/qtsingleapplication.cpp \
+@@ -454,3 +420,6 @@ INSTALLS += desktop
+ icon.files = utilities/texmaker.png
+ INSTALLS += icon
+ }
+
+CONFIG	+= link_pkgconfig
+PKGCONFIG += hunspell
+\ No newline at end of file
--- a/app-office/texmaker/texmaker-4.0.3.ebuild
+++ b/app-office/texmaker/texmaker-4.0.3.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.0.3.ebuild,v 1.1 2013/07/29 12:54:54 jlec Exp $
+
+EAPI=5
+
+inherit qt4-r2 versionator
+
+# The upstream version numbering is bad, so we have to remove a dot in the
+# minor version number
+MAJOR="$(get_major_version)"
+MINOR_1="$(($(get_version_component_range 2)/10))"
+MINOR_2="$(($(get_version_component_range 2)%10))"
+if [ ${MINOR_2} -eq "0" ] ; then
+	MY_P="${PN}-${MAJOR}.${MINOR_1}"
+else
+	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+fi
+
+MY_P="${P}"
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	app-text/hunspell
+	app-text/poppler:=[qt4]
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	dev-qt/qtgui:4
+	dev-qt/qtcore:4
+	dev-qt/qtwebkit:4
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-hunspell.patch )
+
+DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
+HTML_DOCS=( doc/. )
+
+src_configure() {
+	eqmake4 \
+		${PN}.pro \
+		PREFIX="${EPREFIX}/usr" \
+		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@ -1,4 +1,4 @@
 DIST portpeek-2.0.24.tar.gz 11373 SHA256 77b787e2c59743f40ad407c5a3026b3858f2c8475cf4d78cada25f3852691d4d SHA512 ef8ed9446caa41011c8d2d83cc5522848aff64c1cc45acc6863cdd474ed5654bd8d2a6985f815598110f4efc63253f8b1540242466e8b8cdc514426f99f0faae WHIRLPOOL 8e29ebe03a33d849d284e032c2cc1de1c574dacc81a355003eca2dac0cfb6f7302213296f68c0565f1ca872c3e73fd1afd5cd6ec0f3e5e71b1181986a672ca44
 DIST portpeek-2.0.25.tar.gz 11367 SHA256 38de327bdefdd853166ec0ecdae03ccd508fb27c9762b99cea9926ce38801f5b SHA512 ea4b996787f4f956e3146f6618189f389f78f7a3778297ba1a2118b048c5f2e950221fbe4f9c52249a043f1fc65b4c45a01b799bb52b61e337527702f2149d9d WHIRLPOOL b57636fb820d6e5f0cb1611ca0e417c8d6b04a2c0fc50f9b32da78b940984c687c3ea1dc9a00660ce395108daca372fc3b9d90d9158cab51c502aa6677fd282d
-DIST portpeek-2.1.7.tar.gz 11692 SHA256 46d0e35fe3bff9cf44d6a30434a044597a578b4f42f643c4b8ed73bd8778cc2e SHA512 ca550f3c53d650d7061010201141f1490c53119933db79149f6ddaa8c3d7a25170b65dc8d4ba2b839c7b059feba24976c688d1ea73d224625728884e2ac1ae28 WHIRLPOOL 3891f62dcff06ddbfd596fa7e21027387302388db9129f5fea463bfddc2f175631a1092ad1350a911f2f895db89a2500c37ffadc0cca5d306c8a5d8c31fffb72
 DIST portpeek-2.1.8.tar.gz 11699 SHA256 d37990b6e5259088a47beb2add47b4dd4878d0fc9b2723d16f5505adb2cb6c69 SHA512 edaba729a0a099aae0754075c65badd712d5edd5bde102f8fac54c82de6d810ee180381cb211078978438d16eb412c85feb64036c940e026496b0a865ea1726c WHIRLPOOL 690a85b850deb9b1dde61ffb2c4f75e44319d9e17a938848d60bcdd0c551f1f80010d043a62052451ce9476a155edd595b982d978622f4ae96c7022913d19301
+DIST portpeek-2.1.9.tar.gz 11827 SHA256 46d7fe52bdc1113e9a790d9d77fc7284721ec6e99817a553204800d7cad19382 SHA512 751b313c605355d92a4fc11d4b717bdaf30cf9e1dd3f78346761fd0c9ed64ce195efdc33cc541f136370b264f60d1438191eae6f1ef6c10d499c6a7e084cefb5 WHIRLPOOL 3f1a18376756d837202268565fa695be0898ff4c27e297ddd3fa4c80670e9d03759e4ad4ec7b6d3032b1230769cc224e6c6444d539c8890aa57beadda2314d71
--- a/app-portage/portpeek/portpeek-2.0.24.ebuild
+++ b/app-portage/portpeek/portpeek-2.0.24.ebuild
@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.24.ebuild,v 1.7 2013/03/08 19:53:34 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.24.ebuild,v 1.8 2013/07/29 19:56:28 mpagano Exp $

-EAPI="4"
-PYTHON_DEPEND="*:2.7"
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )

-inherit python
+inherit python-single-r1

 DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
 HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
--- a/app-portage/portpeek/portpeek-2.0.25.ebuild
+++ b/app-portage/portpeek/portpeek-2.0.25.ebuild
@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.25.ebuild,v 1.7 2013/03/08 19:53:34 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.25.ebuild,v 1.8 2013/07/29 19:56:28 mpagano Exp $

-EAPI="4"
-PYTHON_DEPEND="*:2.7"
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )

-inherit python
+inherit python-single-r1

 DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
 HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
--- a/app-portage/portpeek/portpeek-2.1.9.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.9.ebuild
@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.1.7.ebuild,v 1.2 2013/03/08 23:27:59 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.1.9.ebuild,v 1.1 2013/07/29 19:48:50 mpagano Exp $

-EAPI="4"
-PYTHON_DEPEND="*:2.7"
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_2} )

-inherit python
+inherit python-single-r1

 DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
 HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
--- a/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild,v 1.21 2013/01/27 20:08:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild,v 1.22 2013/07/29 10:14:37 pinkbyte Exp $

 EAPI="4"

-WANT_AUTOMAKE="1.9"
+WANT_AUTOMAKE="1.12"

 inherit autotools eutils

--- a/app-text/docbook2X/docbook2X-0.8.8-r3.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r3.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r3.ebuild,v 1.1 2013/07/29 10:48:04 pinkbyte Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1 #290284
+inherit autotools-utils
+
+DESCRIPTION="Tools to convert docbook to man and info"
+SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
+HOMEPAGE="http://docbook2x.sourceforge.net/"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-solaris"
+IUSE="test"
+LICENSE="MIT"
+
+# dev-perl/XML-LibXML - although not mentioned upstream is required
+# for make check to complete.
+DEPEND="dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-NamespaceSupport
+	dev-perl/XML-SAX
+	dev-perl/XML-LibXML
+	app-text/docbook-xsl-stylesheets
+	=app-text/docbook-xml-dtd-4.2*"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# Patches from debian, for description see patches itself.
+	"${FILESDIR}/${P}-filename_whitespace_handling.patch"
+	"${FILESDIR}/${P}-preprocessor_declaration_syntax.patch"
+	"${FILESDIR}/${P}-error_on_missing_refentry.patch"
+	# bug #296112
+	"${FILESDIR}/${P}-drop-htmldir.patch"
+)
+src_prepare() {
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die 'sed on configure.ac failed'
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		--with-xslt-processor=libxslt
+		--program-transform-name='/^docbook2/s,$,.pl,'
+	)
+	autotools-utils_src_configure
+}
--- a/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
@ -0,0 +1,14 @@
+Put HTML documentation in proper directory.
+Patch by Chris Mayo, https://bugs.gentoo.org/show_bug.cgi?id=296112
+
+--- doc/Makefile.am.orig
+++ doc/Makefile.am
+@@ -182,8 +182,6 @@
+ # Install (automake)
+ #
+ 
+-htmldir = $(datadir)/doc/docbook2X
+-
+ man_MANS = $(MAN_FILES)
+ html_DATA = $(HTML_FILES)
+ info_TEXINFOS = docbook2X.texi
--- a/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch
+++ b/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch
@ -0,0 +1,30 @@
+From 4a5ec00d229d9ccf293dc21ce64eb42de7e8118c Mon Sep 17 00:00:00 2001
+From: Jung-uk Kim <jkim@FreeBSD.org>
+Date: Thu, 9 May 2013 15:59:35 -0400
+Subject: [PATCH] Fix duplicate typedef introduced in 57c47aa.
+
+---
+ liblangtag/lt-trie.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/liblangtag/lt-trie.c b/liblangtag/lt-trie.c
+index d2162c9..301a6da 100644
+--- a/liblangtag/lt-trie.c
+++ b/liblangtag/lt-trie.c
+@@ -33,11 +33,11 @@ struct _lt_trie_t {
+ 	lt_iter_tmpl_t  parent;
+ 	lt_trie_node_t *root;
+ };
+-typedef struct _lt_trie_iter_t {
+struct _lt_trie_iter_t {
+ 	lt_iter_t    parent;
+ 	lt_list_t   *stack;
+ 	lt_string_t *pos_str;
+-} lt_trie_iter_t;
+};
+ 
+ /*< private >*/
+ static lt_trie_node_t *
+-- 
+1.8.2.3
+
--- a/app-text/liblangtag/liblangtag-0.5.1.ebuild
+++ b/app-text/liblangtag/liblangtag-0.5.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/liblangtag/liblangtag-0.5.1.ebuild,v 1.4 2013/06/25 12:49:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/liblangtag/liblangtag-0.5.1.ebuild,v 1.5 2013/07/30 07:09:38 scarabeus Exp $

 EAPI=5

@ -27,6 +27,10 @@ DEPEND="${RDEPEND}
 # Upstream expect liblangtag to be installed when one runs tests...
 RESTRICT="test"

+PATCHES=(
+	"${FILESDIR}/${P}-gcc45.patch"
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable introspection)
--- a/dev-lang/fpc-ide/Manifest
+++ b/dev-lang/fpc-ide/Manifest
@ -3,3 +3,4 @@ DIST fpcbuild-2.2.2.tar.gz 39186745 SHA256 0d73b119e029382052fc6615034c4b5ee3ec6
 DIST fpcbuild-2.2.4.tar.gz 39849184 SHA256 77a54f09e39f07ed723071784a86d9ac8ca08fb5aa6fe41c8e9970bea395b4cf SHA512 91085c7f0e5f991726cc4a8bd8bf54e2384eb7fa0a1d96f4a329691a668c9fd977fec31e265f5cb8a904e37d61158282e11a5485657f8c6fb59d8105217b5b92 WHIRLPOOL 9f487f9ef198e20e863ee4f69092b10416c21017b81fc2a02452c1d2c7b688413c02fa507a0ccdeb3263c3b201674ff8f0a056926c623d19e11e3031eb69af28
 DIST fpcbuild-2.4.0.tar.gz 41769847 SHA256 b3abbeaa0f2c3427fd447759e715cbc19b920f2ccad2b40ae5ab47e9d4124fd4 SHA512 e167426460ff68d4ead5a5ed849c1e9bd3b46c45fdf826bf47a7dade448a77b31a2486a9976ffb8c32a5c2d0d7267de019a3815fb225d8aa1bdb8afa6636a1e1 WHIRLPOOL 8fd915afcddb4596be20b1aa8e585eeaef5ad26d0864cd8955d2b5a082bce8a6b0e5bc5f262005bea1d592ec478e642feec27f201ef0cc37b7dd76a471a7c9a9
 DIST fpcbuild-2.6.0.tar.gz 50751193 SHA256 d788854faa373e59835d4e353133f9965993cce79c62d82e5c31837a9117beef SHA512 5139bde3490cbe4e25fb5031299412c372a29149a083180fe3828856c2fb371347f4201ec98ae4cf8b2d4c77101de843b63e27ceee644018901e156718d994cd WHIRLPOOL 3c0c9403983cfdbc97cc4b840aefbf6595c8f28a1c4759945ada7db436f939db3dfe6aa1380ef0e8cabb1051899adcc4a5c4321ec8bd64431fdfa28c0a47be87
+DIST fpcbuild-2.6.2.tar.gz 55198144 SHA256 75ad700ccc772b07304c286b0aae95f48a504b15fe890a36361d17dc8e92d83c SHA512 ecc28e8c63fd6bdd6a1b02b0aca4b7ac861bd4c0e815146ab34181fff63f3f60102c227e17317efdc30d6e97b6003b708ed9853f1d21f9e5faabcc89c85a91fe WHIRLPOOL 8614adf51cb71072dc1a4ed9b79acb1943b58decfcadbefd260dfbf20b07f9cba1b5c91c3b57ea78cf89ceb4de102e7cc4d0d93c54e7101bbfa3151b80c0af26
--- a/dev-lang/fpc-ide/fpc-ide-2.6.2.ebuild
+++ b/dev-lang/fpc-ide/fpc-ide-2.6.2.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/fpc-ide-2.6.2.ebuild,v 1.1 2013/07/29 20:31:34 hasufell Exp $
+
+EAPI=5
+
+
+HOMEPAGE="http://www.freepascal.org/"
+DESCRIPTION="Free Pascal Compiler Integrated Development Environment"
+SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="~dev-lang/fpc-${PV}"
+RDEPEND="${DEPEND}"
+
+# test gives compile errors, was not updated with fpc changes
+RESTRICT="test"
+
+S=${WORKDIR}/fpcbuild-${PV}/fpcsrc/ide
+
+src_prepare() {
+	find "${WORKDIR}" -name Makefile -exec sed -i -e 's/ -Xs / /g' {} + || die
+
+	# Use default configuration (minus stripping) unless specifically requested otherwise
+	if ! test ${PPC_CONFIG_PATH+set}; then
+		local FPCVER=$(fpc -iV)
+		export PPC_CONFIG_PATH="${WORKDIR}"
+		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
+			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
+		sed -i -e '/^-Xs/d' "${PPC_CONFIG_PATH}"/fpc.cfg || die
+	fi
+}
+
+src_compile() {
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	emake -j1 INSTALL_PREFIX="${D}"usr install || die "make install failed"
+}
+
+pkg_postinst() {
+	einfo "To read the documentation, enable the doc USE flag for dev-lang/fpc,"
+	einfo "and add /usr/share/doc/fpc-${PV}/fpctoc.htx to the Help Files list."
+}
--- a/dev-lang/fpc/fpc-2.6.2.ebuild
+++ b/dev-lang/fpc/fpc-2.6.2.ebuild
@ -1,9 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.6.2.ebuild,v 1.1 2013/06/26 22:20:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.6.2.ebuild,v 1.2 2013/07/29 20:11:12 hasufell Exp $

 EAPI=5

+inherit toolchain-funcs
+
 HOMEPAGE="http://www.freepascal.org/"
 DESCRIPTION="Free Pascal Compiler"
 SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
@ -27,6 +29,17 @@ RESTRICT="strip" #269221

 S=${WORKDIR}/fpcbuild-${PV}/fpcsrc

+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug 475210
+		if $(tc-getLD) --version | grep -q "GNU gold"; then
+			eerror "fpc does not function correctly when built with the gold linker."
+			eerror "Please select the bfd linker with binutils-config."
+			die "GNU gold detected"
+		fi
+	fi
+}
+
 src_unpack() {
 	case ${ARCH} in
 	amd64)	FPC_ARCH="x86_64"    PV_BIN=${PV} ;;
--- a/dev-lang/gprolog/Manifest
+++ b/dev-lang/gprolog/Manifest
@ -1,3 +1 @@
-DIST gprolog-1.4.2.tar.gz 3358528 SHA256 d5856a5b6a0f237db4b09264861898ef5b55339dd2798cc4333190cf9f604578 SHA512 b93eb522e1aacac08b347b84d0d82d146ae29b7331754f71f02a89bfab3038a1f5c40dbc936118edfddb8ea07e44e3283b2130756d2027b0a90467a45506dc84 WHIRLPOOL f5b82c68208ad85640f48b1910e40ae774788c11e114af8258911b6a8b2d3df3f36a49e03d79a5393e331ab843d52ee7eecbdf0b90986e0dbce2ea1a668e9ef9
-DIST gprolog-1.4.3.tar.gz 3426105 SHA256 4292fa15b310762d2df219e67d27c00ed4404799b3a7072f452df5e61336d49b SHA512 70cfc99d8dd78ecc0134651665624d857c52630048fb8ac9b4260bb15480888087d62b088a58daa73058e035bc8dfe027ace2a96222a0e6ee220042380d697ba WHIRLPOOL 0a9a4ddd1629ad5c6f1cf07af3462fb06705f3a8fd152f5c8bcc3afe720d4ac1dcdb32bd46177a4fbdc77d21fcd8f8def1de74f22ec403b8a3ac214e46241d3e
 DIST gprolog-1.4.4.tar.gz 3538152 SHA256 18c0e9644b33afd4dd3cdf29f94c099ad820d65e0c99da5495b1ae43b4f2b18e SHA512 b6227a06794d31162f2c790a025f7372a6676c1891a76e880d2152aeab6322d3341aeab85e11d9be6d97ff1c69801bee73fa3ea6b0659af61f55990a455dc212 WHIRLPOOL cdcdd60a7ebd045fa9bad2692430577477fc3a42eca3c86b31ce6c7c26c1b7c9e9c6d60273b33d0ceaec85bab08cc30d482c9ff740ed1ca0fce37a4b2c0a191d
--- a/dev-lang/gprolog/files/gprolog-1.4.0-ldflags.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.0-ldflags.patch
@ -1,40 +0,0 @@
-diff -ur gprolog-1.4.0.orig/src/Ma2Asm/Makefile.in gprolog-1.4.0/src/Ma2Asm/Makefile.in
--- gprolog-1.4.0.orig/src/Ma2Asm/Makefile.in	2011-04-07 04:14:10.000000000 +1200
-+++ gprolog-1.4.0/src/Ma2Asm/Makefile.in	2011-07-01 21:07:33.000000000 +1200
-@@ -19,7 +19,7 @@
- 
- ma2asm@EXE_SUFFIX@: ma2asm@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@ \
-                     ma2asm_inst@OBJ_SUFFIX@ ma2asm_inst.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
-+	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
- 
- 
- clean:
-diff -ur gprolog-1.4.0.orig/src/TopComp/Makefile.in gprolog-1.4.0/src/TopComp/Makefile.in
--- gprolog-1.4.0.orig/src/TopComp/Makefile.in	2011-04-08 20:41:40.000000000 +1200
-+++ gprolog-1.4.0/src/TopComp/Makefile.in	2011-07-01 21:09:31.000000000 +1200
-@@ -15,10 +15,10 @@
- 
- $(GPLC)@EXE_SUFFIX@: top_comp.c copying.c ../EnginePl/wam_regs.h \
-          ../EnginePl/gp_config.h ../EnginePl/machine1.c decode_hexa.c copying.c prolog_path.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
- 
- $(HEXGPLC)@EXE_SUFFIX@: hexfilter.c decode_hexa.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
- 
- 
- 
-diff -ur gprolog-1.4.0.orig/src/Wam2Ma/Makefile.in gprolog-1.4.0/src/Wam2Ma/Makefile.in
--- gprolog-1.4.0.orig/src/Wam2Ma/Makefile.in	2011-03-29 02:21:35.000000000 +1300
-+++ gprolog-1.4.0/src/Wam2Ma/Makefile.in	2011-07-01 21:06:22.000000000 +1200
-@@ -12,7 +12,7 @@
- 	$(CC) $(CFLAGS) -c wam2ma.c
- 
- wam2ma@EXE_SUFFIX@: wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
-+	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
- 
- 
- clean:
--- a/dev-lang/gprolog/files/gprolog-1.4.0-links.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.0-links.patch
@ -1,15 +0,0 @@
--- gprolog-1.4.0.orig/src/Makefile.in	2011-04-08 18:35:22.000000000 +0200
-+++ gprolog-1.4.0/src/Makefile.in	2012-07-04 09:46:49.000000000 +0200
-@@ -81,10 +81,10 @@
- 
- # --- Links --- #
- 
-install-links: uninstall-links
-+install-links:
- 	if test $(LINKS_DIR) != none; then \
- 	   ./mkinstalldirs $(LINKS_DIR); \
-	   (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
-+	   (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) $(INSTALL_DIR)/bin/$$i .; done); \
- 	fi
- 
- uninstall-links:
--- a/dev-lang/gprolog/files/gprolog-1.4.0-ma2asm-pllong.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.0-ma2asm-pllong.patch
@ -1,120 +0,0 @@
-diff -ur gprolog-1.4.0.orig/src/Ma2Asm/alpha_any.c gprolog-1.4.0/src/Ma2Asm/alpha_any.c
--- gprolog-1.4.0.orig/src/Ma2Asm/alpha_any.c	2011-03-29 05:20:05.000000000 +1300
-+++ gprolog-1.4.0/src/Ma2Asm/alpha_any.c	2011-07-05 19:38:52.000000000 +1200
-@@ -870,7 +870,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- int
-Call_C_Arg_Int(int offset, long int_val)
-+Call_C_Arg_Int(int offset, PlLong int_val)
- {
-   switch (offset)
-     {
-@@ -1433,7 +1433,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- void
-Cmp_Ret_And_Int(long int_val)
-+Cmp_Ret_And_Int(PlLong int_val)
- {
-   Inst_Printf("lda", "$1,%ld", int_val);
-   Inst_Printf("subq", "$0,$1,$1");
-@@ -1551,7 +1551,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- void
-Dico_Long(char *name, int global, VType vtype, long value)
-+Dico_Long(char *name, int global, VType vtype, PlLong value)
- {
-   switch (vtype)
-     {
-diff -ur gprolog-1.4.0.orig/src/Ma2Asm/mips_irix.c gprolog-1.4.0/src/Ma2Asm/mips_irix.c
--- gprolog-1.4.0.orig/src/Ma2Asm/mips_irix.c	2011-03-29 05:20:05.000000000 +1300
-+++ gprolog-1.4.0/src/Ma2Asm/mips_irix.c	2011-07-05 19:39:30.000000000 +1200
-@@ -510,7 +510,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- int
-Call_C_Arg_Int(int offset, long int_val)
-+Call_C_Arg_Int(int offset, PlLong int_val)
- {
-   switch (offset)
-     {
-@@ -1125,7 +1125,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- void
-Cmp_Ret_And_Int(long int_val)
-+Cmp_Ret_And_Int(PlLong int_val)
- {
-   Inst_Printf("li", "$24,%d", int_val);
-   Inst_Printf("sub", "$12,$2,$24");	/* $2 - $24 -> $12 */
-@@ -1238,7 +1238,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- void
-Dico_Long(char *name, int global, VType vtype, long value)
-+Dico_Long(char *name, int global, VType vtype, PlLong value)
- {
-   switch (vtype)
-     {
-diff -ur gprolog-1.4.0.orig/src/Ma2Asm/powerpc_any.c gprolog-1.4.0/src/Ma2Asm/powerpc_any.c
--- gprolog-1.4.0.orig/src/Ma2Asm/powerpc_any.c	2011-03-29 05:20:05.000000000 +1300
-+++ gprolog-1.4.0/src/Ma2Asm/powerpc_any.c	2011-07-05 19:17:16.000000000 +1200
-@@ -500,7 +500,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- int
-Call_C_Arg_Int(int offset, long int_val)
-+Call_C_Arg_Int(int offset, PlLong int_val)
- {
-   BEFORE_ARG;
- 
-@@ -835,7 +835,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- void
-Cmp_Ret_And_Int(long int_val)
-+Cmp_Ret_And_Int(PlLong int_val)
- {
-   if (LITTLE_INT(int_val))
-     Inst_Printf("cmpwi", CR(1) "," R(3) ",%ld", int_val);
-@@ -958,7 +958,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- void
-Dico_Long(char *name, int global, VType vtype, long value)
-+Dico_Long(char *name, int global, VType vtype, PlLong value)
- {
-   switch (vtype)
-     {
-diff -ur gprolog-1.4.0.orig/src/Ma2Asm/sparc_any.c gprolog-1.4.0/src/Ma2Asm/sparc_any.c
--- gprolog-1.4.0.orig/src/Ma2Asm/sparc_any.c	2011-03-29 05:20:05.000000000 +1300
-+++ gprolog-1.4.0/src/Ma2Asm/sparc_any.c	2011-07-05 19:18:29.000000000 +1200
-@@ -449,7 +449,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- int
-Call_C_Arg_Int(int offset, long int_val)
-+Call_C_Arg_Int(int offset, PlLong int_val)
- {
-   BEFORE_ARG;
- 
-@@ -792,7 +792,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- void
-Cmp_Ret_And_Int(long int_val)
-+Cmp_Ret_And_Int(PlLong int_val)
- {
-   if (LITTLE_INT(int_val))
-     Inst_Printf("cmp", "%%o0,%ld", int_val);
-@@ -912,7 +912,7 @@
-  *                                                                         *
-  *-------------------------------------------------------------------------*/
- void
-Dico_Long(char *name, int global, VType vtype, long value)
-+Dico_Long(char *name, int global, VType vtype, PlLong value)
- {
- 
-   switch (vtype)
--- a/dev-lang/gprolog/files/gprolog-1.4.0-nodocs.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.0-nodocs.patch
@ -1,29 +0,0 @@
--- gprolog-1.4.0.orig/src/Makefile.in	2011-04-09 04:35:22.000000000 +1200
-+++ gprolog-1.4.0/src/Makefile.in	2011-07-02 08:25:22.000000000 +1200
-@@ -97,7 +96,7 @@
- # --- Documentation --- #
- 
- install-doc:
-	if test $(DOC_DIR) != none; then \
-+	if test $(DOC_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(DOC_DIR); \
- 	   (F=`cd ../doc; echo $(DOC_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../doc/$$i $(DOC_DIR); done); \
-@@ -113,7 +112,7 @@
- # --- HTML --- #
- 
- install-html:
-	if test $(HTML_DIR) != none; then \
-+	if test $(HTML_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(HTML_DIR); \
- 	   (F=`cd ../doc/html_node; echo $(HTML_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../doc/html_node/$$i $(HTML_DIR); done); \
-@@ -129,7 +128,7 @@
- # --- Examples --- #
- 
- install-examples:
-	if test $(EXAMPLES_DIR) != none; then \
-+	if test $(EXAMPLES_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(EXAMPLES_DIR)/ExamplesPl; \
- 	   (F=`cd ../examples/ExamplesPl; echo $(EXPL_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../examples/ExamplesPl/$$i $(EXAMPLES_DIR)/ExamplesPl; done); \
--- a/dev-lang/gprolog/files/gprolog-1.4.0-txt-file.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.0-txt-file.patch
@ -1,10 +0,0 @@
--- gprolog-1.4.0.orig/src/Makefile.in	2011-04-09 04:35:22.000000000 +1200
-+++ gprolog-1.4.0/src/Makefile.in	2011-07-01 20:40:24.000000000 +1200
-@@ -60,7 +60,6 @@
- install-system:
- 	./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
- 	$(INSTALL_DIR)/include $(INSTALL_DIR)/lib
-	for i in $(TXT_FILES); do $(INSTALL_DATA) ../$$i $(INSTALL_DIR); done
- 	for i in $(BIN_FILES); do $(INSTALL_PROGRAM) */$$i $(INSTALL_DIR)/bin; done
- 	for i in $(OBJ_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
- 	for i in $(LIB_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
--- a/dev-lang/gprolog/files/gprolog-1.4.1-ldflags.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.1-ldflags.patch
@ -1,40 +0,0 @@
-diff -ur gprolog-1.4.1.orig/src/Ma2Asm/Makefile.in gprolog-1.4.1/src/Ma2Asm/Makefile.in
--- gprolog-1.4.1.orig/src/Ma2Asm/Makefile.in	2012-01-10 18:24:39.000000000 +0100
-+++ gprolog-1.4.1/src/Ma2Asm/Makefile.in	2012-07-02 13:08:11.000000000 +0200
-@@ -19,7 +19,7 @@
- 
- ma2asm@EXE_SUFFIX@: ma2asm@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@ \
-                     ma2asm_inst@OBJ_SUFFIX@ ma2asm_inst.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
-+	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
- 
- 
- clean:
-diff -ur gprolog-1.4.1.orig/src/TopComp/Makefile.in gprolog-1.4.1/src/TopComp/Makefile.in
--- gprolog-1.4.1.orig/src/TopComp/Makefile.in	2012-01-10 18:24:39.000000000 +0100
-+++ gprolog-1.4.1/src/TopComp/Makefile.in	2012-07-02 13:08:11.000000000 +0200
-@@ -15,10 +15,10 @@
- 
- $(GPLC)@EXE_SUFFIX@: top_comp.c copying.c ../EnginePl/wam_regs.h \
-          ../EnginePl/gp_config.h ../EnginePl/machine1.c decode_hexa.c copying.c prolog_path.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
- 
- $(HEXGPLC)@EXE_SUFFIX@: hexfilter.c decode_hexa.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
- 
- 
- 
-diff -ur gprolog-1.4.1.orig/src/Wam2Ma/Makefile.in gprolog-1.4.1/src/Wam2Ma/Makefile.in
--- gprolog-1.4.1.orig/src/Wam2Ma/Makefile.in	2012-01-10 18:24:38.000000000 +0100
-+++ gprolog-1.4.1/src/Wam2Ma/Makefile.in	2012-07-02 13:08:11.000000000 +0200
-@@ -12,7 +12,7 @@
- 	$(CC) $(CFLAGS) -c wam2ma.c
- 
- wam2ma@EXE_SUFFIX@: wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
-+	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
- 
- 
- clean:
--- a/dev-lang/gprolog/files/gprolog-1.4.1-links.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.1-links.patch
@ -1,15 +0,0 @@
--- gprolog-1.4.1.orig/src/Makefile.in	2012-01-10 18:24:39.000000000 +0100
-+++ gprolog-1.4.1/src/Makefile.in	2012-07-02 13:38:49.000000000 +0200
-@@ -81,10 +81,10 @@
- 
- # --- Links --- #
- 
-install-links: uninstall-links
-+install-links:
- 	if test $(LINKS_DIR) != none; then \
- 	   ./mkinstalldirs $(LINKS_DIR); \
-	   (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
-+	   (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) $(INSTALL_DIR)/bin/$$i .; done); \
- 	fi
- 
- uninstall-links:
--- a/dev-lang/gprolog/files/gprolog-1.4.1-nodocs.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.1-nodocs.patch
@ -1,29 +0,0 @@
--- gprolog-1.4.1.orig/src/Makefile.in	2012-01-10 18:24:39.000000000 +0100
-+++ gprolog-1.4.1/src/Makefile.in	2012-07-02 12:53:42.000000000 +0200
-@@ -97,7 +97,7 @@
- # --- Documentation --- #
- 
- install-doc:
-	if test $(DOC_DIR) != none; then \
-+	if test $(DOC_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(DOC_DIR); \
- 	   (F=`cd ../doc; echo $(DOC_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../doc/$$i $(DOC_DIR); done); \
-@@ -113,7 +113,7 @@
- # --- HTML --- #
- 
- install-html:
-	if test $(HTML_DIR) != none; then \
-+	if test $(HTML_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(HTML_DIR); \
- 	   (F=`cd ../doc/html_node; echo $(HTML_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../doc/html_node/$$i $(HTML_DIR); done); \
-@@ -129,7 +129,7 @@
- # --- Examples --- #
- 
- install-examples:
-	if test $(EXAMPLES_DIR) != none; then \
-+	if test $(EXAMPLES_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(EXAMPLES_DIR)/ExamplesPl; \
- 	   (F=`cd ../examples/ExamplesPl; echo $(EXPL_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../examples/ExamplesPl/$$i $(EXAMPLES_DIR)/ExamplesPl; done); \
--- a/dev-lang/gprolog/files/gprolog-1.4.1-txt-file.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.1-txt-file.patch
@ -1,10 +0,0 @@
--- gprolog-1.4.1.orig/src/Makefile.in	2012-01-10 18:24:39.000000000 +0100
-+++ gprolog-1.4.1/src/Makefile.in	2012-07-02 12:55:39.000000000 +0200
-@@ -60,7 +60,6 @@
- install-system:
- 	./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
- 	$(INSTALL_DIR)/include $(INSTALL_DIR)/lib
-	for i in $(TXT_FILES); do $(INSTALL_DATA) ../$$i $(INSTALL_DIR); done
- 	for i in $(BIN_FILES); do $(INSTALL_PROGRAM) */$$i $(INSTALL_DIR)/bin; done
- 	for i in $(OBJ_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
- 	for i in $(LIB_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
--- a/dev-lang/gprolog/files/gprolog-1.4.2-ldflags.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.2-ldflags.patch
@ -1,40 +0,0 @@
-diff -ur gprolog-1.4.2.orig/src/Ma2Asm/Makefile.in gprolog-1.4.2/src/Ma2Asm/Makefile.in
--- gprolog-1.4.2.orig/src/Ma2Asm/Makefile.in	2012-01-10 18:24:39.000000000 +0100
-+++ gprolog-1.4.2/src/Ma2Asm/Makefile.in	2013-01-09 20:07:58.000000000 +0100
-@@ -19,7 +19,7 @@
- 
- ma2asm@EXE_SUFFIX@: ma2asm@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@ \
-                     ma2asm_inst@OBJ_SUFFIX@ ma2asm_inst.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
-+	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
- 
- 
- clean:
-diff -ur gprolog-1.4.2.orig/src/TopComp/Makefile.in gprolog-1.4.2/src/TopComp/Makefile.in
--- gprolog-1.4.2.orig/src/TopComp/Makefile.in	2012-01-10 18:24:39.000000000 +0100
-+++ gprolog-1.4.2/src/TopComp/Makefile.in	2013-01-09 20:07:58.000000000 +0100
-@@ -15,10 +15,10 @@
- 
- $(GPLC)@EXE_SUFFIX@: top_comp.c copying.c ../EnginePl/wam_regs.h \
-          ../EnginePl/gp_config.h ../EnginePl/machine1.c decode_hexa.c copying.c prolog_path.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
- 
- $(HEXGPLC)@EXE_SUFFIX@: hexfilter.c decode_hexa.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
- 
- 
- 
-diff -ur gprolog-1.4.2.orig/src/Wam2Ma/Makefile.in gprolog-1.4.2/src/Wam2Ma/Makefile.in
--- gprolog-1.4.2.orig/src/Wam2Ma/Makefile.in	2012-01-10 18:24:38.000000000 +0100
-+++ gprolog-1.4.2/src/Wam2Ma/Makefile.in	2013-01-09 20:07:58.000000000 +0100
-@@ -12,7 +12,7 @@
- 	$(CC) $(CFLAGS) -c wam2ma.c
- 
- wam2ma@EXE_SUFFIX@: wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
-+	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
- 
- 
- clean:
--- a/dev-lang/gprolog/files/gprolog-1.4.2-links.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.2-links.patch
@ -1,16 +0,0 @@
-diff -ur gprolog-1.4.2.orig/src/Makefile.in gprolog-1.4.2/src/Makefile.in
--- gprolog-1.4.2.orig/src/Makefile.in	2012-10-02 17:55:53.000000000 +0200
-+++ gprolog-1.4.2/src/Makefile.in	2013-01-09 20:09:59.000000000 +0100
-@@ -81,10 +81,10 @@
- 
- # --- Links --- #
- 
-install-links: uninstall-links
-+install-links:
- 	if test $(LINKS_DIR) != none; then \
- 	   ./mkinstalldirs $(LINKS_DIR); \
-	   (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
-+	   (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) $(INSTALL_DIR)/bin/$$i .; done); \
- 	fi
- 
- uninstall-links:
--- a/dev-lang/gprolog/files/gprolog-1.4.2-nodocs.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.2-nodocs.patch
@ -1,30 +0,0 @@
-diff -ur gprolog-1.4.2.orig/src/Makefile.in gprolog-1.4.2/src/Makefile.in
--- gprolog-1.4.2.orig/src/Makefile.in	2012-10-02 17:55:53.000000000 +0200
-+++ gprolog-1.4.2/src/Makefile.in	2013-01-09 20:11:14.000000000 +0100
-@@ -97,7 +97,7 @@
- # --- Documentation --- #
- 
- install-doc:
-	if test $(DOC_DIR) != none; then \
-+	if test $(DOC_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(DOC_DIR); \
- 	   (F=`cd ../doc; echo $(DOC_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../doc/$$i $(DOC_DIR); done); \
-@@ -113,7 +113,7 @@
- # --- HTML --- #
- 
- install-html:
-	if test $(HTML_DIR) != none; then \
-+	if test $(HTML_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(HTML_DIR); \
- 	   (F=`cd ../doc/html_node; echo $(HTML_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../doc/html_node/$$i $(HTML_DIR); done); \
-@@ -129,7 +129,7 @@
- # --- Examples --- #
- 
- install-examples:
-	if test $(EXAMPLES_DIR) != none; then \
-+	if test $(EXAMPLES_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(EXAMPLES_DIR)/ExamplesPl; \
- 	   (F=`cd ../examples/ExamplesPl; echo $(EXPL_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../examples/ExamplesPl/$$i $(EXAMPLES_DIR)/ExamplesPl; done); \
--- a/dev-lang/gprolog/files/gprolog-1.4.2-txt-file.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.2-txt-file.patch
@ -1,11 +0,0 @@
-diff -ur gprolog-1.4.2.orig/src/Makefile.in gprolog-1.4.2/src/Makefile.in
--- gprolog-1.4.2.orig/src/Makefile.in	2012-10-02 17:55:53.000000000 +0200
-+++ gprolog-1.4.2/src/Makefile.in	2013-01-09 20:12:15.000000000 +0100
-@@ -60,7 +60,6 @@
- install-system:
- 	./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
- 	$(INSTALL_DIR)/include $(INSTALL_DIR)/lib
-	for i in $(TXT_FILES); do $(INSTALL_DATA) ../$$i $(INSTALL_DIR); done
- 	for i in $(BIN_FILES); do $(INSTALL_PROGRAM) */$$i $(INSTALL_DIR)/bin; done
- 	for i in $(OBJ_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
- 	for i in $(LIB_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
--- a/dev-lang/gprolog/files/gprolog-1.4.3-ldflags.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.3-ldflags.patch
@ -1,40 +0,0 @@
-diff -ur gprolog-1.4.3.orig/src/Ma2Asm/Makefile.in gprolog-1.4.3/src/Ma2Asm/Makefile.in
--- gprolog-1.4.3.orig/src/Ma2Asm/Makefile.in	2012-12-07 03:09:23.000000000 +0100
-+++ gprolog-1.4.3/src/Ma2Asm/Makefile.in	2013-05-12 18:53:31.000000000 +0200
-@@ -19,7 +19,7 @@
- 
- ma2asm@EXE_SUFFIX@: ma2asm@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@ \
-                     ma2asm_inst@OBJ_SUFFIX@ ma2asm_inst.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
-+	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
- 
- 
- clean:
-diff -ur gprolog-1.4.3.orig/src/TopComp/Makefile.in gprolog-1.4.3/src/TopComp/Makefile.in
--- gprolog-1.4.3.orig/src/TopComp/Makefile.in	2012-12-07 03:09:23.000000000 +0100
-+++ gprolog-1.4.3/src/TopComp/Makefile.in	2013-05-12 18:53:31.000000000 +0200
-@@ -15,10 +15,10 @@
- 
- $(GPLC)@EXE_SUFFIX@: top_comp.c copying.c ../EnginePl/wam_regs.h \
-          ../EnginePl/gp_config.h ../EnginePl/machine1.c decode_hexa.c copying.c prolog_path.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
- 
- $(HEXGPLC)@EXE_SUFFIX@: hexfilter.c decode_hexa.c
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
- 
- 
- 
-diff -ur gprolog-1.4.3.orig/src/Wam2Ma/Makefile.in gprolog-1.4.3/src/Wam2Ma/Makefile.in
--- gprolog-1.4.3.orig/src/Wam2Ma/Makefile.in	2012-12-07 03:09:23.000000000 +0100
-+++ gprolog-1.4.3/src/Wam2Ma/Makefile.in	2013-05-12 18:53:31.000000000 +0200
-@@ -12,7 +12,7 @@
- 	$(CC) $(CFLAGS) -c wam2ma.c
- 
- wam2ma@EXE_SUFFIX@: wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
-+	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
- 
- 
- clean:
--- a/dev-lang/gprolog/files/gprolog-1.4.3-links.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.3-links.patch
@ -1,16 +0,0 @@
-diff -ur gprolog-1.4.3.orig/src/Makefile.in gprolog-1.4.3/src/Makefile.in
--- gprolog-1.4.3.orig/src/Makefile.in	2013-03-29 16:05:10.000000000 +0100
-+++ gprolog-1.4.3/src/Makefile.in	2013-05-12 18:54:39.000000000 +0200
-@@ -81,10 +81,10 @@
- 
- # --- Links --- #
- 
-install-links: uninstall-links
-+install-links:
- 	if test $(LINKS_DIR) != none; then \
- 	   ./mkinstalldirs $(LINKS_DIR); \
-	   (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
-+	   (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) $(INSTALL_DIR)/bin/$$i .; done); \
- 	fi
- 
- uninstall-links:
--- a/dev-lang/gprolog/files/gprolog-1.4.3-nodocs.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.3-nodocs.patch
@ -1,30 +0,0 @@
-diff -ur gprolog-1.4.3.orig/src/Makefile.in gprolog-1.4.3/src/Makefile.in
--- gprolog-1.4.3.orig/src/Makefile.in	2013-03-29 16:05:10.000000000 +0100
-+++ gprolog-1.4.3/src/Makefile.in	2013-05-12 18:55:16.000000000 +0200
-@@ -97,7 +97,7 @@
- # --- Documentation --- #
- 
- install-doc:
-	if test $(DOC_DIR) != none; then \
-+	if test $(DOC_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(DOC_DIR); \
- 	   (F=`cd ../doc; echo $(DOC_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../doc/$$i $(DOC_DIR); done); \
-@@ -113,7 +113,7 @@
- # --- HTML --- #
- 
- install-html:
-	if test $(HTML_DIR) != none; then \
-+	if test $(HTML_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(HTML_DIR); \
- 	   (F=`cd ../doc/html_node; echo $(HTML_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../doc/html_node/$$i $(HTML_DIR); done); \
-@@ -129,7 +129,7 @@
- # --- Examples --- #
- 
- install-examples:
-	if test $(EXAMPLES_DIR) != none; then \
-+	if test $(EXAMPLES_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(EXAMPLES_DIR)/ExamplesPl; \
- 	   (F=`cd ../examples/ExamplesPl; echo $(EXPL_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../examples/ExamplesPl/$$i $(EXAMPLES_DIR)/ExamplesPl; done); \
--- a/dev-lang/gprolog/files/gprolog-1.4.3-txt-file.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.3-txt-file.patch
@ -1,11 +0,0 @@
-diff -ur gprolog-1.4.3.orig/src/Makefile.in gprolog-1.4.3/src/Makefile.in
--- gprolog-1.4.3.orig/src/Makefile.in	2013-03-29 16:05:10.000000000 +0100
-+++ gprolog-1.4.3/src/Makefile.in	2013-05-12 18:56:08.000000000 +0200
-@@ -60,7 +60,6 @@
- install-system:
- 	./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
- 	$(INSTALL_DIR)/include $(INSTALL_DIR)/lib
-	for i in $(TXT_FILES); do $(INSTALL_DATA) ../$$i $(INSTALL_DIR); done
- 	for i in $(BIN_FILES); do $(INSTALL_PROGRAM) */$$i $(INSTALL_DIR)/bin; done
- 	for i in $(OBJ_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
- 	for i in $(LIB_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
--- a/dev-lang/gprolog/gprolog-1.4.2.ebuild
+++ b/dev-lang/gprolog/gprolog-1.4.2.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.2.ebuild,v 1.5 2013/03/26 10:27:15 ago Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="GNU Prolog is a native Prolog compiler with constraint solving over finite domains (FD)"
-HOMEPAGE="http://www.gprolog.org/"
-SRC_URI="mirror://gnu/gprolog/${P}.tar.gz"
-S="${WORKDIR}"/${P}
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="debug doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-links.patch
-	epatch "${FILESDIR}"/${P}-nodocs.patch
-	epatch "${FILESDIR}"/${P}-txt-file.patch
-}
-
-src_configure() {
-	CFLAGS_MACHINE="`get-flag -march` `get-flag -mcpu` `get-flag -mtune`"
-
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DDEBUG
-
-	if gcc-specs-pie ; then
-		# gplc generates its own native ASM; disable PIE
-		append-ldflags -nopie
-	fi
-
-	cd "${S}"/src
-	econf \
-		CFLAGS_MACHINE="${CFLAGS_MACHINE}" \
-		--with-c-flags="${CFLAGS}" \
-		--with-install-dir=/usr/$(get_libdir)/${P} \
-		--with-links-dir=/usr/bin \
-		$(use_with doc doc-dir /usr/share/doc/${PF}) \
-		$(use_with doc html-dir /usr/share/doc/${PF}/html) \
-		$(use_with examples examples-dir /usr/share/doc/${PF}/examples)
-}
-
-src_compile() {
-	cd "${S}"/src
-	# gprolog is compiled using gplc which cannot be run in parallel
-	emake -j1
-}
-
-src_test() {
-	cd "${S}"/src
-	emake -j1 check
-}
-
-src_install() {
-	cd "${S}"/src
-	emake DESTDIR="${D}" install
-
-	cd "${S}"
-	dodoc ChangeLog NEWS PROBLEMS README VERSION
-}
--- a/dev-lang/gprolog/gprolog-1.4.3.ebuild
+++ b/dev-lang/gprolog/gprolog-1.4.3.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.3.ebuild,v 1.1 2013/05/12 17:05:07 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="GNU Prolog is a native Prolog compiler with constraint solving over finite domains (FD)"
-HOMEPAGE="http://www.gprolog.org/"
-SRC_URI="mirror://gnu/gprolog/${P}.tar.gz"
-S="${WORKDIR}"/${P}
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="debug doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-links.patch
-	epatch "${FILESDIR}"/${P}-nodocs.patch
-	epatch "${FILESDIR}"/${P}-txt-file.patch
-}
-
-src_configure() {
-	CFLAGS_MACHINE="`get-flag -march` `get-flag -mcpu` `get-flag -mtune`"
-
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DDEBUG
-
-	if gcc-specs-pie ; then
-		# gplc generates its own native ASM; disable PIE
-		append-ldflags -nopie
-	fi
-
-	cd "${S}"/src
-	econf \
-		CFLAGS_MACHINE="${CFLAGS_MACHINE}" \
-		--with-c-flags="${CFLAGS}" \
-		--with-install-dir=/usr/$(get_libdir)/${P} \
-		--with-links-dir=/usr/bin \
-		$(use_with doc doc-dir /usr/share/doc/${PF}) \
-		$(use_with doc html-dir /usr/share/doc/${PF}/html) \
-		$(use_with examples examples-dir /usr/share/doc/${PF}/examples)
-}
-
-src_compile() {
-	cd "${S}"/src
-	# gprolog is compiled using gplc which cannot be run in parallel
-	emake -j1
-}
-
-src_test() {
-	cd "${S}"/src
-	emake -j1 check
-}
-
-src_install() {
-	cd "${S}"/src
-	emake DESTDIR="${D}" install
-
-	cd "${S}"
-	dodoc ChangeLog NEWS PROBLEMS README VERSION
-}
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@ -4,7 +4,10 @@ DIST ruby-1.9.3-p429.tar.bz2 10042323 SHA256 9d8949c24cf6fe810b65fb466076708b842
 DIST ruby-1.9.3-p448.tar.bz2 10052488 SHA256 a7372230357bfff8e4525fb8019046da521561fe66b02c25d8efc10c9877bc91 SHA512 d973cf712a0002bf2eba5d19bf2191195ceecf56339026babba53b7b0cacbd8264b8236be92bdb8e7e7fb26e2b8693f8c7c2aa098065ca172c56a602c5771461 WHIRLPOOL 8ee50c811aac11c9b1b7e64bcd8c90af94b9cc84082bb4303fd001943b1b0b2ff26ff431d52fb3e1b996bcb68ca670f426c771902c3541b4a62cd60ae272e387
 DIST ruby-2.0.0-p247.tar.bz2 10804581 SHA256 08e3d4b85b8a1118a8e81261f59dd8b4ddcfd70b6ae554e0ec5ceb99c3185e8a SHA512 9bd793d0df8f0704fb1521a937c09ecc89b777851312793f0b3391df11dec8239808585697b932c4a94665fa29c7781503166dbd109f269811788c4c648f285f WHIRLPOOL 59eb0a5d71125b63226435d825f5793fd9ff7f065851b902ee45f974fdaf5f5498d12b07d8e20e668a1e4636dbc8f34d025f8713bd98e3c565327484e484a863
 DIST ruby-patches-1.8.7_p371.tar.bz2 1751 SHA256 aac510388694255db850d7773d75e37b0d6ceefcb36786c61870f318d831be42 SHA512 21b3b6c8c91337414d68a30faf1f800854fa627c3b7078a42920b55a4c9c8af25997657ad5165a98096b14816f422bc88b0bbbb7735eeda6d5782c87ae9ff9cf WHIRLPOOL 8418d37166ddcb45c31c95cbddf957153d1c601ed33e6d23aa1fc9dd4328f3daa9a8b0fbb16720b2cab7f6ca0cf1c81cde99929339a53830e1168779645fe5c7
+DIST ruby-patches-1.8.7_p374-r1.tar.bz2 1751 SHA256 aac510388694255db850d7773d75e37b0d6ceefcb36786c61870f318d831be42 SHA512 21b3b6c8c91337414d68a30faf1f800854fa627c3b7078a42920b55a4c9c8af25997657ad5165a98096b14816f422bc88b0bbbb7735eeda6d5782c87ae9ff9cf WHIRLPOOL 8418d37166ddcb45c31c95cbddf957153d1c601ed33e6d23aa1fc9dd4328f3daa9a8b0fbb16720b2cab7f6ca0cf1c81cde99929339a53830e1168779645fe5c7
 DIST ruby-patches-1.8.7_p374.tar.bz2 1751 SHA256 aac510388694255db850d7773d75e37b0d6ceefcb36786c61870f318d831be42 SHA512 21b3b6c8c91337414d68a30faf1f800854fa627c3b7078a42920b55a4c9c8af25997657ad5165a98096b14816f422bc88b0bbbb7735eeda6d5782c87ae9ff9cf WHIRLPOOL 8418d37166ddcb45c31c95cbddf957153d1c601ed33e6d23aa1fc9dd4328f3daa9a8b0fbb16720b2cab7f6ca0cf1c81cde99929339a53830e1168779645fe5c7
 DIST ruby-patches-1.9.3_p429.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 SHA512 fdb07393439dfcc97e5d4ecd12059ef69983b23588079e1292cec1c93544524a67265e4f61f75d20ac540ee9f9ace730a584462f94bea4919124a3264e6f0ae1 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
+DIST ruby-patches-1.9.3_p448-r1.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 SHA512 fdb07393439dfcc97e5d4ecd12059ef69983b23588079e1292cec1c93544524a67265e4f61f75d20ac540ee9f9ace730a584462f94bea4919124a3264e6f0ae1 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
 DIST ruby-patches-1.9.3_p448.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 SHA512 fdb07393439dfcc97e5d4ecd12059ef69983b23588079e1292cec1c93544524a67265e4f61f75d20ac540ee9f9ace730a584462f94bea4919124a3264e6f0ae1 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
+DIST ruby-patches-2.0.0_p247-r1.tar.bz2 1929 SHA256 4feee409319dbcac7525fb9c1c76c36888a62ee0623c117ae532bf765845f0f9 SHA512 95cf20e26e43a1515843d74c558e3344ae33b7383362c1742a115c1b3e6d09e1ed947df8ab7fee6275e96c920bd0ef880647da70165ddccd40d0995ff43aae64 WHIRLPOOL 869055dd0e14af0dc285a11d95a891ab4686e1d16960d46728ddf680eee58d42570f64d058b88d30805b732b082c354a36dac5a816a7ce5f3034d1b22237aa5a
 DIST ruby-patches-2.0.0_p247.tar.bz2 1929 SHA256 4feee409319dbcac7525fb9c1c76c36888a62ee0623c117ae532bf765845f0f9 SHA512 95cf20e26e43a1515843d74c558e3344ae33b7383362c1742a115c1b3e6d09e1ed947df8ab7fee6275e96c920bd0ef880647da70165ddccd40d0995ff43aae64 WHIRLPOOL 869055dd0e14af0dc285a11d95a891ab4686e1d16960d46728ddf680eee58d42570f64d058b88d30805b732b082c354a36dac5a816a7ce5f3034d1b22237aa5a
--- a/dev-lang/ruby/ruby-1.8.7_p374-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.7_p374-r1.ebuild
@ -0,0 +1,193 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p374-r1.ebuild,v 1.1 2013/07/29 19:06:01 graaff Exp $
+
+EAPI=2
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(replace_version_separator 3 '-')"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+# 1.8 and 1.9 series disagree on this
+RUBYVERSION=$(get_version_component_range 1-2)
+
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby GPL-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	ssl? ( >=dev-libs/openssl-0.9.8m )
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? ( dev-lang/tk[threads=] )
+	ncurses? ( sys-libs/ncurses )
+	libedit? ( dev-libs/libedit )
+	!libedit? ( readline? ( sys-libs/readline ) )
+	sys-libs/zlib
+	>=app-admin/eselect-ruby-20100603
+	!<dev-ruby/rdoc-2"
+DEPEND="${RDEPEND}"
+PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	if use libedit; then
+		einfo "Using libedit to provide readline extension"
+		myconf="${myconf} --enable-libedit --with-readline"
+	elif use readline; then
+		einfo "Using readline to provide readline extension"
+		myconf="${myconf} --with-readline"
+	else
+		myconf="${myconf} --without-readline"
+	fi
+
+	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+		--program-suffix="${MY_SUFFIX}" \
+		--enable-shared \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
+		--enable-ipv6 \
+		$(use_enable debug) \
+		$(use_with berkdb dbm) \
+		$(use_with gdbm) \
+		$(use_with ssl openssl) \
+		$(use_with tk) \
+		$(use_with ncurses curses) \
+		${myconf} \
+		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
+	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
+		"/usr/$(get_libdir)/libruby$(get_libname ${PV%.*})"
+	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
+		"/usr/$(get_libdir)/libruby$(get_libname ${PV%_*})"
+
+	dodoc ChangeLog NEWS README* ToDo || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(18|19|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
--- a/dev-lang/ruby/ruby-1.9.3_p448-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p448-r1.ebuild
@ -0,0 +1,216 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p448-r1.ebuild,v 1.1 2013/07/29 19:06:01 graaff Exp $
+
+EAPI=4
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+RUBYPL=$(get_version_component_range 4)
+
+MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+# 1.9.3 still uses 1.9.1
+RUBYVERSION=1.9.1
+
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml" #libedit
+
+# libedit support is removed everywhere because of this upstream bug:
+# http://redmine.ruby-lang.org/issues/show/3698
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	ssl? ( dev-libs/openssl )
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? ( dev-lang/tk[threads] )
+	ncurses? ( sys-libs/ncurses )
+	readline?  ( sys-libs/readline )
+	yaml? ( dev-libs/libyaml )
+	virtual/libffi
+	sys-libs/zlib
+	>=app-admin/eselect-ruby-20100402
+	!<dev-ruby/rdoc-3.9.4
+	!<dev-ruby/rubygems-1.8.10-r1"
+#	libedit? ( dev-libs/libedit )
+#	!libedit? ( readline? ( sys-libs/readline ) )
+
+DEPEND="${RDEPEND}"
+PDEPEND="
+	>=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19]
+	rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	rm -r \
+		{bin,lib}/rake lib/rake.rb man/rake.1 \
+		ext/json \
+		bin/gem || die "removal failed"
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+#	if use libedit; then
+#		einfo "Using libedit to provide readline extension"
+#		myconf="${myconf} --enable-libedit --with-readline"
+#	elif use readline; then
+#		einfo "Using readline to provide readline extension"
+#		myconf="${myconf} --with-readline"
+#	else
+#		myconf="${myconf} --without-readline"
+#	fi
+	myconf="${myconf} $(use_with readline)"
+
+	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--enable-shared \
+		--enable-pthread \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable debug) \
+		$(use_with berkdb dbm) \
+		$(use_with gdbm) \
+		$(use_with ssl openssl) \
+		$(use_with tk) \
+		$(use_with ncurses curses) \
+		$(use_with yaml psych) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems copy
+	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* ToDo || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(18|19|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
--- a/dev-lang/ruby/ruby-2.0.0_p247-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p247-r1.ebuild
@ -0,0 +1,225 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p247-r1.ebuild,v 1.1 2013/07/29 19:06:01 graaff Exp $
+
+EAPI=5
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+RUBYPL=$(get_version_component_range 4)
+
+MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+RUBYVERSION=2.0.0
+
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/2.0/${MY_P}.tar.bz2
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	ssl? ( dev-libs/openssl )
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? ( dev-lang/tk[threads] )
+	ncurses? ( sys-libs/ncurses )
+	readline?  ( sys-libs/readline )
+	yaml? ( dev-libs/libyaml )
+	virtual/libffi
+	sys-libs/zlib
+	>=app-admin/eselect-ruby-20100402
+	!<dev-ruby/rdoc-3.9.4
+	!<dev-ruby/rubygems-1.8.10-r1"
+
+DEPEND="${RDEPEND}"
+PDEPEND="
+	>=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20]
+	>=dev-ruby/json-1.7.7[ruby_targets_ruby20]
+	>=dev-ruby/rake-0.9.6[ruby_targets_ruby20]
+	rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	# We can no longer unbundle all of rake because rubygems now depends
+	# on this. We leave the actual rake code around to bootstrap
+	# rubygems, but remove the bits that would cause a file collision.
+	einfo "Unbundling gems..."
+	cd "$S"
+	rm -r \
+		{bin,lib}/rake lib/rake.rb man/rake.1 \
+		bin/gem || die "removal failed"
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+#	if use libedit; then
+#		einfo "Using libedit to provide readline extension"
+#		myconf="${myconf} --enable-libedit --with-readline"
+#	elif use readline; then
+#		einfo "Using readline to provide readline extension"
+#		myconf="${myconf} --with-readline"
+#	else
+#		myconf="${myconf} --without-readline"
+#	fi
+	myconf="${myconf} $(use_with readline)"
+
+	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable debug) \
+		$(use_with berkdb dbm) \
+		$(use_with gdbm) \
+		$(use_with ssl openssl) \
+		$(use_with tk) \
+		$(use_with ncurses curses) \
+		$(use_with yaml psych) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems copy
+	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
+		"/usr/$(get_libdir)/libruby$(get_libname ${PV%.*})"
+	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
+		"/usr/$(get_libdir)/libruby$(get_libname ${PV%_*})"
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(18|19|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
--- a/dev-libs/Ice/Ice-3.4.2-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.4.2-r1.ebuild
@ -1,267 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.2-r1.ebuild,v 1.3 2012/12/10 07:21:04 polynomial-c Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
-
-inherit toolchain-funcs versionator python mono ruby-ng db-use
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="http://www.zeroc.com/"
-SRC_URI="http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.tar.gz
-	doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf.gz )
-	http://dev.gentoo.org/~ssuominen/${P}-gcc47.patch.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x64-macos ~x86-linux"
-IUSE="doc examples +ncurses mono python ruby test debug"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	>=dev-libs/openssl-0.9.8o:0
-	>=sys-libs/db-4.8.30[cxx]
-	~dev-cpp/libmcpp-2.7.2
-	ruby? ( $(ruby_implementation_depend ruby18) )
-	mono? ( dev-lang/mono )
-	!dev-python/IcePy
-	!dev-ruby/IceRuby"
-DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses sys-libs/readline )
-	test? ( =dev-lang/python-2* )"
-
-# Maintainer notes:
-# - yes, we have to do the trickery with the move for the python functions
-#   since the build and test frameworks deduce various settings from the path
-#   and they can't be tricked by a symlink. And we also need
-#   SUPPORT_PYTHON_ABIS=1 otherwise we can't get pyc/pyo anymore the sane way.
-# TODO: php bindings
-# TODO: java bindings
-
-#overwrite ruby-ng.eclass default
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	if use python || use test; then
-		python_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.4.1-db5.patch \
-		"${FILESDIR}"/${PN}-3.4.2-gcc46.patch \
-		"${WORKDIR}"/${PN}-3.4.2-gcc47.patch
-
-	sed -i \
-		-e 's|\(install_docdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
-		cpp/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_pythondir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_rubydir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		{py,rb}/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|-O2 ||g' \
-		cpp/config/Make.rules.Linux || die "sed failed"
-
-	sed -i \
-		-e 's|install-common||' \
-		-e 's|demo||' \
-		{cpp,cs,php,py,rb}/Makefile || die "sed failed"
-
-	sed -i \
-		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-		cs/config/Make.rules.cs || die "sed failed"
-
-	if ! use test ; then
-		sed -i \
-			-e 's|^\(SUBDIRS.*\)test|\1|' \
-			{cpp,cs,php,py,rb}/Makefile || die "sed failed"
-	fi
-}
-
-src_configure() {
-	MAKE_RULES="prefix=\"${ED}/usr\"
-		install_docdir=\"${ED}/usr/share/doc/${PF}\"
-		install_configdir=\"${ED}/usr/share/Ice-${PV}/config\"
-		embedded_runpath_prefix=\"${EPREFIX}/usr\"
-		LP64=yes"
-
-	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
-	use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"
-
-	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir)"
-	sed -i \
-		-e "s|c++|$(tc-getCXX)|" \
-		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db)|" \
-		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
-
-	if use python ; then
-		python_copy_sources py
-		mv py py.orig
-	fi
-
-	if use ruby ; then
-		SITERUBY="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
-		MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
-			install_libdir=\"${ED}/${SITERUBY}\""
-
-		# make it use ruby18 only
-		sed -i \
-			-e 's|RUBY = ruby|\018|' \
-			rb/config/Make.rules || die "sed failed"
-	fi
-
-	MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)"
-
-}
-
-src_compile() {
-	if tc-is-cross-compiler ; then
-		export CXX="${CHOST}-g++"
-	fi
-
-	emake -C cpp ${MAKE_RULES} || die "emake failed"
-
-	if use doc ; then
-		emake -C cpp/doc || die "building docs failed"
-	fi
-
-	if use python ; then
-		building() {
-			mv py-${PYTHON_ABI} py
-			emake -C py ${MAKE_RULES} || die "emake py failed (for py-${PYTHON_ABI})"
-			mv py py-${PYTHON_ABI}
-		}
-		python_execute_function building
-	fi
-
-	if use ruby ; then
-		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} || die "emake rb failed"
-	fi
-
-	if use mono ; then
-		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} || die "emake cs failed"
-	fi
-}
-
-src_install() {
-	dodoc CHANGES README
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp ${MAKE_RULES} install || die "emake install failed"
-
-	docinto cpp
-	dodoc CHANGES README
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples-cpp
-		doins cpp/config/*.cfg
-		doins -r cpp/demo/*
-	fi
-
-	if use doc ; then
-		dohtml -r cpp/doc/reference/*
-		dodoc "${WORKDIR}/${P}.pdf"
-	fi
-
-	if use python ; then
-		installation() {
-			dodir $(python_get_sitedir)
-			mv py-${PYTHON_ABI} py
-			emake -C py ${MAKE_RULES} install_pythondir="\"${D}/$(python_get_sitedir)\"" install_libdir="\"${D}/$(python_get_sitedir)\"" install || die "emake py install failed (for py-${PYTHON_ABI})"
-			mv py py-${PYTHON_ABI}
-		}
-		python_execute_function installation
-
-		docinto py
-		dodoc py.orig/CHANGES py.orig/README
-
-		if use examples ; then
-			insinto /usr/share/doc/${PF}/examples-py
-			doins -r py.orig/demo/*
-		fi
-
-		cd "${ED}/$(python_get_sitedir -f)"
-		PYTHON_MODULES=(*.py)
-		PYTHON_MODULES+=(IceBox IceGrid IcePatch2 IceStorm)
-		cd "${S}"
-	fi
-
-	if use ruby ; then
-		dodir "${SITERUBY}"
-		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} install || die "emake rb install failed"
-
-		docinto rb
-		dodoc rb/CHANGES rb/README
-
-		if use examples ; then
-			insinto /usr/share/doc/${PF}/examples-rb
-			doins -r rb/demo/*
-		fi
-	fi
-
-	if use mono ; then
-		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake cs install failed"
-
-		# TODO: anyone has an idea what those are for?
-		rm "${ED}"/usr/bin/*.xml
-
-		docinto cs
-		dodoc cs/CHANGES cs/README
-
-		if use examples ; then
-			insinto /usr/share/doc/${PF}/examples-cs
-			doins -r cs/demo/*
-		fi
-	fi
-}
-
-src_test() {
-	emake -C cpp ${MAKE_RULES} test || die "emake test failed"
-
-	if use python ; then
-		testing() {
-			mv py-${PYTHON_ABI} py
-			emake -C py ${MAKE_RULES} test || die "emake py test failed (for py-${PYTHON_ABI})"
-			mv py py-${PYTHON_ABI}
-		}
-		python_execute_function testing
-	fi
-
-	if use ruby ; then
-		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} test || die "emake rb test failed"
-	fi
-
-	if use mono ; then
-#		ewarn "Tests for C# are currently disabled."
-		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} test || die "emake cs test failed"
-	fi
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize "${PYTHON_MODULES[@]}"
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup "${PYTHON_MODULES[@]}"
-}
--- a/dev-libs/Ice/Ice-3.4.2.ebuild
+++ b/dev-libs/Ice/Ice-3.4.2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.2.ebuild,v 1.9 2012/11/16 13:40:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.2.ebuild,v 1.10 2013/07/30 06:21:51 polynomial-c Exp $

 EAPI="2"

@ -25,7 +25,7 @@ IUSE="doc examples +ncurses mono python ruby test debug"
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
 	>=dev-libs/openssl-0.9.8o:0
-	>=sys-libs/db-4.8.30[cxx]
+	<sys-libs/db-6.0[cxx]
 	~dev-cpp/libmcpp-2.7.2
 	ruby? ( $(ruby_implementation_depend ruby18) )
 	mono? ( dev-lang/mono )
--- a/dev-libs/Ice/Ice-3.5.0-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.5.0-r1.ebuild
@ -1,16 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.0.ebuild,v 1.2 2013/06/12 14:55:02 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.0-r1.ebuild,v 1.1 2013/07/30 06:21:51 polynomial-c Exp $

-EAPI="4"
+EAPI=5

-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby18"

-inherit toolchain-funcs versionator python mono ruby-ng db-use
+inherit toolchain-funcs versionator python-r1 mono-env ruby-ng db-use

 DESCRIPTION="ICE middleware C++ library and generator tools"
 HOMEPAGE="http://www.zeroc.com/"
@ -24,15 +22,16 @@ IUSE="doc examples +ncurses mono python ruby test debug"
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
 	>=dev-libs/openssl-0.9.8o:0
-	>=sys-libs/db-4.8.30[cxx]
+	<sys-libs/db-6.0[cxx]
 	~dev-cpp/libmcpp-2.7.2
+	python? ( ${PYTHON_DEPS} )
 	ruby? ( $(ruby_implementation_depend ruby18) )
 	mono? ( dev-lang/mono )
 	!dev-python/IcePy
 	!dev-ruby/IceRuby"
 DEPEND="${RDEPEND}
 	ncurses? ( sys-libs/ncurses sys-libs/readline )
-	test? ( =dev-lang/python-2* )"
+	test? ( ${PYTHON_DEPS} )"

 # Maintainer notes:
 # - yes, we have to do the trickery with the move for the python functions
@ -45,12 +44,6 @@ DEPEND="${RDEPEND}
 #overwrite ruby-ng.eclass default
 S="${WORKDIR}/${P}"

-pkg_setup() {
-	if use python || use test; then
-		python_pkg_setup
-	fi
-}
-
 src_unpack() {
 	# prevent ruby-ng.eclass from messing with src_unpack
 	default
@ -109,8 +102,10 @@ src_configure() {
 		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"

 	if use python ; then
-		python_copy_sources py
-		mv py py.orig
+		S=${S}/py python_copy_sources
+
+		# make a place for the symlink
+		rm -r py/python || die
 	fi

 	if use ruby ; then
@ -126,6 +121,7 @@ src_configure() {

 	MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)"

+	use test && python_export_best
 }

 src_compile() {
@ -141,11 +137,9 @@ src_compile() {

 	if use python ; then
 		building() {
-			mv py-${PYTHON_ABI} py
-			emake -C py ${MAKE_RULES} || die "emake py failed (for py-${PYTHON_ABI})"
-			mv py py-${PYTHON_ABI}
+			emake -C "${BUILD_DIR}" ${MAKE_RULES} || die "emake py-${EPYTHON} failed"
 		}
-		python_execute_function building
+		BUILD_DIR=py python_foreach_impl building
 	fi

 	if use ruby ; then
@ -181,25 +175,22 @@ src_install() {

 	if use python ; then
 		installation() {
-			dodir $(python_get_sitedir)
-			mv py-${PYTHON_ABI} py
-			emake -C py ${MAKE_RULES} install_pythondir="\"${D}/$(python_get_sitedir)\"" install_libdir="\"${D}/$(python_get_sitedir)\"" install || die "emake py install failed (for py-${PYTHON_ABI})"
-			mv py py-${PYTHON_ABI}
+			mkdir -p "${D}/$(python_get_sitedir)" || die
+
+			emake -C "${BUILD_DIR}" ${MAKE_RULES} \
+				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D}/$(python_get_sitedir)\"" \
+				install || die "emake py-${EPYTHON} install failed"
 		}
-		python_execute_function installation
+		BUILD_DIR=py python_foreach_impl installation

 		docinto py
-		dodoc py.orig/CHANGES py.orig/README
+		dodoc py/CHANGES py/README

 		if use examples ; then
 			insinto /usr/share/doc/${PF}/examples-py
-			doins -r py.orig/demo/*
+			doins -r py/demo/*
 		fi
-
-		cd "${ED}/$(python_get_sitedir -f)"
-		PYTHON_MODULES=(*.py)
-		PYTHON_MODULES+=(IceBox IceGrid IcePatch2 IceStorm)
-		cd "${S}"
 	fi

 	if use ruby ; then
@ -231,32 +222,36 @@ src_install() {
 	fi
 }

+run_tests() {
+	# Run tests through the script interface since Python test runner
+	# fails to exit with non-zero code for some reason.
+
+	pushd "${1}" >/dev/null || die
+	./allTests.py --script | sh
+	ret=${?}
+	popd >/dev/null || die
+
+	return ${ret}
+}
+
 src_test() {
-	emake -C cpp ${MAKE_RULES} test || die "emake test failed"
+	run_tests cpp || die "emake cpp test failed"

 	if use python ; then
 		testing() {
-			mv py-${PYTHON_ABI} py
-			emake -C py ${MAKE_RULES} test || die "emake py test failed (for py-${PYTHON_ABI})"
-			mv py py-${PYTHON_ABI}
+			# tests require that the directory is named 'py'
+			ln -f -s ../"${BUILD_DIR}"/python py/python || die
+			run_tests py || die "emake py-${EPYTHON} test failed"
 		}
-		python_execute_function testing
+		BUILD_DIR=py python_foreach_impl testing
 	fi

 	if use ruby ; then
-		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} test || die "emake rb test failed"
+		run_tests rb || die "emake rb test failed"
 	fi

 	if use mono ; then
 #		ewarn "Tests for C# are currently disabled."
-		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} test || die "emake cs test failed"
+		run_tests cs || die "emake cs test failed"
 	fi
 }
-
-pkg_postinst() {
-	use python && python_mod_optimize "${PYTHON_MODULES[@]}"
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup "${PYTHON_MODULES[@]}"
-}
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@ -3,3 +3,4 @@ DIST angelscript_2.26.0.zip 1374077 SHA256 2701441de3e8bdbb601d560b95bd6302a82ab
 DIST angelscript_2.26.1.zip 1381321 SHA256 40896a61008671df8210efe9d1b9dc78fc32dafca35f5b4d2526b151ff7d97e6 SHA512 327f87c3e836327ad3fc71031bc6c2559f05dea03c149fedd93aca147042292fab58e484cea9052403379cc5c9c1d4667732a610f0688bd87520c823484bb384 WHIRLPOOL 315b5453782fc018693a0ba62147df18ee0cc876b1593b8c728671f990614d18543d13ad33fb06ba803ed590c7e44ed2385f705c86fca99573afbae831d2092c
 DIST angelscript_2.26.2.zip 1390172 SHA256 53b8c71118a3a317d71ecbcc89be3e623b98e5c7cf5bc3c884859d4ca143cf0f SHA512 eb646899cff998b4a0b59d9e808a15b443ce0d9d4827df900a88ba3c09a9d500940fdb6494d22d6e321a7b2e266d4ddd0f3682e2909478c10bff908138effd71 WHIRLPOOL f1cb4ea3e9c2466d011ac6eb36da21e0f3cb9152a19bbd85598507363587a0982d8d7d57233d14accae55c182da478166b65ba065ac350a57ded70aa592dcf9e
 DIST angelscript_2.26.3.zip 1420959 SHA256 c2fd4a8ec001b78a9edc11b31e4c87d30922be74817f339d067b096fbdd4c1dc SHA512 cdcef4b7bc01788baff6633e4babf8fb94e45c7cd71d189365df2edf535fd0b244a0bc235abddb9abc48598e941e73ba5c2cb4c5738228b31201bb5dae046159 WHIRLPOOL d6555fd32ca546cac45eeabdea27d72b096bbc6a5311ec4ab77eed278b46cba67d6f24d339a67a6bf9da068cf772f8263bd4697dc72dce31351af94197b718cd
+DIST angelscript_2.27.0.zip 1442212 SHA256 5bb3b197c972dc5021da5cd05f8bf8181e5d11195e6391d2193c9d0a81a4da5a SHA512 adae1a7daad8e9b1910767e7f3dc12dd9964026812262661b8da6a50d60c47a77e9bf6835c44573520c565568167d18e7219df0df8a9d4deb24c2f4871f68f2a WHIRLPOOL c6a8b6e5ef954b9b95ac10bc13b90d84ee9be3118e1f705e75ac88cbc14dce3a87c08cfeaa1565c49e7a59cf81336f190c5a6ece31348c9ee7924aab488e4ba6
--- a/dev-libs/angelscript/angelscript-2.27.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.27.0.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/angelscript-2.27.0.ebuild,v 1.1 2013/07/29 20:37:16 hasufell Exp $
+
+EAPI=5
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A flexible, cross-platform scripting library"
+HOMEPAGE="http://www.angelcode.com/angelscript/"
+SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/sdk
+S2=${WORKDIR}/sdk_static
+
+pkg_setup() {
+	tc-export CXX AR RANLIB
+}
+
+src_prepare() {
+	if use static-libs ; then
+		cp -pR "${WORKDIR}"/sdk "${S2}"/ || die
+	fi
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	einfo "Shared build"
+	emake -C ${PN}/projects/gnuc SHARED=1 VERSION=${PV}
+
+	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+		if use static-libs ; then
+			einfo "Static build"
+			emake -C "${S2}"/${PN}/projects/gnuc
+		fi
+	fi
+}
+
+multilib_src_install() {
+	doheader ${PN}/include/angelscript.h
+	dolib.so ${PN}/lib/libangelscript-${PV}.so
+	dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so
+
+	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+		if use static-libs ; then
+			 dolib.a "${S2}"/${PN}/lib/libangelscript.a
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
+}
--- a/dev-libs/atk/metadata.xml
+++ b/dev-libs/atk/metadata.xml
@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>gnome-accessibility</herd>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:gnome:at-spi2-atk</remote-id>
-  </upstream>
 </pkgmetadata>
--- a/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild,v 1.15 2012/12/09 18:33:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild,v 1.16 2013/07/30 03:33:09 tetromino Exp $

 EAPI="4"
 GCONF_DEBUG="no"
@ -19,7 +19,10 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbs

 IUSE="doc doctool test"

-RDEPEND=">=dev-libs/gobject-introspection-common-${PV}
+# 1.35.9 introduced the --cflags-begin argument
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	<dev-libs/gobject-introspection-common-1.35.9
 	>=dev-libs/glib-2.31.22:2
 	<dev-libs/glib-2.33:2
 	doctool? ( dev-python/mako )
--- a/dev-libs/gobject-introspection/gobject-introspection-1.34.2-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.34.2-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.34.2-r1.ebuild,v 1.3 2013/02/22 19:17:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.34.2-r1.ebuild,v 1.4 2013/07/30 03:33:09 tetromino Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -19,8 +19,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86

 IUSE="doctool test"

+# 1.35.9 introduced the --cflags-begin argument
 RDEPEND="
 	>=dev-libs/gobject-introspection-common-${PV}
+	<dev-libs/gobject-introspection-common-1.35.9
 	>=dev-libs/glib-2.34.1:2
 	doctool? ( dev-python/mako )
 	virtual/libffi:=
--- a/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-3.3.1.ebuild,v 1.5 2013/04/14 21:24:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-3.3.1.ebuild,v 1.6 2013/07/29 12:28:53 grobian Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://www.canonware.com/download/${PN}/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~x64-macos"
 IUSE="debug static-libs stats"

 src_prepare() {
@ -34,5 +34,12 @@ src_install() {
 	default
 	dohtml doc/jemalloc.html

-	use static-libs || find "${ED}" -name '*.a' -delete
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fixup install_name, #437362
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.1.dylib \
+			"${ED}"/usr/$(get_libdir)/libjemalloc.1.dylib || die
+	fi
+
+	use static-libs || find "${D}" -name '*.a' -delete
 }
--- a/dev-libs/libbrahe/libbrahe-1.1.0.ebuild
+++ b/dev-libs/libbrahe/libbrahe-1.1.0.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbrahe/libbrahe-1.1.0.ebuild,v 1.3 2009/02/26 14:50:42 josejx Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="A Heterogenous C Library of Numeric Functions"
-HOMEPAGE="http://www.coyotegulch.com/products/brahe/"
-SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PV}-missing_libs.patch"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS
-}
--- a/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild
+++ b/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild
@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild,v 1.1 2013/06/19 15:22:29 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild,v 1.2 2013/07/29 15:10:29 chithanh Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )

-EGIT_REPO_URI="git://people.freedesktop.org/~tstellar/${PN}"
+EGIT_REPO_URI="http://llvm.org/git/${PN}.git"

 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-2"
@ -15,7 +15,7 @@ fi
 inherit base python-any-r1 $GIT_ECLASS

 DESCRIPTION="OpenCL C library"
-HOMEPAGE="http://libclc.llvm.org/ http://cgit.freedesktop.org/~tstellar/libclc/"
+HOMEPAGE="http://libclc.llvm.org/"

 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
--- a/dev-libs/libevocosm/Manifest
+++ b/dev-libs/libevocosm/Manifest
@ -1,4 +1 @@
-DIST libevocosm-2.5.2.tar.gz 328537 SHA256 a27282af189396cad96774cd65167eae98642bc81fd6be781058ca429940ab70 SHA512 c531679f372b851ddb1439734b0df2b6dd999cefb4ee09d18c1bbde2cffb3b1d1667d3a58cdd37cc5a24e725facedbf00d88c78768b1142cdb777e3b422dcde8 WHIRLPOOL 9bac3fe3be6150a14b68956239396ff2deb0eb235ed9c15047367a503e847d35f0cd0f94ad588608c1858b7e93b01f23363c2e0217ca03d32621932b9342f31b
-DIST libevocosm-3.1.0.tar.gz 357858 SHA256 8ed8781e25afa9c0baabdc5e661e5a55b74ef0de207c1f093e311815afab3751 SHA512 a3f00d1ade920ddcaf945a795b00799a07110bf9c7f83731d0b51ea63a74942af2198e33d646c9467daa5bb0acb6500a909773ccada489a13b0701968489932e WHIRLPOOL f0ce0b5341c36e3cf4c8d7c8b571714c6f8a5f6f165878b090f80ba0ac0f29eb55a683ff7a35cf82e30f7ad8d02ad0ea5712207f83be5bc481d719b1f286570a
-DIST libevocosm-3.3.0.tar.gz 823295 SHA256 e1ab7c7061aeb9f0a0fe30d4399041c4c93a056cd603778c6724b8f22fa8d136 SHA512 d55f53e6be16935e10c2fd37cad5c40653750ad06ecfc2562c20224a2ed71c6260436d6e52fe4c338820a57d1c4d0af7ef6aab00d526e16e1f19648deba28406 WHIRLPOOL 2c79cf5b184b2c905fca93d080a566a18b958e0f25421cbb189739bd0c86447f1fb623ffed4347f4dbb8a2f0f95ae0cc149cba3d360d28f9f2df68be7bbe008b
 DIST libevocosm-3.3.1.tar.gz 414392 SHA256 a1c7380e627b688540c3dc9652dc38b132beec7afbb7b0420d30e1e605b997ba SHA512 ebb4200ac533bdb86051a8a33e5da08d677ae0aa8c2e65a9855e9465b76827c0a72f31e260ee34be62600cd22794a4e47c4471623de8d9fcb4749dcf0a37d946 WHIRLPOOL 430c4d826ff7106c7a1520f3acfa044f233a381bb9f18a292a495b9db49a4beb9888df5a5afec101b9d8a841c2ec618b213aa9830403db57f9bb95d8d2c17170
--- a/dev-libs/libevocosm/files/3.3.0-gcc-4.3.patch
+++ b/dev-libs/libevocosm/files/3.3.0-gcc-4.3.patch
@ -1,11 +0,0 @@
-diff -Naur libevocosm-3.3.0.orig/libevocosm/roulette.cpp libevocosm-3.3.0/libevocosm/roulette.cpp
--- libevocosm-3.3.0.orig/libevocosm/roulette.cpp	2008-05-01 02:30:39.000000000 +0200
-+++ libevocosm-3.3.0/libevocosm/roulette.cpp	2008-05-01 02:31:25.000000000 +0200
-@@ -34,6 +34,7 @@
- 
- // Standard C++ Library
- #include <stdexcept>
-+#include <cstring>
- 
- // libevocosm
- #include "validator.h"
--- a/dev-libs/libevocosm/libevocosm-2.5.2.ebuild
+++ b/dev-libs/libevocosm/libevocosm-2.5.2.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevocosm/libevocosm-2.5.2.ebuild,v 1.5 2005/12/18 23:42:48 halcy0n Exp $
-
-DESCRIPTION="A C++ framework for evolutionary computing"
-HOMEPAGE="http://www.coyotegulch.com/products/libevocosm/"
-SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ~ppc"
-IUSE=""
-DEPEND="dev-libs/libcoyotl"
-
-src_install() {
-	make DESTDIR="${D}" install
-	dodoc ChangeLog NEWS README
-}
--- a/dev-libs/libevocosm/libevocosm-3.1.0.ebuild
+++ b/dev-libs/libevocosm/libevocosm-3.1.0.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevocosm/libevocosm-3.1.0.ebuild,v 1.2 2005/12/19 13:29:49 halcy0n Exp $
-
-DESCRIPTION="A C++ framework for evolutionary computing"
-HOMEPAGE="http://www.coyotegulch.com/products/libevocosm/"
-SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="dev-libs/libcoyotl"
-
-src_install() {
-	make DESTDIR="${D}" install
-	dodoc ChangeLog NEWS README
-}
--- a/dev-libs/libevocosm/libevocosm-3.3.0.ebuild
+++ b/dev-libs/libevocosm/libevocosm-3.3.0.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevocosm/libevocosm-3.3.0.ebuild,v 1.3 2009/02/26 14:53:19 josejx Exp $
-
-inherit eutils
-
-DESCRIPTION="A C++ framework for evolutionary computing"
-HOMEPAGE="http://www.coyotegulch.com/products/libevocosm/"
-SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libcoyotl
-	dev-libs/libbrahe"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-gcc-4.3.patch"
-}
-
-src_compile() {
-	ac_cv_prog_HAVE_DOXYGEN="false" econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		cd docs
-		doxygen libevocosm.doxygen || die "generating docs failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-	dohtml docs/html/*
-}
--- a/dev-libs/libevocosm/libevocosm-3.3.1.ebuild
+++ b/dev-libs/libevocosm/libevocosm-3.3.1.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevocosm/libevocosm-3.3.1.ebuild,v 1.2 2013/02/19 17:05:43 dirtyepic Exp $
-
-inherit eutils
-
-DESCRIPTION="A C++ framework for evolutionary computing"
-HOMEPAGE="http://www.coyotegulch.com/products/libevocosm/"
-SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libcoyotl
-	dev-libs/libbrahe"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-}
-
-src_compile() {
-	ac_cv_prog_HAVE_DOXYGEN="false" econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		cd docs
-		doxygen libevocosm.doxygen || die "generating docs failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-	dohtml docs/html/*
-}
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@ -3,20 +3,23 @@
 <pkgmetadata>
 <herd>x11</herd>
 <use>
-	<flag name='clients'>Enable support for clients.</flag>
-	<flag name='colord'>Allow setting color managment.</flag>
-	<flag name='drm'>Enable drm compositor support.</flag>
-	<flag name='egl'>Enable egl acceleration.</flag>
-	<flag name='fbdev'>Enable fbdev compositor support.</flag>
-	<flag name='gles2'>Use GLESv2 cairo instead of full GL.</flag>
-	<flag name='headless'>Headless backend and a noop renderer, mainly for testing purposes.</flag>
-	<flag name='rdp'>Enable Remote Desktop Protocol compositor support.</flag>
-	<flag name='resize-optimization'>Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi.</flag>
-	<flag name='rpi'>Raspberry Pi GPU support.</flag>
-	<flag name='simple-clients'>Enable simple-clients?.</flag>
-	<flag name='tablet'>Enable interface for tablets.</flag>
-	<flag name='wayland-compositor'>Enable Wayland compositor support.</flag>
-	<flag name='xwayland'>Enable ability support native X11 applications.</flag>
-	<flag name='x11'>Enable X11 compositor support.</flag>
+	<flag name='clients'>Enable support for clients</flag>
+	<flag name='colord'>Allow setting color managment</flag>
+	<flag name='drm'>Enable drm compositor support</flag>
+	<flag name='editor'>Install wayland-editor example application</flag>
+	<flag name='egl'>Enable egl acceleration</flag>
+	<flag name='fbdev'>Enable fbdev compositor support</flag>
+	<flag name='gles2'>Use GLESv2 cairo instead of full GL</flag>
+	<flag name='headless'>Headless backend and a noop renderer, mainly for testing purposes</flag>
+	<flag name='rdp'>Enable Remote Desktop Protocol compositor support</flag>
+	<flag name='resize-optimization'>Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
+	<flag name='rpi'>Raspberry Pi GPU support</flag>
+	<flag name='simple-clients'>Enable simple-clients</flag>
+	<flag name='tablet'>Enable interface for tablets</flag>
+	<flag name='unwind'>Enable libunwind usage for backtraces</flag>
+	<flag name='view'>Install wayland-view example application</flag>
+	<flag name='wayland-compositor'>Enable Wayland compositor support</flag>
+	<flag name='x11'>Enable X11 compositor support</flag>
+	<flag name='xwayland'>Enable ability support native X11 applications</flag>
 </use>
 </pkgmetadata>
--- a/dev-libs/weston/weston-1.2.0-r1.ebuild
+++ b/dev-libs/weston/weston-1.2.0-r1.ebuild
@ -0,0 +1,162 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/weston/weston-1.2.0-r1.ebuild,v 1.1 2013/07/29 14:35:47 chithanh Exp $
+
+EAPI=5
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}"
+	GIT_ECLASS="git-2"
+	EXPERIMENTAL="true"
+fi
+VIRTUALX_REQUIRED="test"
+
+inherit autotools readme.gentoo toolchain-funcs virtualx $GIT_ECLASS
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="http://wayland.freedesktop.org/"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+	KEYWORDS=""
+else
+	SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~arm ~amd64 ~x86 ~arm-linux"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+IUSE="colord +drm +egl editor examples fbdev gles2 headless +opengl rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind view wayland-compositor +X xwayland"
+
+REQUIRED_USE="
+	drm? ( egl )
+	editor? ( examples )
+	egl? ( || ( gles2 opengl ) )
+	fbdev? ( drm )
+	gles2? ( !opengl )
+	test? ( X )
+	view? ( examples )
+	wayland-compositor? ( egl )
+"
+
+RDEPEND="
+	>=dev-libs/wayland-1.1.90
+	media-libs/mesa[egl?,wayland]
+	media-libs/lcms:2
+	media-libs/libpng:=
+	media-libs/libwebp
+	virtual/jpeg
+	sys-libs/pam
+	>=x11-libs/cairo-1.11.3[gles2(-)?,opengl?]
+	>=x11-libs/libdrm-2.4.30
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	fbdev? (
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	colord? ( >=x11-misc/colord-0.1.27 )
+	drm? (
+		media-libs/mesa[gbm]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	egl? (
+		media-libs/glu
+		media-libs/mesa[gles2]
+	)
+	examples? (
+		editor? ( x11-libs/pango )
+		view? (
+			app-text/poppler:=[cairo]
+			dev-libs/glib:2
+		)
+	)
+	rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
+	rpi? (
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	systemd? (
+		sys-auth/pambase[systemd]
+		sys-apps/systemd[pam]
+	)
+	unwind? ( sys-libs/libunwind )
+	X? (
+		x11-libs/libxcb
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-libs/cairo[xcb]
+		x11-libs/libxcb
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}
+	gnome-base/librsvg
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myconf
+	if use examples || use gles2 || use test; then
+		myconf="--enable-simple-clients
+			$(use_enable egl simple-egl-clients)"
+	else
+		myconf="--disable-simple-clients
+			--disable-simple-egl-clients"
+	fi
+	econf \
+		$(use_enable fbdev fbdev-compositor) \
+		$(use_enable drm drm-compositor) \
+		$(use_enable headless headless-compositor) \
+		$(use_enable rdp rdp-compositor) \
+		$(use_enable rpi rpi-compositor) \
+		$(use_enable wayland-compositor) \
+		$(use_enable X x11-compositor) \
+		$(use_enable colord) \
+		$(use_enable egl) \
+		$(use_enable unwind libunwind) \
+		$(use_with gles2 cairo-glesv2) \
+		$(use_enable resize-optimization) \
+		$(use_enable suid setuid-install) \
+		$(use_enable tablet tablet-shell) \
+		$(use_enable xwayland) \
+		$(use_enable xwayland xwayland-test) \
+		${myconf}
+}
+
+src_test() {
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	cd "${BUILD_DIR}" || die
+	Xemake check
+}
+
+src_install() {
+	default
+
+	readme.gentoo_src_install
+
+	cd "${BUILD_DIR}" || die
+	if use opengl && use egl; then
+		newbin clients/gears weston-gears
+	fi
+	if use examples; then
+		use egl && newbin clients/simple-egl weston-simple-egl
+		use editor && newbin clients/editor weston-editor
+		use view && newbin clients/view weston-view
+		local i
+		for i in calibrator clickdot cliptest dnd eventdemo flower fullscreen image resizor simple-shm simple-touch smoke transformed; do
+			newbin "clients/${i}" "weston-${i}"
+		done
+	fi
+}
--- a/dev-perl/Net-HTTP/Net-HTTP-6.60.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.60.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-HTTP/Net-HTTP-6.60.0.ebuild,v 1.2 2013/07/28 19:45:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-HTTP/Net-HTTP-6.60.0.ebuild,v 1.3 2013/07/29 17:29:50 pinkbyte Exp $

 EAPI=5

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Low-level HTTP connection (client)"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-perl/Tie-Hash-Method/Manifest
+++ b/dev-perl/Tie-Hash-Method/Manifest
@ -0,0 +1 @@
+DIST Tie-Hash-Method-0.02.tar.gz 4874 SHA256 d513fbb51413f7ca1e64a1bdce6194df7ec6076dea55066d67b950191eec32a9 SHA512 e32e911310dfbe066167a8750f9e9a4c5b277c4666addaf3a6b00851ef47e190c88195c394b8778b38e570001ada38f00d78b2ca4fa32498bf8fbb1f94b82424 WHIRLPOOL a8567e2703eac325c30a9033573dc2808affa3bc70182615e3e14a54424081d4c32d95e48b0ba9d07393374a7e245c81d8a1f644c04c9ee71117a9ad80131476
--- a/dev-perl/Tie-Hash-Method/Tie-Hash-Method-0.20.0.ebuild
+++ b/dev-perl/Tie-Hash-Method/Tie-Hash-Method-0.20.0.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tie-Hash-Method/Tie-Hash-Method-0.20.0.ebuild,v 1.1 2013/07/29 14:47:02 zlogene Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=YVES
+MODULE_VERSION=0.02
+
+inherit perl-module
+
+DESCRIPTION="Tied hash with specific methods overriden by callbacks"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-perl/Test-Pod )"
+
+SRC_TEST="do paralell"
--- a/dev-perl/Tie-Hash-Method/metadata.xml
+++ b/dev-perl/Tie-Hash-Method/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>perl</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>kentfredric@gmail.com</email>
+		<name>Kent Fredric</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">Tie-Hash-Method</remote-id>
+		<remote-id type="cpan-module">Tie::Hash::Method</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST codecrypt-1.2.tar.gz 438752 SHA256 007f8f7f00659f618f3f733f5895ee56baa1d6e55df0a62e0f07ac50bfc5df0b SHA512 29ecec99c2c89ab169bb11ece4b6726ef1b9dd5ae7580c0ee5a3598779bf5e8734f0771f31c408a0b4e36047036f976d65b0400d21bbe589c437f28a793912da WHIRLPOOL 49c0689cfaa064747c22be1830b69c1753f851f59af818063f9771c1930bdb25a4da14939045d0e8886b19351dd030ff58fb0ba6a7bd2f6d61ec022f6acfb112`
				`@ -0,0 +1 @@`
				`DIST d-mode-2.0.6.tar.gz 5465 SHA256 303ede6d2555ab935676ec4576d36c79bc880af86f37838a3b651b39f20a8f38 SHA512 8706459af61e49b3ca1ef6d4021abff752706b4dca9385c4fbe2b7c29ecb028dc3df558b1e9b3a358e5c38e3d2ab7121505583f95d3afdd9a06bc9449ed678f2 WHIRLPOOL 6f86955536c68fdc6da917c453d0e2ab9603de661abb6b2c504a298a8f76ad4111a0afa2ac0e5b585f8f7acb7a8a688fd3a3089726aa4150476acdd4364ae09c`
				`@ -0,0 +1 @@`
				`DIST Tie-Hash-Method-0.02.tar.gz 4874 SHA256 d513fbb51413f7ca1e64a1bdce6194df7ec6076dea55066d67b950191eec32a9 SHA512 e32e911310dfbe066167a8750f9e9a4c5b277c4666addaf3a6b00851ef47e190c88195c394b8778b38e570001ada38f00d78b2ca4fa32498bf8fbb1f94b82424 WHIRLPOOL a8567e2703eac325c30a9033573dc2808affa3bc70182615e3e14a54424081d4c32d95e48b0ba9d07393374a7e245c81d8a1f644c04c9ee71117a9ad80131476`