[gentoo-commits] dev/axs:master commit in: dev-perl/Proc-ProcessTable/files/, media-video/gxine/, dev-perl/HTML-Form/, ...

[Ian Stakenvicius]

commit:     47a7a78ea9ac8093abda573eae03d0fbeb2bed4e
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 18:39:26 2012 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 18:39:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/axs.git;a=commit;h=47a7a78e

fixed the botched update from yesterday before trying to sync to todays tree

---
 app-accessibility/edbrowse/Manifest                |    7 +
 app-accessibility/edbrowse/edbrowse-3.4.7.ebuild   |   61 ++
 app-accessibility/edbrowse/edbrowse-3.4.8.ebuild   |   58 ++
 .../files/edbrowse-3.4.7-fix-makefile.patch        |   13 +
 app-portage/g-cpan/files/g-cpan-0.16.4-misc.patch  |   40 ++
 app-portage/g-cpan/g-cpan-0.13.02.ebuild           |   29 +
 app-portage/g-cpan/g-cpan-0.14.0.ebuild            |   33 +
 app-portage/g-cpan/g-cpan-0.15.0-r1.ebuild         |   33 +
 app-portage/g-cpan/g-cpan-0.16.2.ebuild            |   38 ++
 app-portage/g-cpan/g-cpan-0.16.3.ebuild            |   38 ++
 app-portage/g-cpan/g-cpan-0.16.4.ebuild            |   38 ++
 dev-lang/perl/files/eblits/common-v50160001.eblit  |   71 ++
 .../perl/files/eblits/pkg_postinst-v50160001.eblit |   67 ++
 .../perl/files/eblits/pkg_postrm-v50160001.eblit   |   12 +
 .../perl/files/eblits/pkg_setup-v50160001.eblit    |   69 ++
 .../files/eblits/src_configure-v50160001.eblit     |  141 ++++
 .../perl/files/eblits/src_install-v50160001.eblit  |   59 ++
 .../perl/files/eblits/src_prepare-v50160001.eblit  |   70 ++
 .../perl/files/eblits/src_test-v50160001.eblit     |   12 +
 .../perl/files/perl-5.10.1-cleanup-paths.patch     |  100 +++
 dev-lang/perl/files/perl-5.10.1-hpux.patch         |   40 ++
 dev-lang/perl/files/perl-5.12.3-aix-soname.patch   |   70 ++
 dev-lang/perl/files/perl-5.12.3-interix.patch      |   21 +
 dev-lang/perl/files/perl-5.12.3-mint.patch         |  321 +++++++++
 .../perl/files/perl-5.14.1-cleanup-paths.patch     |  100 +++
 .../perl/files/perl-5.8.7-MakeMaker-RUNPATH.patch  |   21 +
 .../files/perl-5.8.8-CAN-2005-0448-rmtree-2.patch  |  280 ++++++++
 dev-lang/perl/files/perl-5.8.8-CVE-2008-1927.patch |  256 +++++++
 .../perl/files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch |  111 +++
 .../perl-5.8.8-asm-page-h-compile-failure.patch    |   12 +
 dev-lang/perl/files/perl-5.8.8-ccld-cflags.patch   |   33 +
 dev-lang/perl/files/perl-5.8.8-cplusplus.patch     |   22 +
 dev-lang/perl/files/perl-5.8.8-darwin-cc-ld.patch  |   22 +
 .../perl/files/perl-5.8.8-dragonfly-clean.patch    |  170 +++++
 dev-lang/perl/files/perl-5.8.8-fbsdhints.patch     |   57 ++
 .../files/perl-5.8.8-fix_file_path_chdir.patch     |   72 ++
 .../perl/files/perl-5.8.8-gcc42-command-line.patch |   11 +
 dev-lang/perl/files/perl-5.8.8-lib32.patch         |   76 +++
 dev-lang/perl/files/perl-5.8.8-lib64.patch         |   76 +++
 .../perl/files/perl-5.8.8-libnet-hostname.patch    |   25 +
 dev-lang/perl/files/perl-5.8.8-links.patch         |   86 +++
 .../perl/files/perl-5.8.8-makedepend-syntax.patch  |   11 +
 dev-lang/perl/files/perl-5.8.8-perlcc.patch        |   11 +
 dev-lang/perl/files/perl-5.8.8-reorder-INC.patch   |   93 +++
 .../perl/files/perl-5.8.8-solaris-relocation.patch |   21 +
 dev-lang/perl/files/perl-5.8.8-solaris11.patch     |   14 +
 dev-lang/perl/files/perl-5.8.8-usr-local.patch     |   25 +
 dev-lang/perl/files/perl-5.8.8-utf8-boundary.patch |   57 ++
 .../perl/files/perl-fix_h2ph_include_quote.patch   |   61 ++
 dev-lang/perl/files/perl-h2ph-ansi-header.patch    |   11 +
 .../perl/files/perl-hppa-pa7200-configure.patch    |   11 +
 dev-lang/perl/files/perl-noksh.patch               |   16 +
 dev-lang/perl/files/perl-perldoc-emptydirs.patch   |   10 +
 dev-lang/perl/files/perl-picdl.patch               |   13 +
 dev-lang/perl/files/perl-prelink-lpthread.patch    |   11 +
 dev-lang/perl/files/perl-regexp-nossp.patch        |   11 +
 dev-lang/perl/perl-5.10.1.ebuild                   |  610 +++++++++++++++++
 dev-lang/perl/perl-5.12.3-r1.ebuild                |  638 ++++++++++++++++++
 dev-lang/perl/perl-5.8.8-r8.ebuild                 |  698 ++++++++++++++++++++
 dev-lang/ruby/ruby-1.8.7_p352.ebuild               |  195 ++++++
 dev-lang/ruby/ruby-1.8.7_p357.ebuild               |  193 ++++++
 dev-lang/ruby/ruby-1.8.7_p358.ebuild               |  193 ++++++
 dev-lang/ruby/ruby-1.9.3_p0.ebuild                 |  223 +++++++
 dev-lang/ruby/ruby-1.9.3_p125.ebuild               |  223 +++++++
 dev-lang/ruby/ruby-1.9.3_p194.ebuild               |  223 +++++++
 dev-lang/spidermonkey/Manifest                     |    4 +-
 .../files/spidermonkey-1.5-build.patch             |  138 ++++
 .../files/spidermonkey-1.6-header.patch            |   13 +
 .../files/spidermonkey-1.7.0-ldflags.patch         |   42 ++
 .../files/spidermonkey-1.7.0-threadsafe.diff       |   18 +
 .../spidermonkey-1.8.5-arm_resprect_cflags-1.patch |   58 ++
 .../spidermonkey-1.8.5-fix-install-symlinks.patch  |   15 +
 .../files/spidermonkey-1.8.5-fix-ppc64.patch       |   61 ++
 .../files/spidermonkey-1.8.7-filter_desc.patch     |   18 +
 .../files/spidermonkey-1.9.2.13-as-needed.patch    |   22 +
 dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild |   51 ++
 dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild |   52 ++
 dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild    |   50 ++
 .../spidermonkey/spidermonkey-1.8.2.15-r1.ebuild   |   79 +++
 dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild |   78 +++
 ...y-1.8.7.ebuild => spidermonkey-1.8.5-r1.ebuild} |   40 +-
 dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild    |    1 +
 dev-libs/gjs/Manifest                              |    6 +
 dev-libs/gjs/gjs-1.30.1.ebuild                     |   65 ++
 dev-libs/gjs/gjs-1.32.0.ebuild                     |   67 ++
 dev-libs/libyaml/libyaml-0.0.1.ebuild              |   37 +
 dev-libs/libyaml/libyaml-0.1.2.ebuild              |   37 +
 dev-libs/libyaml/libyaml-0.1.3.ebuild              |   37 +
 dev-perl/AnyEvent/AnyEvent-5.2.5.1.ebuild          |   23 +
 ...-SizeLimit-0.95-Fix_Linux-Smaps_detection.patch |   25 +
 dev-perl/AppConfig/files/blockdiffs.patch          |   83 +++
 dev-perl/Archive-Rar/Archive-Rar-1.9.3.ebuild      |   24 +
 dev-perl/B-OPCheck/files/0.29-Perl_check_t.patch   |   15 +
 dev-perl/BerkeleyDB/files/Gentoo-config-0.26.diff  |   23 +
 dev-perl/CPAN-Mini/CPAN-Mini-0.562.ebuild          |   22 +
 .../Cache-Memcached/Cache-Memcached-1.24.ebuild    |   20 +
 .../Cache-Memcached/Cache-Memcached-1.26.ebuild    |   23 +
 .../Cache-Memcached/Cache-Memcached-1.27.ebuild    |   21 +
 .../Cache-Memcached/Cache-Memcached-1.28.ebuild    |   21 +
 .../Cache-Memcached/Cache-Memcached-1.29.ebuild    |   21 +
 dev-perl/Chart/Chart-2.4.2.ebuild                  |   20 +
 dev-perl/Class-Load/Class-Load-0.06.ebuild         |   23 +
 .../Class-MethodMaker-2.15.ebuild                  |   18 +
 .../Class-Singleton/Class-Singleton-1.03.ebuild    |   15 +
 dev-perl/Convert-UUlib/Convert-UUlib-1.340.ebuild  |   18 +
 .../files/1.4-disable-reversed-test.patch          |   17 +
 .../Crypt-RIPEMD160/Crypt-RIPEMD160-0.04.ebuild    |   17 +
 dev-perl/Crypt-RIPEMD160/files/0.50.0-header.patch |    8 +
 dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.57.ebuild     |   27 +
 dev-perl/Curses/files/Curses-1.08-p5.8-fixes.diff  |   32 +
 dev-perl/DBD-SQLite/DBD-SQLite-0.31-r1.ebuild      |   17 +
 dev-perl/DBD-SQLite/DBD-SQLite-1.31.ebuild         |   34 +
 dev-perl/DBD-mysql/DBD-mysql-4.01.7.ebuild         |   22 +
 dev-perl/DBI/DBI-1.615.ebuild                      |   24 +
 dev-perl/Daemon-Generic/Daemon-Generic-0.71.ebuild |   22 +
 dev-perl/Data-ShowTable/files/3.3.patch            |   39 ++
 dev-perl/Date-Pcalc/Date-Pcalc-1.2.ebuild          |   16 +
 ....100.0_identifier_before_numeric_constant.patch |   16 +
 dev-perl/DateManip/DateManip-5.56.ebuild           |   26 +
 .../DateTime-Format-Strptime-1.500.0.ebuild        |   25 +
 .../DateTime-TimeZone-1.22.ebuild                  |   25 +
 dev-perl/DateTime/DateTime-0.55.ebuild             |   27 +
 dev-perl/Devel-Profiler/files/perl510.patch        |   39 ++
 dev-perl/Devel-Symdump/Devel-Symdump-2.07.ebuild   |   20 +
 .../Device-SerialPort-1.002.001.ebuild             |   25 +
 dev-perl/Email-Address/Email-Address-1.88.9.ebuild |   24 +
 dev-perl/Email-Sender/Email-Sender-0.110.0.ebuild  |   45 ++
 dev-perl/Email-Valid/Email-Valid-0.184.ebuild      |   23 +
 .../files/0.181-disable-online-test.patch          |   11 +
 .../files/0.185-disable-online-test.patch          |   10 +
 dev-perl/Encode-Locale/Encode-Locale-1.20.0.ebuild |   17 +
 dev-perl/Error/Error-0.170.160.ebuild              |   23 +
 dev-perl/Event-RPC/Event-RPC-0.90.ebuild           |   21 +
 dev-perl/Event/Event-1.09.ebuild                   |   19 +
 dev-perl/Event/Event-1.10.ebuild                   |   19 +
 dev-perl/FCGI/FCGI-0.67.ebuild                     |   19 +
 dev-perl/FCGI/FCGI-0.71.ebuild                     |   17 +
 dev-perl/File-Flat/File-Flat-1.00.ebuild           |   26 +
 dev-perl/File-NCopy/File-NCopy-0.34.ebuild         |   17 +
 dev-perl/File-RsyncP/File-RsyncP-0.68.ebuild       |   25 +
 dev-perl/File-Slurp/File-Slurp-9999.13.ebuild      |   20 +
 dev-perl/Finance-Quote/Finance-Quote-1.17.ebuild   |   24 +
 dev-perl/Finance-Quote/files/VWD.pm.diff           |   11 +
 dev-perl/GSSAPI/files/0.26-libs-parse.patch        |   11 +
 .../Gearman-Client-Async-0.94.ebuild               |   20 +
 .../Gearman-Server/Gearman-Server-1.09-r1.ebuild   |   27 +
 dev-perl/Gearman-Server/Gearman-Server-1.10.ebuild |   27 +
 dev-perl/Gearman-Server/Gearman-Server-1.11.ebuild |   27 +
 ...er-1.09-Use-saner-name-in-process-listing.patch |   33 +
 dev-perl/Gearman-Server/files/gearmand-conf.d-1.09 |    4 +
 dev-perl/Gearman-Server/files/gearmand-init.d-1.09 |   26 +
 dev-perl/Gearman/Gearman-1.09.ebuild               |   21 +
 dev-perl/Gearman/Gearman-1.10.ebuild               |   21 +
 dev-perl/Gearman/Gearman-1.11.ebuild               |   21 +
 .../files/fix_implicit_pointer_declaration.patch   |   14 +
 dev-perl/GraphViz/GraphViz-2.02.ebuild             |   20 +
 .../files/Gtk2-Notify-0.05-libnotify.patch         |  114 ++++
 .../files/Gtk2-Unique-0.05-implicit-pointer.patch  |   13 +
 dev-perl/HTML-Form/HTML-Form-6.0.0.ebuild          |   24 +
 dev-perl/HTML-Mason/HTML-Mason-1.42.ebuild         |   59 ++
 .../HTML-TableContentParser/files/0.13-test.patch  |   74 ++
 dev-perl/HTTP-Daemon/HTTP-Daemon-6.0.0.ebuild      |   26 +
 dev-perl/HTTP-Date/HTTP-Date-6.0.0.ebuild          |   23 +
 dev-perl/HTTP-Message/HTTP-Message-6.20.0.ebuild   |   31 +
 dev-perl/IO-AIO/IO-AIO-2.33.ebuild                 |   18 +
 dev-perl/IO-AIO/IO-AIO-3.3.1.ebuild                |   24 +
 dev-perl/IO-AIO/IO-AIO-3.3.ebuild                  |   21 +
 dev-perl/IO-AIO/IO-AIO-3.6.5.ebuild                |   24 +
 dev-perl/IO-AIO/IO-AIO-3.6.ebuild                  |   24 +
 dev-perl/IO-AIO/IO-AIO-3.650.ebuild                |   20 +
 dev-perl/IO-AIO/IO-AIO-3.710.ebuild                |   20 +
 dev-perl/IO-Multiplex/IO-Multiplex-1.09.ebuild     |   18 +
 dev-perl/IO-Socket-IP/IO-Socket-IP-0.160.0.ebuild  |   32 +
 dev-perl/IO-Tty/IO-Tty-1.08.ebuild                 |   16 +
 dev-perl/IP-Country/IP-Country-2.23.ebuild         |   20 +
 dev-perl/IPC-Run/IPC-Run-0.89.ebuild               |   21 +
 dev-perl/IPC-Run3/IPC-Run3-0.043.ebuild            |   22 +
 .../IPC-Shareable/files/fix_perl_5.10_compat.patch |   17 +
 .../files/0.80.0-disable_autodetect.patch          |   44 ++
 dev-perl/Image-Scale/files/libpng-1.5-memcpy.patch |   11 +
 dev-perl/Inline/Inline-0.44-r1.ebuild              |   37 +
 dev-perl/Inline/files/gtk2-patch.diff              |   32 +
 .../LWP-MediaTypes/LWP-MediaTypes-6.10.0.ebuild    |   22 +
 .../files/compatibility-with-POSIX-module.diff     |   16 +
 dev-perl/Log-Log4perl/Log-Log4perl-1.28.ebuild     |   21 +
 .../Log-TraceMessages/Log-TraceMessages-1.4.ebuild |   16 +
 dev-perl/MIME-Types/MIME-Types-1.29.ebuild         |   20 +
 dev-perl/MIME-tools/MIME-tools-5.427.ebuild        |   28 +
 dev-perl/MIME-tools/MIME-tools-5.502.0.ebuild      |   32 +
 dev-perl/MLDBM/MLDBM-2.01.ebuild                   |   14 +
 dev-perl/MP3-Tag/files/MP3-Tag-makefile.patch      |   17 +
 .../files/1.16-escape-at-for-perl-5.8.patch        |   14 +
 .../Mail-IMAPClient/files/2.2.9-skiptest.patch     |   11 +
 .../files/24_google_safebrowsing.cf                |   18 +
 .../files/init_google_safebrowsing.pre             |    3 +
 .../files/update_google_safebrowsing.cron          |    5 +
 .../files/update_google_safebrowsing.sh            |   21 +
 dev-perl/MailTools/MailTools-2.06.ebuild           |   21 +
 .../Math-BigInt-GMP/Math-BigInt-GMP-1.24.ebuild    |   19 +
 .../Math-BigInt-GMP/Math-BigInt-GMP-1.360.0.ebuild |   21 +
 dev-perl/Math-Derivative/files/0.01-pod-1.diff     |   15 +
 dev-perl/Math-Spline/files/0.01-pod.diff           |   10 +
 .../MogileFS-Client/MogileFS-Client-1.08.ebuild    |   22 +
 .../MogileFS-Client/MogileFS-Client-1.09.ebuild    |   22 +
 .../MogileFS-Client/MogileFS-Client-1.10.ebuild    |   22 +
 .../MogileFS-Client/MogileFS-Client-1.11.ebuild    |   22 +
 .../MogileFS-Client/MogileFS-Client-1.12.ebuild    |   22 +
 .../MogileFS-Client/MogileFS-Client-1.13.ebuild    |   22 +
 .../MogileFS-Client/MogileFS-Client-1.14.ebuild    |   22 +
 dev-perl/MogileFS-Utils/MogileFS-Utils-2.13.ebuild |   19 +
 dev-perl/MogileFS-Utils/MogileFS-Utils-2.14.ebuild |   19 +
 dev-perl/MogileFS-Utils/MogileFS-Utils-2.15.ebuild |   19 +
 dev-perl/MogileFS-Utils/MogileFS-Utils-2.16.ebuild |   18 +
 dev-perl/MogileFS-Utils/MogileFS-Utils-2.17.ebuild |   18 +
 dev-perl/MogileFS-Utils/MogileFS-Utils-2.18.ebuild |   18 +
 dev-perl/MogileFS-Utils/MogileFS-Utils-2.19.ebuild |   18 +
 dev-perl/MogileFS-Utils/MogileFS-Utils-2.20.ebuild |   18 +
 dev-perl/Moo/Moo-0.91.9.ebuild                     |   30 +
 dev-perl/Moose/Moose-1.240.ebuild                  |   38 ++
 dev-perl/Mouse/files/0.64-ppport.patch             |   27 +
 dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.20.ebuild   |   14 +
 dev-perl/Net-DNS/files/Net-DNS-0.64-ar.patch       |   13 +
 dev-perl/Net-DNS/files/Net-DNS-0.68-ar.patch       |   16 +
 dev-perl/Net-IP/files/initip-0.patch               |   12 +
 .../files/0.120.0-multiple-attachments-fix.patch   |   12 +
 dev-perl/Net-Telnet-Cisco/files/1.10-warning.patch |   15 +
 dev-perl/Net-XMPP/files/1.02-defined.patch         |   14 +
 dev-perl/NetAddr-IP/NetAddr-IP-4.028.ebuild        |   18 +
 dev-perl/Number-Format/Number-Format-1.52.ebuild   |   18 +
 dev-perl/OpenGL/files/OpenGL-0.66-no-display.patch |   50 ++
 dev-perl/PDL/PDL-2.4.3-r1.ebuild                   |   92 +++
 dev-perl/PDL/PDL-2.4.7.ebuild                      |   92 +++
 dev-perl/PDL/files/PDL-2.4.11-fortran.patch        |   22 +
 dev-perl/PDL/files/PDL-2.4.11-shared-hdf.patch     |   36 +
 dev-perl/PDL/files/PDL-2.4.2-makemakerfix.patch    |   20 +
 dev-perl/PDL/files/PDL-2.4.3-PIC.patch             |   11 +
 dev-perl/PDL/files/PDL-2.4.4-PIC.patch             |   22 +
 dev-perl/PDL/files/perldl.conf                     |  110 +++
 .../POE-Test-Loops/POE-Test-Loops-1.035.ebuild     |   16 +
 dev-perl/POE/POE-1.289.ebuild                      |   44 ++
 dev-perl/Package-Stash/Package-Stash-0.250.ebuild  |   34 +
 dev-perl/PadWalker/PadWalker-1.940.0.ebuild        |   17 +
 .../Parse-RecDescent-1.965.1.ebuild                |   28 +
 dev-perl/Parse-Syslog/Parse-Syslog-1.09.ebuild     |   18 +
 dev-perl/Path-Class/Path-Class-0.21.ebuild         |   21 +
 ...al-1.58-Use-saner-name-in-process-listing.patch |   34 +
 dev-perl/Perlbal/files/perlbal_conf.d_1.58         |    5 +
 dev-perl/Perlbal/files/perlbal_init.d_1.58         |   25 +
 .../files/0.45-fix-format-errors.patch             |   30 +
 .../Proc-ProcessTable/files/0.45-pthread.patch     |   15 +
 .../amd64_canonicalize_file_name_definition.patch  |   13 +
 dev-perl/Role-Tiny/Role-Tiny-1.1.3.ebuild          |   29 +
 dev-perl/SOAP-Lite/files/SOAP-Lite-0.60.a.patch    |   12 +
 dev-perl/SOAP-Lite/files/SOAP-Lite-0.710.08.patch  |   12 +
 .../SOAP-Lite/files/SOAP-Lite-0.712_sysread.patch  |   38 ++
 dev-perl/SQL-Abstract/SQL-Abstract-1.63.ebuild     |   24 +
 dev-perl/SQL-Statement/SQL-Statement-1.31.ebuild   |   34 +
 dev-perl/SVN-Mirror/SVN-Mirror-0.73.ebuild         |   33 +
 dev-perl/Socket6/Socket6-0.20.ebuild               |   21 +
 .../Spreadsheet-ParseExcel-0.57.ebuild             |   29 +
 .../Sys-Statistics-Linux-0.49.ebuild               |   22 +
 dev-perl/Template-Latex/files/Makefile.patch       |   15 +
 .../Template-Toolkit/Template-Toolkit-2.22.ebuild  |   46 ++
 .../files/bug-144689-branch-2.17.patch             |   13 +
 dev-perl/Test-Class/Test-Class-0.370.0.ebuild      |   24 +
 dev-perl/Test-Exception/Test-Exception-0.27.ebuild |   22 +
 dev-perl/Test-Inline/Test-Inline-2.201.ebuild      |   31 +
 dev-perl/Test-Inline/Test-Inline-2.208.ebuild      |   33 +
 dev-perl/Test-Output/Test-Output-0.16.ebuild       |   24 +
 .../Test-WWW-Mechanize-1.28.ebuild                 |   25 +
 dev-perl/Test-Warn/Test-Warn-0.21.ebuild           |   25 +
 dev-perl/Test-Warn/Test-Warn-0.230.0.ebuild        |   24 +
 .../Text-Kakasi/files/Text-Kakasi-1.05-gentoo.diff |   13 +
 .../Text-Unaccent/files/text-unaccent_size_t.diff  |   27 +
 dev-perl/TimeDate/TimeDate-1.16.ebuild             |   16 +
 dev-perl/Tk-CursorControl/files/0.4-demo.patch     |   12 +
 dev-perl/Tk-TableMatrix/files/pTk-1.22.patch       |   18 +
 dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.05.ebuild   |   18 +
 dev-perl/URI/URI-1.55.ebuild                       |   21 +
 dev-perl/Unicode-Map/files/0.112-no-scripts.patch  |   15 +
 dev-perl/Unicode-Map8/Unicode-Map8-0.12.ebuild     |   19 +
 .../Variable-Magic/Variable-Magic-0.500.0.ebuild   |   22 +
 dev-perl/WWW-Dict-Leo-Org/files/1.34-umlaut.patch  |   41 ++
 dev-perl/XML-GDOME/files/0.86-includes.patch       |   22 +
 dev-perl/XML-Mini/XML-Mini-1.2.8.ebuild            |   19 +
 dev-perl/XML-SAX/files/encodings.patch             |   11 +
 dev-perl/XML-Stream/XML-Stream-1.22.ebuild         |   22 +
 dev-perl/YAML-Syck/YAML-Syck-1.05.ebuild           |   18 +
 dev-perl/cache-mmap/cache-mmap-0.09.ebuild         |   21 +
 dev-perl/cdk-perl/cdk-perl-20031210.ebuild         |   25 +
 dev-perl/crypt-dsa/crypt-dsa-1.16.ebuild           |   30 +
 .../crypt-dsa/files/crypt-dsa-1.16-dsaparam.patch  |   14 +
 dev-perl/gnome2-gconf/gnome2-gconf-1.043.ebuild    |   27 +
 dev-perl/gtk2-perl/gtk2-perl-1.222.ebuild          |   31 +
 dev-perl/gtk2-spell/gtk2-spell-1.30.0.ebuild       |   40 ++
 dev-perl/libwww-perl/files/ca-certs.patch          |   30 +
 dev-perl/log-dispatch/log-dispatch-2.290.0.ebuild  |   24 +
 dev-perl/math-pari/math-pari-2.01080604.ebuild     |   60 ++
 .../mogilefs-server/files/mogautomount-init.d-2.50 |   22 +
 .../mogilefs-server/files/mogilefsd-conf.d-2.16    |    4 +
 .../mogilefs-server/files/mogilefsd-init.d-2.16    |   28 +
 dev-perl/mogilefs-server/files/mogilefsd.conf-2.30 |   36 +
 .../mogilefs-server/files/mogstored-conf.d-2.30    |    4 +
 .../mogilefs-server/files/mogstored-init.d-2.30    |   26 +
 .../mogilefs-server/files/mogstored-init.d-2.50    |   27 +
 dev-perl/mogilefs-server/files/mogstored.conf-2.16 |   23 +
 .../mogilefs-server/mogilefs-server-2.37.ebuild    |   98 +++
 .../mogilefs-server/mogilefs-server-2.43.ebuild    |   99 +++
 .../mogilefs-server/mogilefs-server-2.46.ebuild    |   99 +++
 .../mogilefs-server/mogilefs-server-2.50.ebuild    |  101 +++
 .../mogilefs-server/mogilefs-server-2.51.ebuild    |  101 +++
 .../mogilefs-server/mogilefs-server-2.53.ebuild    |  101 +++
 dev-perl/net-server/net-server-0.97.ebuild         |   23 +
 dev-perl/perl-ldap/perl-ldap-0.400.100.ebuild      |   26 +
 dev-perl/perl-tk/files/804.028-path.patch          |   24 +
 dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch    |   19 +
 dev-perl/perl-tk/files/xorg.patch                  |   50 ++
 dev-perl/yaml/yaml-0.71.ebuild                     |   19 +
 dev-vcs/git/files/50git-gentoo.el                  |   13 +
 dev-vcs/git/files/git-1.6.6.1-interix6.patch       |   17 +
 dev-vcs/git/files/git-1.7.1-interix.patch          |  100 +++
 dev-vcs/git/files/git-1.7.10.2-optional-cvs.patch  |  375 +++++++++++
 dev-vcs/git/files/git-1.7.11-optional-cvs.patch    |  400 +++++++++++
 .../git/files/git-1.7.2-always-install-js.patch    |   31 +
 dev-vcs/git/files/git-1.7.3.2-interix.patch        |   90 +++
 .../git/files/git-1.7.3.4-avoid-shell-issues.patch |   26 +
 .../files/git-1.7.3.4-fix-perl-test-prereq.patch   |   37 +
 dev-vcs/git/files/git-1.7.3.5-optional-cvs.patch   |  366 ++++++++++
 dev-vcs/git/files/git-1.7.5-interix.patch          |   43 ++
 dev-vcs/git/files/git-1.7.6-interix.patch          |   29 +
 .../git-1.7.8-git-svn-1.7-canonical-path.patch     |   63 ++
 dev-vcs/git/files/git-daemon.confd                 |   19 +
 dev-vcs/git/files/git-daemon.initd                 |   30 +
 dev-vcs/git/files/git-daemon.xinetd                |   13 +
 dev-vcs/git/git-1.6.4.5.ebuild                     |  381 +++++++++++
 dev-vcs/git/git-1.7.2.5.ebuild                     |  470 +++++++++++++
 dev-vcs/git/git-1.7.3.4-r1.ebuild                  |  490 ++++++++++++++
 eclass/vdr-plugin-2.eclass.~1~                     |  614 +++++++++++++++++
 eclass/xorg-2.eclass                               |   14 +
 media-gfx/freewrl/Manifest                         |    5 +
 .../files/freewrl-1.22.13-mozjs187-config.patch    |   10 +
 media-gfx/freewrl/freewrl-1.22.13.ebuild           |  135 ++++
 .../files/graphite2-1.0.2-no_harfbuzz_tests.patch  |   12 +
 .../files/graphite2-1.0.3-no-test-binaries.patch   |    9 +
 .../files/graphite2-1.1.0-includes-libs-perl.patch |   13 +
 .../files/graphite2-fix_wrong_linker_opts.patch    |   11 +
 media-libs/exiftool/exiftool-8.50.ebuild           |   26 +
 media-libs/exiftool/exiftool-8.60.ebuild           |   26 +
 media-libs/exiftool/exiftool-8.65.ebuild           |   26 +
 media-libs/exiftool/exiftool-8.75.ebuild           |   26 +
 media-tv/dvbstreamer/dvbstreamer-1.1-r1.ebuild     |   40 ++
 .../dvbstreamer/files/dvbstreamer-1.1-Werror.patch |   36 +
 .../files/dvbstreamer-1.1-libtool.patch            |   71 ++
 .../dvbstreamer-2.0.0_rc1-evloop-configure.patch   |   11 +
 media-video/gxine/Manifest                         |    9 +
 .../gxine/files/gxine-0.5.905-desktop.patch        |   12 +
 .../files/gxine-0.5.905-fix-nspr-useage.patch      |   11 +
 media-video/gxine/files/gxine-0.5.906-endif.patch  |   14 +
 .../gxine/files/gxine-0.5.907-glib-2.31.patch      |   34 +
 .../gxine/files/gxine-0.5.907-mozjs187.patch       |   21 +
 media-video/gxine/gxine-0.5.907.ebuild             |  101 +++
 net-print/cups/.#Manifest.1.577                    |   36 +
 net-print/cups/.#cups-1.5.2-r4.ebuild.1.13         |  302 +++++++++
 net-print/cups/.#cups-1.5.3.ebuild.1.4             |  311 +++++++++
 net-print/cups/cups-1.4.8-r1.ebuild                |  268 ++++++++
 net-print/cups/cups-1.4.8-r23.ebuild               |  311 +++++++++
 .../cups/files/cups-1.4.0-backend-https.patch      |   11 +
 net-print/cups/files/cups-1.4.2-str3200.patch      |   43 ++
 .../files/cups-1.4.4-dont-compress-manpages.patch  |   20 +
 .../cups/files/cups-1.4.4-fix-install-perms.patch  |   22 +
 net-print/cups/files/cups-1.4.4-nostrip.patch      |   14 +
 .../cups/files/cups-1.4.4-perl-includes.patch      |   12 +
 net-print/cups/files/cups-1.4.4-php-destdir.patch  |   21 +
 net-print/cups/files/cups-1.4.6-force-gnutls.patch |   93 +++
 .../cups/files/cups-1.4.6-serialize-gnutls.patch   |  113 ++++
 .../cups/files/cups-1.4.8-CVE-2011-3170.patch      |   37 +
 net-print/cups/files/cups-1.4.8-largeimage.patch   |   18 +
 .../cups/files/cups-1.5.0-systemd-socket.patch     |  396 +++++++++++
 net-print/cups/files/cups-1.5.2-browsing.patch     |   13 +
 net-print/cups/files/cups-1.5.2-linkperl.patch     |   12 +
 net-print/cups/files/cups-1.5.2-threads.patch      |   21 +
 net-print/cups/files/cups-1.5.2-threads2.patch     |  111 +++
 .../cups/files/cups-1.5.3-fix-install-perms.patch  |   24 +
 .../files/cups-1.6.0-dont-compress-manpages.patch  |   19 +
 .../cups/files/cups-1.6.0-fix-install-perms.patch  |   25 +
 net-print/cups/files/cupsd.init.d                  |   22 +
 net-print/cups/files/pdftops-1.20.gentoo           |  340 ++++++++++
 perl-core/Archive-Tar/Archive-Tar-1.54.ebuild      |   22 +
 perl-core/Archive-Tar/Archive-Tar-1.72.ebuild      |   22 +
 perl-core/Archive-Tar/Archive-Tar-1.760.0.ebuild   |   23 +
 .../Attribute-Handlers-0.88.ebuild                 |   16 +
 perl-core/AutoLoader/AutoLoader-5.710.0.ebuild     |   17 +
 perl-core/CGI/CGI-3.510.ebuild                     |   21 +
 perl-core/CGI/CGI-3.520.ebuild                     |   21 +
 perl-core/CGI/files/3.47-fcgi.patch                |   24 +
 .../CPAN-Meta-YAML/CPAN-Meta-YAML-0.3.0.ebuild     |   17 +
 perl-core/CPAN-Meta/CPAN-Meta-2.110.440.ebuild     |   31 +
 perl-core/CPAN-Meta/CPAN-Meta-2.110.580.ebuild     |   31 +
 .../Compress-Raw-Bzip2-2.024.ebuild                |   25 +
 .../Compress-Raw-Bzip2-2.33.ebuild                 |   32 +
 .../Compress-Raw-Zlib-2.024.ebuild                 |   34 +
 .../Compress-Raw-Zlib-2.33.ebuild                  |   34 +
 perl-core/DB_File/DB_File-1.820.ebuild             |   26 +
 perl-core/DB_File/DB_File-1.821.ebuild             |   29 +
 perl-core/DB_File/DB_File-1.822.0.ebuild           |   27 +
 perl-core/DB_File/files/DB_File-MakeMaker.patch    |   11 +
 perl-core/DB_File/files/config.in                  |   97 +++
 perl-core/Digest-MD5/Digest-MD5-2.39.ebuild        |   20 +
 perl-core/Digest-MD5/Digest-MD5-2.510.0.ebuild     |   21 +
 perl-core/Digest-SHA/Digest-SHA-5.47.ebuild        |   17 +
 perl-core/Digest-SHA/Digest-SHA-5.48.ebuild        |   17 +
 perl-core/Digest-SHA/Digest-SHA-5.500.ebuild       |   17 +
 perl-core/Digest-SHA/Digest-SHA-5.600.0.ebuild     |   17 +
 perl-core/Digest-SHA/Digest-SHA-5.610.0.ebuild     |   17 +
 perl-core/Encode/Encode-2.40-r1.ebuild             |   19 +
 perl-core/Encode/Encode-2.420.0.ebuild             |   20 +
 perl-core/Encode/files/gentoo_enc2xs.diff          |   36 +
 .../ExtUtils-CBuilder-0.26.03.ebuild               |   23 +
 .../ExtUtils-CBuilder-0.27.03.ebuild               |   19 +
 .../ExtUtils-MakeMaker-6.56-r1.ebuild              |   26 +
 .../files/6.56-delete_packlist_podlocal.patch      |   79 +++
 .../ExtUtils-MakeMaker/files/6.58-RUNPATH.patch    |   16 +
 .../files/6.58-delete_packlist_podlocal.patch      |   76 +++
 .../files/6.62-delete_packlist_podlocal.patch      |   76 +++
 .../ExtUtils-MakeMaker/files/RUNPATH-6.54.patch    |   17 +
 .../ExtUtils-Manifest-1.580.0.ebuild               |   18 +
 .../ExtUtils-ParseXS-2.22.03.ebuild                |   24 +
 .../ExtUtils-ParseXS-2.22.05.ebuild                |   23 +
 .../ExtUtils-ParseXS-2.22.06.ebuild                |   24 +
 perl-core/Filter/Filter-1.37.ebuild                |   16 +
 perl-core/IO-Compress/IO-Compress-2.024.ebuild     |   26 +
 perl-core/IO-Compress/IO-Compress-2.33.ebuild      |   27 +
 perl-core/IPC-Cmd/IPC-Cmd-0.680.ebuild             |   22 +
 perl-core/IPC-Cmd/IPC-Cmd-0.700.0.ebuild           |   22 +
 perl-core/JSON-PP/JSON-PP-2.271.40.ebuild          |   19 +
 perl-core/JSON-PP/JSON-PP-2.271.50.ebuild          |   19 +
 .../Math-BigInt-FastCalc-0.19.ebuild               |   19 +
 .../Math-BigInt-FastCalc-0.24.ebuild               |   20 +
 .../Math-BigInt-FastCalc-0.251.ebuild              |   21 +
 .../Math-BigInt-FastCalc-0.260.ebuild              |   21 +
 .../Math-BigInt-FastCalc-0.270.0.ebuild            |   21 +
 .../Math-BigInt-FastCalc-0.280.0.ebuild            |   21 +
 perl-core/Math-BigInt/Math-BigInt-1.89.ebuild      |   23 +
 perl-core/Math-BigInt/Math-BigInt-1.99.ebuild      |   23 +
 perl-core/Math-BigInt/Math-BigInt-1.991.ebuild     |   24 +
 perl-core/Math-BigInt/Math-BigInt-1.992.ebuild     |   24 +
 perl-core/Math-BigInt/Math-BigInt-1.993.0.ebuild   |   24 +
 perl-core/Memoize/Memoize-1.01.ebuild              |   19 +
 perl-core/Memoize/Memoize-1.20.0.ebuild            |   17 +
 .../Module-Build/Module-Build-0.34.0201.ebuild     |   28 +
 perl-core/Module-Build/Module-Build-0.36.07.ebuild |   26 +
 .../Module-Build/Module-Build-0.362.400.ebuild     |   29 +
 perl-core/Module-Build/Module-Build-0.380.0.ebuild |   30 +
 .../Module-CoreList/Module-CoreList-2.38.ebuild    |   19 +
 .../Module-CoreList/Module-CoreList-2.41.ebuild    |   19 +
 .../Module-CoreList/Module-CoreList-2.430.ebuild   |   20 +
 .../Module-CoreList/Module-CoreList-2.440.ebuild   |   20 +
 .../Module-CoreList/Module-CoreList-2.450.ebuild   |   20 +
 .../Module-CoreList/Module-CoreList-2.460.0.ebuild |   20 +
 .../Module-CoreList/Module-CoreList-2.490.0.ebuild |   20 +
 .../Module-Load-Conditional-0.400.ebuild           |   24 +
 .../Module-Load-Conditional-0.440.0.ebuild         |   24 +
 perl-core/Module-Load/Module-Load-0.180.0.ebuild   |   17 +
 .../Module-Loaded/Module-Loaded-0.60.0.ebuild      |   17 +
 .../Module-Metadata/Module-Metadata-1.0.3.ebuild   |   20 +
 .../Module-Metadata/Module-Metadata-1.0.4.ebuild   |   20 +
 .../Module-Pluggable-3.900.0.ebuild                |   20 +
 perl-core/Params-Check/Params-Check-0.26.ebuild    |   16 +
 perl-core/Params-Check/Params-Check-0.280.0.ebuild |   20 +
 .../Parse-CPAN-Meta/Parse-CPAN-Meta-1.40.ebuild    |   16 +
 .../Parse-CPAN-Meta/Parse-CPAN-Meta-1.420.ebuild   |   24 +
 .../Parse-CPAN-Meta-1.440.100.ebuild               |   23 +
 .../Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.ebuild   |   24 +
 perl-core/Pod-Simple/Pod-Simple-3.14.ebuild        |   19 +
 perl-core/Pod-Simple/Pod-Simple-3.15.ebuild        |   19 +
 perl-core/Pod-Simple/Pod-Simple-3.160.0.ebuild     |   20 +
 perl-core/PodParser/PodParser-1.380.0.ebuild       |   21 +
 perl-core/Safe/Safe-2.27.ebuild                    |   16 +
 perl-core/Safe/Safe-2.290.0.ebuild                 |   17 +
 .../Scalar-List-Utils-1.230.0.ebuild               |   17 +
 perl-core/Storable/Storable-2.20.ebuild            |   16 +
 perl-core/Storable/Storable-2.250.ebuild           |   17 +
 perl-core/Sys-Syslog/Sys-Syslog-0.270.0.ebuild     |   19 +
 .../Term-ANSIColor/Term-ANSIColor-3.0.0.ebuild     |   22 +
 perl-core/Test-Harness/Test-Harness-3.17.ebuild    |   19 +
 perl-core/Test-Harness/Test-Harness-3.22.ebuild    |   18 +
 perl-core/Test-Harness/Test-Harness-3.230.0.ebuild |   19 +
 perl-core/Test-Harness/files/3.17-taint.patch      |   19 +
 perl-core/Test/Test-1.25.ebuild                    |   17 +
 perl-core/Time-HiRes/Time-HiRes-1.97.19.ebuild     |   22 +
 perl-core/Time-HiRes/Time-HiRes-1.97.21.ebuild     |   19 +
 .../Version-Requirements-0.101.20.ebuild           |   23 +
 perl-core/XSLoader/XSLoader-0.10.ebuild            |   17 +
 .../files/91152fc1_rt54132_version081.patch        |   27 +
 perl-core/bignum/bignum-0.23.ebuild                |   23 +
 perl-core/bignum/bignum-0.24.ebuild                |   22 +
 perl-core/bignum/bignum-0.25.ebuild                |   22 +
 perl-core/digest-base/digest-base-1.160.0.ebuild   |   22 +
 perl-core/locale-maketext/files/1.13-defined.patch |   11 +
 .../locale-maketext/locale-maketext-1.13-r1.ebuild |   23 +
 .../locale-maketext/locale-maketext-1.17.ebuild    |   23 +
 perl-core/podlators/podlators-2.2.2.ebuild         |   20 +
 perl-core/podlators/podlators-2.3.0.ebuild         |   20 +
 perl-core/podlators/podlators-2.3.1.ebuild         |   20 +
 perl-core/podlators/podlators-2.4.0.ebuild         |   20 +
 .../threads-shared/threads-shared-1.32.ebuild      |   20 +
 .../threads-shared/threads-shared-1.33.ebuild      |   20 +
 .../threads-shared/threads-shared-1.34.ebuild      |   20 +
 .../threads-shared/threads-shared-1.360.ebuild     |   21 +
 perl-core/threads/threads-1.75.ebuild              |   19 +
 perl-core/threads/threads-1.76.ebuild              |   19 +
 perl-core/threads/threads-1.77.ebuild              |   19 +
 perl-core/threads/threads-1.79.ebuild              |   19 +
 perl-core/threads/threads-1.81.ebuild              |   19 +
 perl-core/threads/threads-1.820.ebuild             |   20 +
 perl-core/version/version-0.82.ebuild              |   23 +
 perl-core/version/version-0.880.0.ebuild           |   17 +
 profiles/base/package.keywords                     |    1 +
 sys-auth/polkit/.#Manifest.1.91                    |    8 +
 sys-auth/polkit/.#Manifest.1.93                    |    9 +
 sys-auth/polkit/.#polkit-0.106-r2.ebuild.1.3       |  108 +++
 sys-auth/polkit/Manifest                           |    8 +
 sys-auth/polkit/polkit-0.104-r1.ebuild             |  109 +++
 sys-auth/polkit/polkit-0.105.ebuild                |   80 +++
 sys-auth/polkit/polkit-0.106-r5.ebuild             |  108 +++
 www-client/elinks/Manifest                         |   17 +
 www-client/elinks/elinks-0.11.7.ebuild             |  140 ++++
 www-client/elinks/elinks-0.12_pre5-r2.ebuild       |  156 +++++
 .../files/elinks-0.10.1-utf_8_io-default.patch     |   11 +
 .../files/elinks-0.10.4.conf-syscharset.diff       |   79 +++
 .../elinks/files/elinks-0.11.2-lua-5.1.patch       |   16 +
 www-client/elinks/files/elinks-0.11.2-lua-5.patch  |   60 ++
 www-client/elinks/files/elinks-0.11.3-lua-5.patch  |   45 ++
 .../elinks/files/elinks-0.11.5-makefile.patch      |   30 +
 .../files/elinks-0.12_pre5-compilation-fix.patch   |   12 +
 .../files/elinks-0.12_pre5-sm185-jsval-fixes.patch |  124 ++++
 .../elinks-0.12pre5-spidermonkey-callback.patch    |   12 +
 x11-base/xorg-server/Manifest                      |   28 +
 x11-base/xorg-server/files/xdm-setup.initd-1       |   14 +
 x11-base/xorg-server/files/xdm.confd-3             |   16 +
 x11-base/xorg-server/files/xdm.confd-4             |   10 +
 x11-base/xorg-server/files/xdm.initd-3             |  218 ++++++
 x11-base/xorg-server/files/xdm.initd-5             |  219 ++++++
 x11-base/xorg-server/files/xdm.initd-8             |  216 ++++++
 .../files/xorg-cve-2011-4028+4029.patch            |   22 +
 ...org-server-1.11-disable-tests-without-ddx.patch |   64 ++
 ...rver-1.11-dix-pointerrootwin-send-focusin.patch |   27 +
 .../xorg-server-1.11-dix-send-focus-events.patch   |   48 ++
 .../files/xorg-server-1.11-log-format-fix.patch    |  441 ++++++++++++
 .../files/xorg-server-1.12-disable-acpi.patch      |   11 +
 ...rg-server-1.12-xf86edidmodes-array-bounds.patch |   35 +
 .../files/xorg-server-1.9-nouveau-default.patch    |   30 +
 .../files/xorg-server-disable-acpi.patch           |   31 +
 .../xorg-server/files/xorg-server-glapi_c.patch    |   78 +++
 x11-base/xorg-server/files/xorg-sets.conf          |    6 +
 x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild  |  248 +++++++
 x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild  |  251 +++++++
 x11-base/xorg-server/xorg-server-1.12.2.ebuild     |  243 +++++++
 x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild   |  270 ++++++++
 x11-libs/cairo/cairo-1.10.2-r1.ebuild              |  158 +++++
 x11-libs/cairo/cairo-1.10.2-r2.ebuild              |  161 +++++
 x11-libs/cairo/cairo-1.8.10.ebuild                 |  102 +++
 x11-libs/cairo/cairo-9999.ebuild                   |  136 ++++
 .../cairo/files/cairo-1.10.0-buggy_gradients.patch |   17 +
 x11-libs/cairo/files/cairo-1.10.2-interix.patch    |   36 +
 x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch |   55 ++
 .../files/cairo-1.2.4-lcd-cleartype-like.diff      |  275 ++++++++
 x11-libs/cairo/files/cairo-1.8.10-libpng14.patch   |   11 +
 x11-libs/cairo/files/cairo-1.8.8-interix.patch     |   16 +
 x11-libs/libXmu/Manifest                           |    6 +
 x11-libs/libXmu/libXmu-1.1.0.ebuild                |   27 +
 x11-libs/libXmu/libXmu-1.1.1.ebuild                |   30 +
 x11-libs/libxcb/files/libxcb-1.7-interix.patch     |  103 +++
 .../libxcb/files/libxcb-1.8-waitall-hang.patch     |   54 ++
 x11-libs/libxcb/files/xcb-rebuilder.sh             |   68 ++
 x11-libs/libxcb/libxcb-1.7.ebuild                  |   38 ++
 x11-libs/libxcb/libxcb-1.8-r1.ebuild               |   39 ++
 x11-libs/libxcb/libxcb-1.8.ebuild                  |   35 +
 .../files/startup-notification-0.10-tests.patch    |   14 +
 x11-libs/xcb-util/xcb-util-0.3.6.ebuild            |   34 +
 580 files changed, 28393 insertions(+), 29 deletions(-)

diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
new file mode 100644
index 0000000..6a67d0e
--- /dev/null
+++ b/app-accessibility/edbrowse/Manifest
@@ -0,0 +1,7 @@
+AUX edbrowse-3.4.7-fix-makefile.patch 406 RMD160 e35ee9777ddb988064bc34d7704457b3e092dddf SHA1 985528fdbb7d29469794f6871d1e45b07f40d5ed SHA256 0f3976650537658b81a8302346fa225fd6e5e13a126e5324fb6cc4062ffcd7e0
+DIST edbrowse-3.4.7.zip 719586 RMD160 baa0bf1c3cb4320aaee3c2c556bc910ca5502a71 SHA1 57f1dbfa2226e5fa8b715498dcd1f699794dc5b0 SHA256 488d8a02b4480f1474686dfa99058b7f2f36c1d4eb1942ee79471aa8327328fe
+DIST edbrowse-3.4.8.zip 725791 RMD160 9466b6e1946a55cc97bd8c7abc670191261b1a41 SHA1 571046b078a4ffbce5952a31e29fc66a8ad02dfc SHA256 b138381a134e8b00a183305ff227bb7fc97d55a2ee5a787499e191445f2d8977
+EBUILD edbrowse-3.4.7.ebuild 1419 RMD160 9a3c75c4a5357e4152f4602c1a0f6dfe4c118de4 SHA1 be41076c1f3462c9bb34e15ebbe3745fb179c443 SHA256 df2a96484aba871be62ed084f74dd87208811ea9e46b33ba91554cbc73db2107
+EBUILD edbrowse-3.4.8.ebuild 1555 RMD160 985f38b0782495a79ba82f445823fbe65152938b SHA1 e86c849657deacf98cf1167cbc56ba3128eab3f2 SHA256 d21ef2849db5d8a01837bef4e00c34ed31fc74341ac9c8b5e189c070997d5fc4
+MISC ChangeLog 2403 RMD160 b7473acdffef352d2f9e35966cca78aa6b5677a8 SHA1 c5409cb86e5113a01ad60b8ffe59e23af9560222 SHA256 13410f6da9226f0ff846770d8afb1efe539bbec981d7064e104b950643cbb51a
+MISC metadata.xml 295 RMD160 9aaf4f6029a98d7cb5b7856117556c722a9a92ef SHA1 a0d281df73f09163fd9e4e5714fe49b7a9e5c03f SHA256 20ab62eb1ca3b77142f2e3d833521693654f3bcc91eed756233c131afec727ab

diff --git a/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild b/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild
new file mode 100644
index 0000000..62e0d32
--- /dev/null
+++ b/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild,v 1.3 2011/11/15 16:35:58 axs Exp $
+
+EAPI="4"
+inherit eutils
+
+DESCRIPTION="editor, browser, and mail client using the /bin/ed interface"
+HOMEPAGE="http://the-brannons.com/edbrowse/"
+SRC_URI="http://the-brannons.com/${PN}/${P}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="linguas_fr odbc"
+COMMON_DEPEND="<dev-lang/spidermonkey-1.8.5
+	>=sys-libs/readline-6.0
+	>=net-misc/curl-7.17.0
+	>=dev-libs/libpcre-7.8
+	>=dev-libs/openssl-0.9.8j
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-makefile.patch
+}
+
+src_compile() {
+	local JSLIB=-ljs
+
+	if has_version "=dev-lang/spidermonkey-1.8.2*"; then
+		JSLIB=-lmozjs
+	fi
+
+	emake prefix=/usr JSLIB="${JSLIB}" STRIP=''
+	if use odbc; then
+		# Top-level makefile doesn't have this target.
+		cd src
+		emake prefix=/usr STRIP='' edbrowseodbc
+		cd ..
+	fi
+}
+
+src_install() {
+	cd src
+	emake prefix=/usr DESTDIR="${D}" install
+	if use odbc; then
+		dobin edbrowseodbc
+	fi
+	cd ..
+	dodoc CHANGES README todo
+	cd doc
+	dobin setup.ebrc
+	dohtml usersguide.html philosophy.html
+	dodoc sample.ebrc
+	if use linguas_fr; then
+		dohtml usersguide_fr.html philosophy_fr.html
+		dodoc sample_fr.ebrc
+	fi
+}

diff --git a/app-accessibility/edbrowse/edbrowse-3.4.8.ebuild b/app-accessibility/edbrowse/edbrowse-3.4.8.ebuild
new file mode 100644
index 0000000..48c29ab
--- /dev/null
+++ b/app-accessibility/edbrowse/edbrowse-3.4.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/edbrowse-3.4.8.ebuild,v 1.2 2012/06/19 17:45:19 axs Exp $
+
+EAPI="4-slot-abi"
+inherit eutils
+
+DESCRIPTION="editor, browser, and mail client using the /bin/ed interface"
+HOMEPAGE="http://the-brannons.com/edbrowse/"
+SRC_URI="http://the-brannons.com/${PN}/${P}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="linguas_fr odbc"
+COMMON_DEPEND=">=dev-lang/spidermonkey-1.8.5:=
+	>=sys-libs/readline-6.0
+	>=net-misc/curl-7.17.0
+	>=dev-libs/libpcre-7.8
+	>=dev-libs/openssl-0.9.8j
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	app-arch/unzip"
+RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+	local jslib="-lmozjs185"
+	local jscppflags="-DXP_UNIX -DX86_LINUX -I/usr/include/js"
+	if has_version dev-lang/spidermonkey:0/187 ; then
+		jscppflags=$(pkg-config --cflags mozjs187)
+		jslib=$(pkg-config --libs mozjs187)
+	fi
+	emake -j1 prefix=/usr JSLIB="${jslib}" JS_CPPFLAGS="${jscppflags}" STRIP=''
+	if use odbc; then
+		# Top-level makefile doesn't have this target.
+		cd src
+		emake -j1 prefix=/usr STRIP='' edbrowseodbc
+		cd ..
+	fi
+}
+
+src_install() {
+	cd src
+	emake -j1 prefix=/usr DESTDIR="${D}" install
+	if use odbc; then
+		dobin edbrowseodbc
+	fi
+	cd ..
+	dodoc CHANGES README todo
+	cd doc
+	dobin setup.ebrc
+	dohtml usersguide.html philosophy.html
+	dodoc sample.ebrc
+	if use linguas_fr; then
+		dohtml usersguide_fr.html philosophy_fr.html
+		dodoc sample_fr.ebrc
+	fi
+}

diff --git a/app-accessibility/edbrowse/files/edbrowse-3.4.7-fix-makefile.patch b/app-accessibility/edbrowse/files/edbrowse-3.4.7-fix-makefile.patch
new file mode 100644
index 0000000..142c6ab
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.4.7-fix-makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/src/makefile b/src/makefile
+index 900c425..af1250e 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -59,7 +59,7 @@ edbrowse: $(EBOBJS) tcp.o dbstubs.o
+ 
+ #  You probably need to be root to do this.
+ install:
+-	install -Dm755 edbrowse $(bindir)/edbrowse
++	install -Dm755 edbrowse $(DESTDIR)$(bindir)/edbrowse
+ 
+ #  If you had to build the javascript library yourself,
+ #  link it into /usr/lib.

diff --git a/app-portage/g-cpan/files/g-cpan-0.16.4-misc.patch b/app-portage/g-cpan/files/g-cpan-0.16.4-misc.patch
new file mode 100644
index 0000000..edbedd2
--- /dev/null
+++ b/app-portage/g-cpan/files/g-cpan-0.16.4-misc.patch
@@ -0,0 +1,40 @@
+Index: g-cpan-0.16.4/lib/Gentoo/CPAN.pm
+===================================================================
+--- g-cpan-0.16.4.orig/lib/Gentoo/CPAN.pm
++++ g-cpan-0.16.4/lib/Gentoo/CPAN.pm
+@@ -11,7 +11,6 @@ use YAML::Node;
+ use Memoize;
+ use Cwd qw(getcwd abs_path cwd);
+ use File::Basename;
+-use Shell qw(perl);
+ 
+ memoize('transformCPAN');
+ memoize('FindDeps');
+@@ -197,12 +196,12 @@ sub unpackModule {
+ 
+     # If we have a Makefile.PL, run it to generate Makefile
+     if ( -f "Makefile.PL" ) {
+-        perl("Makefile.PL",'</dev/null');
++        system("perl Makefile.PL </dev/null");
+     }
+ 
+     # If we have a Build.PL, run it to generate the Build script
+     if ( -f "Build.PL" ) {
+-        perl("Build.PL",'</dev/null');
++        system("perl Build.PL </dev/null");
+     }
+ 
+     # Return whence we came
+Index: g-cpan-0.16.4/lib/Gentoo/Portage.pm
+===================================================================
+--- g-cpan-0.16.4.orig/lib/Gentoo/Portage.pm
++++ g-cpan-0.16.4/lib/Gentoo/Portage.pm
+@@ -47,7 +47,7 @@ sub getEnv {
+         return($var =~ /^$envvar$/ );
+     };
+ 
+-foreach my $file ( "$ENV{HOME}/.gcpanrc", "/etc/make.conf", "/etc/make.globals" ) {
++foreach my $file ( "$ENV{HOME}/.gcpanrc", "/etc/make.conf", "/etc/portage/make.conf", "/etc/make.globals" ) {
+     if ( -f $file) {
+     	my $importer = Shell::EnvImporter->new(
+     		file => $file,

diff --git a/app-portage/g-cpan/g-cpan-0.13.02.ebuild b/app-portage/g-cpan/g-cpan-0.13.02.ebuild
new file mode 100644
index 0000000..f599ef9
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.13.02.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.13.02.ebuild,v 1.8 2010/10/23 09:02:23 ssuominen Exp $
+
+DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+}
+
+src_install() {
+	dodir /usr/bin
+	cp "${S}"/bin/g-cpan.pl "${D}"/usr/bin/
+	dodir /usr/share/man/man1
+	cp "${S}"/man/g-cpan.pl.1 "${S}"/man/g-cpan.1
+	doman "${S}"/man/*
+	dodoc Changes
+	dosym /usr/bin/g-cpan.pl /usr/bin/g-cpan
+}

diff --git a/app-portage/g-cpan/g-cpan-0.14.0.ebuild b/app-portage/g-cpan/g-cpan-0.14.0.ebuild
new file mode 100644
index 0000000..3d0e40b
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.14.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.14.0.ebuild,v 1.12 2010/10/19 11:37:16 leio Exp $
+
+inherit perl-module
+
+DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/g-cpan.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		dev-perl/yaml
+		dev-perl/Log-Agent"
+
+src_install() {
+		perl-module_src_install
+		diropts "-m0755"
+		dodir "/var/tmp/g-cpan"
+		keepdir "/var/tmp/g-cpan"
+		dodir "/var/log/g-cpan"
+		keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
+	elog "if you have users besides root expecting to use g-cpan."
+}

diff --git a/app-portage/g-cpan/g-cpan-0.15.0-r1.ebuild b/app-portage/g-cpan/g-cpan-0.15.0-r1.ebuild
new file mode 100644
index 0000000..82c7748
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.15.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.15.0-r1.ebuild,v 1.14 2010/10/19 11:37:16 leio Exp $
+
+inherit perl-module
+
+DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/g-cpan.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		>=dev-perl/yaml-0.60
+		dev-perl/Shell-EnvImporter
+		dev-perl/Log-Agent"
+
+src_install() {
+		perl-module_src_install
+		diropts "-m0755"
+		dodir "/var/tmp/g-cpan"
+		keepdir "/var/tmp/g-cpan"
+		dodir "/var/log/g-cpan"
+		keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
+	elog "if you have users besides root expecting to use g-cpan."
+}

diff --git a/app-portage/g-cpan/g-cpan-0.16.2.ebuild b/app-portage/g-cpan/g-cpan-0.16.2.ebuild
new file mode 100644
index 0000000..9bdb577
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.16.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.16.2.ebuild,v 1.9 2010/10/23 09:00:05 ssuominen Exp $
+
+EAPI=2
+
+inherit perl-module
+
+DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/g-cpan.xml"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+		 http://dev.gentoo.org/~robbat2/${P}.tar.bz2"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		>=dev-perl/yaml-0.60
+		dev-perl/Shell-EnvImporter
+		dev-perl/Log-Agent"
+
+src_install() {
+		perl-module_src_install
+		diropts "-m0755"
+		dodir "/var/tmp/g-cpan"
+		keepdir "/var/tmp/g-cpan"
+		dodir "/var/log/g-cpan"
+		keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
+	elog "if you have users besides root expecting to use g-cpan."
+	einfo "Please note that some CPAN packages need additional manual"
+	einfo "parameters or tweaking, due to bugs in their build systems."
+}

diff --git a/app-portage/g-cpan/g-cpan-0.16.3.ebuild b/app-portage/g-cpan/g-cpan-0.16.3.ebuild
new file mode 100644
index 0000000..45db593
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.16.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.16.3.ebuild,v 1.1 2011/01/24 05:10:54 robbat2 Exp $
+
+EAPI=2
+
+inherit perl-module
+
+DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/g-cpan.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+		 http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		>=dev-perl/yaml-0.60
+		dev-perl/Shell-EnvImporter
+		dev-perl/Log-Agent"
+
+src_install() {
+		perl-module_src_install
+		diropts "-m0755"
+		dodir "/var/tmp/g-cpan"
+		keepdir "/var/tmp/g-cpan"
+		dodir "/var/log/g-cpan"
+		keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
+	elog "if you have users besides root expecting to use g-cpan."
+	einfo "Please note that some CPAN packages need additional manual"
+	einfo "parameters or tweaking, due to bugs in their build systems."
+}

diff --git a/app-portage/g-cpan/g-cpan-0.16.4.ebuild b/app-portage/g-cpan/g-cpan-0.16.4.ebuild
new file mode 100644
index 0000000..b246689
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.16.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.16.4.ebuild,v 1.1 2011/01/24 23:36:12 robbat2 Exp $
+
+EAPI=2
+
+inherit perl-module
+
+DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/g-cpan.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+		 http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		>=dev-perl/yaml-0.60
+		dev-perl/Shell-EnvImporter
+		dev-perl/Log-Agent"
+
+src_install() {
+		perl-module_src_install
+		diropts "-m0755"
+		dodir "/var/tmp/g-cpan"
+		keepdir "/var/tmp/g-cpan"
+		dodir "/var/log/g-cpan"
+		keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
+	elog "if you have users besides root expecting to use g-cpan."
+	einfo "Please note that some CPAN packages need additional manual"
+	einfo "parameters or tweaking, due to bugs in their build systems."
+}

diff --git a/dev-lang/perl/files/eblits/common-v50160001.eblit b/dev-lang/perl/files/eblits/common-v50160001.eblit
new file mode 100644
index 0000000..e108d2a
--- /dev/null
+++ b/dev-lang/perl/files/eblits/common-v50160001.eblit
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/common-v50160001.eblit,v 1.1 2012/06/05 17:52:35 tove Exp $
+
+src_remove_dual_file() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
+			done
+			;;
+		setup)
+			for i in "$@" ; do
+				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
+					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
+					break
+				fi
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i}{,-${ver}-${P}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual_man() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
+				ff=${ff##*${i#${i%.[0-9]}}}
+				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	for i in "$@" ; do
+		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
+		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
+	done
+}
+

diff --git a/dev-lang/perl/files/eblits/pkg_postinst-v50160001.eblit b/dev-lang/perl/files/eblits/pkg_postinst-v50160001.eblit
new file mode 100644
index 0000000..ad743bc
--- /dev/null
+++ b/dev-lang/perl/files/eblits/pkg_postinst-v50160001.eblit
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/pkg_postinst-v50160001.eblit,v 1.1 2012/06/05 17:52:35 tove Exp $
+
+eblit-perl-pkg_postinst() {
+	dual_scripts
+
+	if [[ "${ROOT}" = "/" ]] ; then
+		local INC DIR file
+		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
+		einfo "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+
+#		ebegin "Generating ConfigLocal.pm (ignore any error)"
+#		enc2xs -C
+
+		einfo "Converting C header files to the corresponding Perl format (ignore any error)"
+		# Prefix note: unprefixed as this is all kernel/libc stuff that we never provide
+		pushd /usr/include >/dev/null
+			h2ph -Q -a -d "${EPREFIX}"${ARCH_LIB} \
+				asm/termios.h syscall.h syslimits.h syslog.h sys/ioctl.h \
+				sys/socket.h sys/time.h wait.h sysexits.h
+		popd >/dev/null
+
+# This has been moved into a function because rumor has it that a future release
+# of portage will allow us to check what version was just removed - which means
+# we will be able to invoke this only as needed :)
+		# Tried doing this via  -z, but $INC is too big...
+		#if [[ "${INC}x" != "x" ]]; then
+		#	cleaner_msg
+		#fi
+	fi
+}
+
+cleaner_msg() {
+	eerror "You have had multiple versions of perl. It is recommended"
+	eerror "that you run perl-cleaner now. perl-cleaner will"
+	eerror "assist with this transition. This script is capable"
+	eerror "of cleaning out old .ph files, rebuilding modules for "
+	eerror "your new version of perl, as well as re-emerging"
+	eerror "applications that compiled against your old libperl$(get_libname)"
+	eerror
+	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
+	eerror "Part of the rebuilding of applications compiled against "
+	eerror "your old libperl involves temporarily unmerging"
+	eerror "them - interruptions could leave you with unmerged"
+	eerror "packages before they can be remerged."
+	eerror ""
+	eerror "If you have run perl-cleaner and a package still gives"
+	eerror "you trouble, and re-emerging it fails to correct"
+	eerror "the problem, please check http://bugs.gentoo.org/"
+	eerror "for more information or to report a bug."
+	eerror ""
+}

diff --git a/dev-lang/perl/files/eblits/pkg_postrm-v50160001.eblit b/dev-lang/perl/files/eblits/pkg_postrm-v50160001.eblit
new file mode 100644
index 0000000..a4d5ad6
--- /dev/null
+++ b/dev-lang/perl/files/eblits/pkg_postrm-v50160001.eblit
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/pkg_postrm-v50160001.eblit,v 1.1 2012/06/05 17:52:35 tove Exp $
+
+eblit-perl-pkg_postrm(){
+	dual_scripts
+
+#	if [[ -e ${ARCH_LIB}/Encode/ConfigLocal.pm ]] ; then
+#		ebegin "Removing ConfigLocal.pm"
+#		rm "${ARCH_LIB}/Encode/ConfigLocal.pm"
+#	fi
+}

diff --git a/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit b/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit
new file mode 100644
index 0000000..9931075
--- /dev/null
+++ b/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit,v 1.1 2012/06/05 17:52:35 tove Exp $
+
+eblit-perl-pkg_setup() {
+	case ${CHOST} in
+		*-freebsd*)   osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*)    osname="netbsd" ;;
+		*-openbsd*)   osname="openbsd" ;;
+		*-darwin*)    osname="darwin" ;;
+		*-interix*)   osname="interix" ;;
+		*)            osname="linux" ;;
+	esac
+
+	myarch="${CHOST%%-*}-${osname}"
+	if use debug ; then
+		myarch+="-debug"
+	fi
+	if use ithreads ; then
+		mythreading="-multi"
+		myarch+="-thread"
+	fi
+
+	LIBPERL="libperl$(get_libname ${MY_PV} )"
+	PRIV_LIB="/usr/$(get_libdir)/perl5/${MY_PV}"
+	ARCH_LIB="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}"
+	SITE_LIB="/usr/local/$(get_libdir)/perl5/${MY_PV}"
+	SITE_ARCH="/usr/local/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}"
+	VENDOR_LIB="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}"
+	VENDOR_ARCH="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}/${myarch}${mythreading}"
+
+	if use ithreads ; then
+		echo ""
+		ewarn "THREADS WARNING:"
+		ewarn "PLEASE NOTE: You are compiling ${MY_P} with"
+		ewarn "interpreter-level threading enabled."
+		ewarn "Threading is not supported by all applications "
+		ewarn "that compile against perl. You use threading at "
+		ewarn "your own discretion. "
+	fi
+	check_rebuild
+	dual_scripts
+}
+
+check_rebuild() {
+	if has_version "<dev-lang/perl-${SHORT_PV}" ; then
+		echo ""
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl you must reinstall"
+		ewarn "the installed perl modules."
+		ewarn "Use: perl-cleaner --all"
+	elif has_version dev-lang/perl ; then
+		# doesnot work
+		#if ! has_version dev-lang/perl[ithreads=,debug=] ; then
+		#if ! has_version dev-lang/perl[ithreads=] || ! has_version dev-lang/perl[debug=] ; then
+		if (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
+		   ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		   (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		   ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+			echo ""
+			ewarn "TOGGLED USE-FLAGS WARNING:"
+			ewarn "You changed one of the use-flags ithreads or debug."
+			ewarn "You must rebuild all perl-modules installed."
+			ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+		fi
+	fi
+}
+

diff --git a/dev-lang/perl/files/eblits/src_configure-v50160001.eblit b/dev-lang/perl/files/eblits/src_configure-v50160001.eblit
new file mode 100644
index 0000000..569312f
--- /dev/null
+++ b/dev-lang/perl/files/eblits/src_configure-v50160001.eblit
@@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit,v 1.1 2012/06/05 17:52:35 tove Exp $
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+eblit-perl-src_configure() {
+	declare -a myconf
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# some arches and -O do not mix :)
+	use ppc && replace-flags -O? -O1
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+	# Fixes bug #97645
+	use ppc && filter-flags "-mpowerpc-gpopt"
+	# Fixes bug #143895 on gcc-4.1.1
+	filter-flags "-fsched2-use-superblocks"
+
+	use sparc && myconf -Ud_longdbl
+
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=${EPREFIX}/usr/include
+	export BZIP2_LIB=${EPREFIX}/usr/$(get_libdir)
+
+	export BUILD_ZLIB=False
+	export ZLIB_INCLUDE=${EPREFIX}/usr/include
+	export ZLIB_LIB=${EPREFIX}/usr/$(get_libdir)
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+
+	if use gdbm ; then
+		mygdbm='D'
+		myndbm='D'
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	use ithreads && myconf -Dusethreads
+
+	if use debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	elif [[ ${CFLAGS} == *-g* ]] ; then
+		myconf -DDEBUGGING=-g
+	else
+		myconf -DDEBUGGING=none
+	fi
+
+	if [[ -n ${PERL_OLDVERSEN} ]] ; then
+		local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done )
+		myconf -Dinc_version_list="${inclist}"
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
+	# Prefix itself we don't do multilib either, so make sure perl can find
+	# something compatible.
+	if use prefix ; then
+		local ldir
+		local llib
+		local paths=""
+		echo "int main() {}" > "${T}"/t.c
+		# need to ensure dirs contain compatible libs, bug #358875
+		for ldir in /lib /usr/lib /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 ; do
+			[[ -d ${ldir} ]] || continue
+			# find a random lib from here
+			llib=( ${ldir}/*$(get_libname) )
+			[[ -e ${llib[0]} ]] || continue
+			$(tc-getCC) -o "${T}"/t "${T}"/t.c ${llib[0]} >& /dev/null \
+				&& paths="${paths} ${ldir}"
+		done
+		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
+	elif [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	# don't try building ODBM, bug #354453
+	myconf -Dnoextensions=ODBM_File
+
+	sh Configure \
+		-des \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix="${EPREFIX}"'/usr' \
+		-Dinstallprefix="${EPREFIX}"'/usr' \
+		-Dsiteprefix="${EPREFIX}"'/usr/local' \
+		-Dvendorprefix="${EPREFIX}"'/usr' \
+		-Dscriptdir="${EPREFIX}"'/usr/bin' \
+		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
+		-Darchlib="${EPREFIX}${ARCH_LIB}" \
+		-Dsitelib="${EPREFIX}${SITE_LIB}" \
+		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
+		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
+		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
+		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth="${EPREFIX}"'/usr/include ' \
+		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Dinstallusrbinperl='n' \
+		-Ud_csh \
+		-Uusenm \
+		"${myconf[@]}" || die "Unable to configure"
+}

diff --git a/dev-lang/perl/files/eblits/src_install-v50160001.eblit b/dev-lang/perl/files/eblits/src_install-v50160001.eblit
new file mode 100644
index 0000000..dac22a2
--- /dev/null
+++ b/dev-lang/perl/files/eblits/src_install-v50160001.eblit
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_install-v50160001.eblit,v 1.1 2012/06/05 17:52:35 tove Exp $
+
+eblit-perl-src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+	emake DESTDIR="${D}" install
+
+	rm -f "${ED}"/usr/bin/perl
+	ln -s perl${MY_PV} "${ED}"/usr/bin/perl || die
+
+	if ! tc-is-static-only ; then
+		dolib.so "${ED}"${coredir}/${LIBPERL}
+		rm -f "${ED}"${coredir}/${LIBPERL}
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
+		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
+		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
+	fi
+
+	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+#	# A poor fix for the miniperl issues
+#	dosed 's:./miniperl:/usr/bin/perl:' /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+#	fperms 0444 /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+#	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
+#	fperms 0755 /usr/bin/xsubpp
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	find "${ED}" -type f -name .packlist -delete || die
+
+	# Note: find out from psm why we would need/want this.
+	# ( use berkdb && has_version '=sys-libs/db-1*' ) ||
+	#	find "${ED}" -name "*NDBM*" | xargs rm -f
+
+	dodoc Changes* README AUTHORS
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	dual_scripts
+}

diff --git a/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit b/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit
new file mode 100644
index 0000000..075e576
--- /dev/null
+++ b/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit,v 1.1 2012/06/05 17:52:35 tove Exp $
+
+src_prepare_update_patchlevel_h() {
+	# Copied and modified from debian:
+	# Copyright 2011 Niko Tyni
+	# This program is free software; you can redistribute it and/or modify
+	# it under the same terms as Perl itself.
+	local patchdir="${WORKDIR}/patches"
+	local prefix
+
+	[[ -f ${patchdir}/series ]] || return 0
+
+while read patch
+do
+	patchname=$(echo $patch | sed 's/\.diff$//')
+	< $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
+
+	# massage the patch headers
+	s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
+	s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
+	s|^Bug-Gentoo: ||; tprepend;
+	s/^\(Subject\|Description\): //; tappend;
+	s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
+
+	# post-process at the end of input
+	$ { x;
+		# include the version number in the patchlevel.h description (if available)
+		s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
+
+		# escape any backslashes and double quotes
+		s|\\|\\\\|g; s|"|\\"|g;
+
+		# add a prefix
+		s|^|\t,"'"$prefix$patchname"' - |;
+		# newlines away
+		s/\n/ /g; s/  */ /g;
+		# add a suffix
+		s/ *$/"/; p
+	};
+	# stop all processing
+	d;
+	# label: append to the hold space
+	:append H; d;
+	# label: prepend to the hold space
+	:prepend x; H; d;
+	'
+done < "${WORKDIR}"/patches/series > "${S}"/patchlevel-gentoo.h
+}
+
+eblit-perl-src_prepare() {
+	local patch
+	EPATCH_OPTS+=" -p1"
+	einfo "Applying patches from ${MY_P}-${PATCH_VER} ..."
+	while read patch ; do
+		EPATCH_SINGLE_MSG="  ${patch} ..."
+		epatch "${WORKDIR}"/patches/${patch}
+	done < "${WORKDIR}"/patches/series
+
+	src_prepare_update_patchlevel_h
+
+	# pod/perltoc.pod fails
+	# lib/ExtUtils/t/Embed.t fails
+	if ! tc-is-static-only ; then
+		ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+		ln -s ${LIBPERL} libperl$(get_libname ) || die
+	fi
+}
+

diff --git a/dev-lang/perl/files/eblits/src_test-v50160001.eblit b/dev-lang/perl/files/eblits/src_test-v50160001.eblit
new file mode 100644
index 0000000..86acdc4
--- /dev/null
+++ b/dev-lang/perl/files/eblits/src_test-v50160001.eblit
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_test-v50160001.eblit,v 1.1 2012/06/05 17:52:35 tove Exp $
+
+eblit-perl-src_test() {
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+		return 0
+	fi
+	use elibc_uclibc && export MAKEOPTS+=" -j1"
+	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
+}

diff --git a/dev-lang/perl/files/perl-5.10.1-cleanup-paths.patch b/dev-lang/perl/files/perl-5.10.1-cleanup-paths.patch
new file mode 100644
index 0000000..3fc60af
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.10.1-cleanup-paths.patch
@@ -0,0 +1,100 @@
+cut the crap of inventing paths, or adding search paths that we don't use
+
+--- Configure
++++ Configure
+@@ -102,28 +102,6 @@
+ 	fi
+ fi
+ 
+-: Proper PATH setting
+-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
+-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
+-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
+-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
+-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
+-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
+-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
+-paths="$paths /sbin /usr/sbin /usr/libexec"
+-paths="$paths /system/gnu_library/bin"
+-
+-for p in $paths
+-do
+-	case "$p_$PATH$p_" in
+-	*$p_$p$p_*) ;;
+-	*) test -d $p && PATH=$PATH$p_$p ;;
+-	esac
+-done
+-
+-PATH=.$p_$PATH
+-export PATH
+-
+ : shall we be using ksh?
+ inksh=''
+ needksh=''
+@@ -8282,66 +8260,6 @@
+ 	;;
+ esac
+ 
+-# How will the perl executable find the installed shared $libperl?
+-# Add $xxx to ccdlflags.
+-# If we can't figure out a command-line option, use $shrpenv to
+-# set env LD_RUN_PATH.  The main perl makefile uses this.
+-shrpdir=$archlibexp/CORE
+-xxx=''
+-tmp_shrpenv=''
+-if "$useshrplib"; then
+-    case "$osname" in
+-	aix)
+-		# We'll set it in Makefile.SH...
+-		;;
+-	solaris)
+-		xxx="-R $shrpdir"
+-		;;
+-	freebsd|netbsd|openbsd|interix|dragonfly)
+-		xxx="-Wl,-R$shrpdir"
+-		;;
+-	bsdos|linux|irix*|dec_osf|gnu*)
+-		xxx="-Wl,-rpath,$shrpdir"
+-		;;
+-	next)
+-		# next doesn't like the default...
+-		;;
+-	beos)
+-		# beos doesn't like the default, either.
+-		;;
+-	haiku)
+-		# Haiku doesn't like the default, either.
+-		;;
+-	hpux*)
+-		# hpux doesn't like the default, either.
+-		tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\""
+-		;;
+-	cygwin)
+-		# cygwin needs only ldlibpth
+-		;;
+-	*)
+-		tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
+-		;;
+-	esac
+-	case "$xxx" in
+-	'') ;;
+-	*)
+-		# Only add $xxx if it isn't already in ccdlflags.
+-		case " $ccdlflags " in
+-		*" $xxx "*)	;;
+-		*)	ccdlflags="$ccdlflags $xxx"
+-			cat <<EOM >&4
+-
+-Adding $xxx to the flags
+-passed to $ld so that the perl executable will find the
+-installed shared $libperl.
+-
+-EOM
+-			;;
+-		esac
+-		;;
+-	esac
+-fi
+ # Fix ccdlflags in AIX for building external extensions.
+ # (For building Perl itself bare -bE:perl.exp is needed,
+ #  Makefile.SH takes care of this.)

diff --git a/dev-lang/perl/files/perl-5.10.1-hpux.patch b/dev-lang/perl/files/perl-5.10.1-hpux.patch
new file mode 100644
index 0000000..ca4ee52
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.10.1-hpux.patch
@@ -0,0 +1,40 @@
+# do not assume '.' being in PATH on hpux,
+# use 'gcc' as linker, link with '-lm'.
+
+--- hints/hpux.sh
++++ hints/hpux.sh
+@@ -190,7 +190,7 @@
+     $define|true|[Yy])
+ 	echo '#include <stdio.h>\nint main(){long l;printf("%d\\n",sizeof(l));}'>try.c
+ 	$cc -o try $ccflags $ldflags try.c
+-	if [ "`try`" = "8" ]; then
++	if [ "`./try`" = "8" ]; then
+ 	    case "$use64bitall" in
+ 		$define|true|[Yy]) ;;
+ 		*)  cat <<EOM >&4
+@@ -338,7 +338,7 @@
+     } /* main */
+ EOF
+ $cc -o try $ccflags $ldflags try.c
+-	maxdsiz=`try`
++	maxdsiz=`./try`
+ rm -f try try.c core
+ if [ $maxdsiz -le 64 ]; then
+     # 64 Mb is probably not enough to optimize toke.c
+@@ -363,11 +363,12 @@
+ 	    "")           optimize="-g -O" ;;
+ 	    *O[3456789]*) optimize=`echo "$optimize" | sed -e 's/O[3-9]/O2/'` ;;
+ 	    esac
+-	#ld="$cc"
+-	ld=/usr/bin/ld
++	ld="$cc"
++	#ld=/usr/bin/ld
+ 	cccdlflags='-fPIC'
+-	#lddlflags='-shared'
+-	lddlflags='-b'
++	lddlflags='-shared'
++	#lddlflags='-b'
++	libs='-lm'
+ 	case "$optimize" in
+ 	    *-g*-O*|*-O*-g*)
+ 		# gcc without gas will not accept -g

diff --git a/dev-lang/perl/files/perl-5.12.3-aix-soname.patch b/dev-lang/perl/files/perl-5.12.3-aix-soname.patch
new file mode 100644
index 0000000..70fe5fa
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.12.3-aix-soname.patch
@@ -0,0 +1,70 @@
+1) Match "powerpc-ibm-aix5.3.0.0-gcc" as gcc too.
+
+2) Creating shared library on aix with full soname support, following
+http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html
+http://lists.gnu.org/archive/html/libtool/2011-02/msg00000.html
+
+Once there is an agreement on that, this patch basically is designed
+for upstream perl to be applied when their soname would change anyway.
+However, there is 'strip' being used, and I don't know yet what to
+use instead in cross-aix setups with recent binutils.
+
+--- Makefile.SH
++++ Makefile.SH
+@@ -92,12 +92,12 @@
+ 		;;
+ 	aix*)
+ 		case "$cc" in
+-		gcc*)
+-			shrpldflags="-shared -Wl,-H512 -Wl,-T512 -Wl,-bhalt:4 -Wl,-bM:SRE -Wl,-bE:perl.exp"
++		*gcc*)
++			shrpldflags="-shared -Wl,-H512 -Wl,-T512 -Wl,-bhalt:4 -Wl,-bE:perl.exp"
+ 			case "$osvers" in
+-			3*)	shrpldflags="$shrpldflags -e _nostart"
++			3*)	shrpldflags="$shrpldflags -Wl,-bM:SRE -e _nostart"
+ 				;;
+-			*)	shrpldflags="$shrpldflags -Wl,-bnoentry"
++			*)	shrpldflags="$shrpldflags -Wl,-G -Wl,-bernotok -Wl,-bnoentry"
+ 				;;
+ 			esac
+ 			shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
+@@ -105,11 +105,11 @@
+ 			linklibperl_nonshr='-lperl_nonshr'
+ 			;;
+ 		*)
+-			shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
++			shrpldflags="-H512 -T512 -bhalt:4 -bE:perl.exp"
+ 			case "$osvers" in
+-			3*)	shrpldflags="$shrpldflags -e _nostart"
++			3*)	shrpldflags="$shrpldflags -bM:SRE -e _nostart"
+ 				;;
+-			*)	shrpldflags="$shrpldflags -b noentry"
++			*)	shrpldflags="$shrpldflags -G -bernotok -b noentry"
+ 				;;
+ 			esac
+ 			shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
+@@ -763,11 +763,19 @@
+ !NO!SUBS!
+ 		case "$osname" in
+ 		aix)
+-			$spitshell >>$Makefile <<'!NO!SUBS!'
+-	rm -f libperl$(OBJ_EXT)
+-	mv $@ libperl$(OBJ_EXT)
+-	$(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
+-!NO!SUBS!
++			bits=32
++			if test X"$use64bitall" = Xdefine; then bits=64; fi
++			$spitshell >>$Makefile <<!GROK!THIS!
++	rm -f shr.imp shr.o
++	mv \$@ shr.o
++	strip -e shr.o
++	( echo '#! libperl.so.${revision}.${patchlevel}(shr.o)' \\
++	; echo '# ${bits}' \\
++	; grep -v '^#!' perl.exp \\
++	) > shr.imp
++	\$(AR) qv \$@ shr.imp shr.o
++	rm -f shr.imp shr.o
++!GROK!THIS!
+ 			;;
+ 		esac
+ 		;;

diff --git a/dev-lang/perl/files/perl-5.12.3-interix.patch b/dev-lang/perl/files/perl-5.12.3-interix.patch
new file mode 100644
index 0000000..5e875b2
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.12.3-interix.patch
@@ -0,0 +1,21 @@
+reported: http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2011-04/msg01014.html
+
+diff -ru perl-5.12.3.orig/hints/interix.sh perl-5.12.3/hints/interix.sh
+--- perl-5.12.3.orig/hints/interix.sh	2011-04-27 08:34:00 +0200
++++ perl-5.12.3/hints/interix.sh	2011-04-27 08:53:46 +0200
+@@ -6,14 +6,13 @@
+ cc='gcc'
+ cccdlflags="-DPIC $cccdlflags"
+ ccdlflags='-Wl,-E'
+-ccflags="-D_ALL_SOURCE $ccflags"
+-d_poll="$undef"
+ ld='gcc'
+ lddlflags="-shared $lddlflags"
+ rpathflag='-Wl,-R'
+ sharpbang='#!'
+ usemymalloc='false'
+ usenm='false'
++firstmakefile=GNUmakefile
+ 
+ # This script UU/usethreads.cbu will get 'called-back' by Configure 
+ # after it has prompted the user for whether to use threads. 

diff --git a/dev-lang/perl/files/perl-5.12.3-mint.patch b/dev-lang/perl/files/perl-5.12.3-mint.patch
new file mode 100644
index 0000000..4c6c108
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.12.3-mint.patch
@@ -0,0 +1,321 @@
+http://rt.perl.org/rt3/Ticket/Display.html?id=89502
+
+--- perl-5.12.3/Configure	2011-02-21 09:18:09.000000000 +0000
++++ perl-5.12.3/Configure	2011-02-21 09:38:49.000000000 +0000
+@@ -1275,6 +1275,9 @@ 
+ elif test -n "$DJGPP"; then
+ : DOS DJGPP
+     _exe=".exe"
++elif test -f "/kern/cookiejar"; then
++: MiNT
++    _exe=""
+ elif test -d c:/. -o -n "$is_os2" ; then
+ : OS/2 or cygwin
+     _exe=".exe"
+@@ -1402,7 +1405,7 @@ 
+ 	xcat=/bin/cat
+ 	test -f $xcat$_exe || xcat=/usr/bin/cat
+ 	if test ! -f $xcat$_exe; then
+-		for p in `echo $PATH | sed -e "s/$p_/ /g"` $paths; do
++		for p in `echo $PATH | sed -e 's/$p_/ /g'` $paths; do
+ 			if test -f $p/cat$_exe; then
+ 				xcat=$p/cat
+ 				break
+--- perl-5.12.3/ext/DynaLoader/dl_dld.xs	2010-11-21 21:40:55.000000000 +0000
++++ perl-5.12.3/ext/DynaLoader/dl_dld.xs	2011-02-21 09:38:51.000000000 +0000
+@@ -116,6 +116,18 @@ 
+ 	goto haverror;
+     }
+ 
++    DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dld_link(libm.a)\n"));
++    if (dlderr = dld_link("/usr/lib/libm.a")) {
++	SaveError(aTHX_ "dld_link(libm.a): %s", dld_strerror(dlderr));
++	goto haverror;
++    }
++
++    DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dld_link(libc.a)\n"));
++    if (dlderr = dld_link("/usr/lib/libc.a")) {
++	SaveError(aTHX_ "dld_link(libc.a): %s", dld_strerror(dlderr));
++	goto haverror;
++    }
++
+     max = AvFILL(dl_resolve_using);
+     for (x = 0; x <= max; x++) {
+ 	char *sym = SvPVX(*av_fetch(dl_resolve_using, x, 0));
+--- perl-5.12.3/malloc.c	2011-01-09 20:20:57.000000000 +0000
++++ perl-5.12.3/malloc.c	2011-02-21 09:38:51.000000000 +0000
+@@ -264,7 +264,7 @@ 
+ #define MIN_BUC_POW2 (sizeof(void*) > 4 ? 3 : 2) /* Allow for 4-byte arena. */
+ #define MIN_BUCKET (MIN_BUC_POW2 * BUCKETS_PER_POW2)
+ 
+-#if !(defined(I286) || defined(atarist))
++#if !defined(I286)
+ 	/* take 2k unless the block is bigger than that */
+ #  define LOG_OF_MIN_ARENA 11
+ #else
+@@ -551,8 +551,8 @@ 
+  */
+ #define u_short unsigned short
+ 
+-/* 286 and atarist like big chunks, which gives too much overhead. */
+-#if (defined(RCHECK) || defined(I286) || defined(atarist)) && defined(PACK_MALLOC)
++/* 286 like big chunks, which gives too much overhead. */
++#if (defined(RCHECK) || defined(I286)) && defined(PACK_MALLOC)
+ #  undef PACK_MALLOC
+ #endif 
+ 
+@@ -1734,16 +1734,14 @@ 
+ 	/* Second, check alignment. */
+ 	slack = 0;
+ 
+-#if !defined(atarist) /* on the atari we dont have to worry about this */
+-#  ifndef I286 	/* The sbrk(0) call on the I286 always returns the next segment */
++#ifndef I286 	/* The sbrk(0) call on the I286 always returns the next segment */
+ 	/* WANTED_ALIGNMENT may be more than NEEDED_ALIGNMENT, but this may
+ 	   improve performance of memory access. */
+ 	if (PTR2UV(cp) & (WANTED_ALIGNMENT - 1)) { /* Not aligned. */
+ 	    slack = WANTED_ALIGNMENT - (PTR2UV(cp) & (WANTED_ALIGNMENT - 1));
+ 	    add += slack;
+ 	}
+-#  endif
+-#endif /* !atarist */
++#endif
+ 		
+ 	if (add) {
+ 	    DEBUG_m(PerlIO_printf(Perl_debug_log, 
+--- perl-5.12.3/miniperlmain.c	2011-01-09 20:20:57.000000000 +0000
++++ perl-5.12.3/miniperlmain.c	2011-02-21 09:38:49.000000000 +0000
+@@ -45,7 +45,7 @@ 
+ #if defined (atarist)
+ /* The Atari operating system doesn't have a dynamic stack.  The
+    stack size is determined from this value.  */
+-long _stksize = 64 * 1024;
++long _stksize = 256 * 1024;
+ #endif
+ 
+ #if defined(PERL_GLOBAL_STRUCT_PRIVATE)
+--- perl-5.12.3/os2/perlrexx.c	2010-11-21 21:40:56.000000000 +0000
++++ perl-5.12.3/os2/perlrexx.c	2011-02-21 09:42:49.000000000 +0000
+@@ -38,7 +38,7 @@ 
+ #if defined (atarist)
+ /* The Atari operating system doesn't have a dynamic stack.  The
+    stack size is determined from this value.  */
+-long _stksize = 64 * 1024;
++long _stksize = 256 * 1024;
+ #endif
+ 
+ /* Register any extra external extensions */
+--- perl-5.12.3/perl.c	2011-02-21 09:17:19.000000000 +0000
++++ perl-5.12.3/perl.c	2011-02-21 09:38:50.000000000 +0000
+@@ -3272,10 +3272,6 @@ 
+ 		      "\n\nOS/2 port Copyright (c) 1990, 1991, Raymond Chen, Kai Uwe Rommel\n"
+ 		      "Version 5 port Copyright (c) 1994-2002, Andreas Kaiser, Ilya Zakharevich\n");
+ #endif
+-#ifdef atarist
+-	PerlIO_printf(PerlIO_stdout(),
+-		      "atariST series port, ++jrb  bammi@×××××××.com\n");
+-#endif
+ #ifdef __BEOS__
+ 	PerlIO_printf(PerlIO_stdout(),
+ 		      "BeOS port Copyright Tom Spindler, 1997-1999\n");
+--- perl-5.12.3/perl.h	2011-01-09 20:20:57.000000000 +0000
++++ perl-5.12.3/perl.h	2011-02-21 09:38:50.000000000 +0000
+@@ -497,7 +497,7 @@ 
+  */
+ 
+ /* define this once if either system, instead of cluttering up the src */
+-#if defined(MSDOS) || defined(atarist) || defined(WIN32) || defined(NETWARE)
++#if defined(MSDOS) || defined(WIN32) || defined(NETWARE)
+ #define DOSISH 1
+ #endif
+ 
+--- perl-5.12.3/perlio.c	2009-04-14 23:47:25.000000000 +0000
++++ perl-5.12.3/perlio.c	2010-03-23 18:36:15.000000000 +0000
+@@ -135,17 +135,6 @@ 
+      * This used to be contents of do_binmode in doio.c
+      */
+ #ifdef DOSISH
+-#  if defined(atarist)
+-    PERL_UNUSED_ARG(iotype);
+-    if (!fflush(fp)) {
+-        if (mode & O_BINARY)
+-            ((FILE *) fp)->_flag |= _IOBIN;
+-        else
+-            ((FILE *) fp)->_flag &= ~_IOBIN;
+-        return 1;
+-    }
+-    return 0;
+-#  else
+     dTHX;
+     PERL_UNUSED_ARG(iotype);
+ #ifdef NETWARE
+@@ -153,7 +142,7 @@ 
+ #else
+     if (PerlLIO_setmode(fileno(fp), mode) != -1) {
+ #endif
+-#    if defined(WIN32) && defined(__BORLANDC__)
++#  if defined(WIN32) && defined(__BORLANDC__)
+         /*
+          * The translation mode of the stream is maintained independent 
+ of
+@@ -169,12 +158,11 @@ 
+             fp->flags |= _F_BIN;
+         else
+             fp->flags &= ~_F_BIN;
+-#    endif
++#  endif
+         return 1;
+     }
+     else
+         return 0;
+-#  endif
+ #else
+ #  if defined(USEMYBINMODE)
+     dTHX;
+--- perl-5.12.3/pp_sys.c	2011-01-09 20:20:58.000000000 +0000
++++ perl-5.12.3/pp_sys.c	2011-02-21 09:38:50.000000000 +0000
+@@ -3308,14 +3308,6 @@ 
+     RETPUSHNO;
+ }
+ 
+-#if defined(atarist) /* this will work with atariST. Configure will
+-			make guesses for other systems. */
+-# define FILE_base(f) ((f)->_base)
+-# define FILE_ptr(f) ((f)->_ptr)
+-# define FILE_cnt(f) ((f)->_cnt)
+-# define FILE_bufsiz(f) ((f)->_cnt + ((f)->_ptr - (f)->_base))
+-#endif
+-
+ PP(pp_fttext)
+ {
+     dVAR;
+@@ -5567,30 +5559,6 @@ 
+     case 8:
+ 	retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7]);
+ 	break;
+-#ifdef atarist
+-    case 9:
+-	retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8]);
+-	break;
+-    case 10:
+-	retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9]);
+-	break;
+-    case 11:
+-	retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
+-	  a[10]);
+-	break;
+-    case 12:
+-	retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
+-	  a[10],a[11]);
+-	break;
+-    case 13:
+-	retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
+-	  a[10],a[11],a[12]);
+-	break;
+-    case 14:
+-	retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
+-	  a[10],a[11],a[12],a[13]);
+-	break;
+-#endif /* atarist */
+     }
+     SP = ORIGMARK;
+     PUSHi(retval);
+--- perl-5.12.3/util.c	2011-01-09 20:20:58.000000000 +0000
++++ perl-5.12.3/util.c	2011-02-21 09:38:51.000000000 +0000
+@@ -2545,7 +2545,7 @@ 
+     return PerlIO_fdopen(p[This], mode);
+ }
+ #else
+-#if defined(atarist) || defined(EPOC)
++#if defined(EPOC)
+ FILE *popen();
+ PerlIO *
+ Perl_my_popen(pTHX_ const char *cmd, const char *mode)
+@@ -2994,7 +2994,7 @@ 
+ }
+ #endif
+ 
+-#if defined(atarist) || defined(OS2) || defined(EPOC)
++#if defined(OS2) || defined(EPOC)
+ int pclose();
+ #ifdef HAS_FORK
+ int					/* Cannot prototype with I32
+@@ -3111,7 +3111,7 @@ 
+     I32 len = 0;
+     int retval;
+     char *bufend;
+-#if defined(DOSISH) && !defined(OS2) && !defined(atarist)
++#if defined(DOSISH) && !defined(OS2)
+ #  define SEARCH_EXTS ".bat", ".cmd", NULL
+ #  define MAX_EXT_LEN 4
+ #endif
+@@ -3234,28 +3234,25 @@ 
+ 
+ 	bufend = s + strlen(s);
+ 	while (s < bufend) {
+-#if defined(atarist) || defined(DOSISH)
++#if defined(DOSISH)
+ 	    for (len = 0; *s
+-#  ifdef atarist
+-		    && *s != ','
+-#  endif
+ 		    && *s != ';'; len++, s++) {
+ 		if (len < sizeof tmpbuf)
+ 		    tmpbuf[len] = *s;
+ 	    }
+ 	    if (len < sizeof tmpbuf)
+ 		tmpbuf[len] = '\0';
+-#else  /* ! (atarist || DOSISH) */
++#else  /* ! (DOSISH) */
+ 	    s = delimcpy(tmpbuf, tmpbuf + sizeof tmpbuf, s, bufend,
+ 			':',
+ 			&len);
+-#endif /* ! (atarist || DOSISH) */
++#endif /* ! (DOSISH) */
+ 	    if (s < bufend)
+ 		s++;
+ 	    if (len + 1 + strlen(scriptname) + MAX_EXT_LEN >= sizeof tmpbuf)
+ 		continue;	/* don't search dir with too-long name */
+ 	    if (len
+-#  if defined(atarist) || defined(DOSISH)
++#  if defined(DOSISH)
+ 		&& tmpbuf[len - 1] != '/'
+ 		&& tmpbuf[len - 1] != '\\'
+ #  endif
+--- perl-5.12.3/hints/freemint.sh	2011-01-09 20:20:58.000000000 +0000
++++ perl-5.12.3/hints/freemint.sh	2011-02-21 09:38:51.000000000 +0000
+@@ -0,0 +1,34 @@ 
++# hints/freemint.sh
++#
++# talk to guido@××××××××.de if you want to change this file.
++# Please read the README.mint file.
++#
++# misc stuff
++
++archname="m68k-freemint"
++
++cccdlflags=' '; # avoid -fPIC
++ccdlflags="-Wl,-whole-archive -lgcc -lpthread -Wl,-no-whole-archive"
++
++# libs
++libpth="$prefix/lib /usr/local/lib /usr/lib"
++glibpth="$libpth"
++xlibpth="$libpth"
++
++ccflags="$ccflags -D_GNU_SOURCE"
++libswanted='m dld'
++dl_src='dl_dld.xs'
++dlext='o'
++lddlflags='-r'
++ldflags='-static'
++so='none'
++useshrplib='false'
++
++#sbrk() returns -1 (failure) somewhere in lib/unicore/mktables at
++#around 14M, so we need to use system malloc() as our sbrk()
++malloc_cflags='ccflags="-DUSE_PERL_SBRK -DPERL_SBRK_VIA_MALLOC $ccflags"'
++
++# Locales aren't feeling well. We crash if -Ox used.
++locale_cflags='optimize="-O0"'
++LC_ALL=C; export LC_ALL;
++LANG=C; export LANG;

diff --git a/dev-lang/perl/files/perl-5.14.1-cleanup-paths.patch b/dev-lang/perl/files/perl-5.14.1-cleanup-paths.patch
new file mode 100644
index 0000000..c199041
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.14.1-cleanup-paths.patch
@@ -0,0 +1,100 @@
+cut the crap of inventing paths, or adding search paths that we don't use
+
+--- Configure
++++ Configure
+@@ -105,28 +105,6 @@
+ 	fi
+ fi
+ 
+-: Proper PATH setting
+-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
+-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
+-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
+-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
+-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
+-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
+-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
+-paths="$paths /sbin /usr/sbin /usr/libexec"
+-paths="$paths /system/gnu_library/bin"
+-
+-for p in $paths
+-do
+-	case "$p_$PATH$p_" in
+-	*$p_$p$p_*) ;;
+-	*) test -d $p && PATH=$PATH$p_$p ;;
+-	esac
+-done
+-
+-PATH=.$p_$PATH
+-export PATH
+-
+ : shall we be using ksh?
+ inksh=''
+ needksh=''
+@@ -8287,66 +8265,6 @@
+ 	;;
+ esac
+ 
+-# How will the perl executable find the installed shared $libperl?
+-# Add $xxx to ccdlflags.
+-# If we can't figure out a command-line option, use $shrpenv to
+-# set env LD_RUN_PATH.  The main perl makefile uses this.
+-shrpdir=$archlibexp/CORE
+-xxx=''
+-tmp_shrpenv=''
+-if "$useshrplib"; then
+-    case "$osname" in
+-	aix)
+-		# We'll set it in Makefile.SH...
+-		;;
+-	solaris)
+-		xxx="-R $shrpdir"
+-		;;
+-	freebsd|mirbsd|netbsd|openbsd|interix|dragonfly)
+-		xxx="-Wl,-R$shrpdir"
+-		;;
+-	bsdos|linux|irix*|dec_osf|gnu*)
+-		xxx="-Wl,-rpath,$shrpdir"
+-		;;
+-	next)
+-		# next doesn't like the default...
+-		;;
+-	beos)
+-		# beos doesn't like the default, either.
+-		;;
+-	haiku)
+-		# Haiku doesn't like the default, either.
+-		;;
+-	hpux*)
+-		# hpux doesn't like the default, either.
+-		tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\""
+-		;;
+-	cygwin)
+-		# cygwin needs only ldlibpth
+-		;;
+-	*)
+-		tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
+-		;;
+-	esac
+-	case "$xxx" in
+-	'') ;;
+-	*)
+-		# Only add $xxx if it isn't already in ccdlflags.
+-		case " $ccdlflags " in
+-		*" $xxx "*)	;;
+-		*)	ccdlflags="$ccdlflags $xxx"
+-			cat <<EOM >&4
+-
+-Adding $xxx to the flags
+-passed to $ld so that the perl executable will find the
+-installed shared $libperl.
+-
+-EOM
+-			;;
+-		esac
+-		;;
+-	esac
+-fi
+ # Fix ccdlflags in AIX for building external extensions.
+ # (For building Perl itself bare -bE:perl.exp is needed,
+ #  Makefile.SH takes care of this.)

diff --git a/dev-lang/perl/files/perl-5.8.7-MakeMaker-RUNPATH.patch b/dev-lang/perl/files/perl-5.8.7-MakeMaker-RUNPATH.patch
new file mode 100644
index 0000000..c442def
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.7-MakeMaker-RUNPATH.patch
@@ -0,0 +1,21 @@
+Bug #105054.
+
+We do not want the build root in the linked perl module's RUNPATH, so strip
+paths containing PORTAGE_TMPDIR if its set.
+
+--- perl-5.8.7/lib/ExtUtils/MM_Unix.pm	2005-09-10 14:06:59.000000000 +0200
++++ perl-5.8.7.az/lib/ExtUtils/MM_Unix.pm	2005-09-10 15:25:52.000000000 +0200
+@@ -1915,6 +1915,13 @@
+ 	    # LD_RUN_PATH now computed by ExtUtils::Liblist
+ 	    ($self->{EXTRALIBS},  $self->{BSLOADLIBS}, 
+              $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
++	    # We do not want the build root in RPATH
++	    if (exists $ENV{PORTAGE_TMPDIR}) {
++	      # If we have PORTAGE_TMPDIR set, strip that, as just testing for
++	      # /usr and /opt might not be sufficient
++	      $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
++	                             split /:/, $self->{LD_RUN_PATH};
++	    }
+ 	    last;
+ 	}
+     }

diff --git a/dev-lang/perl/files/perl-5.8.8-CAN-2005-0448-rmtree-2.patch b/dev-lang/perl/files/perl-5.8.8-CAN-2005-0448-rmtree-2.patch
new file mode 100644
index 0000000..d29fc25
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-CAN-2005-0448-rmtree-2.patch
@@ -0,0 +1,280 @@
+SECURITY [CAN-2005-0448]:
+
+Rewrite File::Path::rmtree to avoid race condition which allows an
+attacker with write permission on directories in the tree being
+removed to make files setuid or to remove arbitrary files (see
+http://bugs.debian.org/286905 and http://bugs.debian.org/286922).
+
+Revised for 5.8.8-7etch6 to avoid failure when rmtree removes the
+current directory.
+
+diff --git a/lib/File/Path.pm b/lib/File/Path.pm
+index 2e41ff3..fd32b96 100644
+--- a/lib/File/Path.pm
++++ b/lib/File/Path.pm
+@@ -72,33 +72,17 @@ or C<unlink> to remove it, or that it's skipping it.
+ 
+ =item *
+ 
+-a boolean value, which if TRUE will cause C<rmtree> to
+-skip any files to which you do not have delete access
+-(if running under VMS) or write access (if running
+-under another OS).  This will change in the future when
+-a criterion for 'delete permission' under OSs other
+-than VMS is settled.  (defaults to FALSE)
++a boolean value, which if FALSE (the default for non-root users) will
++cause C<rmtree> to adjust the mode of directories (if required) prior
++to attempting to remove the contents.  Note that on interruption or
++failure of C<rmtree>, directories may be left with more permissive
++modes for the owner.
+ 
+ =back
+ 
+ It returns the number of files successfully deleted.  Symlinks are
+ simply deleted and not followed.
+ 
+-B<NOTE:> There are race conditions internal to the implementation of
+-C<rmtree> making it unsafe to use on directory trees which may be
+-altered or moved while C<rmtree> is running, and in particular on any
+-directory trees with any path components or subdirectories potentially
+-writable by untrusted users.
+-
+-Additionally, if the third parameter is not TRUE and C<rmtree> is
+-interrupted, it may leave files and directories with permissions altered
+-to allow deletion (and older versions of this module would even set
+-files and directories to world-read/writable!)
+-
+-Note also that the occurrence of errors in C<rmtree> can be determined I<only>
+-by trapping diagnostic messages using C<$SIG{__WARN__}>; it is not apparent
+-from the return value.
+-
+ =head1 DIAGNOSTICS
+ 
+ =over 4
+@@ -172,111 +156,127 @@ sub mkpath {
+     @created;
+ }
+ 
+-sub rmtree {
+-    my($roots, $verbose, $safe) = @_;
+-    my(@files);
+-    my($count) = 0;
+-    $verbose ||= 0;
+-    $safe ||= 0;
++sub _rmtree;
++sub _rmtree
++{
++    my ($path, $prefix, $up, $up_dev, $up_ino, $verbose, $safe) = @_;
++    my $up_name = $up eq '..' ? 'parent' : 'initial';
++
++    my ($dev, $ino) = lstat $path or return 0;
++    unless (-d _)
++    {
++	print "unlink $prefix$path\n" if $verbose;
++	unless (unlink $path)
++	{
++	    carp "Can't remove file $prefix$path ($!)";
++	    return 0;
++	}
+ 
+-    if ( defined($roots) && length($roots) ) {
+-      $roots = [$roots] unless ref $roots;
++	return 1;
+     }
+-    else {
+-      carp "No root path(s) specified\n";
+-      return 0;
++
++    unless (chdir $path)
++    {
++	carp "Can't chdir to $prefix$path ($!)";
++	return 0;
+     }
+ 
+-    my($root);
+-    foreach $root (@{$roots}) {
+-    	if ($Is_MacOS) {
+-	    $root = ":$root" if $root !~ /:/;
+-	    $root =~ s#([^:])\z#$1:#;
+-	} else {
+-	    $root =~ s#/\z##;
+-	}
+-	(undef, undef, my $rp) = lstat $root or next;
+-	$rp &= 07777;	# don't forget setuid, setgid, sticky bits
+-	if ( -d _ ) {
+-	    # notabene: 0700 is for making readable in the first place,
+-	    # it's also intended to change it to writable in case we have
+-	    # to recurse in which case we are better than rm -rf for 
+-	    # subtrees with strange permissions
+-	    chmod($rp | 0700, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
+-	      or carp "Can't make directory $root read+writeable: $!"
+-		unless $safe;
+-
+-	    if (opendir my $d, $root) {
+-		no strict 'refs';
+-		if (!defined ${"\cTAINT"} or ${"\cTAINT"}) {
+-		    # Blindly untaint dir names
+-		    @files = map { /^(.*)$/s ; $1 } readdir $d;
+-		} else {
+-		    @files = readdir $d;
+-		}
+-		closedir $d;
+-	    }
+-	    else {
+-	        carp "Can't read $root: $!";
+-		@files = ();
+-	    }
++    # avoid a race condition where a directory may be replaced by a
++    # symlink between the lstat and the chdir
++    my ($new_dev, $new_ino, $perm) = stat '.';
++    unless ("$new_dev:$new_ino" eq "$dev:$ino")
++    {
++	croak "Directory $prefix$path changed before chdir, aborting";
++    }
+ 
+-	    # Deleting large numbers of files from VMS Files-11 filesystems
+-	    # is faster if done in reverse ASCIIbetical order 
+-	    @files = reverse @files if $Is_VMS;
+-	    ($root = VMS::Filespec::unixify($root)) =~ s#\.dir\z## if $Is_VMS;
+-	    if ($Is_MacOS) {
+-		@files = map("$root$_", @files);
+-	    } else {
+-		@files = map("$root/$_", grep $_!~/^\.{1,2}\z/s,@files);
+-	    }
+-	    $count += rmtree(\@files,$verbose,$safe);
+-	    if ($safe &&
+-		($Is_VMS ? !&VMS::Filespec::candelete($root) : !-w $root)) {
+-		print "skipped $root\n" if $verbose;
+-		next;
+-	    }
+-	    chmod $rp | 0700, $root
+-	      or carp "Can't make directory $root writeable: $!"
+-		if $force_writeable;
+-	    print "rmdir $root\n" if $verbose;
+-	    if (rmdir $root) {
+-		++$count;
+-	    }
+-	    else {
+-		carp "Can't remove directory $root: $!";
+-		chmod($rp, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
+-		    or carp("and can't restore permissions to "
+-		            . sprintf("0%o",$rp) . "\n");
+-	    }
+-	}
+-	else { 
+-	    if ($safe &&
+-		($Is_VMS ? !&VMS::Filespec::candelete($root)
+-		         : !(-l $root || -w $root)))
+-	    {
+-		print "skipped $root\n" if $verbose;
+-		next;
+-	    }
+-	    chmod $rp | 0600, $root
+-	      or carp "Can't make file $root writeable: $!"
+-		if $force_writeable;
+-	    print "unlink $root\n" if $verbose;
+-	    # delete all versions under VMS
+-	    for (;;) {
+-		unless (unlink $root) {
+-		    carp "Can't unlink file $root: $!";
+-		    if ($force_writeable) {
+-			chmod $rp, $root
+-			    or carp("and can't restore permissions to "
+-			            . sprintf("0%o",$rp) . "\n");
+-		    }
+-		    last;
+-		}
+-		++$count;
+-		last unless $Is_VMS && lstat $root;
+-	    }
++    $perm &= 07777;
++    my $nperm = $perm | 0700;
++    unless ($safe or $nperm == $perm or chmod $nperm, '.')
++    {
++	carp "Can't make directory $prefix$path read+writeable ($!)";
++	$nperm = $perm;
++    }
++
++    my $count = 0;
++    if (opendir my $dir, '.')
++    {
++	my $entry;
++	while (defined ($entry = readdir $dir))
++	{
++	    next if $entry =~ /^\.\.?$/;
++	    $entry =~ /^(.*)$/s; $entry = $1; # untaint
++	    $count += _rmtree $entry, "$prefix$path/", '..', $dev, $ino,
++		$verbose, $safe;
+ 	}
++
++	closedir $dir;
++    }
++
++    # restore directory permissions if required (in case the rmdir
++    # below fails) now, while we're still in the directory and may do
++    # so without a race via '.'
++    unless ($nperm == $perm or chmod $perm, '.')
++    {
++	carp "Can't restore permissions on directory $prefix$path ($!)";
++    }
++
++    # don't leave the caller in an unexpected directory
++    unless (chdir $up)
++    {
++	croak "Can't return to $up_name directory from $prefix$path ($!)";
++    }
++
++    # ensure that a chdir .. didn't take us somewhere other than
++    # where we expected (see CVE-2002-0435)
++    unless (($new_dev, $new_ino) = stat '.'
++	and "$new_dev:$new_ino" eq "$up_dev:$up_ino")
++    {
++	croak "\u$up_name directory changed since entering $prefix$path";
++    }
++
++    print "rmdir $prefix$path\n" if $verbose;
++    if (rmdir $path)
++    {
++	$count++;
++    }
++    else
++    {
++	carp "Can't remove directory $prefix$path ($!)";
++    }
++
++    return $count;
++}
++
++sub rmtree
++{
++    my ($p, $verbose, $safe) = @_;
++    $p = [] unless defined $p and length $p;
++    $p = [ $p ] unless ref $p;
++    my @paths = grep defined && length, @$p;
++
++    # default to "unsafe" for non-root (will chmod dirs)
++    $safe = $> ? 0 : 1 unless defined $safe;
++
++    unless (@paths)
++    {
++	carp "No root path(s) specified";
++	return;
++    }
++
++    opendir my $oldpwd, '.' or do {
++	carp "Can't fetch initial working directory";
++	return;
++    };
++
++    my ($dev, $ino) = stat '.' or do {
++	carp "Can't stat initial working directory";
++	return;
++    };
++
++    my $count = 0;
++    for my $path (@paths)
++    {
++	$count += _rmtree $path, '', $oldpwd, $dev, $ino, $verbose, $safe;
+     }
+ 
+     $count;

diff --git a/dev-lang/perl/files/perl-5.8.8-CVE-2008-1927.patch b/dev-lang/perl/files/perl-5.8.8-CVE-2008-1927.patch
new file mode 100644
index 0000000..4700058
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-CVE-2008-1927.patch
@@ -0,0 +1,256 @@
+Fix a double free / segfault with utf8 regexps 
+Debian #454792
+[rt.cpan.org #48156]
+[rt.cpan.org #40641]
+upstream change 29204
+
+UTF8_ALLOW_DEFAULT definition in utf8.h picked from upstream change 27688
+
+diff --git a/embed.fnc b/embed.fnc
+index edfbc0e..26524c7 100644
+--- a/embed.fnc
++++ b/embed.fnc
+@@ -1168,6 +1168,7 @@ Es	|void	|reguni		|NN const struct RExC_state_t *state|UV uv|NN char *s|NN STRLE
+ Es	|regnode*|regclass	|NN struct RExC_state_t *state
+ ERs	|I32	|regcurly	|NN const char *
+ Es	|regnode*|reg_node	|NN struct RExC_state_t *state|U8 op
++Es	|UV	|reg_recode	|const char value|NULLOK SV **encp
+ Es	|regnode*|regpiece	|NN struct RExC_state_t *state|NN I32 *flagp
+ Es	|void	|reginsert	|NN struct RExC_state_t *state|U8 op|NN regnode *opnd
+ Es	|void	|regoptail	|NN struct RExC_state_t *state|NN regnode *p|NN regnode *val
+diff --git a/embed.h b/embed.h
+index 2b38fd5..372b04f 100644
+--- a/embed.h
++++ b/embed.h
+@@ -1234,6 +1234,7 @@
+ #define regclass		S_regclass
+ #define regcurly		S_regcurly
+ #define reg_node		S_reg_node
++#define reg_recode		S_reg_recode
+ #define regpiece		S_regpiece
+ #define reginsert		S_reginsert
+ #define regoptail		S_regoptail
+@@ -3277,6 +3278,7 @@
+ #define regclass(a)		S_regclass(aTHX_ a)
+ #define regcurly(a)		S_regcurly(aTHX_ a)
+ #define reg_node(a,b)		S_reg_node(aTHX_ a,b)
++#define reg_recode(a,b)		S_reg_recode(aTHX_ a,b)
+ #define regpiece(a,b)		S_regpiece(aTHX_ a,b)
+ #define reginsert(a,b,c)	S_reginsert(aTHX_ a,b,c)
+ #define regoptail(a,b,c)	S_regoptail(aTHX_ a,b,c)
+diff --git a/pod/perldiag.pod b/pod/perldiag.pod
+index 9b3134c..7d95216 100644
+--- a/pod/perldiag.pod
++++ b/pod/perldiag.pod
+@@ -1900,6 +1900,15 @@ recognized by Perl or by a user-supplied handler.  See L<attributes>.
+ (W printf) Perl does not understand the given format conversion.  See
+ L<perlfunc/sprintf>.
+ 
++=item Invalid escape in the specified encoding in regex; marked by <-- HERE in m/%s/
++
++(W regexp) The numeric escape (for example C<\xHH>) of value < 256
++didn't correspond to a single character through the conversion
++from the encoding specified by the encoding pragma.
++The escape was replaced with REPLACEMENT CHARACTER (U+FFFD) instead.
++The <-- HERE shows in the regular expression about where the
++escape was discovered.
++
+ =item Invalid [] range "%s" in regex; marked by <-- HERE in m/%s/
+ 
+ (F) The range specified in a character class had a minimum character
+diff --git a/proto.h b/proto.h
+index 6d185dd..ef6c0cf 100644
+--- a/proto.h
++++ b/proto.h
+@@ -1748,6 +1748,7 @@ STATIC I32	S_regcurly(pTHX_ const char *)
+ 			__attribute__warn_unused_result__;
+ 
+ STATIC regnode*	S_reg_node(pTHX_ struct RExC_state_t *state, U8 op);
++STATIC UV	S_reg_recode(pTHX_ const char value, SV **encp);
+ STATIC regnode*	S_regpiece(pTHX_ struct RExC_state_t *state, I32 *flagp);
+ STATIC void	S_reginsert(pTHX_ struct RExC_state_t *state, U8 op, regnode *opnd);
+ STATIC void	S_regoptail(pTHX_ struct RExC_state_t *state, regnode *p, regnode *val);
+diff --git a/regcomp.c b/regcomp.c
+index 928cf39..98d48dd 100644
+--- a/regcomp.c
++++ b/regcomp.c
+@@ -2791,6 +2791,39 @@ S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp)
+ }
+ 
+ /*
++ * reg_recode
++ *
++ * It returns the code point in utf8 for the value in *encp.
++ *    value: a code value in the source encoding
++ *    encp:  a pointer to an Encode object
++ *
++ * If the result from Encode is not a single character,
++ * it returns U+FFFD (Replacement character) and sets *encp to NULL.
++ */
++STATIC UV
++S_reg_recode(pTHX_ const char value, SV **encp)
++{
++    STRLEN numlen = 1;
++    SV * const sv = sv_2mortal(newSVpvn(&value, numlen));
++    const char * const s = encp && *encp ? sv_recode_to_utf8(sv, *encp)
++					 : SvPVX(sv);
++    const STRLEN newlen = SvCUR(sv);
++    UV uv = UNICODE_REPLACEMENT;
++
++    if (newlen)
++	uv = SvUTF8(sv)
++	     ? utf8n_to_uvchr((U8*)s, newlen, &numlen, UTF8_ALLOW_DEFAULT)
++	     : *(U8*)s;
++
++    if (!newlen || numlen != newlen) {
++	uv = UNICODE_REPLACEMENT;
++	if (encp)
++	    *encp = NULL;
++    }
++    return uv;
++}
++
++/*
+  - regatom - the lowest level
+  *
+  * Optimization:  gobbles an entire sequence of ordinary characters so that
+@@ -3182,6 +3215,8 @@ tryagain:
+ 			    ender = grok_hex(p, &numlen, &flags, NULL);
+ 			    p += numlen;
+ 			}
++			if (PL_encoding && ender < 0x100)
++			    goto recode_encoding;
+ 			break;
+ 		    case 'c':
+ 			p++;
+@@ -3201,6 +3236,17 @@ tryagain:
+ 			    --p;
+ 			    goto loopdone;
+ 			}
++			if (PL_encoding && ender < 0x100)
++			    goto recode_encoding;
++			break;
++		    recode_encoding:
++			{
++			    SV* enc = PL_encoding;
++			    ender = reg_recode((const char)(U8)ender, &enc);
++			    if (!enc && SIZE_ONLY && ckWARN(WARN_REGEXP))
++				vWARN(p, "Invalid escape in the specified encoding");
++			    RExC_utf8 = 1;
++			}
+ 			break;
+ 		    case '\0':
+ 			if (p >= RExC_end)
+@@ -3331,32 +3377,6 @@ tryagain:
+ 	break;
+     }
+ 
+-    /* If the encoding pragma is in effect recode the text of
+-     * any EXACT-kind nodes. */
+-    if (PL_encoding && PL_regkind[(U8)OP(ret)] == EXACT) {
+-	STRLEN oldlen = STR_LEN(ret);
+-	SV *sv        = sv_2mortal(newSVpvn(STRING(ret), oldlen));
+-
+-	if (RExC_utf8)
+-	    SvUTF8_on(sv);
+-	if (sv_utf8_downgrade(sv, TRUE)) {
+-	    const char * const s = sv_recode_to_utf8(sv, PL_encoding);
+-	    const STRLEN newlen = SvCUR(sv);
+-
+-	    if (SvUTF8(sv))
+-		RExC_utf8 = 1;
+-	    if (!SIZE_ONLY) {
+-		DEBUG_r(PerlIO_printf(Perl_debug_log, "recode %*s to %*s\n",
+-				      (int)oldlen, STRING(ret),
+-				      (int)newlen, s));
+-		Copy(s, STRING(ret), newlen, char);
+-		STR_LEN(ret) += newlen - oldlen;
+-		RExC_emit += STR_SZ(newlen) - STR_SZ(oldlen);
+-	    } else
+-		RExC_size += STR_SZ(newlen) - STR_SZ(oldlen);
+-	}
+-    }
+-
+     return(ret);
+ }
+ 
+@@ -3734,6 +3754,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state)
+ 		    value = grok_hex(RExC_parse, &numlen, &flags, NULL);
+ 		    RExC_parse += numlen;
+ 		}
++		if (PL_encoding && value < 0x100)
++		    goto recode_encoding;
+ 		break;
+ 	    case 'c':
+ 		value = UCHARAT(RExC_parse++);
+@@ -3741,13 +3763,24 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state)
+ 		break;
+ 	    case '0': case '1': case '2': case '3': case '4':
+ 	    case '5': case '6': case '7': case '8': case '9':
+-            {
+-                I32 flags = 0;
+-		numlen = 3;
+-		value = grok_oct(--RExC_parse, &numlen, &flags, NULL);
+-		RExC_parse += numlen;
+-		break;
+-            }
++		{
++		    I32 flags = 0;
++		    numlen = 3;
++		    value = grok_oct(--RExC_parse, &numlen, &flags, NULL);
++		    RExC_parse += numlen;
++		    if (PL_encoding && value < 0x100)
++			goto recode_encoding;
++		    break;
++		}
++	    recode_encoding:
++		{
++		    SV* enc = PL_encoding;
++		    value = reg_recode((const char)(U8)value, &enc);
++		    if (!enc && SIZE_ONLY && ckWARN(WARN_REGEXP))
++			vWARN(RExC_parse,
++			      "Invalid escape in the specified encoding");
++		    break;
++		}
+ 	    default:
+ 		if (!SIZE_ONLY && isALPHA(value) && ckWARN(WARN_REGEXP))
+ 		    vWARN2(RExC_parse,
+diff --git a/t/uni/tr_utf8.t b/t/uni/tr_utf8.t
+index 606a84a..354156a 100755
+--- a/t/uni/tr_utf8.t
++++ b/t/uni/tr_utf8.t
+@@ -31,7 +31,7 @@ BEGIN {
+ }
+ 
+ use strict;
+-use Test::More tests => 7;
++use Test::More tests => 8;
+ 
+ use encoding 'utf8';
+ 
+@@ -67,4 +67,12 @@ is($str, $hiragana, "s/// # hiragana -> katakana");
+   $line =~ tr/bcdeghijklmnprstvwxyz$02578/בצדעגהיײקלמנפּרסטװשכיזשױתײחא/;
+   is($line, "aבצדעfגהיײקלמנoפqּרסuטװשכיזש1ױ34ת6ײח9", "[perl #16843]");
+ }
++
++{
++  # [perl #40641]
++  my $str = qq/Gebääääääääääääääääääääude/;
++  my $reg = qr/Gebääääääääääääääääääääude/;
++  ok($str =~ /$reg/, "[perl #40641]");
++}
++
+ __END__
+diff --git a/utf8.h b/utf8.h
+index 6d63897..3800866 100644
+--- a/utf8.h
++++ b/utf8.h
+@@ -198,6 +198,8 @@ encoded character.
+ 					 UTF8_ALLOW_SURROGATE|UTF8_ALLOW_FFFF)
+ #define UTF8_ALLOW_ANY			0x00FF
+ #define UTF8_CHECK_ONLY			0x0200
++#define UTF8_ALLOW_DEFAULT             (ckWARN(WARN_UTF8) ? 0 : \
++                                        UTF8_ALLOW_ANYUV)
+ 
+ #define UNICODE_SURROGATE_FIRST		0xD800
+ #define UNICODE_SURROGATE_LAST		0xDFFF

diff --git a/dev-lang/perl/files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch b/dev-lang/perl/files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch
new file mode 100644
index 0000000..edcfc6a
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch
@@ -0,0 +1,111 @@
+diff -Naurp perl-5.8.8-orig/lib/ExtUtils/Liblist.pm perl-5.8.8/lib/ExtUtils/Liblist.pm
+--- perl-5.8.8-orig/lib/ExtUtils/Liblist.pm	2003-04-07 14:58:17.000000000 -0400
++++ perl-5.8.8/lib/ExtUtils/Liblist.pm	2006-02-07 09:57:04.000000000 -0500
+@@ -87,6 +87,11 @@ libraries.  LD_RUN_PATH is a colon separ
+ in LDLOADLIBS. It is passed as an environment variable to the process
+ that links the shared library.
+ 
++The Red Hat extension: This generation of LD_RUN_PATH is disabled by default.
++To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH
++MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH
++environment variable).
++
+ =head2 BSLOADLIBS
+ 
+ List of those libraries that are needed but can be linked in
+diff -Naurp perl-5.8.8-orig/lib/ExtUtils/MM_Unix.pm perl-5.8.8/lib/ExtUtils/MM_Unix.pm
+--- perl-5.8.8-orig/lib/ExtUtils/MM_Unix.pm	2005-05-21 05:42:56.000000000 -0400
++++ perl-5.8.8/lib/ExtUtils/MM_Unix.pm	2006-02-07 09:56:08.000000000 -0500
+@@ -941,7 +941,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+     }
+ 
+     my $ld_run_path_shell = "";
+-    if ($self->{LD_RUN_PATH} ne "") {
++	if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) {
+ 	$ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
+     }
+ 
+diff -Naurp perl-5.8.8-orig/lib/ExtUtils/MakeMaker.pm perl-5.8.8/lib/ExtUtils/MakeMaker.pm
+--- perl-5.8.8-orig/lib/ExtUtils/MakeMaker.pm	2005-10-21 10:11:04.000000000 -0400
++++ perl-5.8.8/lib/ExtUtils/MakeMaker.pm	2006-02-07 09:55:03.000000000 -0500
+@@ -233,7 +233,7 @@ sub full_setup {
+     PERL_SRC PERM_RW PERM_RWX
+     PL_FILES PM PM_FILTER PMLIBDIRS POLLUTE PPM_INSTALL_EXEC
+     PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
+-    SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG
++	SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
+     XS_VERSION clean depend dist dynamic_lib linkext macro realclean
+     tool_autosplit
+ 
+@@ -371,6 +371,26 @@ sub new {
+         exit 0;
+    }
+ 
++    # USE_MM_LD_RUN_PATH - borrowed from RedHat to disable automatic RPATH generation
++    if ( ( ! $self->{USE_MM_LD_RUN_PATH} )
++       &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/)
++        ||( exists( $ENV{USE_MM_LD_RUN_PATH} )
++           &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ )
++           )
++        )
++       )
++    {
++       my $v = $1;
++       if( $v )
++       {
++           $v = ($v=~/=([01])$/)[0];
++       }else
++       {
++           $v = 1;
++       };
++       $self->{USE_MM_LD_RUN_PATH}=$v;
++    };
++
+     print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose;
+     if (-f "MANIFEST" && ! -f "Makefile"){
+         check_manifest();
+@@ -2057,6 +2077,44 @@ precedence.  A typemap in the current di
+ precedence, even if it isn't listed in TYPEMAPS.  The default system
+ typemap has lowest precedence.
+ 
++=item USE_MM_LD_RUN_PATH
++
++boolean
++This feature is borrowed from Red Hat to deal with RPATH issues.
++Please see bug 81745 - http://bugs.gentoo.org/81745 - for more
++information.
++
++The Red Hat perl MakeMaker distribution differs from the standard
++upstream release in that it disables use of the MakeMaker generated
++LD_RUN_PATH by default, UNLESS this attribute is specified , or the
++USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run.
++
++The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH
++to the concatenation of every -L ld(1) option directory in which a -l ld(1)
++option library is found, which is used as the ld(1) -rpath option if none
++is specified. This means that, if your application builds shared libraries
++and your MakeMaker application links to them, that the absolute paths of the
++libraries in the build tree will be inserted into the RPATH header of all
++MakeMaker generated binaries, and that such binaries will be unable to link
++to these libraries if they do not still reside in the build tree directories
++(unlikely) or in the system library directories (/lib or /usr/lib), regardless
++of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and
++your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib,
++your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH
++is set to include /some_directory_other_than_usr_lib, because RPATH overrides
++LD_LIBRARY_PATH.
++
++So for Red Hat MakeMaker builds LD_RUN_PATH is NOT generated by default for
++every link. You can still use explicit -rpath ld options or the LD_RUN_PATH
++environment variable during the build to generate an RPATH for the binaries.
++
++You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command
++line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH
++for every link command.
++
++USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the
++$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run.
++
+ =item VENDORPREFIX
+ 
+ Like PERLPREFIX, but only for the vendor install locations.

diff --git a/dev-lang/perl/files/perl-5.8.8-asm-page-h-compile-failure.patch b/dev-lang/perl/files/perl-5.8.8-asm-page-h-compile-failure.patch
new file mode 100644
index 0000000..325caaf
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-asm-page-h-compile-failure.patch
@@ -0,0 +1,12 @@
+--- perl-5.8.8/ext/IPC/SysV/SysV.xs.no_asm_page_h       2001-06-30 14:46:07.000000000 -0400
++++ perl-5.8.8/ext/IPC/SysV/SysV.xs     2006-06-02 17:37:22.000000000 -0400
+@@ -3,9 +3,6 @@
+ #include "XSUB.h"
+
+ #include <sys/types.h>
+-#ifdef __linux__
+-#   include <asm/page.h>
+-#endif
+ #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
+ #ifndef HAS_SEM
+ #   include <sys/ipc.h>

diff --git a/dev-lang/perl/files/perl-5.8.8-ccld-cflags.patch b/dev-lang/perl/files/perl-5.8.8-ccld-cflags.patch
new file mode 100644
index 0000000..85f66fe
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-ccld-cflags.patch
@@ -0,0 +1,33 @@
+--- Configure.orig	2009-11-04 11:09:08.934965499 +0100
++++ Configure	2009-11-04 11:13:19.055305854 +0100
+@@ -7617,7 +7617,7 @@
+ 			cat <<EOM
+ You appear to have ELF support.  I'll use $cc to build dynamic libraries.
+ EOM
+-			dflt="$cc"
++			dflt="$cc $optimize"
+ 		else
+ 			echo "I'll use ld to build dynamic libraries."
+ 			dflt='ld'
+--- Makefile.SH.orig	2009-11-04 15:34:22.643322823 +0100
++++ Makefile.SH	2009-11-04 15:34:30.110147884 +0100
+@@ -201,7 +201,7 @@
+ LD = $ld
+ 
+ LDFLAGS = $ldflags
+-CLDFLAGS = $ldflags
++CLDFLAGS = \$(OPTIMIZE) $ldflags
+ 
+ mallocsrc = $mallocsrc
+ mallocobj = $mallocobj
+--- x2p/Makefile.SH.orig	2009-11-04 15:54:14.146759212 +0100
++++ x2p/Makefile.SH	2009-11-04 15:54:19.963253154 +0100
+@@ -107,7 +107,7 @@
+ 	$(REALPERL) -I../lib ../utils/perlcc -I .. -L .. $(plextract) -v -log ../compilelog;  
+ 
+ a2p$(EXE_EXT): $(obj) a2p$(OBJ_EXT)
+-	$(CC) -o a2p $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs)
++	$(CC) -o a2p $(OPTIMIZE) $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs)
+ 
+ # I now supply a2p.c with the kits, so the following section is
+ # used only if you force byacc to run by saying

diff --git a/dev-lang/perl/files/perl-5.8.8-cplusplus.patch b/dev-lang/perl/files/perl-5.8.8-cplusplus.patch
new file mode 100644
index 0000000..064bda4
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-cplusplus.patch
@@ -0,0 +1,22 @@
+--- perl.h.orig	2006-03-29 08:53:46.000000000 -0500
++++ perl.h	2006-03-29 08:54:19.000000000 -0500
+@@ -159,7 +159,7 @@ struct perl_thread;
+ #endif
+ 
+ #ifndef PERL_UNUSED_DECL
+-#  ifdef HASATTRIBUTE_UNUSED
++#  if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus)
+ #    define PERL_UNUSED_DECL __attribute__unused__
+ #  else
+ #    define PERL_UNUSED_DECL
+--- XSUB.h.orig	2006-03-29 08:54:24.000000000 -0500
++++ XSUB.h	2006-03-29 08:54:48.000000000 -0500
+@@ -91,7 +91,7 @@ handled automatically by C<xsubpp>.
+ #if defined(__CYGWIN__) && defined(USE_DYNAMIC_LOADING)
+ #  define XS(name) __declspec(dllexport) void name(pTHX_ CV* cv)
+ #else
+-#  ifdef HASATTRIBUTE_UNUSED
++#  if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus)
+ #    define XS(name) void name(pTHX_ CV* cv __attribute__unused__)
+ #  else
+ #    define XS(name) void name(pTHX_ CV* cv)

diff --git a/dev-lang/perl/files/perl-5.8.8-darwin-cc-ld.patch b/dev-lang/perl/files/perl-5.8.8-darwin-cc-ld.patch
new file mode 100644
index 0000000..b96eea8
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-darwin-cc-ld.patch
@@ -0,0 +1,22 @@
+Use $CC to link (and check for broken compilers), such that we don't get
+linked modules of a different bitness.
+http://bugs.gentoo.org/show_bug.cgi?id=297751
+
+--- hints/darwin.sh
++++ hints/darwin.sh
+@@ -128,13 +128,13 @@
+ ccflags="${ccflags} ${cppflags}"
+ 
+ # Known optimizer problems.
+-case "`cc -v 2>&1`" in
++case "`${cc:-gcc} -v 2>&1`" in
+   *"3.1 20020105"*) toke_cflags='optimize=""' ;;
+ esac
+ 
+ # Shared library extension is .dylib.
+ # Bundle extension is .bundle.
+-ld='cc';
++ld="${cc:-gcc}";
+ so='dylib';
+ dlext='bundle';
+ usedl='define';

diff --git a/dev-lang/perl/files/perl-5.8.8-dragonfly-clean.patch b/dev-lang/perl/files/perl-5.8.8-dragonfly-clean.patch
new file mode 100644
index 0000000..52f32bf
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-dragonfly-clean.patch
@@ -0,0 +1,170 @@
+Index: perl-5.8.8/Configure
+===================================================================
+--- perl-5.8.8.orig/Configure	2006-01-08 14:51:03 +0000
++++ perl-5.8.8/Configure	2006-02-14 13:41:41 +0000
+@@ -3130,6 +3130,8 @@
+ 		dgux)	osname=dgux 
+ 			osvers="$3"
+ 			;;
++		dragonfly) osname=dragonfly
++			osvers="$3" ;;
+ 		dynixptx*) osname=dynixptx
+ 			osvers=`echo "$4"|sed 's/^v//'`
+ 			;;
+@@ -7889,7 +7891,7 @@
+ 	solaris)
+ 		xxx="-R $shrpdir"
+ 		;;
+-	freebsd|netbsd|openbsd|interix)
++	freebsd|netbsd|openbsd|dragonfly|interix)
+ 		xxx="-Wl,-R$shrpdir"
+ 		;;
+ 	bsdos|linux|irix*|dec_osf|gnu*)
+Index: perl-5.8.8/Makefile.SH
+===================================================================
+--- perl-5.8.8.orig/Makefile.SH	2006-01-24 12:49:44 +0000
++++ perl-5.8.8/Makefile.SH	2006-02-14 13:46:57 +0000
+@@ -73,7 +73,7 @@
+ 	sunos*)
+ 		linklibperl="-lperl"
+ 		;;
+-	netbsd*|freebsd[234]*|openbsd*)
++	netbsd*|freebsd[234]*|openbsd*|dragonfly*)
+ 		linklibperl="-L. -lperl"
+ 		;;
+ 	interix*)
+@@ -990,6 +990,10 @@
+ n_dummy $(nonxs_ext):	miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
+ 	@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
+ 
++.PHONY: printconfig
++printconfig:
++	@eval `$(LDLIBPTH) ./perl -Ilib -V:$(CONFIGVAR)`; echo $$$(CONFIGVAR)
++
+ .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
+ 	realclean _realcleaner clobber _clobber \
+ 	distclean veryclean _verycleaner
+Index: perl-5.8.8/hints/dragonfly.sh
+===================================================================
+--- perl-5.8.8.orig/hints/dragonfly.sh	1970-01-01 00:00:00 +0000
++++ perl-5.8.8/hints/dragonfly.sh	2006-02-14 13:15:04 +0000
+@@ -0,0 +1,118 @@
++# hints/dragonfly.sh
++#
++# This file is mostly copied from hints/freebsd.sh with the OS version
++# information taken out and only the FreeBSD-4 information intact.
++# Please check with Todd Willey <xtoddx@×××××.com> before making
++# modifications to this file.
++
++case "$osvers" in
++*)     usevfork='true'
++       case "$usemymalloc" in
++           "") usemymalloc='n'
++               ;;
++       esac
++       libswanted=`echo $libswanted | sed 's/ malloc / /'`
++       ;;
++esac
++
++# Dynamic Loading flags have not changed much, so they are separated
++# out here to avoid duplicating them everywhere.
++case "$osvers" in
++*)
++        objformat=`/usr/bin/objformat`
++        if [ x$objformat = xelf ]; then
++            libpth="/usr/lib /usr/local/lib"
++            glibpth="/usr/lib /usr/local/lib"
++            ldflags="-Wl,-E "
++            lddlflags="-shared "
++        else
++            if [ -e /usr/lib/aout ]; then
++                libpth="/usr/lib/aout /usr/local/lib /usr/lib"
++                glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
++            fi
++            lddlflags='-Bshareable'
++        fi
++        cccdlflags='-DPIC -fPIC'
++        ;;
++esac
++
++case "$osvers" in
++*)
++       ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
++       if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
++           usenm=false
++       fi
++        ;;
++esac
++
++cat <<'EOM' >&4
++
++Some users have reported that Configure halts when testing for
++the O_NONBLOCK symbol with a syntax error.  This is apparently a
++sh error.  Rerunning Configure with ksh apparently fixes the
++problem.  Try
++       ksh Configure [your options]
++
++EOM
++
++# From: Anton Berezin <tobez@×××××××.dk>
++# To: perl5-porters@××××.org
++# Subject: [PATCH 5.005_54] Configure - hints/freebsd.sh signal handler type
++# Date: 30 Nov 1998 19:46:24 +0100
++# Message-ID: <864srhhvcv.fsf@××××××××××××.dk>
++
++signal_t='void'
++d_voidsig='define'
++
++# This script UU/usethreads.cbu will get 'called-back' by Configure
++# after it has prompted the user for whether to use threads.
++cat > UU/usethreads.cbu <<'EOCBU'
++case "$usethreads" in
++$define|true|[yY]*)
++        lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'|sed -n '$p'`
++        case "$osvers" in
++       *)
++             if [ ! -r "$lc_r" ]; then
++             cat <<EOM >&4
++POSIX threads should be supported by FreeBSD $osvers --
++but your system is missing the shared libc_r.
++(/sbin/ldconfig -r doesn't find any).
++
++Consider using the latest STABLE release.
++EOM
++                exit 1
++             fi
++             case "$osvers" in
++             *)        ldflags="-pthread $ldflags"
++                       ;;
++             esac
++             # Both in 4.x and 5.x gethostbyaddr_r exists but
++             # it is "Temporary function, not threadsafe"...
++             # Presumably earlier it didn't even exist.
++             d_gethostbyaddr_r="undef"
++             d_gethostbyaddr_r_proto="0"
++             ;;
++
++       esac
++
++       set `echo X "$libswanted "| sed -e 's/ c / c_r /'`
++       shift
++       libswanted="$*"
++       # Configure will probably pick the wrong libc to use for nm scan.
++       # The safest quick-fix is just to not use nm at all...
++       usenm=false
++
++        unset lc_r
++
++       # Even with the malloc mutexes the Perl malloc does not
++       # seem to be threadsafe in FreeBSD?
++       case "$usemymalloc" in
++       '') usemymalloc=n ;;
++       esac
++esac
++EOCBU
++
++# malloc wrap works
++case "$usemallocwrap" in
++'') usemallocwrap='define' ;;
++esac
+

diff --git a/dev-lang/perl/files/perl-5.8.8-fbsdhints.patch b/dev-lang/perl/files/perl-5.8.8-fbsdhints.patch
new file mode 100644
index 0000000..7dc1a65
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-fbsdhints.patch
@@ -0,0 +1,57 @@
+Index: perl-5.8.8/hints/freebsd.sh
+===================================================================
+--- perl-5.8.8.orig/hints/freebsd.sh
++++ perl-5.8.8/hints/freebsd.sh
+@@ -88,6 +88,8 @@ case "$osvers" in
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
+ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
++	libswanted=`echo $libswanted | sed 's/ c / /'`
+ 	# iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
+ 	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	d_setregid='define'
+@@ -102,6 +104,10 @@ case "$osvers" in
+ 	        ;;
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
++	libswanted=`echo $libswanted | sed 's/ iconv / /'`
++	libswanted=`echo $libswanted | sed 's/ c / /'`
+ 	;;
+ esac
+ 
+@@ -116,17 +122,17 @@ case "$osvers" in
+
+ *)
+         objformat=`/usr/bin/objformat`
+-        if [ x$objformat = xelf ]; then
+-            libpth="/usr/lib /usr/local/lib"
+-            glibpth="/usr/lib /usr/local/lib"
+-            ldflags="-Wl,-E "
+-            lddlflags="-shared "
+-        else
++        if [ x$objformat = xaout ]; then
+             if [ -e /usr/lib/aout ]; then
+                 libpth="/usr/lib/aout /usr/local/lib /usr/lib"
+                 glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
+             fi
+             lddlflags='-Bshareable'
++        else
++            libpth="/usr/lib /usr/local/lib"
++            glibpth="/usr/lib /usr/local/lib"
++            ldflags="-Wl,-E"
++            lddlflags="-shared "
+         fi
+         cccdlflags='-DPIC -fPIC'
+         ;;
+@@ -137,7 +143,7 @@ case "$osvers" in
+ 
+ *)
+ 	ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
+-	if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
++	if /usr/bin/file -L /usr/lib/libc.so | grep -vq "not stripped" ; then
+ 	    usenm=false
+ 	fi
+         ;;

diff --git a/dev-lang/perl/files/perl-5.8.8-fix_file_path_chdir.patch b/dev-lang/perl/files/perl-5.8.8-fix_file_path_chdir.patch
new file mode 100644
index 0000000..c75aa89
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-fix_file_path_chdir.patch
@@ -0,0 +1,72 @@
+ExtUtils/Command.pm (among other things) expects to be able to destroy
+a strangely-permissioned testdir.  This is a backport of the chdir/chmod
+work performed in File::Path released in Perl 5.10.0.
+
+--- perl-5.8.7.orig/lib/File/Path.pm	2008-12-05 13:23:32.000000000 -0800
++++ perl-5.8.7/lib/File/Path.pm	2008-12-05 13:33:13.000000000 -0800
+@@ -162,7 +162,7 @@
+ {
+     my ($path, $prefix, $up, $up_dev, $up_ino, $verbose, $safe) = @_;
+ 
+-    my ($dev, $ino) = lstat $path or return 0;
++    my ($dev, $ino, $perm) = lstat $path or return 0;
+     unless (-d _)
+     {
+ 	print "unlink $prefix$path\n" if $verbose;
+@@ -175,15 +175,25 @@
+ 	return 1;
+     }
+ 
+-    unless (chdir $path)
+-    {
++    if (!chdir($path)) {
++        # see if we can escalate privileges to get in
++        # (e.g. funny protection mask such as -w- instead of rwx)
++        $perm &= 07777;
++        my $nperm = $perm | 0700;
++        if (!($safe or $nperm == $perm or chmod($nperm, $path))) {
++            carp "cannot make $prefix$path read-write-exec";
++            return 0;
++        }
++        elsif (!chdir($path)) {
+ 	carp "Can't chdir to $prefix$path ($!)";
+ 	return 0;
++        }
+     }
+ 
+     # avoid a race condition where a directory may be replaced by a
+     # symlink between the lstat and the chdir
+-    my ($new_dev, $new_ino, $perm) = stat '.';
++    my ($new_dev, $new_ino);
++    ($new_dev, $new_ino, $perm) = stat '.';
+     unless ("$new_dev:$new_ino" eq "$dev:$ino")
+     {
+ 	croak "Directory $prefix$path changed before chdir, aborting";
+--- perl-5.8.8.orig/lib/ExtUtils/t/Command.t
++++ perl-5.8.8/lib/ExtUtils/t/Command.t
+@@ -23,7 +23,7 @@
+ }
+ 
+ BEGIN {
+-    use Test::More tests => 38;
++    use Test::More tests => 39;
+     use File::Spec;
+ }
+ 
+@@ -148,7 +148,7 @@
+             $^O eq 'NetWare' || $^O eq 'dos' || $^O eq 'cygwin'  ||
+             $^O eq 'MacOS'
+            ) {
+-            skip( "different file permission semantics on $^O", 4);
++            skip( "different file permission semantics on $^O", 5);
+         }
+ 
+         @ARGV = ('testdir');
+@@ -178,6 +178,7 @@
+ 
+         @ARGV = ('testdir');
+         rm_rf;
++        ok( ! -e 'testdir', 'rm_rf can delete a read-only dir' );
+     }
+ 
+ 

diff --git a/dev-lang/perl/files/perl-5.8.8-gcc42-command-line.patch b/dev-lang/perl/files/perl-5.8.8-gcc42-command-line.patch
new file mode 100644
index 0000000..6904136
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-gcc42-command-line.patch
@@ -0,0 +1,11 @@
+diff -Naur perl-5.8.8-orig/makedepend.SH perl-5.8.8/makedepend.SH
+--- perl-5.8.8-orig/makedepend.SH	2006-10-01 20:05:40.000000000 -0600
++++ perl-5.8.8/makedepend.SH	2006-10-01 20:07:03.000000000 -0600
+@@ -167,6 +167,7 @@
+             -e '/^#.*<builtin>/d' \
+             -e '/^#.*<built-in>/d' \
+             -e '/^#.*<command line>/d' \
++            -e '/^#.*<command-line>/d' \
+ 	    -e '/^#.*"-"/d' \
+ 	    -e '/: file path prefix .* never used$/d' \
+ 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \

diff --git a/dev-lang/perl/files/perl-5.8.8-lib32.patch b/dev-lang/perl/files/perl-5.8.8-lib32.patch
new file mode 100644
index 0000000..88d5049
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-lib32.patch
@@ -0,0 +1,76 @@
+--- a/Configure
++++ b/Configure
+@@ -1255,12 +1255,12 @@ libnames=''
+ : change the next line if compiling for Xenix/286 on Xenix/386
+ xlibpth='/usr/lib/386 /lib/386'
+ : Possible local library directories to search.
+-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
+-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
++loclibpth="/usr/local/lib32 /opt/local/lib32 /usr/gnu/lib32"
++loclibpth="$loclibpth /opt/gnu/lib32 /usr/GNU/lib32 /opt/GNU/lib32"
+ 
+ : general looking path for locating libraries
+-glibpth="/lib /usr/lib $xlibpth"
+-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
++glibpth="/lib32 /usr/lib32 $xlibpth"
++glibpth="$glibpth /usr/ccs/lib32 /usr/ucblib /usr/local/lib32"
+ test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
+ test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
+ 
+@@ -5945,8 +5945,8 @@ fi
+ : Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7.
+ case "$installstyle" in
+ '')	case "$prefix" in
+-		*perl*) dflt='lib';;
+-		*) dflt='lib/perl5' ;;
++		*perl*) dflt='lib32';;
++		*) dflt='lib32/perl5' ;;
+ 	esac
+ 	;;
+ *)	dflt="$installstyle" ;;
+@@ -5962,8 +5962,8 @@ installstyle=$dflt
+ : /opt/perl/lib/perl5... would be redundant.
+ : The default "style" setting is made in installstyle.U
+ case "$installstyle" in
+-*lib/perl5*) set dflt privlib lib/$package/$version ;;
+-*)	 set dflt privlib lib/$version ;;
++*lib32/perl5*) set dflt privlib lib32/$package/$version ;;
++*)	 set dflt privlib lib32/$version ;;
+ esac
+ eval $prefixit
+ $cat <<EOM
+@@ -6465,8 +6465,8 @@ siteprefixexp="$ansexp"
+ prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ case "$sitelib" in
+ '') case "$installstyle" in
+-	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
+-	*)	 dflt=$siteprefix/lib/site_$prog/$version ;;
++	*lib32/perl5*) dflt=$siteprefix/lib32/$package/site_$prog/$version ;;
++	*)	 dflt=$siteprefix/lib32/site_$prog/$version ;;
+ 	esac
+ 	;;
+ *)	dflt="$sitelib"
+@@ -6592,8 +6592,8 @@ case "$vendorprefix" in
+ 	'')
+ 		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ 		case "$installstyle" in
+-		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
+-		*)	     dflt=$vendorprefix/lib/vendor_$prog/$version ;;
++		*lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;;
++		*)	     dflt=$vendorprefix/lib32/vendor_$prog/$version ;;
+ 		esac
+ 		;;
+ 	*)	dflt="$vendorlib"
+@@ -10550,9 +10550,9 @@ else
+ 		else
+ 			for net in net socket
+ 			do
+-				if test -f /usr/lib/lib$net$_a; then
+-					( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) ||  \
+-					$ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list
++				if test -f /usr/lib32/lib$net$_a; then
++					( ($nm $nm_opt /usr/lib32/lib$net$_a | eval $nm_extract) ||  \
++					$ar t /usr/lib32/lib$net$_a) 2>/dev/null >> libc.list
+ 					if $contains socket libc.list >/dev/null 2>&1; then
+ 						d_socket="$define"
+ 						socketlib="-l$net"

diff --git a/dev-lang/perl/files/perl-5.8.8-lib64.patch b/dev-lang/perl/files/perl-5.8.8-lib64.patch
new file mode 100644
index 0000000..4cc3aee
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-lib64.patch
@@ -0,0 +1,76 @@
+--- a/Configure
++++ b/Configure
+@@ -1255,12 +1255,12 @@ libnames=''
+ : change the next line if compiling for Xenix/286 on Xenix/386
+ xlibpth='/usr/lib/386 /lib/386'
+ : Possible local library directories to search.
+-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
+-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
++loclibpth="/usr/local/lib64 /opt/local/lib64 /usr/gnu/lib64"
++loclibpth="$loclibpth /opt/gnu/lib64 /usr/GNU/lib64 /opt/GNU/lib64"
+ 
+ : general looking path for locating libraries
+-glibpth="/lib /usr/lib $xlibpth"
+-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
++glibpth="/lib64 /usr/lib64 $xlibpth"
++glibpth="$glibpth /usr/ccs/lib64 /usr/ucblib /usr/local/lib64"
+ test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
+ test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
+ 
+@@ -5945,8 +5945,8 @@ fi
+ : Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7.
+ case "$installstyle" in
+ '')	case "$prefix" in
+-		*perl*) dflt='lib';;
+-		*) dflt='lib/perl5' ;;
++		*perl*) dflt='lib64';;
++		*) dflt='lib64/perl5' ;;
+ 	esac
+ 	;;
+ *)	dflt="$installstyle" ;;
+@@ -5962,8 +5962,8 @@ installstyle=$dflt
+ : /opt/perl/lib/perl5... would be redundant.
+ : The default "style" setting is made in installstyle.U
+ case "$installstyle" in
+-*lib/perl5*) set dflt privlib lib/$package/$version ;;
+-*)	 set dflt privlib lib/$version ;;
++*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
++*)	 set dflt privlib lib64/$version ;;
+ esac
+ eval $prefixit
+ $cat <<EOM
+@@ -6465,8 +6465,8 @@ siteprefixexp="$ansexp"
+ prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ case "$sitelib" in
+ '') case "$installstyle" in
+-	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
+-	*)	 dflt=$siteprefix/lib/site_$prog/$version ;;
++	*lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
++	*)	 dflt=$siteprefix/lib64/site_$prog/$version ;;
+ 	esac
+ 	;;
+ *)	dflt="$sitelib"
+@@ -6592,8 +6592,8 @@ case "$vendorprefix" in
+ 	'')
+ 		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ 		case "$installstyle" in
+-		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
+-		*)	     dflt=$vendorprefix/lib/vendor_$prog/$version ;;
++		*lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
++		*)	     dflt=$vendorprefix/lib64/vendor_$prog/$version ;;
+ 		esac
+ 		;;
+ 	*)	dflt="$vendorlib"
+@@ -10550,9 +10550,9 @@ else
+ 		else
+ 			for net in net socket
+ 			do
+-				if test -f /usr/lib/lib$net$_a; then
+-					( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) ||  \
+-					$ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list
++				if test -f /usr/lib64/lib$net$_a; then
++					( ($nm $nm_opt /usr/lib64/lib$net$_a | eval $nm_extract) ||  \
++					$ar t /usr/lib64/lib$net$_a) 2>/dev/null >> libc.list
+ 					if $contains socket libc.list >/dev/null 2>&1; then
+ 						d_socket="$define"
+ 						socketlib="-l$net"

diff --git a/dev-lang/perl/files/perl-5.8.8-libnet-hostname.patch b/dev-lang/perl/files/perl-5.8.8-libnet-hostname.patch
new file mode 100644
index 0000000..60440e2
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-libnet-hostname.patch
@@ -0,0 +1,25 @@
+commit adeb94125ab7de8d20c129a905a5159972ad9fd1
+Author: Ricardo SIGNES <rjbs@××××.org>
+Date:   Mon Oct 22 05:01:09 2007 -0400
+
+    hostname.t busted
+    Message-ID: <20071022130109.GA16748@knight>
+    
+    p4raw-id: //depot/perl@32180
+
+diff --git a/lib/Net/t/hostname.t b/lib/Net/t/hostname.t
+index 758d304..4013d74 100644
+--- a/lib/Net/t/hostname.t
++++ b/lib/Net/t/hostname.t
+@@ -26,7 +26,10 @@ print "1..5\n";
+ $domain = domainname();
+ 
+ if(defined $domain && $domain ne "") {
+- print "ok 1\n";
++ print "ok 1 - defined, non-empty domainname\n";
++}
++elsif (not defined $domain) {
++ print "ok 1 # SKIP domain not fully defined\n";
+ }
+ else {
+  print "not ok 1\n";

diff --git a/dev-lang/perl/files/perl-5.8.8-links.patch b/dev-lang/perl/files/perl-5.8.8-links.patch
new file mode 100644
index 0000000..22e74b3
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-links.patch
@@ -0,0 +1,86 @@
+--- lib/CPAN/FirstTime.pm.orig	2006-02-06 07:50:13.000000000 -0500
++++ lib/CPAN/FirstTime.pm	2006-02-06 07:50:28.000000000 -0500
+@@ -292,7 +292,7 @@ by ENTER.
+     my(@path) = split /$Config{'path_sep'}/, $ENV{'PATH'};
+     local $^W = $old_warn;
+     my $progname;
+-    for $progname (qw/gzip tar unzip make lynx wget ncftpget ncftp ftp gpg/){
++    for $progname (qw/gzip tar unzip make links lynx wget ncftpget ncftp ftp gpg/){
+       if ($^O eq 'MacOS') {
+           $CPAN::Config->{$progname} = 'not_here';
+           next;
+--- lib/CPAN.pm.orig	2006-02-06 07:54:43.000000000 -0500
++++ lib/CPAN.pm	2006-02-06 07:52:59.000000000 -0500
+@@ -2604,7 +2604,7 @@ sub hosthard {
+ 
+ 	$self->debug("localizing funkyftpwise[$url]") if $CPAN::DEBUG;
+ 	my($f,$funkyftp);
+-	for $f ('lynx','ncftpget','ncftp','wget') {
++	for $f ('links','lynx','ncftpget','ncftp','wget') {
+ 	  next unless exists $CPAN::Config->{$f};
+ 	  $funkyftp = $CPAN::Config->{$f};
+ 	  next unless defined $funkyftp;
+@@ -2613,7 +2613,7 @@ sub hosthard {
+ 	  ($asl_ungz = $aslocal) =~ s/\.gz//;
+           $asl_gz = "$asl_ungz.gz";
+ 	  my($src_switch) = "";
+-	  if ($f eq "lynx"){
++	  if (($f eq "lynx")||($f eq "links")){
+ 	    $src_switch = " -source";
+ 	  } elsif ($f eq "ncftp"){
+ 	    $src_switch = " -c";
+@@ -2637,10 +2637,14 @@ Trying with "$funkyftp$src_switch" to ge
+ 	  my($wstatus);
+ 	  if (($wstatus = system($system)) == 0
+ 	      &&
+-	      ($f eq "lynx" ?
++	      (($f eq "lynx" ?
+ 	       -s $asl_ungz # lynx returns 0 when it fails somewhere
+ 	       : 1
+-	      )
++	      )||
++	      ($f eq "links" ?
++	       -s $asl_ungz # links returns 0 when it fails somewhere
++	       : 1
++	      ))
+ 	     ) {
+ 	    if (-s $aslocal) {
+ 	      # Looks good
+@@ -2695,7 +2699,7 @@ returned status $estatus (wstat $wstatus
+ });
+ 	  }
+           return if $CPAN::Signal;
+-	} # lynx,ncftpget,ncftp
++	} # links,lynx,ncftpget,ncftp
+     } # host
+ }
+ 
+@@ -6022,7 +6026,7 @@ stalled.
+ 
+ The CPAN module is designed to automate the make and install of perl
+ modules and extensions. It includes some primitive searching capabilities and
+-knows how to use Net::FTP or LWP (or lynx or an external ftp client)
++knows how to use Net::FTP or LWP (or lynx or links or an external ftp client)
+ to fetch the raw data from the net.
+ 
+ Modules are fetched from one or more of the mirrored CPAN
+@@ -6975,16 +6979,18 @@ or
+ 
+ =back
+ 
+-=head2 Configuring lynx or ncftp for going through a firewall
++=head2 Configuring links or lynx or ncftp for going through a firewall
+ 
+ If you can go through your firewall with e.g. lynx, presumably with a
+ command such as
+ 
+     /usr/local/bin/lynx -pscott:tiger
++    /usr/local/bin/links -pscott:tiger
+ 
+ then you would configure CPAN.pm with the command
+ 
+     o conf lynx "/usr/local/bin/lynx -pscott:tiger"
++    o conf links "/usr/local/bin/links -pscott:tiger"
+ 
+ That's all. Similarly for ncftp or ftp, you would configure something
+ like

diff --git a/dev-lang/perl/files/perl-5.8.8-makedepend-syntax.patch b/dev-lang/perl/files/perl-5.8.8-makedepend-syntax.patch
new file mode 100644
index 0000000..147d499
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-makedepend-syntax.patch
@@ -0,0 +1,11 @@
+--- perl-5.8.8/makedepend.SH
++++ perl-5.8.8/makedepend.SH
+@@ -128,7 +128,7 @@
+     *.y) filebase=`basename $file .y` ;;
+     esac
+     case "$file" in
+-    */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;;
++    */*) finc="-I`echo $file | sed 's#/[^/]*$##'`" ;;
+     *)   finc= ;;
+     esac
+     $echo "Finding dependencies for $filebase$_o."

diff --git a/dev-lang/perl/files/perl-5.8.8-perlcc.patch b/dev-lang/perl/files/perl-5.8.8-perlcc.patch
new file mode 100644
index 0000000..5c4b778
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-perlcc.patch
@@ -0,0 +1,11 @@
+--- perl-5.8.8/ext/B/B/C.pm.orig	2007-06-07 21:12:04.000000000 +0300
++++ perl-5.8.8/ext/B/B/C.pm	2007-06-07 21:12:21.000000000 +0300
+@@ -647,7 +647,7 @@
+     return $sym if defined $sym;
+     my $val= $sv->NVX;
+     $val .= '.00' if $val =~ /^-?\d+$/;
+-    $xpvnvsect->add(sprintf("0, 0, 0, %d, %s", $sv->IVX, $val));
++    $xpvnvsect->add(sprintf("0, 0, 0, %d, %s", $sv->NVX, $val));
+     $svsect->add(sprintf("&xpvnv_list[%d], %lu, 0x%x",
+ 			 $xpvnvsect->index, $sv->REFCNT , $sv->FLAGS));
+     return savesym($sv, sprintf("&sv_list[%d]", $svsect->index));

diff --git a/dev-lang/perl/files/perl-5.8.8-reorder-INC.patch b/dev-lang/perl/files/perl-5.8.8-reorder-INC.patch
new file mode 100644
index 0000000..11c5692
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-reorder-INC.patch
@@ -0,0 +1,93 @@
+--- perl.c.orig	2006-01-24 09:57:33.000000000 -0500
++++ perl.c	2006-01-24 10:03:15.000000000 -0500
+@@ -4777,9 +4777,9 @@ S_init_perllib(pTHX)
+     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+ #endif
+ 
+-#ifdef ARCHLIB_EXP
+-    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
+-#endif
++    /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */
++    incpush("/etc/perl", FALSE, FALSE, TRUE);
++
+ #ifdef MACOS_TRADITIONAL
+     {
+ 	Stat_t tmpstatbuf;
+@@ -4806,51 +4806,58 @@ S_init_perllib(pTHX)
+ #endif
+ #if defined(WIN32)
+     incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
+-#else
+-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
+ #endif
+ 
+-#ifdef SITEARCH_EXP
+-    /* sitearch is always relative to sitelib on Windows for
++#ifdef PERL_VENDORARCH_EXP
++    /* vendorarch is always relative to vendorlib on Windows for
+      * DLL-based path intuition to work correctly */
+ #  if !defined(WIN32)
+-    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
++    incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE);
+ #  endif
+ #endif
+ 
+-#ifdef SITELIB_EXP
++#ifdef PERL_VENDORLIB_EXP
+ #  if defined(WIN32)
+-    /* this picks up sitearch as well */
+-    incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
++    incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE);	/* this picks up vendorarch as well */
+ #  else
+-    incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
++    incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE);
+ #  endif
+ #endif
+ 
+-#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
+-    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
++#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
++    incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
+ #endif
+ 
+-#ifdef PERL_VENDORARCH_EXP
+-    /* vendorarch is always relative to vendorlib on Windows for
++#ifdef SITEARCH_EXP
++    /* sitearch is always relative to sitelib on Windows for
+      * DLL-based path intuition to work correctly */
+ #  if !defined(WIN32)
+-    incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE);
++    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
+ #  endif
+ #endif
+ 
+-#ifdef PERL_VENDORLIB_EXP
++#ifdef SITELIB_EXP
+ #  if defined(WIN32)
+-    incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE);	/* this picks up vendorarch as well */
++    /* this picks up sitearch as well */
++    incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
+ #  else
+-    incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE);
++    incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
+ #  endif
+ #endif
+ 
+-#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
+-    incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
++#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
++    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
+ #endif
+ 
++    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
++    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
++
++    /* Non-versioned site directory for local modules and for
++       compatability with the previous packages' site dirs */
++
++    incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE);
++
++
+ #ifdef PERL_OTHERLIBDIRS
+     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
+ #endif

diff --git a/dev-lang/perl/files/perl-5.8.8-solaris-relocation.patch b/dev-lang/perl/files/perl-5.8.8-solaris-relocation.patch
new file mode 100644
index 0000000..f2df825
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-solaris-relocation.patch
@@ -0,0 +1,21 @@
+http://sourceware.org/ml/binutils/2005-12/msg00008.html
+--- hints/solaris_2.sh
++++ hints/solaris_2.sh
+@@ -289,7 +289,7 @@
+ 
+ END
+ 		ccdlflags="$ccdlflags -Wl,-E"
+-		lddlflags="$lddlflags -Wl,-E -G"
++		lddlflags="$lddlflags -shared"
+ 	    fi
+ 	fi
+ 
+@@ -555,7 +555,7 @@
+ 		    : #ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+ 		fi
+ 		ldflags="$ldflags -m64"
+-		lddlflags="$lddlflags -G -m64"
++		lddlflags="$lddlflags -m64"
+ 		;;
+ 	    *)
+ 		ccflags="$ccflags `getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"

diff --git a/dev-lang/perl/files/perl-5.8.8-solaris11.patch b/dev-lang/perl/files/perl-5.8.8-solaris11.patch
new file mode 100644
index 0000000..6ba72e0
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-solaris11.patch
@@ -0,0 +1,14 @@
+Thanks to the nice OpenSolaris guys, I finally figured out that on
+OpenSolaris 11, the header dependencies have changed.
+
+--- perl.h
++++ perl.h
+@@ -1192,6 +1192,8 @@
+  */
+ 
+ #if defined(I_SYSMODE) && !defined(PERL_MICRO)
++#include <sys/stat.h>
++#include <sys/vnode.h>
+ #include <sys/mode.h>
+ #endif
+ 

diff --git a/dev-lang/perl/files/perl-5.8.8-usr-local.patch b/dev-lang/perl/files/perl-5.8.8-usr-local.patch
new file mode 100644
index 0000000..c44b786
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-usr-local.patch
@@ -0,0 +1,25 @@
+# remove /usr/local paths from all stuff thats used
+# in Configure script, locincpth, loclibpth and glibpth are sedded
+# afterwards not to conflict with the lib32 and lib64 patches
+
+diff -rubB perl-5.8.8.orig/Configure perl-5.8.8/Configure
+--- perl-5.8.8.orig/Configure	Tue Jan 15 10:41:29 2008
++++ perl-5.8.8/Configure	Tue Jan 15 10:44:59 2008
+@@ -4424,7 +4422,7 @@
+ : Set private lib path
+ case "$plibpth" in
+ '') if ./mips; then
+-		plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
++		plibpth="$incpath/usr/lib /usr/ccs/lib"
+ 	fi;;
+ esac
+ case "$libpth" in
+@@ -19144,7 +19142,7 @@
+ 	case "$ranlib" in
+ 	:) ranlib='';;
+ 	'')
+-		ranlib=`./loc ranlib X /usr/bin /bin /usr/local/bin`
++		ranlib=`./loc ranlib X /usr/bin /bin`
+ 		$test -f $ranlib || ranlib=''
+ 		;;
+ 	esac

diff --git a/dev-lang/perl/files/perl-5.8.8-utf8-boundary.patch b/dev-lang/perl/files/perl-5.8.8-utf8-boundary.patch
new file mode 100644
index 0000000..d0efa3f
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-utf8-boundary.patch
@@ -0,0 +1,57 @@
+--- regcomp.c	2006-01-08 12:59:27.000000000 -0800
++++ regcomp.c	2007-10-05 12:07:55.000000000 -0700
+@@ -135,7 +135,8 @@
+     I32		extralen;
+     I32		seen_zerolen;
+     I32		seen_evals;
+-    I32		utf8;
++    I32		utf8;			/* pattern is utf8 or not */
++    I32		orig_utf8;		/* pattern was originally utf8 */
+ #if ADD_TO_REGEXEC
+     char 	*starttry;		/* -Dr: where regtry was called. */
+ #define RExC_starttry	(pRExC_state->starttry)
+@@ -161,6 +162,7 @@
+ #define RExC_seen_zerolen	(pRExC_state->seen_zerolen)
+ #define RExC_seen_evals	(pRExC_state->seen_evals)
+ #define RExC_utf8	(pRExC_state->utf8)
++#define RExC_orig_utf8	(pRExC_state->orig_utf8)
+ 
+ #define	ISMULT1(c)	((c) == '*' || (c) == '+' || (c) == '?')
+ #define	ISMULT2(s)	((*s) == '*' || (*s) == '+' || (*s) == '?' || \
+@@ -1749,15 +1751,17 @@
+     if (exp == NULL)
+ 	FAIL("NULL regexp argument");
+ 
+-    RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8;
++    RExC_orig_utf8 = RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8;
+ 
+-    RExC_precomp = exp;
+     DEBUG_r({
+ 	 if (!PL_colorset) reginitcolors();
+ 	 PerlIO_printf(Perl_debug_log, "%sCompiling REx%s `%s%*s%s'\n",
+ 		       PL_colors[4],PL_colors[5],PL_colors[0],
+-		       (int)(xend - exp), RExC_precomp, PL_colors[1]);
++		       (int)(xend - exp), exp, PL_colors[1]);
+     });
++
++redo_first_pass:
++    RExC_precomp = exp;
+     RExC_flags = pm->op_pmflags;
+     RExC_sawback = 0;
+ 
+@@ -1783,6 +1787,17 @@
+ 	RExC_precomp = Nullch;
+ 	return(NULL);
+     }
++    if (RExC_utf8 && !RExC_orig_utf8) {
++        STRLEN len = xend-exp;
++        DEBUG_r(PerlIO_printf(Perl_debug_log,
++                    "UTF8 mismatch! Converting to utf8 for resizing and compile\n"));
++        exp = (char*)Perl_bytes_to_utf8(aTHX_ (U8*)exp, &len);
++        xend = exp + len;
++        RExC_orig_utf8 = RExC_utf8;
++        SAVEFREEPV(exp);
++        goto redo_first_pass;
++    }
++
+

diff --git a/dev-lang/perl/files/perl-fix_h2ph_include_quote.patch b/dev-lang/perl/files/perl-fix_h2ph_include_quote.patch
new file mode 100644
index 0000000..a71fbe6
--- /dev/null
+++ b/dev-lang/perl/files/perl-fix_h2ph_include_quote.patch
@@ -0,0 +1,61 @@
+Subject: Fix h2ph with double-quote-delimited #include directives.
+
+Allow the quote mark delimiter also for those #include directives chased with "h2ph -a".
+
+Debian bug #479762.
+
+Also add the directory prefix of the current file when the quote syntax is
+used; 'require' will only look in @INC, not the current directory.
+
+Upstream change 33835.
+--- a/utils/h2ph.PL
++++ b/utils/h2ph.PL
+@@ -85,7 +85,7 @@ sub reindent($) {
+ }
+ 
+ my ($t, $tab, %curargs, $new, $eval_index, $dir, $name, $args, $outfile);
+-my ($incl, $incl_type, $next);
++my ($incl, $incl_type, $incl_quote, $next);
+ while (defined (my $file = next_file())) {
+     if (-l $file and -d $file) {
+         link_if_possible($file) if ($opt_l);
+@@ -186,9 +186,10 @@ while (defined (my $file = next_file())) {
+                       print OUT $t,"unless(defined(\&$name)) {\n    sub $name () {\t",$new,";}\n}\n";
+ 		    }
+ 		}
+-	    } elsif (/^(include|import|include_next)\s*[<\"](.*)[>\"]/) {
++	    } elsif (/^(include|import|include_next)\s*([<\"])(.*)[>\"]/) {
+                 $incl_type = $1;
+-                $incl = $2;
++                $incl_quote = $2;
++                $incl = $3;
+                 if (($incl_type eq 'include_next') ||
+                     ($opt_e && exists($bad_file{$incl}))) {
+                     $incl =~ s/\.h$/.ph/;
+@@ -221,6 +222,10 @@ while (defined (my $file = next_file())) {
+ 			   "warn(\$\@) if \$\@;\n");
+                 } else {
+                     $incl =~ s/\.h$/.ph/;
++                    # copy the prefix in the quote syntax (#include "x.h") case
++                    if ($incl !~ m|/| && $incl_quote eq q{"} && $file =~ m|^(.*)/|) {
++                        $incl = "$1/$incl";
++                    }
+ 		    print OUT $t,"require '$incl';\n";
+                 }
+ 	    } elsif (/^ifdef\s+(\w+)/) {
+@@ -724,8 +729,13 @@ sub queue_includes_from
+                 $line .= <HEADER>;
+             }
+ 
+-            if ($line =~ /^#\s*include\s+<(.*?)>/) {
+-                push(@ARGV, $1) unless $Is_converted{$1};
++            if ($line =~ /^#\s*include\s+([<"])(.*?)[>"]/) {
++                my ($delimiter, $new_file) = ($1, $2);
++                # copy the prefix in the quote syntax (#include "x.h") case
++                if ($delimiter eq q{"} && $file =~ m|^(.*)/|) {
++                    $new_file = "$1/$new_file";
++                }
++                push(@ARGV, $new_file) unless $Is_converted{$new_file};
+             }
+         }
+     close HEADER;

diff --git a/dev-lang/perl/files/perl-h2ph-ansi-header.patch b/dev-lang/perl/files/perl-h2ph-ansi-header.patch
new file mode 100644
index 0000000..c7f0d72
--- /dev/null
+++ b/dev-lang/perl/files/perl-h2ph-ansi-header.patch
@@ -0,0 +1,11 @@
+--- perl-5.8.0-RC2/utils/h2ph_patched.pix	2002-06-24 12:52:31.000000000 +0200
++++ perl-5.8.0-RC2/utils/h2ph_patched	2002-06-24 12:54:32.000000000 +0200
+@@ -39,6 +39,8 @@
+ my ($t, $tab, %curargs, $new, $eval_index, $dir, $name, $args, $outfile);
+ my ($incl, $next);
+ while (defined (my $file = next_file())) {
++    next if $file eq 'machine/ansi.h';
++
+     if (-l $file and -d $file) {
+         link_if_possible($file) if ($opt_l);
+         next;

diff --git a/dev-lang/perl/files/perl-hppa-pa7200-configure.patch b/dev-lang/perl/files/perl-hppa-pa7200-configure.patch
new file mode 100644
index 0000000..396209a
--- /dev/null
+++ b/dev-lang/perl/files/perl-hppa-pa7200-configure.patch
@@ -0,0 +1,11 @@
+--- Configure.orig	2006-06-02 13:14:22.000000000 -0500
++++ Configure	2006-06-02 13:07:03.000000000 -0500
+@@ -2967,7 +2967,7 @@
+ : Try to determine whether config.sh was made on this system
+ case "$config_sh" in
+ '')
+-myuname=`$uname -a 2>/dev/null`
++myuname=`$uname -a | $sed -e "s/'//" 2>/dev/null`
+ $test -z "$myuname" && myuname=`hostname 2>/dev/null`
+ # tr '[A-Z]' '[a-z]' would not work in EBCDIC
+ # because the A-Z/a-z are not consecutive.

diff --git a/dev-lang/perl/files/perl-noksh.patch b/dev-lang/perl/files/perl-noksh.patch
new file mode 100644
index 0000000..4c33b3e
--- /dev/null
+++ b/dev-lang/perl/files/perl-noksh.patch
@@ -0,0 +1,16 @@
+diff -burN perl-5.8.4.orig/Configure perl-5.8.4/Configure
+--- perl-5.8.4.orig/Configure	2004-04-01 05:48:18.000000000 -0800
++++ perl-5.8.4/Configure	2004-06-09 12:02:54.694172368 -0700
+@@ -164,6 +164,12 @@
+ 	;;
+ esac
+ 
++# 2004.06.09 rac
++# having $newsh persist as ksh here is bad news if ksh doesn't really
++# exist. this causes us to toss away a perfectly good working test in
++# bash in favour of more exotic external options. see bug 42665.
++test -x "${newsh}" || unset newsh
++
+ : if needed set CDPATH to a harmless value that is not chatty
+ : avoid bash 2.02 problems with empty CDPATH.
+ case "$CDPATH" in

diff --git a/dev-lang/perl/files/perl-perldoc-emptydirs.patch b/dev-lang/perl/files/perl-perldoc-emptydirs.patch
new file mode 100644
index 0000000..650248c
--- /dev/null
+++ b/dev-lang/perl/files/perl-perldoc-emptydirs.patch
@@ -0,0 +1,10 @@
+--- lib/Pod/Perldoc.pm.orig	2003-10-22 13:02:15.000000000 -0700
++++ lib/Pod/Perldoc.pm	2003-10-22 13:02:36.000000000 -0700
+@@ -1513,6 +1513,7 @@
+     $self->{'target'} = (splitdir $s)[-1];  # XXX: why not use File::Basename?
+     for ($i=0; $i<@dirs; $i++) {
+ 	$dir = $dirs[$i];
++	next unless -d $dir;
+ 	($dir = VMS::Filespec::unixpath($dir)) =~ s!/\z!! if IS_VMS;
+ 	if (       (! $self->opt_m && ( $ret = $self->check_file($dir,"$s.pod")))
+ 		or ( $ret = $self->check_file($dir,"$s.pm"))

diff --git a/dev-lang/perl/files/perl-picdl.patch b/dev-lang/perl/files/perl-picdl.patch
new file mode 100644
index 0000000..f69a680
--- /dev/null
+++ b/dev-lang/perl/files/perl-picdl.patch
@@ -0,0 +1,13 @@
+--- Makefile.SH.orig	2003-11-29 01:16:15.000000000 -0800
++++ Makefile.SH	2003-11-29 01:16:52.000000000 -0800
+@@ -129,8 +129,8 @@
+ 
+ 	;;
+ 
+-*)	pldlflags=''
+-	static_target='static'
++*)	pldlflags="$cccdlflags"
++	static_target='static_pic'
+ 	;;
+ esac
+ 

diff --git a/dev-lang/perl/files/perl-prelink-lpthread.patch b/dev-lang/perl/files/perl-prelink-lpthread.patch
new file mode 100644
index 0000000..d38497e
--- /dev/null
+++ b/dev-lang/perl/files/perl-prelink-lpthread.patch
@@ -0,0 +1,11 @@
+--- hints/linux.sh.orig	2003-02-14 18:11:50.000000000 -0800
++++ hints/linux.sh	2003-02-14 18:12:01.000000000 -0800
+@@ -43,7 +43,7 @@
+ # 'kaffe' has a /usr/lib/libnet.so which is not at all relevent for perl.
+ set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /'`
+ shift
+-libswanted="$*"
++libswanted="pthread $*"
+ 
+ # If you have glibc, then report the version for ./myconfig bug reporting.
+ # (Configure doesn't need to know the specific version since it just uses

diff --git a/dev-lang/perl/files/perl-regexp-nossp.patch b/dev-lang/perl/files/perl-regexp-nossp.patch
new file mode 100644
index 0000000..d0357cd
--- /dev/null
+++ b/dev-lang/perl/files/perl-regexp-nossp.patch
@@ -0,0 +1,11 @@
+--- cflags.SH.orig	2005-07-03 23:39:10.000000000 -0400
++++ cflags.SH	2005-07-03 23:39:47.000000000 -0400
+@@ -165,6 +165,8 @@
+ esac
+ 
+     : Can we perhaps use $ansi2knr here
++    [ "x$file" = xregcomp ] && export ccflags="${ccflags} -fno-stack-protector"
++    [ "x$file" = xregexec ] && export ccflags="${ccflags} -fno-stack-protector"
+     echo "$cc -c -DPERL_CORE $ccflags $optimize $warn"
+     eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"'
+ 

diff --git a/dev-lang/perl/perl-5.10.1.ebuild b/dev-lang/perl/perl-5.10.1.ebuild
new file mode 100644
index 0000000..e15f96c
--- /dev/null
+++ b/dev-lang/perl/perl-5.10.1.ebuild
@@ -0,0 +1,610 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.10.1.ebuild,v 1.23 2012/01/02 22:52:21 zmedico Exp $
+
+EAPI=2
+
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib
+
+PATCH_VER=9
+
+PERL_OLDVERSEN="5.10.0"
+
+SHORT_PV="${PV%.*}"
+MY_P="perl-${PV/_rc/-RC}"
+MY_PV="${PV%_rc*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://cpan/src/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~tove/files/${MY_P}-${PATCH_VER}.tar.bz2"
+HOMEPAGE="http://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="berkdb build debug doc gdbm ithreads"
+
+COMMON_DEPEND="berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	>=sys-devel/libperl-5.10.1
+	!!<sys-devel/libperl-5.10.1
+	app-arch/bzip2
+	sys-libs/zlib"
+DEPEND="${COMMON_DEPEND}
+	elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs )"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND=">=app-admin/perl-cleaner-2_pre090920"
+
+dual_scripts() {
+	src_remove_dual_scripts perl-core/Archive-Tar        1.52    ptar ptardiff
+	src_remove_dual_scripts perl-core/Digest-SHA         5.47    shasum
+	src_remove_dual_scripts perl-core/CPAN               1.9402  cpan
+	src_remove_dual_scripts perl-core/CPANPLUS           0.88    cpanp cpan2dist cpanp-run-perl
+	src_remove_dual_scripts perl-core/Encode             2.35    enc2xs piconv
+	src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.55_02 instmodsh
+	src_remove_dual_scripts perl-core/Module-Build       0.34_02 config_data
+	src_remove_dual_scripts perl-core/Module-CoreList    2.18    corelist
+	src_remove_dual_scripts perl-core/PodParser          1.37    pod2usage podchecker podselect
+	src_remove_dual_scripts perl-core/Test-Harness       3.17    prove
+	src_remove_dual_scripts perl-core/podlators          2.2.2   pod2man pod2text
+}
+
+pkg_setup() {
+	LIBPERL="libperl$(get_libname ${MY_PV})"
+
+	if use ithreads ; then
+		ewarn "THREADS WARNING:"
+		ewarn "PLEASE NOTE: You are compiling ${MY_P} with"
+		ewarn "interpreter-level threading enabled."
+		ewarn "Threading is not supported by all applications "
+		ewarn "that compile against perl. You use threading at "
+		ewarn "your own discretion. "
+		echo
+	fi
+	if has_version "~dev-lang/perl-5.8.8" ; then
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl you must reinstall"
+		ewarn "the installed perl modules."
+		ewarn "Use: perl-cleaner --all"
+	elif has_version dev-lang/perl ; then
+		# doesnot work
+		#if ! has_version dev-lang/perl[ithreads=,debug=] ; then
+		#if ! has_version dev-lang/perl[ithreads=] || ! has_version dev-lang/perl[debug=] ; then
+		if (   use ithreads && ! has_version dev-lang/perl[ithreads]   ) || \
+		   ( ! use ithreads &&   has_version dev-lang/perl[ithreads]   ) || \
+		   (   use debug    && ! has_version dev-lang/perl[debug]      ) || \
+		   ( ! use debug    &&   has_version dev-lang/perl[debug]      ) ; then
+			ewarn "TOGGLED USE-FLAGS WARNING:"
+			ewarn "You changed one of the use-flags ithreads or debug."
+			ewarn "You must rebuild all perl-modules installed."
+			ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+		fi
+	fi
+	dual_scripts
+}
+
+src_prepare() {
+	EPATCH_SOURCE="${WORKDIR}/perl-patch" \
+	EPATCH_SUFFIX="diff" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	# pod/perltoc.pod fails
+	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV})
+	ln -s ${LIBPERL} libperl$(get_libname )
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+src_configure() {
+	declare -a myconf
+
+	# some arches and -O do not mix :)
+	use ppc && replace-flags -O? -O1
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+	# Fixes bug #97645
+	use ppc && filter-flags "-mpowerpc-gpopt"
+	# Fixes bug #143895 on gcc-4.1.1
+	filter-flags "-fsched2-use-superblocks"
+
+	# this is needed because gcc 3.3-compiled kernels will hang
+	# the machine trying to run this test - check with `Kumba
+	# <rac@g.o> 2003.06.26
+	use mips && myconf -Dd_u32align
+
+	use sparc && myconf -Ud_longdbl
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# 266337
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=/usr/include
+	export BZIP2_LIB=/usr/$(get_libdir)
+	cat <<-EOF > "${S}/ext/Compress-Raw-Zlib/config.in"
+		BUILD_ZLIB = False
+		INCLUDE = /usr/include
+		LIB = /usr/$(get_libdir)
+
+		OLD_ZLIB = False
+		GZIP_OS_CODE = AUTO_DETECT
+	EOF
+
+	case ${CHOST} in
+		*-freebsd*)   osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*)    osname="netbsd" ;;
+		*-openbsd*)   osname="openbsd" ;;
+		*-darwin*)    osname="darwin" ;;
+		*)            osname="linux" ;;
+	esac
+
+	if use ithreads ; then
+		mythreading="-multi"
+		myconf -Dusethreads
+		myarch=${CHOST}
+		myarch="${myarch%%-*}-${osname}-thread"
+	else
+		myarch=${CHOST}
+		myarch="${myarch%%-*}-${osname}"
+	fi
+	if use debug ; then
+		myarch="${myarch}-debug"
+	fi
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+
+	if use gdbm ; then
+		mygdbm='D'
+		myndbm='D'
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	if use debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	fi
+
+	local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v} ${v}/${myarch}${mythreading}"; done )
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	if [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	sh Configure \
+		-des \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Doptimize="${CFLAGS}" \
+		-Dscriptdir=/usr/bin \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefix='/usr' \
+		-Dprivlib="/usr/$(get_libdir)/perl5/${MY_PV}" \
+		-Darchlib="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}" \
+		-Dvendorlib="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}" \
+		-Dvendorarch="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}/${myarch}${mythreading}" \
+		-Dsitelib="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}" \
+		-Dsitearch="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}" \
+		-Dman1dir=/usr/share/man/man1 \
+		-Dman3dir=/usr/share/man/man3 \
+		-Dinstallman1dir=/usr/share/man/man1 \
+		-Dinstallman3dir=/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth=' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dinc_version_list="$inclist" \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Dinstallusrbinperl='n' \
+		-Ud_csh \
+		-Uusenm \
+		"${myconf[@]}" || die "Unable to configure"
+}
+
+src_test() {
+#	use elibc_uclibc && export MAKEOPTS="${MAKEOPTS} -j1"
+#	TEST_JOBS=$(echo -j1 ${MAKEOPTS} | sed -r 's/.*(-j[[:space:]]*|--jobs=)([[:digit:]]+).*/\2/' ) \
+		make test_harness || die "test failed"
+}
+
+src_install() {
+	export LC_ALL="C"
+	local i
+	local coredir="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}/CORE"
+
+	# Fix for "stupid" modules and programs
+	dodir /usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}
+
+	local installtarget=install
+	if use build ; then
+		installtarget=install.perl
+	fi
+	make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}"
+
+	rm -f "${D}"/usr/bin/perl
+	ln -s perl${MY_PV} "${D}"/usr/bin/perl
+
+	dolib.so "${D}"/${coredir}/${LIBPERL} || die
+	dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+	dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname) || die
+	rm -f "${D}"/${coredir}/${LIBPERL}
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${SHORT_PV})
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
+
+	rm -rf "${D}"/usr/share/man/man3 || die "Unable to remove module man pages"
+#	cp -f utils/h2ph utils/h2ph_patched
+#	epatch "${FILESDIR}"/${PN}-h2ph-ansi-header.patch
+#
+#	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
+#		-a -d "${D}"/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading} <<EOF
+#asm/termios.h
+#syscall.h
+#syslimits.h
+#syslog.h
+#sys/ioctl.h
+#sys/socket.h
+#sys/time.h
+#wait.h
+#EOF
+
+# vvv still needed?
+#	# This is to fix a missing c flag for backwards compat
+#	for i in $(find "${D}"/usr/$(get_libdir)/perl5 -iname "Config.pm" ) ; do
+#		sed -i \
+#			-e "s:ccflags=':ccflags='-DPERL5 :" \
+#			-e "s:cppflags=':cppflags='-DPERL5 :" \
+#			"${i}" || die "Sed failed"
+#	done
+
+	# A poor fix for the miniperl issues
+	dosed 's:./miniperl:/usr/bin/perl:' /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+	fperms 0444 /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
+	fperms 0755 /usr/bin/xsubpp
+
+	# This removes ${D} from Config.pm and .packlist
+	for i in $(find "${D}" -iname "Config.pm" -o -iname ".packlist" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	# Note: find out from psm why we would need/want this.
+	# ( use berkdb && has_version '=sys-libs/db-1*' ) ||
+	#	find "${D}" -name "*NDBM*" | xargs rm -f
+
+	dodoc Changes* README AUTHORS || die
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${D}/usr/share/doc/${PF}/html" \
+			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
+	fi
+
+	dual_scripts
+
+	if use build ; then
+		src_remove_extra_files
+	fi
+}
+
+pkg_postinst() {
+	local INC DIR file
+
+	dual_scripts
+
+	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }')
+	if [[ "${ROOT}" = "/" ]] ; then
+		ebegin "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${ROOT}/${DIR}" ]] ; then
+				for file in $(find "${ROOT}/${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${ROOT}/${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${ROOT}/${DIR}" ]] ; then
+				find "${ROOT}/${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+		ebegin "Generating ConfigLocal.pm (ignore any error)"
+		enc2xs -C
+		ebegin "Converting C header files to the corresponding Perl format"
+		cd /usr/include
+		h2ph -Q *
+		h2ph -Q -r sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/*
+	fi
+
+# This has been moved into a function because rumor has it that a future release
+# of portage will allow us to check what version was just removed - which means
+# we will be able to invoke this only as needed :)
+	# Tried doing this via  -z, but $INC is too big...
+	if [[ "${INC}x" != "x" ]]; then
+		cleaner_msg
+		epause 5
+	fi
+}
+
+pkg_postrm(){
+	${IS_PERL} && dual_scripts
+}
+
+cleaner_msg() {
+	eerror "You have had multiple versions of perl. It is recommended"
+	eerror "that you run perl-cleaner now. perl-cleaner will"
+	eerror "assist with this transition. This script is capable"
+	eerror "of cleaning out old .ph files, rebuilding modules for "
+	eerror "your new version of perl, as well as re-emerging"
+	eerror "applications that compiled against your old libperl$(get_libname)"
+	eerror
+	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
+	eerror "Part of the rebuilding of applications compiled against "
+	eerror "your old libperl involves temporarily unmerging"
+	eerror "them - interruptions could leave you with unmerged"
+	eerror "packages before they can be remerged."
+	eerror ""
+	eerror "If you have run perl-cleaner and a package still gives"
+	eerror "you trouble, and re-emerging it fails to correct"
+	eerror "the problem, please check http://bugs.gentoo.org/"
+	eerror "for more information or to report a bug."
+	eerror ""
+}
+
+src_remove_dual_scripts() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ;then
+		for i in "$@" ; do
+			ff=`echo ${ROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*`
+			ff=${ff##*.1}
+			alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
+			alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
+		done
+	elif has "${EBUILD_PHASE:-none}" "setup" ; then
+		for i in "$@" ; do
+			if [[ -f ${ROOT}/usr/bin/${i} && ! -h ${ROOT}/usr/bin/${i} ]] ; then
+				has_version ${pkg} && ewarn "You must reinstall $pkg !"
+				break
+			fi
+		done
+	else
+		for i in "$@" ; do
+			mv "${D}"/usr/bin/${i}{,-${ver}-${P}} || die
+			mv "${D}"/usr/share/man/man1/${i}{.1,-${ver}-${P}.1} || \
+				echo "/usr/share/man/man1/${i}.1 does not exist!"
+		done
+	fi
+}
+
+src_remove_extra_files() {
+	local prefix="./usr" # ./ is important
+	local bindir="${prefix}/bin"
+	local libdir="${prefix}/$(get_libdir)"
+	local perlroot="${libdir}/perl5" # perl installs per-arch dirs
+	local prV="${perlroot}/${MY_PV}"
+	local prVA="${prV}/${myarch}${mythreading}"
+
+	# I made this list from the Mandr*, Debian and ex-Connectiva perl-base list
+	# Then, I added several files to get GNU autotools running
+	# FIXME: should this be in a separated file to be sourced?
+	local MINIMAL_PERL_INSTALL="
+	${bindir}/h2ph
+	${bindir}/perl
+	${bindir}/perl${MY_PV}
+	${bindir}/pod2man
+	${libdir}/${LIBPERL}
+	${libdir}/libperl$(get_libname)
+	${libdir}/libperl$(get_libname ${SHORT_PV})
+	${prV}/attributes.pm
+	${prV}/AutoLoader.pm
+	${prV}/autouse.pm
+	${prV}/base.pm
+	${prV}/bigint.pm
+	${prV}/bignum.pm
+	${prV}/bigrat.pm
+	${prV}/blib.pm
+	${prV}/bytes_heavy.pl
+	${prV}/bytes.pm
+	${prV}/Carp/Heavy.pm
+	${prV}/Carp.pm
+	${prV}/charnames.pm
+	${prV}/Class/Struct.pm
+	${prV}/constant.pm
+	${prV}/diagnostics.pm
+	${prV}/DirHandle.pm
+	${prV}/Exporter/Heavy.pm
+	${prV}/Exporter.pm
+	${prV}/ExtUtils/Command.pm
+	${prV}/ExtUtils/Constant.pm
+	${prV}/ExtUtils/Embed.pm
+	${prV}/ExtUtils/Installed.pm
+	${prV}/ExtUtils/Install.pm
+	${prV}/ExtUtils/Liblist.pm
+	${prV}/ExtUtils/MakeMaker.pm
+	${prV}/ExtUtils/Manifest.pm
+	${prV}/ExtUtils/Mkbootstrap.pm
+	${prV}/ExtUtils/Mksymlists.pm
+	${prV}/ExtUtils/MM_Any.pm
+	${prV}/ExtUtils/MM_MacOS.pm
+	${prV}/ExtUtils/MM.pm
+	${prV}/ExtUtils/MM_Unix.pm
+	${prV}/ExtUtils/MY.pm
+	${prV}/ExtUtils/Packlist.pm
+	${prV}/ExtUtils/testlib.pm
+	${prV}/ExtUtils/Miniperl.pm
+	${prV}/ExtUtils/Command/MM.pm
+	${prV}/ExtUtils/Constant/Base.pm
+	${prV}/ExtUtils/Constant/Utils.pm
+	${prV}/ExtUtils/Constant/XS.pm
+	${prV}/ExtUtils/Liblist/Kid.pm
+	${prV}/ExtUtils/MakeMaker/bytes.pm
+	${prV}/ExtUtils/MakeMaker/vmsish.pm
+	${prV}/fields.pm
+	${prV}/File/Basename.pm
+	${prV}/File/Compare.pm
+	${prV}/File/Copy.pm
+	${prV}/File/Find.pm
+	${prV}/FileHandle.pm
+	${prV}/File/Path.pm
+	${prV}/File/Spec.pm
+	${prV}/File/Spec/Unix.pm
+	${prV}/File/stat.pm
+	${prV}/filetest.pm
+	${prVA}/attrs.pm
+	${prVA}/auto/attrs
+	${prVA}/auto/Cwd/Cwd$(get_libname)
+	${prVA}/auto/Data/Dumper/Dumper$(get_libname)
+	${prVA}/auto/DynaLoader/dl_findfile.al
+	${prVA}/auto/Fcntl/Fcntl$(get_libname)
+	${prVA}/auto/File/Glob/Glob$(get_libname)
+	${prVA}/auto/IO/IO$(get_libname)
+	${prVA}/auto/POSIX/autosplit.ix
+	${prVA}/auto/POSIX/fstat.al
+	${prVA}/auto/POSIX/load_imports.al
+	${prVA}/auto/POSIX/POSIX.bs
+	${prVA}/auto/POSIX/POSIX$(get_libname)
+	${prVA}/auto/POSIX/stat.al
+	${prVA}/auto/POSIX/tmpfile.al
+	${prVA}/auto/re/re$(get_libname)
+	${prVA}/auto/Socket/Socket$(get_libname)
+	${prVA}/auto/Storable/autosplit.ix
+	${prVA}/auto/Storable/_retrieve.al
+	${prVA}/auto/Storable/retrieve.al
+	${prVA}/auto/Storable/Storable$(get_libname)
+	${prVA}/auto/Storable/_store.al
+	${prVA}/auto/Storable/store.al
+	${prVA}/B/Deparse.pm
+	${prVA}/B.pm
+	${prVA}/Config.pm
+	${prVA}/Config_heavy.pl
+	${prVA}/CORE/libperl$(get_libname)
+	${prVA}/Cwd.pm
+	${prVA}/Data/Dumper.pm
+	${prVA}/DynaLoader.pm
+	${prVA}/encoding.pm
+	${prVA}/Errno.pm
+	${prVA}/Fcntl.pm
+	${prVA}/File/Glob.pm
+	${prVA}/_h2ph_pre.ph
+	${prVA}/IO/File.pm
+	${prVA}/IO/Handle.pm
+	${prVA}/IO/Pipe.pm
+	${prVA}/IO.pm
+	${prVA}/IO/Seekable.pm
+	${prVA}/IO/Select.pm
+	${prVA}/IO/Socket.pm
+	${prVA}/lib.pm
+	${prVA}/NDBM_File.pm
+	${prVA}/ops.pm
+	${prVA}/POSIX.pm
+	${prVA}/re.pm
+	${prVA}/Socket.pm
+	${prVA}/Storable.pm
+	${prVA}/threads
+	${prVA}/threads.pm
+	${prVA}/XSLoader.pm
+	${prV}/Getopt/Long.pm
+	${prV}/Getopt/Std.pm
+	${prV}/if.pm
+	${prV}/integer.pm
+	${prV}/IO/Socket/INET.pm
+	${prV}/IO/Socket/UNIX.pm
+	${prV}/IPC/Open2.pm
+	${prV}/IPC/Open3.pm
+	${prV}/less.pm
+	${prV}/List/Util.pm
+	${prV}/locale.pm
+	${prV}/open.pm
+	${prV}/overload.pm
+	${prV}/Pod/InputObjects.pm
+	${prV}/Pod/Man.pm
+	${prV}/Pod/ParseLink.pm
+	${prV}/Pod/Parser.pm
+	${prV}/Pod/Select.pm
+	${prV}/Pod/Text.pm
+	${prV}/Pod/Usage.pm
+	${prV}/PerlIO.pm
+	${prV}/Scalar/Util.pm
+	${prV}/SelectSaver.pm
+	${prV}/sigtrap.pm
+	${prV}/sort.pm
+	${prV}/stat.pl
+	${prV}/strict.pm
+	${prV}/subs.pm
+	${prV}/Symbol.pm
+	${prV}/Text/ParseWords.pm
+	${prV}/Text/Tabs.pm
+	${prV}/Text/Wrap.pm
+	${prV}/Time/Local.pm
+	${prV}/unicore/Canonical.pl
+	${prV}/unicore/Exact.pl
+	${prV}/unicore/lib/gc_sc/Digit.pl
+	${prV}/unicore/lib/gc_sc/Word.pl
+	${prV}/unicore/PVA.pl
+	${prV}/unicore/To/Fold.pl
+	${prV}/unicore/To/Lower.pl
+	${prV}/unicore/To/Upper.pl
+	${prV}/utf8_heavy.pl
+	${prV}/utf8.pm
+	${prV}/vars.pm
+	${prV}/vmsish.pm
+	${prV}/warnings
+	${prV}/warnings.pm
+	${prV}/warnings/register.pm"
+
+	pushd "${D}" > /dev/null
+	# Remove cruft
+	einfo "Removing files that are not in the minimal install"
+	echo "${MINIMAL_PERL_INSTALL}"
+	for f in $(find . -type f ) ; do
+		has "${f}" ${MINIMAL_PERL_INSTALL} || rm -f "${f}"
+	done
+	# Remove empty directories
+	find . -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+	popd > /dev/null
+}

diff --git a/dev-lang/perl/perl-5.12.3-r1.ebuild b/dev-lang/perl/perl-5.12.3-r1.ebuild
new file mode 100644
index 0000000..5856f99
--- /dev/null
+++ b/dev-lang/perl/perl-5.12.3-r1.ebuild
@@ -0,0 +1,638 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.3-r1.ebuild,v 1.8 2012/01/02 22:52:21 zmedico Exp $
+
+EAPI=3
+
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib
+
+PATCH_VER=4
+
+PERL_OLDVERSEN="5.12.2 5.12.1 5.12.0"
+
+SHORT_PV="${PV%.*}"
+MY_P="perl-${PV/_rc/-RC}"
+MY_PV="${PV%_rc*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+	mirror://cpan/src/${MY_P}.tar.bz2
+	mirror://cpan/authors/id/R/RJ/RJBS/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/${MY_P}-${PATCH_VER}.tar.bz2"
+#	mirror://cpan/src/${MY_P}.tar.bz2
+#	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
+HOMEPAGE="http://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="berkdb build debug doc gdbm ithreads"
+
+COMMON_DEPEND="berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	>=sys-devel/libperl-5.10.1
+	!!<sys-devel/libperl-5.10.1
+	app-arch/bzip2
+	sys-libs/zlib"
+DEPEND="${COMMON_DEPEND}
+	elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs )"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND=">=app-admin/perl-cleaner-2.5"
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual_scripts perl-core/Archive-Tar        1.54    ptar ptardiff
+	src_remove_dual_scripts perl-core/Digest-SHA         5.47    shasum
+	src_remove_dual_scripts perl-core/CPAN               1.9456  cpan
+	src_remove_dual_scripts perl-core/CPANPLUS           0.90    cpanp cpan2dist cpanp-run-perl
+	src_remove_dual_scripts perl-core/Encode             2.39    enc2xs piconv
+	src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.56    instmodsh
+	src_remove_dual_scripts perl-core/Module-Build       0.3603  config_data
+	src_remove_dual_scripts perl-core/Module-CoreList    2.43    corelist
+	src_remove_dual_scripts perl-core/PodParser          1.37    pod2usage podchecker podselect
+	src_remove_dual_scripts perl-core/Test-Harness       3.17    prove
+	src_remove_dual_scripts perl-core/podlators          2.3.1   pod2man pod2text
+}
+
+pkg_setup() {
+	case ${CHOST} in
+		*-freebsd*)   osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*)    osname="netbsd" ;;
+		*-openbsd*)   osname="openbsd" ;;
+		*-darwin*)    osname="darwin" ;;
+		*)            osname="linux" ;;
+	esac
+
+	if use ithreads ; then
+		mythreading="-multi"
+		myarch="${CHOST%%-*}-${osname}-thread"
+	else
+		myarch="${CHOST%%-*}-${osname}"
+	fi
+	if use debug ; then
+		myarch="${myarch}-debug"
+	fi
+
+	LIBPERL="libperl$(get_libname ${MY_PV} )"
+	PRIV_LIB="/usr/$(get_libdir)/perl5/${MY_PV}"
+	ARCH_LIB="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}"
+	SITE_LIB="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}"
+	SITE_ARCH="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}"
+	VENDOR_LIB="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}"
+	VENDOR_ARCH="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}/${myarch}${mythreading}"
+
+	if use ithreads ; then
+		echo ""
+		ewarn "THREADS WARNING:"
+		ewarn "PLEASE NOTE: You are compiling ${MY_P} with"
+		ewarn "interpreter-level threading enabled."
+		ewarn "Threading is not supported by all applications "
+		ewarn "that compile against perl. You use threading at "
+		ewarn "your own discretion. "
+	fi
+	if has_version "<dev-lang/perl-${SHORT_PV}" ; then
+		echo ""
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl you must reinstall"
+		ewarn "the installed perl modules."
+		ewarn "Use: perl-cleaner --all"
+	elif has_version dev-lang/perl ; then
+		# doesnot work
+		#if ! has_version dev-lang/perl[ithreads=,debug=] ; then
+		#if ! has_version dev-lang/perl[ithreads=] || ! has_version dev-lang/perl[debug=] ; then
+		if (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
+		   ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		   (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		   ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+			echo ""
+			ewarn "TOGGLED USE-FLAGS WARNING:"
+			ewarn "You changed one of the use-flags ithreads or debug."
+			ewarn "You must rebuild all perl-modules installed."
+			ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+		fi
+	fi
+	dual_scripts
+}
+
+src_prepare_update_patchlevel_h() {
+	[[ -f ${WORKDIR}/perl-patch/series ]] || return 0
+
+	while read patch level ; do
+		sed -i -e "s/^\t,NULL$/	,\"${patch//__/_}\"\n&/" "${S}"/patchlevel.h || die
+	done < "${WORKDIR}"/perl-patch/series
+}
+
+src_prepare() {
+	EPATCH_SOURCE="${WORKDIR}/perl-patch" \
+	EPATCH_SUFFIX="diff" \
+	EPATCH_FORCE="yes" \
+	EPATCH_OPTS="-p1" \
+	epatch
+
+	src_prepare_update_patchlevel_h
+
+	# pod/perltoc.pod fails
+	# lib/ExtUtils/t/Embed.t fails
+	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV})
+	ln -s ${LIBPERL} libperl$(get_libname )
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+src_configure() {
+	declare -a myconf
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# some arches and -O do not mix :)
+	use ppc && replace-flags -O? -O1
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+	# Fixes bug #97645
+	use ppc && filter-flags "-mpowerpc-gpopt"
+	# Fixes bug #143895 on gcc-4.1.1
+	filter-flags "-fsched2-use-superblocks"
+
+	# this is needed because gcc 3.3-compiled kernels will hang
+	# the machine trying to run this test - check with `Kumba
+	# <rac@g.o> 2003.06.26
+	use mips && myconf -Dd_u32align
+
+	use sparc && myconf -Ud_longdbl
+
+	# 266337
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=/usr/include
+	export BZIP2_LIB=/usr/$(get_libdir)
+	cat <<-EOF > "${S}/cpan/Compress-Raw-Zlib/config.in"
+		BUILD_ZLIB = False
+		INCLUDE = /usr/include
+		LIB = /usr/$(get_libdir)
+
+		OLD_ZLIB = False
+		GZIP_OS_CODE = AUTO_DETECT
+	EOF
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+
+	if use gdbm ; then
+		mygdbm='D'
+		myndbm='D'
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	use ithreads && myconf -Dusethreads
+
+	if use debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	elif [[ ${CFLAGS} == *-g* ]] ; then
+		myconf -DDEBUGGING=-g
+	else
+		myconf -DDEBUGGING=none
+	fi
+
+	if [[ -n ${PERL_OLDVERSEN} ]] ; then
+		local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done )
+		myconf -Dinc_version_list="$inclist"
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	if [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	sh Configure \
+		-des \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix='/usr' \
+		-Dsiteprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dscriptdir='/usr/bin' \
+		-Dprivlib="${PRIV_LIB}" \
+		-Darchlib="${ARCH_LIB}" \
+		-Dsitelib="${SITE_LIB}" \
+		-Dsitearch="${SITE_ARCH}" \
+		-Dvendorlib="${VENDOR_LIB}" \
+		-Dvendorarch="${VENDOR_ARCH}" \
+		-Dman1dir=/usr/share/man/man1 \
+		-Dman3dir=/usr/share/man/man3 \
+		-Dsiteman1dir=/usr/share/man/man1 \
+		-Dsiteman3dir=/usr/share/man/man3 \
+		-Dvendorman1dir=/usr/share/man/man1 \
+		-Dvendorman3dir=/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth=' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Dinstallusrbinperl='n' \
+		-Ud_csh \
+		-Uusenm \
+		"${myconf[@]}" || die "Unable to configure"
+}
+
+src_compile() {
+	# bug 331113
+	emake -j1 || die "emake failed"
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+		return 0
+	fi
+	use elibc_uclibc && export MAKEOPTS+=" -j1"
+	TEST_JOBS=$(echo -j1 ${MAKEOPTS} | sed -r 's/.*(-j[[:space:]]*|--jobs=)([[:digit:]]+).*/\2/' ) \
+		make test_harness || die "test failed"
+}
+
+src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+#	# Fix for "stupid" modules and programs
+#	dodir ${SITE_ARCH} ${SITE_LIB}
+#	keepdir "${VENDOR_ARCH}" #338802 for enc2xs
+
+	local installtarget=install
+	if use build ; then
+		installtarget=install.perl
+	fi
+	make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}"
+
+	rm -f "${D}"/usr/bin/perl
+	ln -s perl${MY_PV} "${D}"/usr/bin/perl
+
+	dolib.so "${D}"/${coredir}/${LIBPERL} || die
+	dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+	dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname) || die
+	rm -f "${D}"/${coredir}/${LIBPERL}
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${SHORT_PV})
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
+
+	rm -rf "${D}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+#	# A poor fix for the miniperl issues
+#	dosed 's:./miniperl:/usr/bin/perl:' /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+#	fperms 0444 /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+#	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
+#	fperms 0755 /usr/bin/xsubpp
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	find "${D}" -type f -name .packlist -delete || die
+
+	# Note: find out from psm why we would need/want this.
+	# ( use berkdb && has_version '=sys-libs/db-1*' ) ||
+	#	find "${D}" -name "*NDBM*" | xargs rm -f
+
+	dodoc Changes* README AUTHORS || die
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${D}/usr/share/doc/${PF}/html" \
+			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
+	fi
+
+	if use build ; then
+		src_remove_extra_files
+	fi
+
+	dual_scripts
+}
+
+pkg_postinst() {
+	dual_scripts
+
+	if [[ "${ROOT}" = "/" ]] ; then
+		local INC DIR file
+		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }')
+		einfo "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+		if ! use build ; then
+			ebegin "Generating ConfigLocal.pm (ignore any error)"
+			enc2xs -C
+		fi
+
+		einfo "Converting C header files to the corresponding Perl format (ignore any error)"
+		pushd /usr/include >/dev/null
+			h2ph -Q -a -d ${ARCH_LIB} \
+				asm/termios.h syscall.h syslimits.h syslog.h sys/ioctl.h \
+				sys/socket.h sys/time.h wait.h sysexits.h
+		popd >/dev/null
+
+# This has been moved into a function because rumor has it that a future release
+# of portage will allow us to check what version was just removed - which means
+# we will be able to invoke this only as needed :)
+		# Tried doing this via  -z, but $INC is too big...
+		#if [[ "${INC}x" != "x" ]]; then
+		#	cleaner_msg
+		#fi
+	fi
+}
+
+pkg_postrm(){
+	dual_scripts
+
+#	if [[ -e ${ARCH_LIB}/Encode/ConfigLocal.pm ]] ; then
+#		ebegin "Removing ConfigLocal.pm"
+#		rm "${ARCH_LIB}/Encode/ConfigLocal.pm"
+#	fi
+}
+
+cleaner_msg() {
+	eerror "You have had multiple versions of perl. It is recommended"
+	eerror "that you run perl-cleaner now. perl-cleaner will"
+	eerror "assist with this transition. This script is capable"
+	eerror "of cleaning out old .ph files, rebuilding modules for "
+	eerror "your new version of perl, as well as re-emerging"
+	eerror "applications that compiled against your old libperl$(get_libname)"
+	eerror
+	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
+	eerror "Part of the rebuilding of applications compiled against "
+	eerror "your old libperl involves temporarily unmerging"
+	eerror "them - interruptions could leave you with unmerged"
+	eerror "packages before they can be remerged."
+	eerror ""
+	eerror "If you have run perl-cleaner and a package still gives"
+	eerror "you trouble, and re-emerging it fails to correct"
+	eerror "the problem, please check http://bugs.gentoo.org/"
+	eerror "for more information or to report a bug."
+	eerror ""
+}
+
+src_remove_dual_scripts() {
+
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ;then
+		for i in "$@" ; do
+			alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
+			if [[ ${i} != cpanp-run-perl ]] ; then
+				ff=`echo ${ROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*`
+				ff=${ff##*.1}
+				alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
+			fi
+		done
+	elif has "${EBUILD_PHASE:-none}" "setup" ; then
+		for i in "$@" ; do
+			if [[ -f ${ROOT}/usr/bin/${i} && ! -h ${ROOT}/usr/bin/${i} ]] ; then
+				has_version ${pkg} && ewarn "You must reinstall $pkg !"
+				break
+			fi
+		done
+	else
+		for i in "$@" ; do
+			if ! [[ -f "${D}"/usr/bin/${i} ]] ; then
+				use build || ewarn "/usr/bin/${i} does not exist!"
+				continue
+			fi
+			mv "${D}"/usr/bin/${i}{,-${ver}-${P}} || die
+			if [[ -f ${D}/usr/share/man/man1/${i}.1 ]] ; then
+				mv "${D}"/usr/share/man/man1/${i}{.1,-${ver}-${P}.1} || die
+			else
+				echo "/usr/share/man/man1/${i}.1 does not exist!"
+			fi
+		done
+	fi
+}
+
+src_remove_extra_files() {
+	local prefix="./usr" # ./ is important
+	local bindir="${prefix}/bin"
+	local libdir="${prefix}/$(get_libdir)"
+
+	# I made this list from the Mandr*, Debian and ex-Connectiva perl-base list
+	# Then, I added several files to get GNU autotools running
+	# FIXME: should this be in a separated file to be sourced?
+	local MINIMAL_PERL_INSTALL="
+	${bindir}/h2ph
+	${bindir}/perl
+	${bindir}/perl${MY_PV}
+	${bindir}/pod2man
+	${libdir}/${LIBPERL}
+	${libdir}/libperl$(get_libname)
+	${libdir}/libperl$(get_libname ${SHORT_PV})
+	.${PRIV_LIB}/AutoLoader.pm
+	.${PRIV_LIB}/B/Deparse.pm
+	.${PRIV_LIB}/Carp.pm
+	.${PRIV_LIB}/Carp/Heavy.pm
+	.${PRIV_LIB}/Class/Struct.pm
+	.${PRIV_LIB}/DirHandle.pm
+	.${PRIV_LIB}/Exporter.pm
+	.${PRIV_LIB}/Exporter/Heavy.pm
+	.${PRIV_LIB}/ExtUtils/Command.pm
+	.${PRIV_LIB}/ExtUtils/Command/MM.pm
+	.${PRIV_LIB}/ExtUtils/Constant.pm
+	.${PRIV_LIB}/ExtUtils/Constant/Base.pm
+	.${PRIV_LIB}/ExtUtils/Constant/Utils.pm
+	.${PRIV_LIB}/ExtUtils/Constant/XS.pm
+	.${PRIV_LIB}/ExtUtils/Embed.pm
+	.${PRIV_LIB}/ExtUtils/Install.pm
+	.${PRIV_LIB}/ExtUtils/Installed.pm
+	.${PRIV_LIB}/ExtUtils/Liblist.pm
+	.${PRIV_LIB}/ExtUtils/Liblist/Kid.pm
+	.${PRIV_LIB}/ExtUtils/MM.pm
+	.${PRIV_LIB}/ExtUtils/MM_Any.pm
+	.${PRIV_LIB}/ExtUtils/MM_MacOS.pm
+	.${PRIV_LIB}/ExtUtils/MM_Unix.pm
+	.${PRIV_LIB}/ExtUtils/MY.pm
+	.${PRIV_LIB}/ExtUtils/MakeMaker.pm
+	.${PRIV_LIB}/ExtUtils/Manifest.pm
+	.${PRIV_LIB}/ExtUtils/Miniperl.pm
+	.${PRIV_LIB}/ExtUtils/Mkbootstrap.pm
+	.${PRIV_LIB}/ExtUtils/Mksymlists.pm
+	.${PRIV_LIB}/ExtUtils/Packlist.pm
+	.${PRIV_LIB}/ExtUtils/testlib.pm
+	.${PRIV_LIB}/File/Basename.pm
+	.${PRIV_LIB}/File/Compare.pm
+	.${PRIV_LIB}/File/Copy.pm
+	.${PRIV_LIB}/File/Find.pm
+	.${PRIV_LIB}/File/Path.pm
+	.${PRIV_LIB}/File/stat.pm
+	.${PRIV_LIB}/FileHandle.pm
+	.${PRIV_LIB}/Getopt/Long.pm
+	.${PRIV_LIB}/Getopt/Std.pm
+	.${PRIV_LIB}/IPC/Open2.pm
+	.${PRIV_LIB}/IPC/Open3.pm
+	.${PRIV_LIB}/PerlIO.pm
+	.${PRIV_LIB}/Pod/InputObjects.pm
+	.${PRIV_LIB}/Pod/Man.pm
+	.${PRIV_LIB}/Pod/ParseLink.pm
+	.${PRIV_LIB}/Pod/Parser.pm
+	.${PRIV_LIB}/Pod/Select.pm
+	.${PRIV_LIB}/Pod/Text.pm
+	.${PRIV_LIB}/Pod/Usage.pm
+	.${PRIV_LIB}/SelectSaver.pm
+	.${PRIV_LIB}/Symbol.pm
+	.${PRIV_LIB}/Text/ParseWords.pm
+	.${PRIV_LIB}/Text/Tabs.pm
+	.${PRIV_LIB}/Text/Wrap.pm
+	.${PRIV_LIB}/Tie/Hash.pm
+	.${PRIV_LIB}/Time/Local.pm
+	.${PRIV_LIB}/XSLoader.pm
+	.${PRIV_LIB}/autouse.pm
+	.${PRIV_LIB}/base.pm
+	.${PRIV_LIB}/bigint.pm
+	.${PRIV_LIB}/bignum.pm
+	.${PRIV_LIB}/bigrat.pm
+	.${PRIV_LIB}/blib.pm
+	.${PRIV_LIB}/bytes.pm
+	.${PRIV_LIB}/bytes_heavy.pl
+	.${PRIV_LIB}/charnames.pm
+	.${PRIV_LIB}/constant.pm
+	.${PRIV_LIB}/diagnostics.pm
+	.${PRIV_LIB}/fields.pm
+	.${PRIV_LIB}/filetest.pm
+	.${PRIV_LIB}/if.pm
+	.${PRIV_LIB}/integer.pm
+	.${PRIV_LIB}/less.pm
+	.${PRIV_LIB}/locale.pm
+	.${PRIV_LIB}/open.pm
+	.${PRIV_LIB}/overload.pm
+	.${PRIV_LIB}/sigtrap.pm
+	.${PRIV_LIB}/sort.pm
+	.${PRIV_LIB}/stat.pl
+	.${PRIV_LIB}/strict.pm
+	.${PRIV_LIB}/subs.pm
+	.${PRIV_LIB}/unicore/To/Fold.pl
+	.${PRIV_LIB}/unicore/To/Lower.pl
+	.${PRIV_LIB}/unicore/To/Upper.pl
+	.${PRIV_LIB}/utf8.pm
+	.${PRIV_LIB}/utf8_heavy.pl
+	.${PRIV_LIB}/vars.pm
+	.${PRIV_LIB}/vmsish.pm
+	.${PRIV_LIB}/warnings
+	.${PRIV_LIB}/warnings.pm
+	.${PRIV_LIB}/warnings/register.pm
+	.${ARCH_LIB}/B.pm
+	.${ARCH_LIB}/CORE/libperl$(get_libname)
+	.${ARCH_LIB}/Config.pm
+	.${ARCH_LIB}/Config_heavy.pl
+	.${ARCH_LIB}/Cwd.pm
+	.${ARCH_LIB}/Data/Dumper.pm
+	.${ARCH_LIB}/DynaLoader.pm
+	.${ARCH_LIB}/Errno.pm
+	.${ARCH_LIB}/Fcntl.pm
+	.${ARCH_LIB}/File/Glob.pm
+	.${ARCH_LIB}/File/Spec.pm
+	.${ARCH_LIB}/File/Spec/Unix.pm
+	.${ARCH_LIB}/IO.pm
+	.${ARCH_LIB}/IO/File.pm
+	.${ARCH_LIB}/IO/Handle.pm
+	.${ARCH_LIB}/IO/Pipe.pm
+	.${ARCH_LIB}/IO/Seekable.pm
+	.${ARCH_LIB}/IO/Select.pm
+	.${ARCH_LIB}/IO/Socket.pm
+	.${ARCH_LIB}/IO/Socket/INET.pm
+	.${ARCH_LIB}/IO/Socket/UNIX.pm
+	.${ARCH_LIB}/List/Util.pm
+	.${ARCH_LIB}/NDBM_File.pm
+	.${ARCH_LIB}/POSIX.pm
+	.${ARCH_LIB}/Scalar/Util.pm
+	.${ARCH_LIB}/Socket.pm
+	.${ARCH_LIB}/Storable.pm
+	.${ARCH_LIB}/attributes.pm
+	.${ARCH_LIB}/auto/Cwd/Cwd$(get_libname)
+	.${ARCH_LIB}/auto/Data/Dumper/Dumper$(get_libname)
+	.${ARCH_LIB}/auto/DynaLoader/dl_findfile.al
+	.${ARCH_LIB}/auto/Fcntl/Fcntl$(get_libname)
+	.${ARCH_LIB}/auto/File/Glob/Glob$(get_libname)
+	.${ARCH_LIB}/auto/IO/IO$(get_libname)
+	.${ARCH_LIB}/auto/POSIX/POSIX$(get_libname)
+	.${ARCH_LIB}/auto/POSIX/autosplit.ix
+	.${ARCH_LIB}/auto/POSIX/fstat.al
+	.${ARCH_LIB}/auto/POSIX/load_imports.al
+	.${ARCH_LIB}/auto/POSIX/stat.al
+	.${ARCH_LIB}/auto/POSIX/tmpfile.al
+	.${ARCH_LIB}/auto/Socket/Socket$(get_libname)
+	.${ARCH_LIB}/auto/Storable/Storable$(get_libname)
+	.${ARCH_LIB}/auto/Storable/_retrieve.al
+	.${ARCH_LIB}/auto/Storable/_store.al
+	.${ARCH_LIB}/auto/Storable/autosplit.ix
+	.${ARCH_LIB}/auto/Storable/retrieve.al
+	.${ARCH_LIB}/auto/Storable/store.al
+	.${ARCH_LIB}/auto/re/re$(get_libname)
+	.${ARCH_LIB}/encoding.pm
+	.${ARCH_LIB}/lib.pm
+	.${ARCH_LIB}/ops.pm
+	.${ARCH_LIB}/re.pm
+	.${ARCH_LIB}/threads.pm
+"
+
+	pushd "${D}" > /dev/null
+	# Remove cruft
+	einfo "Removing files that are not in the minimal install"
+	echo "${MINIMAL_PERL_INSTALL}"
+	for f in $(find . -type f ) ; do
+		has "${f}" ${MINIMAL_PERL_INSTALL} || rm -f "${f}"
+	done
+	# Remove empty directories
+	find . -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+	#for f in ${MINIMAL_PERL_INSTALL} ; do
+	#	[[ -e $f ]] || ewarn "$f unused in MINIMAL_PERL_INSTALL"
+	#done
+	popd > /dev/null
+}

diff --git a/dev-lang/perl/perl-5.8.8-r8.ebuild b/dev-lang/perl/perl-5.8.8-r8.ebuild
new file mode 100644
index 0000000..acea381
--- /dev/null
+++ b/dev-lang/perl/perl-5.8.8-r8.ebuild
@@ -0,0 +1,698 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r8.ebuild,v 1.14 2012/01/02 22:52:21 zmedico Exp $
+
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib
+
+# The slot of this binary compat version of libperl.so
+PERLSLOT="1"
+
+SHORT_PV="${PV%.*}"
+MY_P="perl-${PV/_rc/-RC}"
+MY_PV="${PV%_rc*}"
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://cpan/src/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.perl.org/"
+LIBPERL="libperl$(get_libname ${PERLSLOT}.${SHORT_PV})"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc gdbm ithreads perlsuid build elibc_FreeBSD"
+PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5 5.8.6 5.8.7"
+
+DEPEND="berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	>=sys-devel/libperl-${PV}-r1
+	elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs )
+	<sys-devel/libperl-5.9
+	!<perl-core/File-Spec-0.87
+	!<perl-core/Test-Simple-0.47-r1"
+
+RDEPEND="~sys-devel/libperl-${PV}
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	build? (
+		!perl-core/Test-Harness
+		!perl-core/PodParser
+		!dev-perl/Locale-gettext
+	)"
+
+PDEPEND=">=app-admin/perl-cleaner-1.03"
+
+dual_scripts() {
+	src_remove_dual_scripts perl-core/Encode             2.12    enc2xs piconv
+	src_remove_dual_scripts perl-core/PodParser          1.32    pod2usage podchecker podselect
+	src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.30    instmodsh
+	src_remove_dual_scripts perl-core/Test-Harness       2.56    prove
+	src_remove_dual_scripts perl-core/CPAN               1.76_02 cpan
+	src_remove_dual_scripts perl-core/podlators          1.37    pod2man pod2text
+}
+
+pkg_setup() {
+	# I think this should rather be displayed if you *have* 'ithreads'
+	# in USE if it could break things ...
+	if use ithreads
+	then
+		ewarn "PLEASE NOTE: You are compiling ${MY_P} with"
+		ewarn "interpreter-level threading enabled."
+		ewarn "Threading is not supported by all applications "
+		ewarn "that compile against perl. You use threading at "
+		ewarn "your own discretion. "
+		epause 5
+	fi
+
+	if [[ ! -f "${ROOT}/usr/$(get_libdir)/${LIBPERL}" ]]
+	then
+		# Make sure we have libperl installed ...
+		eerror "Cannot find ${ROOT}/usr/$(get_libdir)/${LIBPERL}!  Make sure that you"
+		eerror "have sys-libs/libperl installed properly ..."
+		die "Cannot find ${ROOT}/usr/$(get_libdir)/${LIBPERL}!"
+	fi
+	dual_scripts
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Get -lpthread linked before -lc.  This is needed
+	# when using glibc >= 2.3, or else runtime signal
+	# handling breaks.  Fixes bug #14380.
+	# <rac@g.o> (14 Feb 2003)
+	# reinstated to try to avoid sdl segfaults 03.10.02
+	cd "${S}"; epatch "${FILESDIR}"/${PN}-prelink-lpthread.patch
+
+	# Patch perldoc to not abort when it attempts to search
+	# nonexistent directories; fixes bug #16589.
+	# <rac@g.o> (28 Feb 2003)
+
+	cd "${S}"; epatch "${FILESDIR}"/${PN}-perldoc-emptydirs.patch
+
+	# this lays the groundwork for solving the issue of what happens
+	# when people (or ebuilds) install different versiosn of modules
+	# that are in the core, by rearranging the @INC directory to look
+	# site -> vendor -> core.
+	cd "${S}"; epatch "${FILESDIR}"/${P}-reorder-INC.patch
+
+	# some well-intentioned stuff in http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=Pine.SOL.4.10.10205231231200.5399-100000%40maxwell.phys.lafayette.edu
+	# attempts to avoid bringing cccdlflags to bear on static
+	# extensions (like DynaLoader).  i believe this is
+	# counterproductive on a Gentoo system which has both a shared
+	# and static libperl, so effectively revert this here.
+	cd "${S}"; epatch "${FILESDIR}"/${PN}-picdl.patch
+
+	# Configure makes an unwarranted assumption that /bin/ksh is a
+	# good shell. This patch makes it revert to using /bin/sh unless
+	# /bin/ksh really is executable. Should fix bug 42665.
+	# rac 2004.06.09
+	cd "${S}"; epatch "${FILESDIR}"/${PN}-noksh.patch
+
+	# makedepend.SH contains a syntax error which is ignored by bash but causes
+	# dash to abort
+	epatch "${FILESDIR}"/${P}-makedepend-syntax.patch
+
+	# We do not want the build root in the linked perl module's RUNPATH, so
+	# strip paths containing PORTAGE_TMPDIR if its set.  This is for the
+	# MakeMaker module, bug #105054.
+	epatch "${FILESDIR}"/${PN}-5.8.7-MakeMaker-RUNPATH.patch
+
+	# Starting and hopefully ending with 5.8.7 we observe stack
+	# corruption with the regexp handling in perls DynaLoader code
+	# with ssp enabled. This become fatal during compile time so we
+	# temporally disable ssp on two regexp files till upstream has a
+	# chance to work it out. Bug #97452
+	[[ -n $(test-flags -fno-stack-protector) ]] && \
+		epatch "${FILESDIR}"/${PN}-regexp-nossp.patch
+
+	# On PA7200, uname -a contains a single quote and we need to
+	# filter it otherwise configure fails. See #125535.
+	epatch "${FILESDIR}"/perl-hppa-pa7200-configure.patch
+
+	case "$(get_libdir)" in
+		lib64) cd "${S}" && epatch "${FILESDIR}"/${P}-lib64.patch;;
+		lib32) cd "${S}" && epatch "${FILESDIR}"/${P}-lib32.patch;;
+		lib) true;;
+		*) die "Something's wrong with your libdir, don't know how to treat it.";;
+	esac
+
+	[[ ${CHOST} == *-dragonfly* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-dragonfly-clean.patch
+	[[ ${CHOST} == *-freebsd* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-fbsdhints.patch
+	cd "${S}"; epatch "${FILESDIR}"/${P}-USE_MM_LD_RUN_PATH.patch
+	cd "${S}"; epatch "${FILESDIR}"/${P}-links.patch
+	# c++ patch - should address swig related items
+	cd "${S}"; epatch "${FILESDIR}"/${P}-cplusplus.patch
+
+	epatch "${FILESDIR}"/${P}-gcc42-command-line.patch
+
+	# Newer linux-headers don't include asm/page.h. Fix this.
+	# Patch from bug 168312, thanks Peter!
+	echo "#include <asm/page.h>" | $(tc-getCPP) > /dev/null 2>&1 || \
+		epatch "${FILESDIR}"/${P}-asm-page-h-compile-failure.patch
+
+	# Also add the directory prefix of the current file when the quote syntax is
+	# used; 'require' will only look in @INC, not the current directory.
+	epatch "${FILESDIR}"/${PN}-fix_h2ph_include_quote.patch
+
+	# perlcc fix patch - bug #181229
+	epatch "${FILESDIR}"/${P}-perlcc.patch
+
+	# libnet hostname test patch
+	epatch "${FILESDIR}"/${P}-libnet-hostname.patch
+
+	# patch to fix bug #198196
+	# UTF/Regular expressions boundary error (CVE-2007-5116)
+	epatch "${FILESDIR}"/${P}-utf8-boundary.patch
+
+	# patch to fix bug #219203
+	epatch "${FILESDIR}"/${P}-CVE-2008-1927.patch
+
+	epatch "${FILESDIR}"/${P}-CAN-2005-0448-rmtree-2.patch
+	epatch "${FILESDIR}"/${P}-fix_file_path_chdir.patch
+
+	# Respect CFLAGS even for linking when done with compiler
+	epatch "${FILESDIR}"/${P}-ccld-cflags.patch
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+src_configure() {
+	declare -a myconf
+
+	# some arches and -O do not mix :)
+	use ppc && replace-flags -O? -O1
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+	( gcc-specs-ssp && use ia64 ) && append-flags -fno-stack-protector
+	# This flag makes compiling crash in interesting ways
+	filter-flags -malign-double
+	# Fixes bug #97645
+	use ppc && filter-flags -mpowerpc-gpopt
+	# Fixes bug #143895 on gcc-4.1.1
+	filter-flags "-fsched2-use-superblocks"
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
+
+		*) osname="linux" ;;
+	esac
+
+	if use ithreads
+	then
+		einfo "using ithreads"
+		mythreading="-multi"
+		myconf -Dusethreads
+		myarch=${CHOST}
+		myarch="${myarch%%-*}-${osname}-thread"
+	else
+		myarch=${CHOST}
+		myarch="${myarch%%-*}-${osname}"
+	fi
+
+	local inclist=$(for v in $PERL_OLDVERSEN; do echo -n "$v $v/$myarch$mythreading "; done)
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+
+	if use gdbm
+	then
+		mygdbm='D'
+		myndbm='D'
+	fi
+	if use berkdb
+	then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use mips
+	then
+		# this is needed because gcc 3.3-compiled kernels will hang
+		# the machine trying to run this test - check with `Kumba
+		# <rac@g.o> 2003.06.26
+		myconf -Dd_u32align
+	fi
+
+	if use perlsuid
+	then
+		myconf -Dd_dosuid
+		ewarn "You have enabled Perl's suid compile. Please"
+		ewarn "read http://search.cpan.org/~nwclark/perl-5.8.8/INSTALL#suidperl"
+		epause 3
+	fi
+
+	if use debug
+	then
+		CFLAGS="${CFLAGS} -g"
+		myconf -DDEBUGGING
+	fi
+
+	if use sparc
+	then
+		myconf -Ud_longdbl
+	fi
+
+	if use alpha && "$(tc-getCC)" == "ccc"
+	then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	if [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	sh Configure -des \
+		-Darchname="${myarch}" \
+		-Dcccdlflags='-fPIC' \
+		-Dccdlflags='-rdynamic' \
+		-Dcc="$(tc-getCC)" \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefix='/usr' \
+		-Dlocincpth=' ' \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dscriptdir=/usr/bin \
+		-Dman1dir=/usr/share/man/man1 \
+		-Dman3dir=/usr/share/man/man3 \
+		-Dinstallman1dir=/usr/share/man/man1 \
+		-Dinstallman3dir=/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dinc_version_list="$inclist" \
+		-Dcf_by='Gentoo' \
+		-Ud_csh \
+		-Dusenm \
+		"${myconf[@]}" || die "Unable to configure"
+}
+
+src_compile() {
+
+	# would like to bracket this with a test for the existence of a
+	# dotfile, but can't clean it automatically now.
+
+	src_configure
+
+	emake -j1 || die "Unable to make"
+}
+
+src_test() {
+	use elibc_uclibc && export MAKEOPTS="${MAKEOPTS} -j1"
+	emake -i test CCDLFLAGS= || die "test failed"
+}
+
+src_install() {
+
+	export LC_ALL="C"
+
+	# Need to do this, else apps do not link to dynamic version of
+	# the library ...
+	local coredir="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}/CORE"
+	dodir ${coredir}
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${PERLSLOT})
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
+
+	# Fix for "stupid" modules and programs
+	dodir /usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}
+
+	local installtarget=install
+	if use build ; then
+		installtarget=install.perl
+	fi
+	make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}"
+
+	rm "${D}"/usr/bin/perl
+	ln -s perl${MY_PV} "${D}"/usr/bin/perl
+
+	cp -f utils/h2ph utils/h2ph_patched
+	epatch "${FILESDIR}"/${PN}-h2ph-ansi-header.patch
+
+	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
+		-a -d "${D}"/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading} <<EOF
+asm/termios.h
+syscall.h
+syslimits.h
+syslog.h
+sys/ioctl.h
+sys/socket.h
+sys/time.h
+wait.h
+EOF
+
+	# This is to fix a missing c flag for backwards compat
+	for i in `find "${D}"/usr/$(get_libdir)/perl5 -iname "Config.pm"`;do
+		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
+			-e "s:cppflags=':cppflags='-DPERL5 :" \
+			${i} > ${i}.new &&\
+			mv ${i}.new ${i} || die "Sed failed"
+	done
+
+	# A poor fix for the miniperl issues
+	dosed 's:./miniperl:/usr/bin/perl:' /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+	fperms 0444 /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
+	fperms 0755 /usr/bin/xsubpp
+
+	# This removes ${D} from Config.pm and .packlist
+	for i in `find "${D}" -iname "Config.pm"` `find "${D}" -iname ".packlist"`;do
+		einfo "Removing ${D} from ${i}..."
+		sed -e "s:${D}::" ${i} > ${i}.new &&\
+			mv ${i}.new ${i} || die "Sed failed"
+	done
+
+	# Note: find out from psm why we would need/want this.
+	# ( use berkdb && has_version '=sys-libs/db-1*' ) ||
+	#	find ${D} -name "*NDBM*" | xargs rm -f
+
+	dodoc Changes* Artistic Copying README Todo* AUTHORS
+
+	if use doc
+	then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${D}/usr/share/doc/${PF}/html" \
+			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
+	fi
+	cd `find "${D}" -name Path.pm|sed -e 's/Path.pm//'`
+	# CAN patch in bug 79685
+	#epatch "${FILESDIR}"/${P}-CAN-2005-0448-rmtree-2.patch
+
+	dual_scripts
+
+	if use build ; then
+		src_remove_extra_files
+	fi
+}
+
+pkg_postinst() {
+	dual_scripts
+	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }')
+	if [[ "${ROOT}" = "/" ]]
+	then
+		ebegin "Removing old .ph files"
+		for DIR in $INC; do
+			if [[ -d "${ROOT}"/$DIR ]]; then
+				for file in $(find "${ROOT}"/$DIR -name "*.ph" -type f); do
+					rm "${ROOT}"/$file
+					einfo "<< $file"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in $INC; do
+		   if [[ -d "${ROOT}"/$DIR ]]; then
+			find "${ROOT}"/$DIR -depth -type d | xargs -r rmdir &> /dev/null
+		   fi
+		done
+		ebegin "Generating ConfigLocal.pm (ignore any error)"
+		enc2xs -C
+		ebegin "Converting C header files to the corresponding Perl format"
+		cd /usr/include;
+		h2ph *
+		h2ph -r sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/* gentoo*
+		cd /usr/include/linux
+		h2ph *
+	fi
+
+# This has been moved into a function because rumor has it that a future release
+# of portage will allow us to check what version was just removed - which means
+# we will be able to invoke this only as needed :)
+	# Tried doing this via  -z, but $INC is too big...
+	if [[ "${INC}x" != "x" ]]; then
+		cleaner_msg
+		epause 5
+	fi
+}
+
+pkg_postrm() {
+	dual_scripts
+}
+
+cleaner_msg() {
+	eerror "You have had multiple versions of perl. It is recommended"
+	eerror "that you run perl-cleaner now. perl-cleaner will"
+	eerror "assist with this transition. This script is capable"
+	eerror "of cleaning out old .ph files, rebuilding modules for "
+	eerror "your new version of perl, as well as re-emerging"
+	eerror "applications that compiled against your old libperl$(get_libname)"
+	eerror
+	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
+	eerror "Part of the rebuilding of applications compiled against "
+	eerror "your old libperl involves temporarily unmerging"
+	eerror "them - interruptions could leave you with unmerged"
+	eerror "packages before they can be remerged."
+	eerror ""
+	eerror "If you have run perl-cleaner and a package still gives"
+	eerror "you trouble, and re-emerging it fails to correct"
+	eerror "the problem, please check http://bugs.gentoo.org/"
+	eerror "for more information or to report a bug."
+	eerror ""
+	eerror ""
+}
+
+src_remove_dual_scripts() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ;then
+		for i in "$@" ; do
+			ff=`echo ${ROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*`
+			ff=${ff##*.1}
+			alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
+			alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
+		done
+	elif has "${EBUILD_PHASE:-none}" "setup" ; then
+		for i in "$@" ; do
+			if [[ -f ${ROOT}/usr/bin/${i} && ! -h ${ROOT}/usr/bin/${i} ]] ; then
+				has_version ${pkg} && ewarn "You must reinstall $pkg !"
+				break
+			fi
+		done
+	else
+		for i in "$@" ; do
+			mv "${D}"/usr/bin/${i}{,-${ver}-${P}} || die
+			mv "${D}"/usr/share/man/man1/${i}{.1,-${ver}-${P}.1} || \
+				echo "/usr/share/man/man1/${i}.1 does not exist!"
+		done
+	fi
+}
+
+src_remove_extra_files() {
+	local prefix="./usr" # ./ is important
+	local bindir="${prefix}/bin"
+	local perlroot="${prefix}/$(get_libdir)/perl5" # perl installs per-arch dirs
+	local prV="${perlroot}/${MY_PV}"
+	# myarch and mythreading are defined inside src_configure()
+	local prVA="${prV}/${myarch}${mythreading}"
+
+	# I made this list from the Mandr*, Debian and ex-Connectiva perl-base list
+	# Then, I added several files to get GNU autotools running
+	# FIXME: should this be in a separated file to be sourced?
+	local MINIMAL_PERL_INSTALL="
+	${bindir}/h2ph
+	${bindir}/perl
+	${bindir}/perl${MY_PV}
+	${bindir}/pod2man
+	${prV}/attributes.pm
+	${prV}/AutoLoader.pm
+	${prV}/autouse.pm
+	${prV}/base.pm
+	${prV}/bigint.pm
+	${prV}/bignum.pm
+	${prV}/bigrat.pm
+	${prV}/blib.pm
+	${prV}/bytes_heavy.pl
+	${prV}/bytes.pm
+	${prV}/Carp/Heavy.pm
+	${prV}/Carp.pm
+	${prV}/charnames.pm
+	${prV}/Class/Struct.pm
+	${prV}/constant.pm
+	${prV}/diagnostics.pm
+	${prV}/DirHandle.pm
+	${prV}/Exporter/Heavy.pm
+	${prV}/Exporter.pm
+	${prV}/ExtUtils/Command.pm
+	${prV}/ExtUtils/Constant.pm
+	${prV}/ExtUtils/Embed.pm
+	${prV}/ExtUtils/Installed.pm
+	${prV}/ExtUtils/Install.pm
+	${prV}/ExtUtils/Liblist.pm
+	${prV}/ExtUtils/MakeMaker.pm
+	${prV}/ExtUtils/Manifest.pm
+	${prV}/ExtUtils/Mkbootstrap.pm
+	${prV}/ExtUtils/Mksymlists.pm
+	${prV}/ExtUtils/MM_Any.pm
+	${prV}/ExtUtils/MM_MacOS.pm
+	${prV}/ExtUtils/MM.pm
+	${prV}/ExtUtils/MM_Unix.pm
+	${prV}/ExtUtils/MY.pm
+	${prV}/ExtUtils/Packlist.pm
+	${prV}/ExtUtils/testlib.pm
+	${prV}/ExtUtils/Miniperl.pm
+	${prV}/ExtUtils/Command/MM.pm
+	${prV}/ExtUtils/Constant/Base.pm
+	${prV}/ExtUtils/Constant/Utils.pm
+	${prV}/ExtUtils/Constant/XS.pm
+	${prV}/ExtUtils/Liblist/Kid.pm
+	${prV}/ExtUtils/MakeMaker/bytes.pm
+	${prV}/ExtUtils/MakeMaker/vmsish.pm
+	${prV}/fields.pm
+	${prV}/File/Basename.pm
+	${prV}/File/Compare.pm
+	${prV}/File/Copy.pm
+	${prV}/File/Find.pm
+	${prV}/FileHandle.pm
+	${prV}/File/Path.pm
+	${prV}/File/Spec.pm
+	${prV}/File/Spec/Unix.pm
+	${prV}/File/stat.pm
+	${prV}/filetest.pm
+	${prVA}/attrs.pm
+	${prVA}/auto/attrs
+	${prVA}/auto/Cwd/Cwd$(get_libname)
+	${prVA}/auto/Data/Dumper/Dumper$(get_libname)
+	${prVA}/auto/DynaLoader/dl_findfile.al
+	${prVA}/auto/Fcntl/Fcntl$(get_libname)
+	${prVA}/auto/File/Glob/Glob$(get_libname)
+	${prVA}/auto/IO/IO$(get_libname)
+	${prVA}/auto/POSIX/autosplit.ix
+	${prVA}/auto/POSIX/fstat.al
+	${prVA}/auto/POSIX/load_imports.al
+	${prVA}/auto/POSIX/POSIX.bs
+	${prVA}/auto/POSIX/POSIX$(get_libname)
+	${prVA}/auto/POSIX/assert.al
+	${prVA}/auto/POSIX/stat.al
+	${prVA}/auto/POSIX/tmpfile.al
+	${prVA}/auto/re/re$(get_libname)
+	${prVA}/auto/Socket/Socket$(get_libname)
+	${prVA}/auto/Storable/autosplit.ix
+	${prVA}/auto/Storable/_retrieve.al
+	${prVA}/auto/Storable/retrieve.al
+	${prVA}/auto/Storable/Storable$(get_libname)
+	${prVA}/auto/Storable/_store.al
+	${prVA}/auto/Storable/store.al
+	${prVA}/B/Deparse.pm
+	${prVA}/B.pm
+	${prVA}/Config.pm
+	${prVA}/Config_heavy.pl
+	${prVA}/CORE/libperl$(get_libname)
+	${prVA}/Cwd.pm
+	${prVA}/Data/Dumper.pm
+	${prVA}/DynaLoader.pm
+	${prVA}/encoding.pm
+	${prVA}/Errno.pm
+	${prVA}/Fcntl.pm
+	${prVA}/File/Glob.pm
+	${prVA}/_h2ph_pre.ph
+	${prVA}/IO/File.pm
+	${prVA}/IO/Handle.pm
+	${prVA}/IO/Pipe.pm
+	${prVA}/IO.pm
+	${prVA}/IO/Seekable.pm
+	${prVA}/IO/Select.pm
+	${prVA}/IO/Socket.pm
+	${prVA}/lib.pm
+	${prVA}/NDBM_File.pm
+	${prVA}/ops.pm
+	${prVA}/POSIX.pm
+	${prVA}/re.pm
+	${prVA}/Socket.pm
+	${prVA}/Storable.pm
+	${prVA}/threads
+	${prVA}/threads.pm
+	${prVA}/XSLoader.pm
+	${prV}/Getopt/Long.pm
+	${prV}/Getopt/Std.pm
+	${prV}/if.pm
+	${prV}/integer.pm
+	${prV}/IO/Socket/INET.pm
+	${prV}/IO/Socket/UNIX.pm
+	${prV}/IPC/Open2.pm
+	${prV}/IPC/Open3.pm
+	${prV}/less.pm
+	${prV}/List/Util.pm
+	${prV}/locale.pm
+	${prV}/open.pm
+	${prV}/overload.pm
+	${prV}/Pod/InputObjects.pm
+	${prV}/Pod/Man.pm
+	${prV}/Pod/ParseLink.pm
+	${prV}/Pod/Parser.pm
+	${prV}/Pod/Select.pm
+	${prV}/Pod/Text.pm
+	${prV}/Pod/Usage.pm
+	${prV}/PerlIO.pm
+	${prV}/Scalar/Util.pm
+	${prV}/SelectSaver.pm
+	${prV}/sigtrap.pm
+	${prV}/sort.pm
+	${prV}/stat.pl
+	${prV}/strict.pm
+	${prV}/subs.pm
+	${prV}/Symbol.pm
+	${prV}/Text/ParseWords.pm
+	${prV}/Text/Tabs.pm
+	${prV}/Text/Wrap.pm
+	${prV}/Time/Local.pm
+	${prV}/unicore/Canonical.pl
+	${prV}/unicore/Exact.pl
+	${prV}/unicore/lib/gc_sc/Digit.pl
+	${prV}/unicore/lib/gc_sc/Word.pl
+	${prV}/unicore/PVA.pl
+	${prV}/unicore/To/Fold.pl
+	${prV}/unicore/To/Lower.pl
+	${prV}/unicore/To/Upper.pl
+	${prV}/utf8_heavy.pl
+	${prV}/utf8.pm
+	${prV}/vars.pm
+	${prV}/vmsish.pm
+	${prV}/warnings
+	${prV}/warnings.pm
+	${prV}/warnings/register.pm"
+
+	if use perlsuid ; then
+		MINIMAL_PERL_INSTALL="${MINIMAL_PERL_INSTALL}
+		${bindir}/suidperl
+		${bindir}/sperl${MY_PV}"
+	fi
+
+	pushd "${D}" > /dev/null
+	# Remove cruft
+	einfo "Removing files that are not in the minimal install"
+	echo "${MINIMAL_PERL_INSTALL}"
+	for f in $(find . -type f); do
+		has ${f} ${MINIMAL_PERL_INSTALL} || rm -f ${f}
+	done
+	# Remove empty directories
+	find . -depth -type d | xargs -r rmdir &> /dev/null
+	popd > /dev/null
+}

diff --git a/dev-lang/ruby/ruby-1.8.7_p352.ebuild b/dev-lang/ruby/ruby-1.8.7_p352.ebuild
new file mode 100644
index 0000000..a2af4de
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.7_p352.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2011 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_p352.ebuild,v 1.7 2011/10/22 12:07:43 armin76 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 ~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-lang/ruby-cvs-${SLOT}*
+	!<dev-ruby/rdoc-2
+	!dev-ruby/rexml"
+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
+
+	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
+}

diff --git a/dev-lang/ruby/ruby-1.8.7_p357.ebuild b/dev-lang/ruby/ruby-1.8.7_p357.ebuild
new file mode 100644
index 0000000..24a03a5
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.7_p357.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2012 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_p357.ebuild,v 1.6 2012/01/08 15:36:01 armin76 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 ~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
+
+	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
+}

diff --git a/dev-lang/ruby/ruby-1.8.7_p358.ebuild b/dev-lang/ruby/ruby-1.8.7_p358.ebuild
new file mode 100644
index 0000000..31ef929
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.7_p358.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2012 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_p358.ebuild,v 1.2 2012/04/26 16:55:14 aballier 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
+
+	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
+}

diff --git a/dev-lang/ruby/ruby-1.9.3_p0.ebuild b/dev-lang/ruby/ruby-1.9.3_p0.ebuild
new file mode 100644
index 0000000..c5934c8
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.9.3_p0.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2012 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_p0.ebuild,v 1.6 2012/02/05 22:06:30 maekke Exp $
+
+EAPI=2
+
+#PATCHSET=
+
+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-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+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="
+	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)"
+
+	# Set a faux target (bug #342819)
+	use hppa && myconf="${myconf} --target=parisc"
+
+	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 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"
+
+	# 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-1.8.7 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
+}

diff --git a/dev-lang/ruby/ruby-1.9.3_p125.ebuild b/dev-lang/ruby/ruby-1.9.3_p125.ebuild
new file mode 100644
index 0000000..2f44811
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.9.3_p125.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2012 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_p125.ebuild,v 1.5 2012/06/25 07:06:31 nativemad Exp $
+
+EAPI=2
+
+#PATCHSET=
+
+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-2 )"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~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="
+	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)"
+
+	# Set a faux target (bug #342819)
+	use hppa && myconf="${myconf} --target=parisc"
+
+	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 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"
+
+	# 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* 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
+}

diff --git a/dev-lang/ruby/ruby-1.9.3_p194.ebuild b/dev-lang/ruby/ruby-1.9.3_p194.ebuild
new file mode 100644
index 0000000..7b7c09b
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.9.3_p194.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2012 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_p194.ebuild,v 1.1 2012/04/30 11:14:18 graaff Exp $
+
+EAPI=2
+
+#PATCHSET=
+
+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-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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="
+	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)"
+
+	# Set a faux target (bug #342819)
+	use hppa && myconf="${myconf} --target=parisc"
+
+	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 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"
+
+	# 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* 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
+}

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 863054f..5e478e5 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -17,7 +17,7 @@ EBUILD spidermonkey-1.7.0-r2.ebuild 1664 RMD160 2eea40d279729740380fd8eca22d1425
 EBUILD spidermonkey-1.7.0.ebuild 1432 RMD160 9dc3f12649f67fe727f8b327a54bbc91c0522358 SHA1 411aad11f1d1beb4435aa19a43d96447b11e7dac SHA256 5df2e8917fce96363d2128a2fdafc623aa159e60682591b347201b062778a99e
 EBUILD spidermonkey-1.8.2.15-r1.ebuild 1938 RMD160 e8c4748dbd6ebb9e1a8d6f1d318c44418bcd2c8c SHA1 f59d3fd53e89d41139d2159822a328a4bcfa6ceb SHA256 b1fc8c11374df02de4ae2136127958f3d5b7d4c9dca349e396f5127769e9c0f2
 EBUILD spidermonkey-1.8.2.15.ebuild 1907 RMD160 597288c1c1478e152f492add1a9222833dc2272a SHA1 ab6719373203f4270ff9bb2c384869d28f379740 SHA256 e03a07403e86e8a20c7efefc59dc5e84853cb8eb459e9685de79d7d90f46de19
-EBUILD spidermonkey-1.8.5-r1.ebuild 3130 RMD160 f3b1a2467602f9a0decdb6cf8bf7ab7848d4979f SHA1 07ef7109f2ba91b70f9382a0a5790936d727049f SHA256 5b1fe36c12e421f1f84ee6dcfff275f1f9bf6b8433163d7e12f5f769397d7e5d
-EBUILD spidermonkey-1.8.7.ebuild 3445 RMD160 5ae7af985f8c820a1fb3f93d39da6a7d67c7b59e SHA1 6c76831838d3e747a6d9229d2816e3cdb68de006 SHA256 af6ed7f9fc7d90b9c183429d54112d496932901459147c14615b83a815ebbff8
+EBUILD spidermonkey-1.8.5-r1.ebuild 3120 RMD160 eef86cb44c0ff51b499cb7fe6cc2eccfc8c67e27 SHA1 65f8a34b18409e243a01cf7eaedafe99eb70e62b SHA256 1cbe794b58e37a656a1cc2a56ea7eed2e3f95828020d48863f6906252faa3de2
+EBUILD spidermonkey-1.8.7.ebuild 3463 RMD160 2dbcaa35304180b4cf361ea19dabc37bb1687b58 SHA1 5775ee624640109480e318b44121bbe4a0ce4e6c SHA256 a5d9397a9da3b811ab1fd547e17d13ca55d4399cd7217cd312bc558d30976182
 MISC ChangeLog 12126 RMD160 aaa3a7af0d5cdca8a8b2ff14ba032bbdced1c56a SHA1 6c091ad48ffb96d1864337d38b8d91e5b6cab066 SHA256 718a0a29975f90cd5628abc4519203c1b93ae2c5e0445d9b115fea5a4559e08f
 MISC metadata.xml 523 RMD160 b40a1ffd94bc32fd5045b99160481c2b95d69d30 SHA1 91eb56541e242621c81e38eb9e9f0c4dea6f099f SHA256 876e7996ea990b78088ea8ef1f0445658fea0bb7cf0a1e07cd1db2bae870307f

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch b/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch
new file mode 100644
index 0000000..a5c4b47
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch
@@ -0,0 +1,138 @@
+--- js/src/Makefile.ref
++++ js/src/Makefile.ref
+@@ -127,7 +127,7 @@ endif 
+ ifdef JS_READLINE
+ # For those platforms with the readline library installed.
+ DEFINES += -DEDITLINE
+-PROG_LIBS += -lreadline -ltermcap
++PROG_LIBS += -lreadline
+ else
+ ifdef JS_EDITLINE
+ # Use the editline library, built locally.
+@@ -370,3 +370,16 @@ TARFILES = files `cat files`
+ SUFFIXES: .i
+ %.i: %.c
+ 	$(CC) -C -E $(CFLAGS) $< > $*.i
++
++DESTDIR :=
++PREFIX := /usr
++BINDIR := $(PREFIX)/bin
++MY_LIBDIR := $(PREFIX)/$(LIBDIR)
++INCLUDEDIR := $(PREFIX)/include/js
++INSTALL := install -g 0 -o root
++install:
++	$(INSTALL) -m 755 -d $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(MY_LIBDIR) $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DESTDIR)$(MY_LIBDIR)
++	$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(MY_LIBDIR)
++	$(INSTALL) -m 755 $(OBJDIR)/js $(OBJDIR)/jscpucfg $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 644 $(HFILES) $(DESTDIR)$(INCLUDEDIR)
+--- js/src/config/Linux_All.mk
++++ js/src/config/Linux_All.mk
+@@ -41,37 +41,15 @@
+ # Config for all versions of Linux
+ #
+ 
+-CC = gcc
+-CCC = g++
+ CFLAGS +=  -Wall -Wno-format
+ OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
+ 
+ RANLIB = echo
+-MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
++MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) -soname $(notdir $@)
+ 
+ #.c.o:
+ #      $(CC) -c -MD $*.d $(CFLAGS) $<
+ 
+-CPU_ARCH = $(shell uname -m)
+-# don't filter in x86-64 architecture
+-ifneq (x86_64,$(CPU_ARCH))
+-ifeq (86,$(findstring 86,$(CPU_ARCH)))
+-CPU_ARCH = x86
+-OS_CFLAGS+= -DX86_LINUX
+-
+-ifeq (gcc, $(CC))
+-# if using gcc on x86, check version for opt bug 
+-# (http://bugzilla.mozilla.org/show_bug.cgi?id=24892)
+-GCC_VERSION := $(shell gcc -v 2>&1 | grep version | awk '{ print $$3 }')
+-GCC_LIST:=$(sort 2.91.66 $(GCC_VERSION) )
+-
+-ifeq (2.91.66, $(firstword $(GCC_LIST)))
+-CFLAGS+= -DGCC_OPT_BUG
+-endif
+-endif
+-endif
+-endif
+-
+ GFX_ARCH = x
+ 
+ OS_LIBS = -lm -lc
+@@ -88,16 +66,6 @@
+ endif
+ 
+ # Use the editline library to provide line-editing support.
+-JS_EDITLINE = 1
++JS_READLINE = 1
+ 
+-ifeq ($(CPU_ARCH),x86_64)
+-# Use VA_COPY() standard macro on x86-64
+-# FIXME: better use it everywhere
+ OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
+-endif
+-
+-ifeq ($(CPU_ARCH),x86_64)
+-# We need PIC code for shared libraries
+-# FIXME: better patch rules.mk & fdlibm/Makefile*
+-OS_CFLAGS += -DPIC -fPIC
+-endif
+--- js/src/rules.mk
++++ js/src/rules.mk
+@@ -82,6 +82,10 @@ $(OBJDIR)/%.o: %.c
+ 	@$(MAKE_OBJDIR)
+ 	$(CC) -o $@ -c $(CFLAGS) $*.c
+ 
++$(OBJDIR)/%.lo: %.c
++	@$(MAKE_OBJDIR)
++	$(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
++
+ $(OBJDIR)/%.o: %.s
+ 	@$(MAKE_OBJDIR)
+ 	$(AS) -o $@ $(ASFLAGS) $*.s
+@@ -111,11 +115,12 @@ $(SHARED_LIBRARY): $(LIB_OBJS)
+ 	    /implib:"$(OBJDIR)/$(@F:.dll=.lib)" $^
+ else
+ $(LIBRARY): $(LIB_OBJS)
+-	$(AR) rv $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+-$(SHARED_LIBRARY): $(LIB_OBJS)
+-	$(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
++SHARED_LIB_OBJS := $(LIB_OBJS:.o=.lo)
++$(SHARED_LIBRARY): $(SHARED_LIB_OBJS)
++	$(MKSHLIB) -o $@ $(SHARED_LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
+ endif
+ endif
+ 
+--- js/src/fdlibm/Makefile.ref
++++ js/src/fdlibm/Makefile.ref
+@@ -151,7 +151,7 @@
+ 
+ $(OBJDIR)/%.o: %.c
+ 	@$(MAKE_OBJDIR)
+-	$(CC) -o $@ -c $(CFLAGS) $*.c
++	$(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
+ 
+ $(OBJDIR)/%.o: %.s
+ 	@$(MAKE_OBJDIR)
+--- js/src/config.mk
++++ js/src/config.mk
+@@ -112,6 +112,8 @@
+ CP = cp
+ endif
+ 
++BUILD_OPT := 1
++
+ ifdef BUILD_OPT
+ OPTIMIZER  = -O
+ DEFINES    += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch b/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch
new file mode 100644
index 0000000..df4cf7d
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch
@@ -0,0 +1,13 @@
+Index: src/Makefile.ref
+===================================================================
+--- src.orig/Makefile.ref
++++ src/Makefile.ref
+@@ -185,6 +185,8 @@ JS_HFILES =		\
+ 	jsstr.h		\
+ 	jsxdrapi.h	\
+ 	jsxml.h		\
++	jsutil.h	\
++	jsprf.h		\
+ 	$(NULL)
+ 
+ API_HFILES =		\

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch
new file mode 100644
index 0000000..4ddc346
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch
@@ -0,0 +1,42 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=331129
+
+--- js/src/Makefile.ref
++++ js/src/Makefile.ref
+@@ -87,7 +87,7 @@
+ LDFLAGS                = $(XLDFLAGS)
+ 
+ ifndef NO_LIBM
+-LDFLAGS += -lm
++OTHER_LIBS += -lm
+ endif
+ 
+ # Prevent floating point errors caused by VC++ optimizations
+@@ -325,7 +325,7 @@
+ 	$(CC) -o $@ -c $(CFLAGS) $<
+ 
+ $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX): $(OBJDIR)/jskwgen.$(OBJ_SUFFIX)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^
++	$(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(OTHER_LIBS) $^
+ 
+ endif
+ 
+@@ -338,7 +338,7 @@
+ 	link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
+ else
+ $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
+-	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
++	$(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(OTHER_LIBS) \
+ 	    $(PROG_LIBS)
+ endif
+ 
+@@ -355,7 +355,7 @@
+ 	$(OBJDIR)/jscpucfg > $@
+ 
+ $(OBJDIR)/jscpucfg: $(OBJDIR)/jscpucfg.o
+-	$(CC) -o $@ $(OBJDIR)/jscpucfg.o
++	$(CC) $(HOST_LDFLAGS) -o $@ $(OBJDIR)/jscpucfg.o
+ 
+ # Add to TARGETS for clobber rule
+ TARGETS += $(OBJDIR)/jsautocfg.h $(OBJDIR)/jscpucfg \

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff
new file mode 100644
index 0000000..8728811
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff
@@ -0,0 +1,18 @@
+Index: src/Makefile.ref
+===================================================================
+--- src.orig/Makefile.ref
++++ src/Makefile.ref
+@@ -63,11 +63,11 @@ INCLUDES   += -I$(OBJDIR)
+ 
+ ifdef JS_THREADSAFE
+ DEFINES += -DJS_THREADSAFE
+-INCLUDES += -I$(DIST)/include/nspr
++INCLUDES += -I/usr/include/nspr
+ ifdef USE_MSVC
+ OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
+ else
+-OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
++OTHER_LIBS += -L/usr/$(LIBDIR)/nspr -lnspr$(NSPR_LIBSUFFIX)
+ endif
+ endif
+ 

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch
new file mode 100644
index 0000000..7c9dd84
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch
@@ -0,0 +1,58 @@
+--- a/js/src/configure.in
++++ b/js/src/configure.in
+@@ -3550,7 +3550,7 @@ AC_MSG_CHECKING(for ARM NEON support in
+ _SAVE_CFLAGS="$CFLAGS"
+ if test "$GNU_CC"; then
+   # gcc needs -mfpu=neon to recognize NEON instructions
+-  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
++  CFLAGS="$CFLAGS -mfpu=neon"
+ fi
+ AC_TRY_COMPILE([],
+                [asm("vadd.i8 d0, d0, d0");],
+@@ -4687,9 +4687,9 @@ if test -n "$MOZ_THUMB2"; then
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_THUMB2)
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
++        CFLAGS="$CFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
++        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
++        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+       fi
+@@ -4703,9 +4703,9 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
+     arm*)
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
++        CFLAGS="$CFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
++        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
++        ASFLAGS="$ASFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
+       fi
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -354,7 +354,7 @@ ASFILES +=	TrampolineSUNWX86.s
+ endif
+ endif
+ endif
+-ifeq (arm, $(TARGET_CPU))
++ifeq (arm, $(findstring arm,$(TARGET_CPU)))
+ #CPPSRCS		+= only_on_arm.cpp
+ endif
+ #
+@@ -436,7 +436,7 @@ else
+ #CPPSRCS		+= only_on_x86.cpp
+ endif
+ endif
+-ifeq (arm, $(TARGET_CPU))
++ifeq (arm, $(findstring arm,$(TARGET_CPU)))
+ #CPPSRCS		+= only_on_arm.cpp
+ endif
+ #
+

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch
new file mode 100644
index 0000000..c867e45
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch
@@ -0,0 +1,15 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+
+--- js/src/Makefile.in
++++ js/src/Makefile.in
+@@ -888,8 +888,8 @@
+ ifeq (,$(HOST_BIN_SUFFIX))
+ 	mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
+ 	@[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
+-	ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
+-	ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
++	ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
++	ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
+ endif
+ endif
+ ifneq (,$(IMPORT_LIBRARY))

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
new file mode 100644
index 0000000..3927c87
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
@@ -0,0 +1,61 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@××××××××.org>
+# Date 1303461188 -7200
+# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
+# Parent  c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
+Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -383,17 +383,17 @@ CPPSRCS += 	checks.cc \
+ 		platform.cc \
+ 		utils.cc \
+ 		$(NONE)
+ 
+ #
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
++ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+ 		$(srcdir)/yarr/pcre \
+ 		$(NULL)
+ 
+ CPPSRCS += 	pcre_compile.cpp \
+                 pcre_exec.cpp \
+
+# HG changeset patch
+# User Luke Wagner <lw@×××××××.com>
+# Date 1299520258 28800
+# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
+# Parent  27e5814815491ebb68e474e453aff6c2ea908c43
+Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
+
+diff --git a/js/src/jsval.h b/js/src/jsval.h
+--- a/js/src/jsval.h
++++ b/js/src/jsval.h
+@@ -342,16 +342,17 @@ typedef union jsval_layout
+         JSValueTag         tag : 17;
+         uint64             payload47 : 47;
+     } debugView;
+     struct {
+         union {
+             int32          i32;
+             uint32         u32;
+             JSWhyMagic     why;
++            jsuword        word;
+         } payload;
+     } s;
+     double asDouble;
+     void *asPtr;
+ } jsval_layout;
+ # endif /* JS_BITS_PER_WORD */
+ #endif  /* defined(IS_LITTLE_ENDIAN) */
+ 
+
+
+

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch
new file mode 100644
index 0000000..65d0a2d
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch
@@ -0,0 +1,18 @@
+--- a/js/src/Makefile.in	2012-06-18 13:53:41.000000000 -0400
++++ b/js/src/Makefile.in	2012-06-18 13:55:44.000000000 -0400
+@@ -965,10 +965,10 @@
+ endif
+ endif
+ 
+-install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
+-ifneq (,$(LIBRARY))
+-	$(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
+-	mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
++install:: $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
++ifneq (,$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
++	$(SYSINSTALL) $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(DESTDIR)$(libdir)
++	mv -f $(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(subst $(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
+ endif
+ ifneq (,$(SHARED_LIBRARY))
+ ifeq (,$(HOST_BIN_SUFFIX))
+

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch b/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
new file mode 100644
index 0000000..847bf79
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
@@ -0,0 +1,22 @@
+diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
+--- a/js/src/jsapi-tests/Makefile.in
++++ b/js/src/jsapi-tests/Makefile.in
+@@ -55,17 +55,17 @@ CPPSRCS = \
+   testSameValue.cpp \
+   testDebugger.cpp \
+   testDefineGetterSetterNonEnumerable.cpp \
+   testExtendedEq.cpp \
+   $(NULL)
+ 
+ DEFINES         += -DEXPORT_JS_API
+ 
+-LIBS      = $(NSPR_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX)
++LIBS      = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS)
+ 
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+ 
+ ifdef _MSC_VER
+ ifdef WINCE
+ WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup
+ endif
+ endif

diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild
new file mode 100644
index 0000000..b6d1054
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild,v 1.2 2011/03/22 15:51:21 jer Exp $
+
+inherit eutils toolchain-funcs multilib flag-o-matic
+
+MY_P="js-${PV}"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz"
+
+LICENSE="NPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="threadsafe unicode"
+
+S="${WORKDIR}/js/src"
+
+RDEPEND="threadsafe? ( dev-libs/nspr )"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.5-build.patch"
+	epatch "${FILESDIR}/${PN}-1.6-header.patch"
+	epatch "${FILESDIR}/${P}-threadsafe.diff"
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# Don't try to be smart, this does not work in cross-compile anyway
+		ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
+	fi
+}
+
+src_compile() {
+	use unicode && append-flags "-DJS_C_STRINGS_ARE_UTF8"
+	tc-export CC LD AR
+	if use threadsafe; then
+		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" JS_THREADSAFE=1 \
+		|| die "emake with threadsafe enabled failed";
+	else
+		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" \
+		|| die "emake without threadsafe enabled failed";
+	fi
+}
+
+src_install() {
+	emake -f Makefile.ref install DESTDIR="${D}" LIBDIR="$(get_libdir)" || die
+	dodoc ../jsd/README
+	dohtml README.html
+}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild
new file mode 100644
index 0000000..b6278f9
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild,v 1.2 2011/03/22 15:51:21 jer Exp $
+
+inherit eutils toolchain-funcs multilib flag-o-matic
+
+MY_P="js-${PV}"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz"
+
+LICENSE="NPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="threadsafe unicode"
+
+S="${WORKDIR}/js/src"
+
+RDEPEND="threadsafe? ( dev-libs/nspr )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.5-build.patch"
+	epatch "${FILESDIR}/${PN}-1.6-header.patch"
+	epatch "${FILESDIR}/${P}-threadsafe.diff" \
+		"${FILESDIR}"/${P}-ldflags.patch
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# Don't try to be smart, this does not work in cross-compile anyway
+		ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
+	fi
+}
+
+src_compile() {
+	use unicode && append-flags "-DJS_C_STRINGS_ARE_UTF8"
+	tc-export CC LD AR
+	if use threadsafe; then
+		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" JS_THREADSAFE=1 \
+			XLDFLAGS="$(raw-ldflags)" HOST_LDFLAGS="${LDFLAGS}" \
+				|| die "emake with threadsafe enabled failed";
+	else
+		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" XLDFLAGS="$(raw-ldflags)" \
+		HOST_LDFLAGS="${LDFLAGS}" || die "emake without threadsafe enabled failed";
+	fi
+}
+
+src_install() {
+	emake -f Makefile.ref install DESTDIR="${D}" LIBDIR="$(get_libdir)" || die
+	dodoc ../jsd/README
+	dohtml README.html
+}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild
new file mode 100644
index 0000000..2d26d44
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild,v 1.9 2011/03/22 15:51:21 jer Exp $
+
+inherit eutils toolchain-funcs multilib
+
+MY_P="js-${PV}"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz"
+
+LICENSE="NPL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="threadsafe"
+
+S="${WORKDIR}/js/src"
+
+RDEPEND="threadsafe? ( dev-libs/nspr )"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.5-build.patch"
+	epatch "${FILESDIR}/${PN}-1.6-header.patch"
+	epatch "${FILESDIR}/${P}-threadsafe.diff"
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# Don't try to be smart, this does not work in cross-compile anyway
+		ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
+	fi
+}
+
+src_compile() {
+	tc-export CC LD AR
+	if use threadsafe; then
+		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" JS_THREADSAFE=1 \
+		|| die "emake with threadsafe enabled failed";
+	else
+		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" \
+		|| die "emake without threadsafe enabled failed";
+	fi
+}
+
+src_install() {
+	emake -f Makefile.ref install DESTDIR="${D}" LIBDIR="$(get_libdir)" || die
+	dodoc ../jsd/README
+	dohtml README.html
+}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r1.ebuild
new file mode 100644
index 0000000..f04b0bd
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r1.ebuild,v 1.2 2012/05/03 02:41:39 jdhore Exp $
+
+EAPI="3"
+inherit eutils toolchain-funcs multilib python
+
+MY_PV="${PV}"
+MY_PV="${MY_PV/1.8.2/3.6}"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
+SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2"
+
+LICENSE="NPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
+IUSE="threadsafe"
+
+S="${WORKDIR}/mozilla-1.9.2"
+BUILDDIR="${S}/js/src"
+
+RDEPEND="threadsafe? ( >=dev-libs/nspr-4.8.6 )"
+
+DEPEND="${RDEPEND}
+	app-arch/zip
+	=dev-lang/python-2*[threads]
+	virtual/pkgconfig"
+
+pkg_setup(){
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.9.2.13-as-needed.patch"
+
+	epatch_user
+
+	cd "${S}"
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# Don't try to be smart, this does not work in cross-compile anyway
+		ln -s "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
+	fi
+}
+
+src_configure() {
+	cd ${BUILDDIR}
+
+	local myconf
+
+	if use threadsafe ; then
+		myconf="${myconf} --with-system-nspr \
+			--enable-threadsafe"
+	fi
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf \
+		${myconf}
+}
+
+src_compile() {
+	cd ${BUILDDIR}
+	emake -j1 || die "emake failed";
+}
+
+src_install() {
+	cd ${BUILDDIR}
+	emake install DESTDIR="${D}" || die
+	dobin shell/js ||die
+	dodoc ../jsd/README
+	dohtml README.html
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fixup install_name
+		install_name_tool -id "${EPREFIX}"/usr/$(get_libdir)/libmozjs.dylib \
+			"${ED}"/usr/$(get_libdir)/libmozjs.dylib || die
+	fi
+}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild
new file mode 100644
index 0000000..6f708f3
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild,v 1.3 2012/05/03 02:41:39 jdhore Exp $
+
+EAPI="3"
+inherit eutils toolchain-funcs multilib python
+
+MY_PV="${PV}"
+MY_PV="${MY_PV/1.8.2/3.6}"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
+SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2"
+
+LICENSE="NPL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x86-macos"
+IUSE="threadsafe"
+
+S="${WORKDIR}/mozilla-1.9.2"
+BUILDDIR="${S}/js/src"
+
+RDEPEND="threadsafe? ( >=dev-libs/nspr-4.8.6 )"
+
+DEPEND="${RDEPEND}
+	app-arch/zip
+	=dev-lang/python-2*[threads]
+	virtual/pkgconfig"
+
+pkg_setup(){
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.9.2.13-as-needed.patch"
+
+	epatch_user
+
+	cd "${S}"
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# Don't try to be smart, this does not work in cross-compile anyway
+		ln -s "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
+	fi
+}
+
+src_configure() {
+	cd ${BUILDDIR}
+
+	local myconf
+
+	if use threadsafe ; then
+		myconf="${myconf} --with-system-nspr \
+			--enable-threadsafe"
+	fi
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf \
+		${myconf}
+}
+
+src_compile() {
+	cd ${BUILDDIR}
+	emake -j1 || die "emake failed";
+}
+
+src_install() {
+	cd ${BUILDDIR}
+	emake install DESTDIR="${D}" || die
+	dodoc ../jsd/README
+	dohtml README.html
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fixup install_name
+		install_name_tool -id "${EPREFIX}"/usr/$(get_libdir)/libmozjs.dylib \
+			"${ED}"/usr/$(get_libdir)/libmozjs.dylib || die
+	fi
+}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
similarity index 73%
copy from dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
copy to dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
index 4f5b1ae..f1372a4 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild,v 1.2 2012/06/19 23:18:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.8 2012/06/19 23:18:48 blueness Exp $
 
 EAPI="4-slot-abi"
 WANT_AUTOCONF="2.1"
@@ -10,22 +10,19 @@ MY_PN="js"
 TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
 MY_P="${MY_PN}-${PV}"
 TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-SPIDERPV="${PV}-patches-0.1"
 DESCRIPTION="Stand-alone JavaScript C library"
 HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="http://people.mozilla.com/~dmandelin/${TARBALL_P}.tar.gz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
 
 LICENSE="NPL-1.1"
-SLOT="0/187"
+SLOT="0/185"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug jit static-libs test"
+IUSE="debug static-libs test"
 
 S="${WORKDIR}/${MY_P}"
 BUILDDIR="${S}/js/src"
 
-RDEPEND=">=dev-libs/nspr-4.7.0
-	virtual/libffi"
+RDEPEND=">=dev-libs/nspr-4.7.0"
 DEPEND="${RDEPEND}
 	app-arch/zip
 	=dev-lang/python-2*[threads]
@@ -33,18 +30,18 @@ DEPEND="${RDEPEND}
 
 pkg_setup(){
 	python_set_active_version 2
+	python_pkg_setup
 
 	export LC_ALL="C"
 }
 
 src_prepare() {
-	# Apply patches that are required for misc archs
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/spidermonkey"
-
-	epatch "${FILESDIR}"/${PN}-1.8.5-fix-install-symlinks.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
+	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=400727
+	epatch "${FILESDIR}/${P}-arm_resprect_cflags-1.patch"
 
 	epatch_user
 
@@ -67,11 +64,7 @@ src_configure() {
 		--enable-readline \
 		--enable-threadsafe \
 		--with-system-nspr \
-		--enable-system-ffi \
-		--enable-jemalloc \
 		$(use_enable debug) \
-		$(use_enable jit tracejit) \
-		$(use_enable jit methodjit) \
 		$(use_enable static-libs static) \
 		$(use_enable test tests)
 }
@@ -111,16 +104,9 @@ src_install() {
 	cd "${BUILDDIR}"
 	emake DESTDIR="${D}" install
 	dobin shell/js
-	if use jit ; then
-		pax-mark m "${ED}/usr/bin/js"
-	fi
+	pax-mark m "${ED}/usr/bin/js"
 	dodoc ../../README
 	dohtml README.html
-	# install header files needed but not part of build system
-	insinto /usr/include/js
-	doins ../public/*.h
-	insinto /usr/include/js/mozilla
-	doins "${S}"/mfbt/*.h
 
 	if ! use static-libs; then
 		# We can't actually disable building of static libraries

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
index 4f5b1ae..4123aa4 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup(){
 	python_set_active_version 2
+	python_pkg_setup
 
 	export LC_ALL="C"
 }

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
new file mode 100644
index 0000000..63585e5
--- /dev/null
+++ b/dev-libs/gjs/Manifest
@@ -0,0 +1,6 @@
+DIST gjs-1.30.1.tar.xz 455456 RMD160 10a44261cb801a2d8eacb075addc296476953f3a SHA1 269796944742bb3f86bbe017620a65f2fea50207 SHA256 f5db07ddf70458a33a5d0bdf83f84070fc234237ecb0d49a8676e67b52119a05
+DIST gjs-1.32.0.tar.xz 464372 RMD160 977ea08c57cb99c597ccf49b994f4c31f8e07458 SHA1 7ea9c2bbcef40f65c0e7aa04e6f2df8c553516ee SHA256 b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0
+EBUILD gjs-1.30.1.ebuild 1461 RMD160 4011b946d7008258583b96a6481c820fd066d8de SHA1 30ab6c8dc06b4e157185c94674eccd44a7c23874 SHA256 dc97e6db47256a1fd31e955c6b2ab513cf890c1ea01bdd8178d8d9478dfb0925
+EBUILD gjs-1.32.0.ebuild 1553 RMD160 c29f93544192716b66706062cd408830be3ccf94 SHA1 82fbb70782604560f830ddface0669abb64de0eb SHA256 b3c4f492a3a09ec91fbabcf5180ef0db5a52ca23d5a785c38af0f3c9626fb937
+MISC ChangeLog 1603 RMD160 2aaa024602d84fa13d3e35c8ccfe555b6f429b47 SHA1 61a63c46598ffd0399081d4f4cb2bf0fe70f1bcd SHA256 f2ea2c62b46b74b04466a1f91f80e58bc8e0a9670d74c339aa2d9cb370edb4e1
+MISC metadata.xml 160 RMD160 2b0d347221b384d4765ecdcccefbc74b0ae502ef SHA1 ae1b892a3e72888c5b66b520f15f740576f607ec SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2

diff --git a/dev-libs/gjs/gjs-1.30.1.ebuild b/dev-libs/gjs/gjs-1.30.1.ebuild
new file mode 100644
index 0000000..724951d
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.30.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.30.1.ebuild,v 1.2 2012/05/04 18:35:43 jdhore Exp $
+
+EAPI="4-slot-abi"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
+
+inherit gnome2 python virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="http://live.gnome.org/Gjs"
+
+LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
+SLOT="0"
+IUSE="examples test"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=dev-libs/gobject-introspection-1.29.16
+
+	dev-libs/dbus-glib
+	sys-libs/readline
+	x11-libs/cairo
+	>=dev-lang/spidermonkey-1.8.5:="
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# AUTHORS, ChangeLog are empty
+	DOCS="NEWS README"
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	G2CONF="${G2CONF}
+		--with-js-package=mozjs185
+		--disable-systemtap
+		--disable-dtrace
+		--disable-coverage"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	python_convert_shebangs 2 "${S}"/scripts/make-tests
+}
+
+src_test() {
+	# Tests need dbus
+	Xemake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins ${S}/examples/*
+	fi
+}

diff --git a/dev-libs/gjs/gjs-1.32.0.ebuild b/dev-libs/gjs/gjs-1.32.0.ebuild
new file mode 100644
index 0000000..4272765
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.32.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.32.0.ebuild,v 1.3 2012/05/28 00:19:48 mattst88 Exp $
+
+EAPI="4-slot-abi"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
+
+inherit gnome2 pax-utils python virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="http://live.gnome.org/Gjs"
+
+LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
+SLOT="0"
+IUSE="examples test"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.31:2
+	>=dev-libs/gobject-introspection-1.31.22
+
+	dev-libs/dbus-glib
+	sys-libs/readline
+	x11-libs/cairo
+	>=dev-lang/spidermonkey-1.8.5:="
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# AUTHORS, ChangeLog are empty
+	DOCS="NEWS README"
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	G2CONF="${G2CONF}
+		--disable-systemtap
+		--disable-dtrace
+		--disable-coverage"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	python_convert_shebangs 2 "${S}"/scripts/make-tests
+}
+
+src_test() {
+	# Tests need dbus
+	Xemake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins ${S}/examples/*
+	fi
+
+	# Required for gjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/gjs-console"
+}

diff --git a/dev-libs/libyaml/libyaml-0.0.1.ebuild b/dev-libs/libyaml/libyaml-0.0.1.ebuild
new file mode 100644
index 0000000..c3c1742
--- /dev/null
+++ b/dev-libs/libyaml/libyaml-0.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.0.1.ebuild,v 1.4 2009/03/01 16:35:13 patrick Exp $
+
+inherit eutils
+
+MY_P="${P/lib}"
+
+DESCRIPTION="YAML 1.1 parser and emitter written in C"
+HOMEPAGE="http://pyyaml.org/wiki/LibYAML"
+SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc examples"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# conditionally remove tests
+	if use test ; then
+		sed -i -e 's: tests::g' Makefile*
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	use doc && dohtml -r doc/html/.
+	dodoc README
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins tests/example-*.c
+	fi
+}

diff --git a/dev-libs/libyaml/libyaml-0.1.2.ebuild b/dev-libs/libyaml/libyaml-0.1.2.ebuild
new file mode 100644
index 0000000..079318b
--- /dev/null
+++ b/dev-libs/libyaml/libyaml-0.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.2.ebuild,v 1.8 2010/01/14 21:39:14 fauli Exp $
+
+inherit eutils
+
+MY_P="${P/lib}"
+
+DESCRIPTION="YAML 1.1 parser and emitter written in C"
+HOMEPAGE="http://pyyaml.org/wiki/LibYAML"
+SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-linux ~x86-macos"
+IUSE="doc examples test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# conditionally remove tests
+	if use test ; then
+		sed -i -e 's: tests::g' Makefile*
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	use doc && dohtml -r doc/html/.
+	dodoc README
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins tests/example-*.c
+	fi
+}

diff --git a/dev-libs/libyaml/libyaml-0.1.3.ebuild b/dev-libs/libyaml/libyaml-0.1.3.ebuild
new file mode 100644
index 0000000..e8659e2
--- /dev/null
+++ b/dev-libs/libyaml/libyaml-0.1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.3.ebuild,v 1.8 2011/12/29 17:07:04 jer Exp $
+
+EAPI="2"
+
+inherit eutils
+
+MY_P="${P/lib}"
+
+DESCRIPTION="YAML 1.1 parser and emitter written in C"
+HOMEPAGE="http://pyyaml.org/wiki/LibYAML"
+SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="doc examples test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# conditionally remove tests
+	if use test ; then
+		sed -i -e 's: tests::g' Makefile*
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	use doc && dohtml -r doc/html/.
+	dodoc README
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins tests/example-*.c
+	fi
+}

diff --git a/dev-perl/AnyEvent/AnyEvent-5.2.5.1.ebuild b/dev-perl/AnyEvent/AnyEvent-5.2.5.1.ebuild
new file mode 100644
index 0000000..ea62551
--- /dev/null
+++ b/dev-perl/AnyEvent/AnyEvent-5.2.5.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/AnyEvent/AnyEvent-5.2.5.1.ebuild,v 1.6 2011/09/11 17:58:24 armin76 Exp $
+
+EAPI=2
+
+inherit versionator
+MODULE_AUTHOR=MLEHMANN
+MY_P=${PN}-$(get_major_version).$(delete_all_version_separators $(get_after_major_version))
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="provide framework for multiple event loops"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-perl/Event"
+DEPEND=""
+
+SRC_TEST="do"

diff --git a/dev-perl/Apache-SizeLimit/files/Apache-SizeLimit-0.95-Fix_Linux-Smaps_detection.patch b/dev-perl/Apache-SizeLimit/files/Apache-SizeLimit-0.95-Fix_Linux-Smaps_detection.patch
new file mode 100644
index 0000000..56283f8
--- /dev/null
+++ b/dev-perl/Apache-SizeLimit/files/Apache-SizeLimit-0.95-Fix_Linux-Smaps_detection.patch
@@ -0,0 +1,25 @@
+From 6b1b60546ffca416a65d047a1c0d5d2b610b4dac Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@g.o>
+Date: Fri, 25 Mar 2011 17:42:54 +0100
+Subject: [PATCH] Fix Linux::Smaps detection to *not* die if /proc/self/smaps doesn't exist
+
+---
+ lib/Apache/SizeLimit/Core.pm |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/Apache/SizeLimit/Core.pm b/lib/Apache/SizeLimit/Core.pm
+index 5942bc8..f2fbac4 100644
+--- a/lib/Apache/SizeLimit/Core.pm
++++ b/lib/Apache/SizeLimit/Core.pm
+@@ -143,7 +143,7 @@ BEGIN {
+ 
+         *_platform_getppid = \&_linux_getppid;
+ 
+-        if (eval { require Linux::Smaps } && Linux::Smaps->new($$)) {
++        if (eval { require Linux::Smaps && Linux::Smaps->new($$) }) {
+             $USE_SMAPS = 1;
+             *_platform_check_size = \&_linux_smaps_size_check;
+         }
+-- 
+1.7.3.4
+

diff --git a/dev-perl/AppConfig/files/blockdiffs.patch b/dev-perl/AppConfig/files/blockdiffs.patch
new file mode 100644
index 0000000..2e30310
--- /dev/null
+++ b/dev-perl/AppConfig/files/blockdiffs.patch
@@ -0,0 +1,83 @@
+diff -Naurp AppConfig-1.65.orig/lib/AppConfig/File.pm AppConfig-1.65/lib/AppConfig/File.pm
+--- AppConfig-1.65.orig/lib/AppConfig/File.pm	2007-05-30 07:24:09.000000000 -0400
++++ AppConfig-1.65/lib/AppConfig/File.pm	2007-06-09 07:08:21.000000000 -0400
+@@ -38,6 +38,7 @@ sub new {
+         STATE    => $state,                # AppConfig::State ref
+         DEBUG    => $state->_debug(),      # store local copy of debug 
+         PEDANTIC => $state->_pedantic,     # and pedantic flags
++        BLOCKSEP => $state->_blocksep,     # and block separator
+     };
+ 
+     bless $self, $class;
+@@ -80,7 +81,7 @@ sub parse {
+     my $flag;
+ 
+     # take a local copy of the state to avoid much hash dereferencing
+-    my ($state, $debug, $pedantic) = @$self{ qw( STATE DEBUG PEDANTIC ) };
++    my ($state, $debug, $pedantic, $blocksep) = @$self{ qw( STATE DEBUG PEDANTIC BLOCKSEP ) };
+ 
+     # we want to install a custom error handler into the AppConfig::State 
+     # which appends filename and line info to error messages and then 
+@@ -163,7 +164,7 @@ sub parse {
+             s/\s+$//;
+ 
+             # look for a [block] to set $prefix
+-            if (/^\[([^\]]+)\]$/) {
++            if (/^\[\s*([^\]\s]+)\s*\]$/) {
+                 $prefix = $1;
+                 print STDERR "Entering [$prefix] block\n" if $debug;
+                 next;
+@@ -194,7 +195,7 @@ sub parse {
+                 $flag = $1;
+ 
+                 # $variable gets any $prefix 
+-                $variable = $prefix . '_' . $variable
++                $variable = $prefix . $blocksep . $variable
+                     if length $prefix;
+ 
+                 # if the variable doesn't exist, we call set() to give 
+diff -Naurp AppConfig-1.65.orig/lib/AppConfig/State.pm AppConfig-1.65/lib/AppConfig/State.pm
+--- AppConfig-1.65.orig/lib/AppConfig/State.pm	2007-05-30 07:24:20.000000000 -0400
++++ AppConfig-1.65/lib/AppConfig/State.pm	2007-06-09 07:11:16.000000000 -0400
+@@ -53,7 +53,7 @@ my %METHVARS;
+ 
+ # internal values that AUTOLOAD should provide access to
+ my %METHFLAGS;
+-   @METHFLAGS{ qw( PEDANTIC ) } = ();
++   @METHFLAGS{ qw( PEDANTIC BLOCKSEP ) } = ();
+ 
+ # variable attributes that may be specified in GLOBAL;
+ my @GLOBAL_OK = qw( DEFAULT EXPAND VALIDATE ACTION ARGS ARGCOUNT );
+@@ -94,6 +94,7 @@ sub new {
+         PEDANTIC   => 0,       # return immediately on parse warnings
+         EHANDLER   => undef,   # error handler (let's hope we don't need it!)
+         ERROR      => '',      # error message
++        BLOCKSEP   => '_',     # separator between [block] and variable name
+     };
+ 
+     bless $self, $class;
+@@ -504,8 +505,8 @@ sub _configure {
+             next;
+         };
+             
+-        # CASE, CREATE and PEDANTIC are stored as they are
+-        $opt =~ /^CASE|CREATE|PEDANTIC$/i && do {
++        # CASE, CREATE, PEDANTIC and BLOCKSEP are stored as they are
++        $opt =~ /^CASE|CREATE|PEDANTIC|BLOCKSEP$/i && do {
+             $self->{ uc $opt } = $cfg->{ $opt };
+             next;
+         };
+@@ -1015,6 +1016,13 @@ instantiated with a reference to an App:
+ DEBUG (and also PEDANTIC) values of the state at that time.  Subsequent
+ changes to the AppConfig::State debug value will not affect them.
+ 
++=item BLOCKSEP
++
++When parsing configuration files that are grouped using constructions
++like [block], this string parameter determines what is used to
++separate the name of the block from the name of each variable
++contained within it.  If unspecified, BLOCKSEP defaults to '_'.
++
+ =item GLOBAL 
+ 
+ The GLOBAL option allows default values to be set for the DEFAULT, ARGCOUNT, 

diff --git a/dev-perl/Archive-Rar/Archive-Rar-1.9.3.ebuild b/dev-perl/Archive-Rar/Archive-Rar-1.9.3.ebuild
new file mode 100644
index 0000000..49a2364
--- /dev/null
+++ b/dev-perl/Archive-Rar/Archive-Rar-1.9.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Archive-Rar/Archive-Rar-1.9.3.ebuild,v 1.5 2008/12/23 08:48:55 robbat2 Exp $
+
+inherit versionator
+MODULE_AUTHOR=SMUELLER
+MY_P="${PN}-$(delete_version_separator 2)"
+inherit perl-module
+
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Archive::Rar - Interface with the rar command"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-lang/perl
+	app-arch/rar"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Test-Pod )"
+
+SRC_TEST="do"

diff --git a/dev-perl/B-OPCheck/files/0.29-Perl_check_t.patch b/dev-perl/B-OPCheck/files/0.29-Perl_check_t.patch
new file mode 100644
index 0000000..77cec36
--- /dev/null
+++ b/dev-perl/B-OPCheck/files/0.29-Perl_check_t.patch
@@ -0,0 +1,15 @@
+https://rt.cpan.org/Public/Bug/Display.html?id=57356
+
+--- B-OPCheck-0.29/OPCheck.xs
++++ B-OPCheck-0.29/OPCheck.xs
+@@ -12,10 +12,6 @@
+ #define NEED_sv_2pv_flags
+ #include "ppport.h"
+ 
+-#if PERL_VERSION < 9
+-typedef OP* (CPERLscope(*Perl_check_t)) (pTHX_ OP*);
+-#endif
+-
+ STATIC AV **OPCHECK_subs;
+ Perl_check_t *PL_check_orig;
+ 

diff --git a/dev-perl/BerkeleyDB/files/Gentoo-config-0.26.diff b/dev-perl/BerkeleyDB/files/Gentoo-config-0.26.diff
new file mode 100644
index 0000000..616beba
--- /dev/null
+++ b/dev-perl/BerkeleyDB/files/Gentoo-config-0.26.diff
@@ -0,0 +1,23 @@
+#diff -Naurp config.old config.in
+--- config.old	2004-10-21 08:11:53.000000000 -0400
++++ config.in	2004-10-21 08:13:05.000000000 -0400
+@@ -9,7 +9,8 @@
+ 
+ #INCLUDE	= /usr/local/include
+ #INCLUDE	= ../..
+-INCLUDE	= /usr/local/BerkeleyDB/include
++#INCLUDE	= /usr/local/BerkeleyDB/include
++INCLUDE         = /usr/include
+ 
+ # 2. Where is libdb?
+ #
+@@ -18,7 +19,8 @@ INCLUDE	= /usr/local/BerkeleyDB/include
+ 
+ #LIB	= /usr/local/lib
+ #LIB	= ../..
+-LIB	= /usr/local/BerkeleyDB/lib
++#LIB	= /usr/local/BerkeleyDB/lib
++LIB     = /usr/lib
+ 
+ # 3. Is the library called libdb?
+ #

diff --git a/dev-perl/CPAN-Mini/CPAN-Mini-0.562.ebuild b/dev-perl/CPAN-Mini/CPAN-Mini-0.562.ebuild
new file mode 100644
index 0000000..d84f148
--- /dev/null
+++ b/dev-perl/CPAN-Mini/CPAN-Mini-0.562.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/CPAN-Mini/CPAN-Mini-0.562.ebuild,v 1.6 2012/06/17 16:33:54 armin76 Exp $
+
+inherit perl-module
+
+DESCRIPTION="create a minimal mirror of CPAN"
+HOMEPAGE="http://search.cpan.org/~rjbs/${P}/"
+SRC_URI="mirror://cpan/authors/id/R/RJ/RJBS/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+SRC_TEST="do"
+
+DEPEND="dev-perl/libwww-perl
+		>=virtual/perl-IO-Compress-1.20
+		dev-perl/File-HomeDir
+		dev-perl/URI
+	dev-lang/perl"

diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.24.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.24.ebuild
new file mode 100644
index 0000000..6fc2a2e
--- /dev/null
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.24.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cache-Memcached/Cache-Memcached-1.24.ebuild,v 1.10 2011/07/30 10:21:00 tove Exp $
+
+inherit perl-module
+
+DESCRIPTION="Perl API for memcached"
+HOMEPAGE="http://www.danga.com/memcached/"
+SRC_URI="mirror://cpan/authors/id/B/BR/BRADFITZ/${P}.tar.gz"
+
+SRC_TEST="do"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-perl/string-crc32
+	dev-lang/perl"
+mydoc="ChangeLog README TODO"

diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.26.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.26.ebuild
new file mode 100644
index 0000000..31754f3
--- /dev/null
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.26.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cache-Memcached/Cache-Memcached-1.26.ebuild,v 1.2 2011/07/30 10:21:00 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=BRADFITZ
+inherit perl-module
+
+DESCRIPTION="Perl API for memcached"
+HOMEPAGE="http://www.danga.com/memcached/"
+
+SRC_TEST="do"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-perl/string-crc32
+	dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+mydoc="ChangeLog README TODO"

diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.27.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.27.ebuild
new file mode 100644
index 0000000..44adce7
--- /dev/null
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.27.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cache-Memcached/Cache-Memcached-1.27.ebuild,v 1.2 2011/07/30 10:21:00 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=BRADFITZ
+inherit perl-module
+
+DESCRIPTION="Perl API for memcached"
+HOMEPAGE="http://www.danga.com/memcached/"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-perl/string-crc32"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
+mydoc="ChangeLog README TODO"

diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.28.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.28.ebuild
new file mode 100644
index 0000000..d1540dd
--- /dev/null
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.28.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cache-Memcached/Cache-Memcached-1.28.ebuild,v 1.3 2011/07/30 10:21:00 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=BRADFITZ
+inherit perl-module
+
+DESCRIPTION="Perl API for memcached"
+HOMEPAGE="http://www.danga.com/memcached/"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-perl/string-crc32"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
+mydoc="ChangeLog README TODO"

diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.29.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.29.ebuild
new file mode 100644
index 0000000..081edb7
--- /dev/null
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.29.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cache-Memcached/Cache-Memcached-1.29.ebuild,v 1.2 2011/07/30 10:21:00 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=DORMANDO
+inherit perl-module
+
+DESCRIPTION="Perl API for memcached"
+HOMEPAGE="http://www.danga.com/memcached/"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-perl/string-crc32"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
+mydoc="ChangeLog README TODO"

diff --git a/dev-perl/Chart/Chart-2.4.2.ebuild b/dev-perl/Chart/Chart-2.4.2.ebuild
new file mode 100644
index 0000000..93a608b
--- /dev/null
+++ b/dev-perl/Chart/Chart-2.4.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Chart/Chart-2.4.2.ebuild,v 1.5 2012/03/02 21:31:47 ranger Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=CHARTGRP
+inherit perl-module
+
+DESCRIPTION="The Perl Chart Module"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND=">=dev-perl/GD-2.0.36"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/GD[png] )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Class-Load/Class-Load-0.06.ebuild b/dev-perl/Class-Load/Class-Load-0.06.ebuild
new file mode 100644
index 0000000..f02a71f
--- /dev/null
+++ b/dev-perl/Class-Load/Class-Load-0.06.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Load/Class-Load-0.06.ebuild,v 1.8 2011/07/07 23:04:56 aballier Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=SARTAK
+inherit perl-module
+
+DESCRIPTION="a working (require q{Class::Name}) and more "
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="virtual/perl-Scalar-List-Utils"
+DEPEND="${RDEPEND}
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/Test-Fatal
+	)"
+
+SRC_TEST="do"

diff --git a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.15.ebuild b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.15.ebuild
new file mode 100644
index 0000000..6c13d65
--- /dev/null
+++ b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.15.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-MethodMaker/Class-MethodMaker-2.15.ebuild,v 1.11 2010/01/09 17:32:44 grobian Exp $
+
+MODULE_AUTHOR=SCHWIGON
+MODULE_SECTION=class-methodmaker
+inherit perl-module eutils
+
+DESCRIPTION="Perl module for Class::MethodMaker"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+SRC_TEST="do"

diff --git a/dev-perl/Class-Singleton/Class-Singleton-1.03.ebuild b/dev-perl/Class-Singleton/Class-Singleton-1.03.ebuild
new file mode 100644
index 0000000..5b87cfb
--- /dev/null
+++ b/dev-perl/Class-Singleton/Class-Singleton-1.03.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Singleton/Class-Singleton-1.03.ebuild,v 1.18 2010/12/03 01:24:12 xmw Exp $
+
+inherit perl-module
+
+DESCRIPTION="Implementation of a Singleton class"
+HOMEPAGE="http://search.cpan.org/~abw/"
+SRC_URI="mirror://cpan/authors/id/A/AB/ABW/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.340.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.340.ebuild
new file mode 100644
index 0000000..d8d76a9
--- /dev/null
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.340.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Convert-UUlib/Convert-UUlib-1.340.ebuild,v 1.6 2011/01/24 03:24:59 jer Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=MLEHMANN
+MODULE_VERSION=1.34
+inherit perl-module
+
+DESCRIPTION="A Perl interface to the uulib library"
+
+LICENSE="Artistic GPL-2" # needs both
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/dev-perl/Crypt-Cracklib/files/1.4-disable-reversed-test.patch b/dev-perl/Crypt-Cracklib/files/1.4-disable-reversed-test.patch
new file mode 100644
index 0000000..f8cde38
--- /dev/null
+++ b/dev-perl/Crypt-Cracklib/files/1.4-disable-reversed-test.patch
@@ -0,0 +1,17 @@
+--- Crypt-Cracklib-1.4/t/01use.t
++++ Crypt-Cracklib-1.4/t/01use.t
+@@ -1,4 +1,4 @@
+-use Test::More tests => 19;
++use Test::More tests => 18;
+ 
+ BEGIN { use_ok( 'Crypt::Cracklib' ); }
+ 
+@@ -28,7 +28,7 @@
+ like(fascist_check('dictionary'), qr/dictionary/, "dictionary");
+ 
+ # it is based on a (reversed) dictionary word
+-like(fascist_check('1elppa'), qr/reversed/, "reversed dictionary");
++#like(fascist_check('1elppa'), qr/reversed/, "reversed dictionary");
+ 
+ # Ok
+ ok(fascist_check('Sil1ntBob') eq 'ok');

diff --git a/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.04.ebuild b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.04.ebuild
new file mode 100644
index 0000000..63e37bd
--- /dev/null
+++ b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.04.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.04.ebuild,v 1.15 2012/06/17 14:25:34 armin76 Exp $
+
+inherit perl-module
+
+DESCRIPTION="Crypt::RIPEMD160 module for perl"
+HOMEPAGE="http://search.cpan.org/~chgeuer/"
+SRC_URI="mirror://cpan/authors/id/C/CH/CHGEUER/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+export OPTIMIZE="$CFLAGS"
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/Crypt-RIPEMD160/files/0.50.0-header.patch b/dev-perl/Crypt-RIPEMD160/files/0.50.0-header.patch
new file mode 100644
index 0000000..e2abeda
--- /dev/null
+++ b/dev-perl/Crypt-RIPEMD160/files/0.50.0-header.patch
@@ -0,0 +1,8 @@
+--- Crypt-RIPEMD160-0.05/wrap_160.c
++++ Crypt-RIPEMD160-0.05/wrap_160.c
+@@ -1,4 +1,5 @@
+ #include <string.h>
++#include <stdio.h>
+ 
+ #include "rmd160.h"
+ #include "wrap_160.h"

diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.57.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.57.ebuild
new file mode 100644
index 0000000..c80723b
--- /dev/null
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.57.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.57.ebuild,v 1.13 2011/07/30 10:21:58 tove Exp $
+
+MODULE_AUTHOR=DLAND
+inherit perl-module
+
+DESCRIPTION="Crypt::SSLeay module for perl"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Disabling tests for now. Opening a port always leads to mixed results for
+# folks - bug 59554
+# nb. Re-enabled tests, seem to be better written now, keeping an eye on bugs
+# for this though.
+SRC_TEST="do"
+
+DEPEND=">=dev-lang/perl-5
+	>=dev-libs/openssl-0.9.7c"
+# PDEPEND: circular dependencies bug #144761
+PDEPEND="dev-perl/libwww-perl"
+
+export OPTIMIZE="${CFLAGS}"
+myconf="--lib=${EPREFIX}/usr"

diff --git a/dev-perl/Curses/files/Curses-1.08-p5.8-fixes.diff b/dev-perl/Curses/files/Curses-1.08-p5.8-fixes.diff
new file mode 100644
index 0000000..f661f80
--- /dev/null
+++ b/dev-perl/Curses/files/Curses-1.08-p5.8-fixes.diff
@@ -0,0 +1,32 @@
+diff -Naurp CursesFun.c.old CursesFun.c
+--- CursesFun.c.old	2005-03-05 09:15:20.714006864 -0500
++++ CursesFun.c	2005-03-05 09:16:14.501829872 -0500
+@@ -1276,8 +1276,8 @@ XS(XS_Curses_newterm)
+     c_exactargs("newterm", items, 3);
+     {
+ 	char *	type	= ST(0) != &PL_sv_undef ? (char *)SvPV(ST(0),PL_na) : NULL;
+-	FILE *	outfd	= IoIFP(sv_2io(ST(1)));
+-	FILE *	infd	= IoIFP(sv_2io(ST(2)));
++	FILE *	outfd	= PerlIO_findFILE(IoIFP(sv_2io(ST(1))));
++	FILE *	infd	= PerlIO_findFILE(IoIFP(sv_2io(ST(2))));
+ 	SCREEN *	ret	= newterm(type, outfd, infd);
+ 	
+ 	ST(0) = sv_newmortal();
+@@ -3450,7 +3450,7 @@ XS(XS_Curses_putwin)
+     c_exactargs("putwin", items, 2);
+     {
+ 	WINDOW *win	= c_sv2window(ST(0), 0);
+-	FILE *	filep	= IoIFP(sv_2io(ST(1)));
++	FILE *	filep	= PerlIO_findFILE(IoIFP(sv_2io(ST(1))));
+ 	int	ret	= putwin(win, filep);
+ 	
+ 	ST(0) = sv_newmortal();
+@@ -3469,7 +3469,7 @@ XS(XS_Curses_getwin)
+ #ifdef C_GETWIN
+     c_exactargs("getwin", items, 1);
+     {
+-	FILE *	filep	= IoIFP(sv_2io(ST(0)));
++	FILE *	filep	= PerlIO_findFILE(IoIFP(sv_2io(ST(0))));
+ 	WINDOW *	ret	= getwin(filep);
+ 	
+ 	ST(0) = sv_newmortal();

diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-0.31-r1.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-0.31-r1.ebuild
new file mode 100644
index 0000000..b214a6c
--- /dev/null
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-0.31-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-SQLite/DBD-SQLite-0.31-r1.ebuild,v 1.7 2011/09/04 11:32:35 tove Exp $
+
+MODULE_AUTHOR=MSERGEANT
+inherit perl-module
+
+DESCRIPTION="Self Contained RDBMS in a DBI Driver"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~ppc sparc x86"
+IUSE=""
+SRC_TEST="do"
+
+DEPEND="dev-perl/DBI
+	dev-lang/perl"

diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.31.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.31.ebuild
new file mode 100644
index 0000000..38ae190
--- /dev/null
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.31.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-SQLite/DBD-SQLite-1.31.ebuild,v 1.8 2011/07/30 10:23:21 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=ADAMK
+inherit perl-module
+
+DESCRIPTION="Self Contained RDBMS in a DBI Driver"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-perl/DBI-1.57
+	>=dev-db/sqlite-3.6.22[extensions]
+	!<dev-perl/DBD-SQLite-1"
+DEPEND="${RDEPEND}
+	test? ( >=virtual/perl-Test-Simple-0.86 )"
+
+SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+	sed -i 's/^if ( 0 )/if ( 1 )/' "${S}"/Makefile.PL || die
+	# remove bundled sqlite (rt.cpan#61361)
+	for i in sqlite3{.c,.h,ext.h} ; do
+		rm ${i} || die
+		sed -i -e "/^${i}\$/d" MANIFEST || die
+	done
+
+	myconf="SQLITE_LOCATION=${EPREFIX}/usr"
+}

diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.01.7.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.01.7.ebuild
new file mode 100644
index 0000000..97f8d8c
--- /dev/null
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.01.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/DBD-mysql-4.01.7.ebuild,v 1.9 2011/07/30 10:24:20 tove Exp $
+
+inherit versionator
+
+MODULE_AUTHOR="CAPTTOFU"
+MY_P=${PN}-$(delete_version_separator 2 )
+S=${WORKDIR}/${MY_P}
+inherit eutils perl-module
+
+DESCRIPTION="The Perl DBD:mysql Module"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-perl/DBI
+	virtual/mysql"
+DEPEND="${RDEPEND}"
+
+mydoc="ToDo"

diff --git a/dev-perl/DBI/DBI-1.615.ebuild b/dev-perl/DBI/DBI-1.615.ebuild
new file mode 100644
index 0000000..c7cd716
--- /dev/null
+++ b/dev-perl/DBI/DBI-1.615.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.615.ebuild,v 1.9 2011/07/30 10:25:15 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=TIMB
+inherit perl-module eutils
+
+DESCRIPTION="The Perl DBI Module"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-perl/PlRPC-0.2
+	>=virtual/perl-Sys-Syslog-0.17
+	virtual/perl-File-Spec"
+DEPEND="${RDEPEND}
+	test? ( >=virtual/perl-Test-Simple-0.90 )"
+
+SRC_TEST="do"
+mydoc="ToDo"
+MAKEOPTS="${MAKEOPTS} -j1"

diff --git a/dev-perl/Daemon-Generic/Daemon-Generic-0.71.ebuild b/dev-perl/Daemon-Generic/Daemon-Generic-0.71.ebuild
new file mode 100644
index 0000000..a6d4904
--- /dev/null
+++ b/dev-perl/Daemon-Generic/Daemon-Generic-0.71.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Daemon-Generic/Daemon-Generic-0.71.ebuild,v 1.6 2011/01/27 19:12:51 xarthisius Exp $
+
+EAPI=3
+
+MODULE_AUTHOR="MUIR"
+MODULE_SECTION="modules"
+
+inherit perl-module
+
+DESCRIPTION="Framework to provide start/stop/reload for a daemon"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="dev-perl/File-Flock
+	dev-perl/File-Slurp"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/dev-perl/Data-ShowTable/files/3.3.patch b/dev-perl/Data-ShowTable/files/3.3.patch
new file mode 100644
index 0000000..4a9e2d4
--- /dev/null
+++ b/dev-perl/Data-ShowTable/files/3.3.patch
@@ -0,0 +1,39 @@
+--- showtable
++++ showtable
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl5
++#!/usr/bin/perl
+ # showtable - read data and show it
+ #
+ #    Copyright (C) 1996,1997  Alan K. Stebbens <aks@×××.com>
+--- ShowTable.pm
++++ ShowTable.pm
+@@ -721,7 +721,7 @@
+ 
+ S<  >B<ShowHTMLTable> I<\@titles>, I<\@types>, I<\@widths>, I<\&row_sub>
+ [, I<\&fmt_sub> [, I<$max_width> [, I<\%URL_Keys> [, I<$no_escape> 
+-[, I<\@title_formats [, I<\@data_formats [, I<$table_attrs> ] ] ] ] ] ] ];
++[, I<\@title_formats> [, I<\@data_formats> [, I<$table_attrs> ] ] ] ] ] ] ];
+ 
+ The B<ShowHTMLTable> displays one or more rows of columns of data using
+ the HTML C<\<TABLE\>> feature.  In addition to the usual parameter arguments
+--- t/Test-Setup.pl
++++ t/Test-Setup.pl
+@@ -19,7 +19,7 @@
+ 
+ sub talk { print STDERR @_; }
+ 
+-sub start_tests {
++sub start_tests($) {
+     my $count = shift;		# how many tests?
+     mkdir("$testdir/out",0755)  unless -d "$testdir/out";
+     print "1..$count\n";	# tell harness how many tests
+@@ -50,7 +50,7 @@
+ 
+ # run_test $num, \&sub;
+ 
+-sub run_test {
++sub run_test($&) {
+     my $num = shift;
+     my $sub = shift;
+ 

diff --git a/dev-perl/Date-Pcalc/Date-Pcalc-1.2.ebuild b/dev-perl/Date-Pcalc/Date-Pcalc-1.2.ebuild
new file mode 100644
index 0000000..8dbf673
--- /dev/null
+++ b/dev-perl/Date-Pcalc/Date-Pcalc-1.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Date-Pcalc/Date-Pcalc-1.2.ebuild,v 1.14 2007/07/10 23:33:28 mr_bones_ Exp $
+
+inherit perl-module
+
+DESCRIPTION="Gregorian calendar date calculations"
+SRC_URI="mirror://cpan/authors/id/S/ST/STBEY/${P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/~stbey/"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="amd64 ia64 ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/Date-Pcalc/files/6.100.0_identifier_before_numeric_constant.patch b/dev-perl/Date-Pcalc/files/6.100.0_identifier_before_numeric_constant.patch
new file mode 100644
index 0000000..e475ea2
--- /dev/null
+++ b/dev-perl/Date-Pcalc/files/6.100.0_identifier_before_numeric_constant.patch
@@ -0,0 +1,16 @@
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=76442
+Gentoo-Bug: https://bugs.gentoo.org/420177
+--- a/src/C_XS/ToolBox.h
++++ b/src/C_XS/ToolBox.h
+@@ -93,7 +93,10 @@
+     #elif PERL_DARWIN
+         #define boolean bool
+     #else
+-        typedef enum { false = FALSE, true = TRUE } boolean;
++        typedef int boolean;
++        #ifndef I_STDBOOL
++            enum { false, true };
++        #endif
+     #endif
+ #endif
+ 

diff --git a/dev-perl/DateManip/DateManip-5.56.ebuild b/dev-perl/DateManip/DateManip-5.56.ebuild
new file mode 100644
index 0000000..c63b861
--- /dev/null
+++ b/dev-perl/DateManip/DateManip-5.56.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateManip/DateManip-5.56.ebuild,v 1.8 2011/07/30 10:26:09 tove Exp $
+
+EAPI=2
+
+MY_PN=Date-Manip
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+MODULE_AUTHOR=SBECK
+inherit perl-module
+
+DESCRIPTION="Perl date manipulation routines"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? ( dev-perl/Test-Pod )"
+#		dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST="do"
+mydoc="HISTORY"

diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.500.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.500.0.ebuild
new file mode 100644
index 0000000..d7ae4f3
--- /dev/null
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.500.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.500.0.ebuild,v 1.4 2011/09/24 13:26:39 grobian Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=1.5000
+inherit perl-module
+
+DESCRIPTION="Parse and Format DateTimes using Strptime"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-perl/DateTime
+	>=dev-perl/DateTime-Locale-0.45
+	>=dev-perl/DateTime-TimeZone-0.79
+	>=dev-perl/Params-Validate-0.91"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.31"
+
+SRC_TEST=do

diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.22.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.22.ebuild
new file mode 100644
index 0000000..fc2edfc
--- /dev/null
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.22.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.22.ebuild,v 1.9 2011/01/13 16:55:36 ranger Exp $
+
+EAPI=3
+
+inherit versionator
+MY_P=${PN}-$(delete_version_separator 2)
+MODULE_AUTHOR=DROLSKY
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Time zone object base class and factory"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-perl/Params-Validate-0.72
+	>=dev-perl/Class-Singleton-1.03"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.34
+	test? ( >=virtual/perl-Test-Simple-0.92 )"
+
+SRC_TEST="do"

diff --git a/dev-perl/DateTime/DateTime-0.55.ebuild b/dev-perl/DateTime/DateTime-0.55.ebuild
new file mode 100644
index 0000000..7783c43
--- /dev/null
+++ b/dev-perl/DateTime/DateTime-0.55.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime/DateTime-0.55.ebuild,v 1.8 2011/01/08 18:54:10 jer Exp $
+
+EAPI=2
+
+#inherit versionator
+#MY_P=${PN}-$(delete_version_separator 2)
+#S=${WORKDIR}/${MY_P}
+MODULE_AUTHOR=DROLSKY
+inherit perl-module
+
+DESCRIPTION="A date and time object"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-perl/Params-Validate-0.76
+	>=virtual/perl-Time-Local-1.04
+	>=dev-perl/DateTime-TimeZone-1.09
+	>=dev-perl/DateTime-Locale-0.44"
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? ( dev-perl/Test-Exception )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Devel-Profiler/files/perl510.patch b/dev-perl/Devel-Profiler/files/perl510.patch
new file mode 100644
index 0000000..78ecc4d
--- /dev/null
+++ b/dev-perl/Devel-Profiler/files/perl510.patch
@@ -0,0 +1,39 @@
+http://cvs.fedoraproject.org/viewvc/devel/perl-Devel-Profiler/perl-Devel-Profiler-perl510.patch
+--- Devel-Profiler-0.04/lib/Devel/Profiler.pm
++++ Devel-Profiler-0.04/lib/Devel/Profiler.pm
+@@ -151,9 +151,14 @@ sub scan {
+             }
+             
+             # found a code ref?  then instrument it
+-            instrument($pkg, $sym, $code) 
+-              if defined($code = *{$glob}{CODE}) and ref $code eq 'CODE';
+-              
++            if (ref \$glob ne 'GLOB') {
++                # Something stranger in the typeglob, which will expand to (at
++                # least) a prototype if we take a reference to it.
++                instrument($pkg, $sym, \&{"$pkg$sym"});
++            } else {
++                instrument($pkg, $sym, $code) 
++                    if defined($code = *{$glob}{CODE}) and ref $code eq 'CODE';
++            }            
+         }
+     }
+ }
+--- Devel-Profiler-0.04/t/09fcntl.t
++++ Devel-Profiler-0.04/t/09fcntl.t
+@@ -8,7 +8,14 @@ foo();
+ END
+ 
+ # make sure the call tree looks right
+-check_tree(<<END, "checking tree");
++if ($] > 5.009) {
++    # Fcntl's constants are now directly defined, so constant() isn't called.
++    check_tree(<<END, "checking tree");
++main::foo
++END
++} else {
++    check_tree(<<END, "checking tree");
+ main::foo
+    Fcntl::constant
+ END
++}

diff --git a/dev-perl/Devel-Symdump/Devel-Symdump-2.07.ebuild b/dev-perl/Devel-Symdump/Devel-Symdump-2.07.ebuild
new file mode 100644
index 0000000..cf296e0
--- /dev/null
+++ b/dev-perl/Devel-Symdump/Devel-Symdump-2.07.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-Symdump/Devel-Symdump-2.07.ebuild,v 1.11 2008/04/27 20:09:06 aballier Exp $
+
+inherit versionator perl-module
+
+MY_P="${PN}-$(delete_version_separator 2)"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="dump symbol names or the symbol table"
+HOMEPAGE="http://search.cpan.org/~andk/"
+SRC_URI="mirror://cpan/authors/id/A/AN/ANDK/${MY_P}.tar.gz"
+
+SRC_TEST="do"
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/Device-SerialPort/Device-SerialPort-1.002.001.ebuild b/dev-perl/Device-SerialPort/Device-SerialPort-1.002.001.ebuild
new file mode 100644
index 0000000..bad3b0e
--- /dev/null
+++ b/dev-perl/Device-SerialPort/Device-SerialPort-1.002.001.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Device-SerialPort/Device-SerialPort-1.002.001.ebuild,v 1.7 2009/07/02 19:32:29 jer Exp $
+
+inherit perl-module versionator
+
+MY_PV="$(delete_version_separator 2)"
+MY_P="${PN}-${MY_PV}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A Serial port Perl Module"
+HOMEPAGE="http://sendpage.org/device-serialport/"
+SRC_URI="mirror://cpan/authors/id/C/CO/COOK/${MY_P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
+IUSE=""
+
+#From the module:
+# If you run 'make test', you must make sure that nothing is plugged
+# into '/dev/ttyS1'!
+# Doesn't sound wise to enable SRC_TEST="do" - mcummings
+
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/Email-Address/Email-Address-1.88.9.ebuild b/dev-perl/Email-Address/Email-Address-1.88.9.ebuild
new file mode 100644
index 0000000..c252ee1
--- /dev/null
+++ b/dev-perl/Email-Address/Email-Address-1.88.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-Address/Email-Address-1.88.9.ebuild,v 1.8 2010/03/18 19:03:58 darkside Exp $
+
+inherit versionator
+MODULE_AUTHOR=RJBS
+MY_P=${PN}-$(delete_version_separator 2)
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Email::Address - RFC 2822 Address Parsing and Creation"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+	test? ( virtual/perl-Test-Simple
+		>=dev-perl/Test-Pod-1.14
+		>=dev-perl/Test-Pod-Coverage-1.08 )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Email-Sender/Email-Sender-0.110.0.ebuild b/dev-perl/Email-Sender/Email-Sender-0.110.0.ebuild
new file mode 100644
index 0000000..c5af2a9
--- /dev/null
+++ b/dev-perl/Email-Sender/Email-Sender-0.110.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-Sender/Email-Sender-0.110.0.ebuild,v 1.3 2011/12/18 19:59:00 phajdan.jr Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=RJBS
+MODULE_VERSION=0.110000
+inherit perl-module
+
+DESCRIPTION="A library for sending email"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="virtual/perl-Scalar-List-Utils
+	virtual/perl-File-Spec
+	>=dev-perl/Email-Abstract-3
+	dev-perl/Email-Simple
+	dev-perl/List-MoreUtils
+	dev-perl/Net-SMTP-SSL
+	dev-perl/Sub-Exporter
+	dev-perl/Throwable
+	dev-perl/Try-Tiny
+	virtual/perl-libnet
+	dev-perl/Moose
+	dev-perl/Email-Address"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.31
+	test? (
+		>=dev-perl/Capture-Tiny-0.08
+	)"
+#		dev-perl/JSON
+#		dev-perl/Test-MinimumVersion
+#		dev-perl/Sub-Override
+#		dev-perl/Test-MockObject )"
+
+SRC_TEST=do
+
+src_test() {
+	# https://rt.cpan.org/Public/Bug/Display.html?id=54642
+	mv "${S}"/t/smtp-via-mock.t{,.disable} || die
+	perl-module_src_test
+}

diff --git a/dev-perl/Email-Valid/Email-Valid-0.184.ebuild b/dev-perl/Email-Valid/Email-Valid-0.184.ebuild
new file mode 100644
index 0000000..4c3f6b4
--- /dev/null
+++ b/dev-perl/Email-Valid/Email-Valid-0.184.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-Valid/Email-Valid-0.184.ebuild,v 1.8 2012/06/17 14:11:35 armin76 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=RJBS
+inherit perl-module
+
+DESCRIPTION="Check validity of Internet email addresses."
+
+SLOT="0"
+KEYWORDS="amd64 hppa ~mips ppc ppc64 x86"
+IUSE="test"
+
+RDEPEND="dev-perl/MailTools
+	dev-perl/Net-DNS"
+DEPEND="test? ( ${RDEPEND}
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST="do"
+PATCHES=( "${FILESDIR}/0.181-disable-online-test.patch" )

diff --git a/dev-perl/Email-Valid/files/0.181-disable-online-test.patch b/dev-perl/Email-Valid/files/0.181-disable-online-test.patch
new file mode 100644
index 0000000..ec716ea
--- /dev/null
+++ b/dev-perl/Email-Valid/files/0.181-disable-online-test.patch
@@ -0,0 +1,11 @@
+diff -ur Email-Valid-0.181-orig/t/valid.t Email-Valid-0.181/t/valid.t
+--- Email-Valid-0.181-orig/t/valid.t	2008-11-21 22:36:54.000000000 +0100
++++ Email-Valid-0.181/t/valid.t	2009-06-08 08:43:31.000000000 +0200
+@@ -85,6 +85,5 @@
+ );
+ 
+ SKIP: {
+-  skip "your dns appears missing or failing to resolve", 2
+-    unless $v->address(-address=> 'devnull@×××××.com', -mxcheck => 1);
++  skip "disabled online tests", 2;
+ 

diff --git a/dev-perl/Email-Valid/files/0.185-disable-online-test.patch b/dev-perl/Email-Valid/files/0.185-disable-online-test.patch
new file mode 100644
index 0000000..6bcbf6d
--- /dev/null
+++ b/dev-perl/Email-Valid/files/0.185-disable-online-test.patch
@@ -0,0 +1,10 @@
+--- a/t/valid.t
++++ b/t/valid.t
+@@ -85,6 +85,5 @@
+ );
+ 
+ SKIP: {
+-  skip "your dns appears missing or failing to resolve", 2
+-    unless eval { $v->address(-address=> 'devnull@×××××.com', -mxcheck => 1) };
++  skip "disabled online tests", 2;
+ 

diff --git a/dev-perl/Encode-Locale/Encode-Locale-1.20.0.ebuild b/dev-perl/Encode-Locale/Encode-Locale-1.20.0.ebuild
new file mode 100644
index 0000000..d037fd3
--- /dev/null
+++ b/dev-perl/Encode-Locale/Encode-Locale-1.20.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Encode-Locale/Encode-Locale-1.20.0.ebuild,v 1.15 2011/12/18 21:31:26 halcy0n Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=GAAS
+MODULE_VERSION=1.02
+inherit perl-module
+
+DESCRIPTION="Determine the locale encoding"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST=do

diff --git a/dev-perl/Error/Error-0.170.160.ebuild b/dev-perl/Error/Error-0.170.160.ebuild
new file mode 100644
index 0000000..ba38de9
--- /dev/null
+++ b/dev-perl/Error/Error-0.170.160.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Error/Error-0.170.160.ebuild,v 1.3 2011/07/30 10:30:01 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=SHLOMIF
+MODULE_VERSION=0.17016
+inherit perl-module
+
+DESCRIPTION="Error/exception handling in an OO-ish way"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? ( >=dev-perl/Test-Pod-1.14
+		>=dev-perl/Test-Pod-Coverage-1.04 )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Event-RPC/Event-RPC-0.90.ebuild b/dev-perl/Event-RPC/Event-RPC-0.90.ebuild
new file mode 100644
index 0000000..b4d35c9
--- /dev/null
+++ b/dev-perl/Event-RPC/Event-RPC-0.90.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Event-RPC/Event-RPC-0.90.ebuild,v 1.10 2006/10/09 14:27:03 mcummings Exp $
+
+inherit perl-module
+
+DESCRIPTION="Event based transparent Client/Server RPC framework"
+SRC_URI="mirror://cpan/modules/by-module/Event/${P}.tar.gz"
+HOMEPAGE="http://www.exit1.org/${PN}/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
+IUSE=""
+SRC_TEST="do"
+
+DEPEND="dev-perl/glib-perl
+	dev-perl/IO-Socket-SSL
+		dev-perl/Net-SSLeay
+		dev-perl/Event
+	dev-lang/perl"

diff --git a/dev-perl/Event/Event-1.09.ebuild b/dev-perl/Event/Event-1.09.ebuild
new file mode 100644
index 0000000..422a589
--- /dev/null
+++ b/dev-perl/Event/Event-1.09.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Event/Event-1.09.ebuild,v 1.8 2009/05/23 17:04:56 armin76 Exp $
+
+inherit perl-module
+
+DESCRIPTION="fast, generic event loop"
+SRC_URI="mirror://cpan/authors/id/J/JP/JPRIT/${P}.tar.gz"
+HOMEPAGE="http://www.cpan.org/modules/by-module/Event/${P}.readme"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
+IUSE=""
+SRC_TEST="do"
+
+mydoc="ANNOUNCE INSTALL TODO Tutorial.pdf"
+
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/Event/Event-1.10.ebuild b/dev-perl/Event/Event-1.10.ebuild
new file mode 100644
index 0000000..e6d796a
--- /dev/null
+++ b/dev-perl/Event/Event-1.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Event/Event-1.10.ebuild,v 1.3 2009/05/23 17:04:56 armin76 Exp $
+
+inherit perl-module
+
+DESCRIPTION="fast, generic event loop"
+SRC_URI="mirror://cpan/authors/id/J/JP/JPRIT/${P}.tar.gz"
+HOMEPAGE="http://www.cpan.org/modules/by-module/Event/${P}.readme"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="alpha ~amd64 ~arm ia64 ~ppc ~ppc64 sparc x86"
+IUSE=""
+SRC_TEST="do"
+
+mydoc="ANNOUNCE INSTALL TODO Tutorial.pdf"
+
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/FCGI/FCGI-0.67.ebuild b/dev-perl/FCGI/FCGI-0.67.ebuild
new file mode 100644
index 0000000..0722934
--- /dev/null
+++ b/dev-perl/FCGI/FCGI-0.67.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/FCGI/FCGI-0.67.ebuild,v 1.16 2012/06/17 16:27:16 armin76 Exp $
+
+# this is an RT dependency
+
+inherit perl-module
+
+DESCRIPTION="Fast CGI"
+SRC_URI="mirror://cpan/authors/id/S/SK/SKIMO/${P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/~skimo/"
+
+SRC_TEST="do"
+SLOT="0"
+LICENSE="openmarket"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/FCGI/FCGI-0.71.ebuild b/dev-perl/FCGI/FCGI-0.71.ebuild
new file mode 100644
index 0000000..ff2ffc3
--- /dev/null
+++ b/dev-perl/FCGI/FCGI-0.71.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/FCGI/FCGI-0.71.ebuild,v 1.4 2012/06/17 16:27:16 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=FLORA
+inherit perl-module
+
+DESCRIPTION="Fast CGI"
+
+LICENSE="openmarket"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/dev-perl/File-Flat/File-Flat-1.00.ebuild b/dev-perl/File-Flat/File-Flat-1.00.ebuild
new file mode 100644
index 0000000..0d5a8c1
--- /dev/null
+++ b/dev-perl/File-Flat/File-Flat-1.00.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Flat/File-Flat-1.00.ebuild,v 1.10 2012/03/19 19:31:17 armin76 Exp $
+
+inherit perl-module
+
+DESCRIPTION="Implements a flat filesystem"
+SRC_URI="mirror://cpan/authors/id/A/AD/ADAMK/${P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/~adamk/"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="alpha amd64 hppa ~mips ppc x86"
+IUSE=""
+SRC_TEST="do"
+
+DEPEND=">=dev-perl/Class-Autouse-1
+	>=dev-perl/Test-ClassAPI-1.02
+	>=dev-perl/File-Copy-Recursive-0.28
+	>=dev-perl/File-Remove-0.21
+	>=virtual/perl-File-Spec-0.85
+	>=virtual/perl-File-Temp-0.14
+	>=dev-perl/File-Remove-0.21
+	>=dev-perl/File-Slurp-9999.04
+	>=dev-perl/prefork-0.02
+	dev-lang/perl"

diff --git a/dev-perl/File-NCopy/File-NCopy-0.34.ebuild b/dev-perl/File-NCopy/File-NCopy-0.34.ebuild
new file mode 100644
index 0000000..0947e9f
--- /dev/null
+++ b/dev-perl/File-NCopy/File-NCopy-0.34.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-NCopy/File-NCopy-0.34.ebuild,v 1.21 2007/01/15 19:39:12 mcummings Exp $
+
+inherit perl-module
+
+DESCRIPTION="Copy file, file Copy file[s] | dir[s], dir"
+SRC_URI="mirror://cpan/authors/id/M/MZ/MZSANFORD/${P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/~mzsanford/"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="virtual/perl-File-Spec
+	dev-lang/perl"

diff --git a/dev-perl/File-RsyncP/File-RsyncP-0.68.ebuild b/dev-perl/File-RsyncP/File-RsyncP-0.68.ebuild
new file mode 100644
index 0000000..dbf2206
--- /dev/null
+++ b/dev-perl/File-RsyncP/File-RsyncP-0.68.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-RsyncP/File-RsyncP-0.68.ebuild,v 1.11 2011/04/20 13:01:04 jlec Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=CBARRATT
+inherit perl-module toolchain-funcs
+
+DESCRIPTION="An rsync perl module"
+HOMEPAGE="http://perlrsync.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 ~ppc ~ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="net-misc/rsync"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	perl-module_src_prepare
+	tc-export CC
+}

diff --git a/dev-perl/File-Slurp/File-Slurp-9999.13.ebuild b/dev-perl/File-Slurp/File-Slurp-9999.13.ebuild
new file mode 100644
index 0000000..6f70f5e
--- /dev/null
+++ b/dev-perl/File-Slurp/File-Slurp-9999.13.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Slurp/File-Slurp-9999.13.ebuild,v 1.9 2010/01/09 20:08:39 grobian Exp $
+
+inherit perl-module
+
+DESCRIPTION="Efficient Reading/Writing of Complete Files"
+HOMEPAGE="http://search.cpan.org/~uri/${P}/"
+SRC_URI="mirror://cpan/authors/id/D/DR/DROLSKY/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+SRC_TEST="do"
+
+mydoc="extras/slurp_article.pod"

diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.17.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.17.ebuild
new file mode 100644
index 0000000..e050fc2
--- /dev/null
+++ b/dev-perl/Finance-Quote/Finance-Quote-1.17.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Finance-Quote/Finance-Quote-1.17.ebuild,v 1.5 2012/03/25 15:17:38 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=ECOCODE
+inherit perl-module
+
+DESCRIPTION="Get stock and mutual fund quotes from various exchanges"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-perl/libwww-perl
+	dev-perl/HTML-Tree
+	dev-perl/HTML-TableExtract
+	dev-perl/Crypt-SSLeay"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
+mydoc="TODO"

diff --git a/dev-perl/Finance-Quote/files/VWD.pm.diff b/dev-perl/Finance-Quote/files/VWD.pm.diff
new file mode 100644
index 0000000..4ddabdb
--- /dev/null
+++ b/dev-perl/Finance-Quote/files/VWD.pm.diff
@@ -0,0 +1,11 @@
+--- lib/Finance/Quote/VWD.pm
++++ lib/Finance/Quote/VWD.pm
+@@ -118,7 +118,7 @@
+       # all other info below <div class=contentContainer>
+       my $content = $tree->look_down(
+          "_tag", "div",
+-         "class", "contentContainer"
++         "class", "mainContainer"
+       );
+       next if not $content;
+ 

diff --git a/dev-perl/GSSAPI/files/0.26-libs-parse.patch b/dev-perl/GSSAPI/files/0.26-libs-parse.patch
new file mode 100644
index 0000000..fa72ced
--- /dev/null
+++ b/dev-perl/GSSAPI/files/0.26-libs-parse.patch
@@ -0,0 +1,11 @@
+--- GSSAPI-0.26/Makefile.PL
++++ GSSAPI-0.26/Makefile.PL
+@@ -267,7 +267,7 @@
+    my ( $confstringstring ) = @_;
+    my (@libs, @others);
+    foreach ( split ' ',  $confstringstring ) {
+-      if ( m/(-(Wl,-R|[LlR])[^ ]*)/) {
++      if ( m/(^-(Wl,-R|[LlR])[^ ]*)/) {
+         push @libs, $1
+       } else {
+         push @others, $_;

diff --git a/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.94.ebuild b/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.94.ebuild
new file mode 100644
index 0000000..b41d783
--- /dev/null
+++ b/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.94.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.94.ebuild,v 1.3 2010/09/19 15:28:12 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=BRADFITZ
+inherit perl-module
+
+DESCRIPTION="Asynchronous client module for Gearman for Danga::Socket applications"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-perl/Gearman-1.07
+	>=dev-perl/Danga-Socket-1.57"
+
+# testsuite requires gearman server
+SRC_TEST="never"

diff --git a/dev-perl/Gearman-Server/Gearman-Server-1.09-r1.ebuild b/dev-perl/Gearman-Server/Gearman-Server-1.09-r1.ebuild
new file mode 100644
index 0000000..0b9a113
--- /dev/null
+++ b/dev-perl/Gearman-Server/Gearman-Server-1.09-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Server/Gearman-Server-1.09-r1.ebuild,v 1.2 2008/09/30 13:15:16 tove Exp $
+
+MODULE_AUTHOR=BRADFITZ
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system - worker/client connector"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-perl/Danga-Socket-1.57
+	>=dev-perl/Gearman-1.07
+	dev-lang/perl"
+
+mydoc="CHANGES"
+
+PATCHES=( "${FILESDIR}/$PN-1.09-Use-saner-name-in-process-listing.patch" )
+
+src_install() {
+	perl-module_src_install
+	newinitd "${FILESDIR}"/gearmand-init.d-1.09 gearmand
+	newconfd "${FILESDIR}"/gearmand-conf.d-1.09 gearmand
+}

diff --git a/dev-perl/Gearman-Server/Gearman-Server-1.10.ebuild b/dev-perl/Gearman-Server/Gearman-Server-1.10.ebuild
new file mode 100644
index 0000000..1f10dc7
--- /dev/null
+++ b/dev-perl/Gearman-Server/Gearman-Server-1.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Server/Gearman-Server-1.10.ebuild,v 1.1 2009/11/10 10:14:50 robbat2 Exp $
+
+MODULE_AUTHOR=DORMANDO
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system - worker/client connector"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-perl/Danga-Socket-1.57
+	>=dev-perl/Gearman-1.07
+	dev-lang/perl"
+
+mydoc="CHANGES"
+
+PATCHES=( "${FILESDIR}/$PN-1.09-Use-saner-name-in-process-listing.patch" )
+
+src_install() {
+	perl-module_src_install
+	newinitd "${FILESDIR}"/gearmand-init.d-1.09 gearmand
+	newconfd "${FILESDIR}"/gearmand-conf.d-1.09 gearmand
+}

diff --git a/dev-perl/Gearman-Server/Gearman-Server-1.11.ebuild b/dev-perl/Gearman-Server/Gearman-Server-1.11.ebuild
new file mode 100644
index 0000000..aa78c76
--- /dev/null
+++ b/dev-perl/Gearman-Server/Gearman-Server-1.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Server/Gearman-Server-1.11.ebuild,v 1.1 2010/03/27 21:43:16 robbat2 Exp $
+
+MODULE_AUTHOR=DORMANDO
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system - worker/client connector"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-perl/Danga-Socket-1.57
+	>=dev-perl/Gearman-1.07
+	dev-lang/perl"
+
+mydoc="CHANGES"
+
+PATCHES=( "${FILESDIR}/$PN-1.09-Use-saner-name-in-process-listing.patch" )
+
+src_install() {
+	perl-module_src_install
+	newinitd "${FILESDIR}"/gearmand-init.d-1.09 gearmand
+	newconfd "${FILESDIR}"/gearmand-conf.d-1.09 gearmand
+}

diff --git a/dev-perl/Gearman-Server/files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch b/dev-perl/Gearman-Server/files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch
new file mode 100644
index 0000000..f573606
--- /dev/null
+++ b/dev-perl/Gearman-Server/files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch
@@ -0,0 +1,33 @@
+From 6d8055b1d44d745f194665458674c6e03f48f322 Mon Sep 17 00:00:00 2001
+From: Robin H. Johnson <robbat2@g.o>
+Date: Sat, 12 May 2007 22:16:37 -0700
+Subject: [PATCH gearman] Use saner name in process listing.
+
+Normally the binary will turn up in the process list as:
+/usr/bin/perl $SCRIPTNAME
+
+By adding a single line, we can make it be simply '$SCRIPTNAME'.
+This makes writing init.d scripts signficently easier.
+
+Signed-off-by: Robin H. Johnson <robbat2@g.o>
+---
+ server/gearmand |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/server/gearmand b/server/gearmand
+index 2d8bd6b..148b1f9 100755
+--- a/server/gearmand
++++ b/server/gearmand
+@@ -94,6 +94,9 @@ my (
+    );
+ my $conf_port = 7003;
+ 
++# Rename binary in process list to make init scripts saner
++$0 = $_ = $0;
++
+ Getopt::Long::GetOptions(
+                          'd|daemonize'    => \$daemonize,
+                          'p|port=i'       => \$conf_port,
+-- 
+1.5.1.4
+

diff --git a/dev-perl/Gearman-Server/files/gearmand-conf.d-1.09 b/dev-perl/Gearman-Server/files/gearmand-conf.d-1.09
new file mode 100644
index 0000000..69efd90
--- /dev/null
+++ b/dev-perl/Gearman-Server/files/gearmand-conf.d-1.09
@@ -0,0 +1,4 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Server/files/gearmand-conf.d-1.09,v 1.1 2007/05/13 02:18:42 robbat2 Exp $
+PIDFILE="/var/run/gearmand.pid"
+GEARMAND_OPTS="--daemonize --port=7003 --pidfile=${PIDFILE}"
+# vim: ft=gentoo-conf-d:

diff --git a/dev-perl/Gearman-Server/files/gearmand-init.d-1.09 b/dev-perl/Gearman-Server/files/gearmand-init.d-1.09
new file mode 100644
index 0000000..5b8c053
--- /dev/null
+++ b/dev-perl/Gearman-Server/files/gearmand-init.d-1.09
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Server/files/gearmand-init.d-1.09,v 1.2 2007/05/13 08:10:05 robbat2 Exp $
+
+NAME="gearmand"
+BINARY="/usr/bin/gearmand"
+
+depend() {
+	use net
+}
+
+start() {
+	# start-stop-daemon does not work properly in certain cases
+	# this hack should go away when bug #178274 is resolved.
+	ebegin "Starting $NAME"
+	start-stop-daemon --start --pidfile="${PIDFILE}" \
+		--exec ${BINARY} -- ${GEARMAND_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $NAME"
+	start-stop-daemon --stop --pidfile="${PIDFILE}"
+	eend $?
+}
+
+# vim: ft=gentoo-init-d:

diff --git a/dev-perl/Gearman/Gearman-1.09.ebuild b/dev-perl/Gearman/Gearman-1.09.ebuild
new file mode 100644
index 0000000..575baf2
--- /dev/null
+++ b/dev-perl/Gearman/Gearman-1.09.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman/Gearman-1.09.ebuild,v 1.1 2007/10/27 01:12:04 robbat2 Exp $
+
+MODULE_AUTHOR="BRADFITZ"
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-perl/string-crc32
+		dev-lang/perl"
+
+mydoc="CHANGES HACKING TODO"
+# testsuite requires gearman server
+SRC_TEST="never"

diff --git a/dev-perl/Gearman/Gearman-1.10.ebuild b/dev-perl/Gearman/Gearman-1.10.ebuild
new file mode 100644
index 0000000..d8ae0f6
--- /dev/null
+++ b/dev-perl/Gearman/Gearman-1.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman/Gearman-1.10.ebuild,v 1.1 2009/11/10 10:15:19 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-perl/string-crc32
+		dev-lang/perl"
+
+mydoc="CHANGES HACKING TODO"
+# testsuite requires gearman server
+SRC_TEST="never"

diff --git a/dev-perl/Gearman/Gearman-1.11.ebuild b/dev-perl/Gearman/Gearman-1.11.ebuild
new file mode 100644
index 0000000..7904551
--- /dev/null
+++ b/dev-perl/Gearman/Gearman-1.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman/Gearman-1.11.ebuild,v 1.1 2010/03/27 21:42:53 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-perl/string-crc32
+		dev-lang/perl"
+
+mydoc="CHANGES HACKING TODO"
+# testsuite requires gearman server
+SRC_TEST="never"

diff --git a/dev-perl/Goo-Canvas/files/fix_implicit_pointer_declaration.patch b/dev-perl/Goo-Canvas/files/fix_implicit_pointer_declaration.patch
new file mode 100644
index 0000000..c33a9b3
--- /dev/null
+++ b/dev-perl/Goo-Canvas/files/fix_implicit_pointer_declaration.patch
@@ -0,0 +1,14 @@
+Index: Goo-Canvas-0.06/goocanvas-perl.h
+===================================================================
+--- Goo-Canvas-0.06.orig/goocanvas-perl.h
++++ Goo-Canvas-0.06/goocanvas-perl.h
+@@ -9,6 +9,9 @@
+ #include "cairo-perl.h"
+ #include "goocanvas.h"
+ 
++cairo_surface_t * goo_canvas_cairo_pattern_from_pixbuf(GdkPixbuf *pixbuf);
++cairo_surface_t * goo_canvas_cairo_surface_from_pixbuf(GdkPixbuf *pixbuf);
++
+ /* FIXME: How to avoid compile error in autogen.h */
+ #define GooCairoPattern cairo_pattern_t
+ #define GooCairoMatrix cairo_matrix_t

diff --git a/dev-perl/GraphViz/GraphViz-2.02.ebuild b/dev-perl/GraphViz/GraphViz-2.02.ebuild
new file mode 100644
index 0000000..3f3c178
--- /dev/null
+++ b/dev-perl/GraphViz/GraphViz-2.02.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/GraphViz/GraphViz-2.02.ebuild,v 1.6 2008/11/19 13:51:15 tove Exp $
+
+MODULE_AUTHOR=LBROCARD
+inherit perl-module
+
+DESCRIPTION="GraphViz - Interface to the GraphViz graphing tool"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+SRC_TEST="do"
+
+RDEPEND="dev-lang/perl
+	media-gfx/graphviz
+	dev-perl/IPC-Run"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.28"

diff --git a/dev-perl/Gtk2-Notify/files/Gtk2-Notify-0.05-libnotify.patch b/dev-perl/Gtk2-Notify/files/Gtk2-Notify-0.05-libnotify.patch
new file mode 100644
index 0000000..1e1ce9c
--- /dev/null
+++ b/dev-perl/Gtk2-Notify/files/Gtk2-Notify-0.05-libnotify.patch
@@ -0,0 +1,114 @@
+http://bugs.gentoo.org/398699
+http://rt.cpan.org/Public/Bug/Display.html?id=67297
+http://pkgs.fedoraproject.org/gitweb/?p=perl-Gtk2-Notify.git;a=blob_plain;f=libnotify.patch;hb=HEAD
+
+--- t/notification.t
++++ t/notification.t
+@@ -2,20 +2,18 @@
+ 
+ use strict;
+ use warnings;
+-use Gtk2::TestHelper tests => 35;
++use Gtk2::TestHelper tests => 32;
+ use Test::Exception;
+ use Gtk2::Notify -init, $0;
+ 
+ ginterfaces_ok('Gtk2::Notify');
+ 
+-my $w = Gtk2::Window->new;
+-my $n = Gtk2::Notify->new('foo', 'bar', '', $w);
++my $n = Gtk2::Notify->new('foo', 'bar', '');
+ 
+ isa_ok($n, 'Gtk2::Notify');
+ 
+ my @methods = qw(
+         add_action
+-        attach_to_widget
+         clear_actions
+         clear_hints
+         close
+@@ -46,16 +44,6 @@ lives_ok(sub {
+         }, 42);
+ }, 'add_action');
+ 
+-{
+-    my $nw = Gtk2::Window->new;
+-    lives_ok(sub {
+-            $n->attach_to_widget($nw);
+-    }, 'attach_to_widget');
+-    lives_ok(sub {
+-            $n->attach_to_widget($w);
+-    }, 'attach_to_widget');
+-}
+-
+ lives_ok(sub {
+         $n->clear_actions;
+ }, 'clear_actions with existing actions');
+@@ -99,8 +87,6 @@ lives_ok(sub {
+         $n->close;
+ }, 'close before show');
+ 
+-$w->show_all;
+-
+ lives_ok(sub {
+         $n->show;
+ }, 'show');
+--- xs/Notify.xs
++++ xs/Notify.xs
+@@ -86,26 +86,12 @@ notify_get_server_info (class, OUTLIST c
+ MODULE = Gtk2::Notify	PACKAGE = Gtk2::Notify	PREFIX = notify_notification_
+ 
+ NotifyNotification *
+-notify_notification_new (class, summary, body=NULL, icon=NULL, attach=NULL)
++notify_notification_new (class, summary, body=NULL, icon=NULL)
+ 		const gchar *summary
+ 		const gchar *body
+ 		const gchar *icon
+-		GtkWidget_ornull *attach
+ 	C_ARGS:
+-		summary, body, icon, attach
+-
+-#if GTK_CHECK_VERSION (2, 9, 2)
+-
+-NotifyNotification *
+-notify_notification_new_with_status_icon (class, summary, body=NULL, icon=NULL, status_icon=NULL)
+-		const gchar *summary
+-		const gchar *body
+-		const gchar *icon
+-		GtkStatusIcon *status_icon
+-	C_ARGS:
+-		summary, body, icon, status_icon
+-
+-#endif
++		summary, body, icon
+ 
+ gboolean
+ notify_notification_update (notification, summary, message=NULL, icon=NULL)
+@@ -114,27 +100,6 @@ notify_notification_update (notification
+ 		const gchar *message
+ 		const gchar *icon
+ 
+-void
+-notify_notification_attach_to_widget (notification, attach)
+-		NotifyNotification *notification
+-		GtkWidget *attach
+-
+-#if GTK_CHECK_VERSION (2, 9, 2)
+-
+-void
+-notify_notification_attach_to_status_icon (notification, status_icon)
+-		NotifyNotification *notification
+-		GtkStatusIcon *status_icon
+-
+-#endif
+-
+-void
+-notify_notification_set_geometry_hints (notification, screen, x, y)
+-		NotifyNotification *notification
+-		GdkScreen *screen
+-		gint x
+-		gint y
+-
+ NO_OUTPUT gboolean
+ notify_notification_show (notification)
+ 		NotifyNotification *notification

diff --git a/dev-perl/Gtk2-Unique/files/Gtk2-Unique-0.05-implicit-pointer.patch b/dev-perl/Gtk2-Unique/files/Gtk2-Unique-0.05-implicit-pointer.patch
new file mode 100644
index 0000000..1df5844
--- /dev/null
+++ b/dev-perl/Gtk2-Unique/files/Gtk2-Unique-0.05-implicit-pointer.patch
@@ -0,0 +1,13 @@
+Index: Gtk2-Unique-0.05/xs/UniqueApp.xs
+===================================================================
+--- Gtk2-Unique-0.05.orig/xs/UniqueApp.xs
++++ Gtk2-Unique-0.05/xs/UniqueApp.xs
+@@ -1,6 +1,8 @@
+ #include "unique-perl.h"
+ #include <gperl_marshal.h>
+ 
++G_CONST_RETURN gchar * unique_command_to_string (UniqueApp *app, gint       command);
++
+ static void
+ perl_unique_app_marshall_message_received (
+ 	GClosure *closure,

diff --git a/dev-perl/HTML-Form/HTML-Form-6.0.0.ebuild b/dev-perl/HTML-Form/HTML-Form-6.0.0.ebuild
new file mode 100644
index 0000000..8137439
--- /dev/null
+++ b/dev-perl/HTML-Form/HTML-Form-6.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Form/HTML-Form-6.0.0.ebuild,v 1.11 2011/12/18 21:27:35 halcy0n Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=GAAS
+MODULE_VERSION=6.00
+inherit perl-module
+
+DESCRIPTION="Class that represents an HTML form element"
+
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	>=dev-perl/HTTP-Message-6.0.0
+	>=dev-perl/URI-1.10
+	dev-perl/HTML-Parser
+	>=virtual/perl-Encode-2
+"
+DEPEND="${RDEPEND}"

diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.42.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.42.ebuild
new file mode 100644
index 0000000..7ba9985
--- /dev/null
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.42.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.42.ebuild,v 1.7 2011/06/19 15:50:32 armin76 Exp $
+
+inherit depend.apache perl-module
+
+DESCRIPTION="A HTML development and delivery Perl Module"
+SRC_URI="mirror://cpan/authors/id/D/DR/DROLSKY/${P}.tar.gz"
+HOMEPAGE="http://www.masonhq.com/"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="amd64 ppc x86"
+IUSE="modperl doc"
+SRC_TEST="do"
+
+RDEPEND="!modperl? ( virtual/perl-CGI )
+	modperl? (
+		www-apache/libapreq2
+		>=www-apache/mod_perl-2
+	)
+	>=dev-perl/Params-Validate-0.7
+	>=dev-perl/Class-Container-0.08
+	>=dev-perl/Exception-Class-1.15
+	dev-perl/HTML-Parser
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-File-Spec
+	>=dev-perl/Cache-Cache-1.01
+	dev-lang/perl"
+
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build"
+
+want_apache2 modperl
+
+mydoc="CREDITS UPGRADE"
+myconf="--noprompts"
+
+pkg_setup() {
+	depend.apache_pkg_setup modperl
+	perl-module_pkg_setup
+}
+
+perl-module_src_prep() {
+	# Note about new modperl use flag
+	if use !modperl ; then
+		ewarn "HTML-Mason will only install with modperl support"
+		ewarn "if the use flag modperl is enabled."
+		sleep 5
+	fi
+	# rendhalver - needed to set an env var for the build script so it finds our apache.
+	APACHE="${APACHE_BIN}" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
+}
+
+src_install () {
+	perl-module_src_install
+	# rendhalver - the html docs have subdirs so this gets all of them
+	use doc && dohtml -r htdocs/*
+}

diff --git a/dev-perl/HTML-TableContentParser/files/0.13-test.patch b/dev-perl/HTML-TableContentParser/files/0.13-test.patch
new file mode 100644
index 0000000..79916ac
--- /dev/null
+++ b/dev-perl/HTML-TableContentParser/files/0.13-test.patch
@@ -0,0 +1,74 @@
+--- t/1.t
++++ t/1.t
+@@ -2,6 +2,8 @@
+ 
+ 
+ use Test;
++use strict;
++use warnings;
+ 
+ BEGIN { plan tests => 34 }
+ 
+@@ -20,7 +22,7 @@
+ 
+ ## Test object creation
+ 
+-$obj = HTML::TableContentParser->new();
++my $obj = HTML::TableContentParser->new();
+ ok(defined $obj, 1, $@);
+ 
+ 
+@@ -29,14 +31,14 @@
+ ## the correct values to the callback.
+ 
+ 
+-$table_caption  = 'This is a caption';
+-$table_content1 = 'This is table cell content 1';
+-$table_content2 = 'This is table cell content 2';
+-$table_content3 = '<a href="SomeLink">This is table cell content 3, a link</a>';
+-$table_content4 = 'Some more text wrapping <a href="SomeLink">This is table cell content 4</a> a link.';
+-$header_text = 'Header text';
++my $table_caption  = 'This is a caption';
++my $table_content1 = 'This is table cell content 1';
++my $table_content2 = 'This is table cell content 2';
++my $table_content3 = '<a href="SomeLink">This is table cell content 3, a link</a>';
++my $table_content4 = 'Some more text wrapping <a href="SomeLink">This is table cell content 4</a> a link.';
++my $header_text = 'Header text';
+ 
+-$html = qq{
++my $html = qq{
+ <html>
+ <head>
+ </head>
+@@ -59,7 +61,7 @@
+ 
+ 
+ $HTML::TableContentParser::DEBUG = 0;
+-$tables = $obj->parse($html);
++my $tables = $obj->parse($html);
+ ok($tables->[0]->{caption}->{data}, $table_caption, $@);
+ ok($tables->[0]->{rows}->[0]->{cells}->[0]->{data}, $table_content1, $@);
+ ok($tables->[0]->{rows}->[1]->{cells}->[0]->{data}, $table_content2, $@);
+@@ -124,16 +126,17 @@
+ ok(@$tables, 2, @_);
+ 
+ ## and three headers for each table
+-for $t (0..$#{@$tables}) {
+-	for (0..$#hdrs) {
+-		ok($tables->[$t]->{headers}->[$_]->{data}, $hdrs[$_], $@);
++for my $t (0..(@$tables-1)) {
++	for (0..2) {
++        # ok($t, $t);
++        ok($tables->[$t]->{headers}->[$_]->{data}, $hdrs[$_], $@);
+ 	}
+ }
+ 
+ 
+ ## and three rows of three cells each, for each table.. (18 total).
+-for $t (0..$#{@$tables}) {
+-	for $r (0..$#rows) {
++for my $t (0..1) {
++	for my $r (0..$#rows) {
+ 		for (0..2) {
+ 			ok($tables->[$t]->{rows}->[$r]->{cells}->[$_]->{data}, $rows[$r]->[$_], $@);
+ 		}

diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.0.0.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.0.0.ebuild
new file mode 100644
index 0000000..5285497
--- /dev/null
+++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Daemon/HTTP-Daemon-6.0.0.ebuild,v 1.15 2011/12/18 21:29:09 halcy0n Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=GAAS
+MODULE_VERSION=6.00
+inherit perl-module
+
+DESCRIPTION="Base class for simple HTTP servers"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	>=dev-perl/HTTP-Date-6.0.0
+	virtual/perl-IO
+	>=dev-perl/HTTP-Message-6.0.0
+	>=dev-perl/LWP-MediaTypes-6.0.0
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=online

diff --git a/dev-perl/HTTP-Date/HTTP-Date-6.0.0.ebuild b/dev-perl/HTTP-Date/HTTP-Date-6.0.0.ebuild
new file mode 100644
index 0000000..445a2d7
--- /dev/null
+++ b/dev-perl/HTTP-Date/HTTP-Date-6.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Date/HTTP-Date-6.0.0.ebuild,v 1.15 2011/12/18 21:35:18 halcy0n Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=GAAS
+MODULE_VERSION=6.00
+inherit perl-module
+
+DESCRIPTION="Date conversion for HTTP date formats"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	virtual/perl-Time-Local
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.20.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.20.0.ebuild
new file mode 100644
index 0000000..9d890e2
--- /dev/null
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.20.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Message/HTTP-Message-6.20.0.ebuild,v 1.15 2011/12/18 21:30:39 halcy0n Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=GAAS
+MODULE_VERSION=6.02
+inherit perl-module
+
+DESCRIPTION="Base class for Request/Response"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	virtual/perl-Compress-Raw-Zlib
+	>=dev-perl/URI-1.10
+	>=virtual/perl-Encode-2.12
+	>=dev-perl/HTTP-Date-6.0.0
+	>=dev-perl/Encode-Locale-1.0.0
+	>=dev-perl/LWP-MediaTypes-6.0.0
+	>=dev-perl/HTML-Parser-3.33
+	>=virtual/perl-IO-Compress-2.021
+	>=virtual/perl-MIME-Base64-2.1
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=online

diff --git a/dev-perl/IO-AIO/IO-AIO-2.33.ebuild b/dev-perl/IO-AIO/IO-AIO-2.33.ebuild
new file mode 100644
index 0000000..5db62b1
--- /dev/null
+++ b/dev-perl/IO-AIO/IO-AIO-2.33.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-AIO/IO-AIO-2.33.ebuild,v 1.2 2007/06/15 03:08:33 mcummings Exp $
+
+inherit perl-module
+
+DESCRIPTION="Asynchronous Input/Output"
+HOMEPAGE="http://search.cpan.org/search?query=IO-AIO&mode=dist"
+SRC_URI="mirror://cpan/authors/id/M/ML/MLEHMANN/${P}.tar.gz"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="amd64 ~ppc ~x86"
+
+mydoc="Changes README"
+SRC_TEST="do"

diff --git a/dev-perl/IO-AIO/IO-AIO-3.3.1.ebuild b/dev-perl/IO-AIO/IO-AIO-3.3.1.ebuild
new file mode 100644
index 0000000..b708729
--- /dev/null
+++ b/dev-perl/IO-AIO/IO-AIO-3.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-AIO/IO-AIO-3.3.1.ebuild,v 1.1 2009/11/13 02:50:17 robbat2 Exp $
+
+inherit versionator
+MODULE_AUTHOR="MLEHMANN"
+MY_PV="$(get_major_version).$(delete_all_version_separators $(get_after_major_version))"
+MY_P="${PN}-${MY_PV}"
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Asynchronous Input/Output"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+mydoc="Changes README"
+SRC_TEST="do"
+
+DEPEND="dev-perl/common-sense"
+RDEPEND="${DEPEND}"

diff --git a/dev-perl/IO-AIO/IO-AIO-3.3.ebuild b/dev-perl/IO-AIO/IO-AIO-3.3.ebuild
new file mode 100644
index 0000000..6b89766
--- /dev/null
+++ b/dev-perl/IO-AIO/IO-AIO-3.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-AIO/IO-AIO-3.3.ebuild,v 1.1 2009/08/25 17:49:58 robbat2 Exp $
+
+MODULE_AUTHOR="MLEHMANN"
+inherit perl-module
+
+DESCRIPTION="Asynchronous Input/Output"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+mydoc="Changes README"
+SRC_TEST="do"
+
+DEPEND="dev-lang/perl
+		dev-perl/common-sense"
+RDEPEND="${DEPEND}"

diff --git a/dev-perl/IO-AIO/IO-AIO-3.6.5.ebuild b/dev-perl/IO-AIO/IO-AIO-3.6.5.ebuild
new file mode 100644
index 0000000..6639357
--- /dev/null
+++ b/dev-perl/IO-AIO/IO-AIO-3.6.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-AIO/IO-AIO-3.6.5.ebuild,v 1.1 2010/04/23 18:20:03 robbat2 Exp $
+
+inherit versionator
+MODULE_AUTHOR="MLEHMANN"
+MY_PV="$(get_major_version).$(delete_all_version_separators $(get_after_major_version))"
+MY_P="${PN}-${MY_PV}"
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Asynchronous Input/Output"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+mydoc="Changes README"
+SRC_TEST="do"
+
+DEPEND="dev-perl/common-sense"
+RDEPEND="${DEPEND}"

diff --git a/dev-perl/IO-AIO/IO-AIO-3.6.ebuild b/dev-perl/IO-AIO/IO-AIO-3.6.ebuild
new file mode 100644
index 0000000..7289024
--- /dev/null
+++ b/dev-perl/IO-AIO/IO-AIO-3.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-AIO/IO-AIO-3.6.ebuild,v 1.1 2010/03/27 21:35:33 robbat2 Exp $
+
+inherit versionator
+MODULE_AUTHOR="MLEHMANN"
+MY_PV="$(get_major_version).$(delete_all_version_separators $(get_after_major_version))"
+MY_P="${PN}-${MY_PV}"
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Asynchronous Input/Output"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+mydoc="Changes README"
+SRC_TEST="do"
+
+DEPEND="dev-perl/common-sense"
+RDEPEND="${DEPEND}"

diff --git a/dev-perl/IO-AIO/IO-AIO-3.650.ebuild b/dev-perl/IO-AIO/IO-AIO-3.650.ebuild
new file mode 100644
index 0000000..f0b52d8
--- /dev/null
+++ b/dev-perl/IO-AIO/IO-AIO-3.650.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-AIO/IO-AIO-3.650.ebuild,v 1.1 2011/01/14 09:25:11 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR="MLEHMANN"
+MODULE_VERSION=3.65
+inherit perl-module
+
+DESCRIPTION="Asynchronous Input/Output"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-perl/common-sense"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/dev-perl/IO-AIO/IO-AIO-3.710.ebuild b/dev-perl/IO-AIO/IO-AIO-3.710.ebuild
new file mode 100644
index 0000000..9ac9f2d
--- /dev/null
+++ b/dev-perl/IO-AIO/IO-AIO-3.710.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-AIO/IO-AIO-3.710.ebuild,v 1.2 2011/02/07 18:38:53 robbat2 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR="MLEHMANN"
+MODULE_VERSION=3.71
+inherit perl-module
+
+DESCRIPTION="Asynchronous Input/Output"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-perl/common-sense"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/dev-perl/IO-Multiplex/IO-Multiplex-1.09.ebuild b/dev-perl/IO-Multiplex/IO-Multiplex-1.09.ebuild
new file mode 100644
index 0000000..5a1de97
--- /dev/null
+++ b/dev-perl/IO-Multiplex/IO-Multiplex-1.09.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Multiplex/IO-Multiplex-1.09.ebuild,v 1.9 2008/03/28 08:33:46 jer Exp $
+
+inherit perl-module
+
+DESCRIPTION="Manage IO on many file handles "
+HOMEPAGE="http://search.cpan.org/~bbb/"
+SRC_URI="mirror://cpan/authors/id/B/BB/BBB/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+SRC_TEST="do"
+
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/IO-Socket-IP/IO-Socket-IP-0.160.0.ebuild b/dev-perl/IO-Socket-IP/IO-Socket-IP-0.160.0.ebuild
new file mode 100644
index 0000000..76ccb21
--- /dev/null
+++ b/dev-perl/IO-Socket-IP/IO-Socket-IP-0.160.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-IP/IO-Socket-IP-0.160.0.ebuild,v 1.1 2012/06/26 19:22:52 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=PEVANS
+MODULE_VERSION=0.16
+inherit perl-module
+
+DESCRIPTION='A drop-in replacement for IO::Socket::INET supporting both IPv4 and IPv6'
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Socket-1.970.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? (
+		dev-perl/Test-Pod
+	)
+"
+
+SRC_TEST="do"
+
+src_test() {
+	rm t/21nonblocking-connect-internet.t || die
+	perl-module_src_test
+}

diff --git a/dev-perl/IO-Tty/IO-Tty-1.08.ebuild b/dev-perl/IO-Tty/IO-Tty-1.08.ebuild
new file mode 100644
index 0000000..21b3bfd
--- /dev/null
+++ b/dev-perl/IO-Tty/IO-Tty-1.08.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Tty/IO-Tty-1.08.ebuild,v 1.6 2010/06/27 19:12:15 nixnut Exp $
+
+MODULE_AUTHOR=RGIERSIG
+inherit perl-module
+
+DESCRIPTION="IO::Tty and IO::Pty modules for Perl"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"

diff --git a/dev-perl/IP-Country/IP-Country-2.23.ebuild b/dev-perl/IP-Country/IP-Country-2.23.ebuild
new file mode 100644
index 0000000..92250c3
--- /dev/null
+++ b/dev-perl/IP-Country/IP-Country-2.23.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IP-Country/IP-Country-2.23.ebuild,v 1.9 2012/03/25 15:08:52 armin76 Exp $
+
+inherit perl-module
+
+DESCRIPTION="fast lookup of country codes from IP addresses"
+SRC_URI="mirror://cpan/authors/id/N/NW/NWETTERS/${P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/~nwetters/${P}/"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+SRC_TEST="do"
+
+DEPEND="dev-perl/Geography-Countries
+	dev-lang/perl"
+mydoc="TODO"

diff --git a/dev-perl/IPC-Run/IPC-Run-0.89.ebuild b/dev-perl/IPC-Run/IPC-Run-0.89.ebuild
new file mode 100644
index 0000000..fa9cc56
--- /dev/null
+++ b/dev-perl/IPC-Run/IPC-Run-0.89.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IPC-Run/IPC-Run-0.89.ebuild,v 1.5 2011/07/22 14:06:58 jer Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=TODDR
+inherit perl-module
+
+DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
+
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86"
+IUSE="test"
+
+RDEPEND=">=dev-perl/IO-Tty-1.08"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST=do

diff --git a/dev-perl/IPC-Run3/IPC-Run3-0.043.ebuild b/dev-perl/IPC-Run3/IPC-Run3-0.043.ebuild
new file mode 100644
index 0000000..2a339a3
--- /dev/null
+++ b/dev-perl/IPC-Run3/IPC-Run3-0.043.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IPC-Run3/IPC-Run3-0.043.ebuild,v 1.10 2010/01/10 13:11:35 grobian Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=RJBS
+inherit perl-module
+
+DESCRIPTION="Run a subprocess in batch mode (a la system)"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+SRC_TEST="do"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( >=dev-perl/Test-Pod-1.00
+		>=dev-perl/Test-Pod-Coverage-1.04 )"

diff --git a/dev-perl/IPC-Shareable/files/fix_perl_5.10_compat.patch b/dev-perl/IPC-Shareable/files/fix_perl_5.10_compat.patch
new file mode 100644
index 0000000..c788d58
--- /dev/null
+++ b/dev-perl/IPC-Shareable/files/fix_perl_5.10_compat.patch
@@ -0,0 +1,17 @@
+http://rt.cpan.org/Public/Bug/Display.html?id=41401
+http://bugs.debian.org/507657
+# Getting $# of an already-dereferenced-arrayref is a no-go in Perl 5.10
+Index: libipc-shareable-perl/lib/IPC/Shareable.pm
+===================================================================
+--- libipc-shareable-perl.orig/lib/IPC/Shareable.pm	2008-12-03 10:51:27.000000000 -0600
++++ libipc-shareable-perl/lib/IPC/Shareable.pm	2008-12-03 10:51:46.000000000 -0600
+@@ -452,7 +452,7 @@
+     my $n    = shift;
+ 
+     $self->{_data} = _thaw($self->{_shm}) unless $self->{_lock};
+-    $#{@{$self->{_data}}} = $n - 1;
++    $#{$self->{_data}} = $n - 1;
+     if ($self->{_lock} & LOCK_EX) {
+         $self->{_was_changed} = 1;
+     } else {
+

diff --git a/dev-perl/Image-Scale/files/0.80.0-disable_autodetect.patch b/dev-perl/Image-Scale/files/0.80.0-disable_autodetect.patch
new file mode 100644
index 0000000..3611479
--- /dev/null
+++ b/dev-perl/Image-Scale/files/0.80.0-disable_autodetect.patch
@@ -0,0 +1,44 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -13,6 +13,7 @@
+ 
+ my ($help, $jpeg_inc, $jpeg_lib, $png_inc, $png_lib, $gif_inc, $gif_lib, $gif_lib_name);
+ my ($jpeg_static, $png_static, $gif_static);
++my ($disable_jpeg, $disable_png, $disable_gif);
+ 
+ my $DEFINES = '-O2';
+ $DEFINES .= ' -Wall' unless $^O =~ /sun|solaris/i;
+@@ -29,6 +30,9 @@
+ 
+ my $result = GetOptions(
+     "help|h"               => \$help,
++    "disable-jpeg"          => \$disable_jpeg,
++    "disable-png"           => \$disable_png,
++    "disable-gif"           => \$disable_gif,
+     "with-jpeg-includes=s" => \$jpeg_inc,
+     "with-jpeg-libs=s"     => \$jpeg_lib,
+     "with-jpeg-static"     => \$jpeg_static,
+@@ -75,6 +79,7 @@
+ 
+ # Look for libjpeg
+ for my $incdir ( $jpeg_inc, @check ) {
++    last if $disable_jpeg;
+     if ( $incdir && -e catfile($incdir, 'jpeglib.h') ) {
+         $JPEG = 1;
+         $jpeg_inc = $incdir;
+@@ -111,6 +116,7 @@
+ 
+ # Look for libpng
+ for my $incdir ( $png_inc, @check ) {
++    last if $disable_png;
+     if ( $incdir && -e catfile($incdir, 'png.h') ) {
+         $PNG = 1;
+         $png_inc = $incdir;
+@@ -144,6 +150,7 @@
+ 
+ # Look for libgif
+ for my $incdir ( $gif_inc, @check ) {
++    last if $disable_gif;
+     if ( $incdir && -e catfile($incdir, 'gif_lib.h') ) {
+         $GIF = 1;
+         $gif_inc = $incdir;

diff --git a/dev-perl/Image-Scale/files/libpng-1.5-memcpy.patch b/dev-perl/Image-Scale/files/libpng-1.5-memcpy.patch
new file mode 100644
index 0000000..fa9ad60
--- /dev/null
+++ b/dev-perl/Image-Scale/files/libpng-1.5-memcpy.patch
@@ -0,0 +1,11 @@
+--- a/src/png.c
++++ b/src/png.c
+@@ -40,7 +40,7 @@
+     }
+  }
+ 
+- png_memcpy(data, buffer_ptr(im->buf), len);
++ memcpy(data, buffer_ptr(im->buf), len);
+  buffer_consume(im->buf, len);
+  
+  goto ok;

diff --git a/dev-perl/Inline/Inline-0.44-r1.ebuild b/dev-perl/Inline/Inline-0.44-r1.ebuild
new file mode 100644
index 0000000..b5f3857
--- /dev/null
+++ b/dev-perl/Inline/Inline-0.44-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Inline/Inline-0.44-r1.ebuild,v 1.28 2010/01/21 13:21:57 tove Exp $
+
+inherit perl-module eutils
+
+DESCRIPTION="Write Perl subroutines in other languages"
+HOMEPAGE="http://search.cpan.org/doc/INGY/Inline-0.43/Inline.pod"
+SRC_URI="mirror://cpan/authors/id/I/IN/INGY/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="gtk"
+
+DEPEND="virtual/perl-Digest-MD5
+	virtual/perl-File-Spec
+	dev-perl/Parse-RecDescent
+	virtual/perl-Test-Harness
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	#gtk-2 suggested patch
+	use gtk && epatch ${FILESDIR}/gtk2-patch.diff
+}
+
+src_compile() {
+	echo "y" | perl-module_src_compile
+	perl-module_src_test
+}
+
+src_install() {
+	perl-module_src_install
+	dohtml DT.html
+}

diff --git a/dev-perl/Inline/files/gtk2-patch.diff b/dev-perl/Inline/files/gtk2-patch.diff
new file mode 100644
index 0000000..bf28ec5
--- /dev/null
+++ b/dev-perl/Inline/files/gtk2-patch.diff
@@ -0,0 +1,32 @@
+*** Inline-0.44/lib/Inline/denter.pm-orig	2001-06-13 06:30:50.000000000 +0200
+--- Inline-0.44/lib/Inline/denter.pm	2002-11-13 15:43:41.000000000 +0100
+***************
+*** 177,182 ****
+--- 177,183 ----
+  }
+  
+  sub _next_line {
++     local ($_);
+      my $o = shift;
+      $o->{done}++, $o->{level} = -1, return unless @{$o->{lines}};
+      $_ = shift @{$o->{lines}};
+***************
+*** 188,193 ****
+--- 189,195 ----
+      $o->{done}++, $o->{level} = -1, return unless @{$o->{lines}};
+      my ($width, $tabwidth) = @{$o}{qw(width tabwidth)};
+      while (1) {
++         local ($_);
+  	$_ = $o->{lines}[0];
+  	# expand tabs in leading whitespace;
+  	$o->next_line, next if /^(\s*$|\#)/; # skip comments and blank lines
+***************
+*** 221,226 ****
+--- 223,229 ----
+  
+  sub indent_data {
+      my $o = shift;
++     local ($_);
+      $_ = shift;
+      return $o->indent_undef($_)
+        if not defined;

diff --git a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.10.0.ebuild b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.10.0.ebuild
new file mode 100644
index 0000000..0d277cc
--- /dev/null
+++ b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.10.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.10.0.ebuild,v 1.15 2011/12/18 21:32:15 halcy0n Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=GAAS
+MODULE_VERSION=6.01
+inherit perl-module
+
+DESCRIPTION="Media types and mailcap processing"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/dev-perl/Locale-gettext/files/compatibility-with-POSIX-module.diff b/dev-perl/Locale-gettext/files/compatibility-with-POSIX-module.diff
new file mode 100644
index 0000000..101e9f2
--- /dev/null
+++ b/dev-perl/Locale-gettext/files/compatibility-with-POSIX-module.diff
@@ -0,0 +1,16 @@
+Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=237378
+Bug: http://rt.cpan.org/Public/Bug/Display.html?id=35680
+Bug-Debian: http://bugs.debian.org/479803
+Author: Raphaël Hertzog <hertzog@××××××.org>
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=479803#20
+
+--- a/gettext.pm
++++ b/gettext.pm
+@@ -32,6 +32,7 @@ to internationalize software.
+ =cut
+ 
+ use Carp;
++use POSIX qw(:locale_h);
+ 
+ require Exporter;
+ require DynaLoader;

diff --git a/dev-perl/Log-Log4perl/Log-Log4perl-1.28.ebuild b/dev-perl/Log-Log4perl/Log-Log4perl-1.28.ebuild
new file mode 100644
index 0000000..19a8575
--- /dev/null
+++ b/dev-perl/Log-Log4perl/Log-Log4perl-1.28.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Log-Log4perl/Log-Log4perl-1.28.ebuild,v 1.5 2012/06/16 18:46:36 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR="MSCHILLI"
+inherit perl-module
+
+DESCRIPTION="Log::Log4perl is a Perl port of the widely popular log4j logging package."
+HOMEPAGE="http://log4perl.sourceforge.net/"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="virtual/perl-Time-HiRes"
+DEPEND="${RDEPEND}
+	test? ( virtual/perl-Test-Simple )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.4.ebuild b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.4.ebuild
new file mode 100644
index 0000000..56ec68b
--- /dev/null
+++ b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Log-TraceMessages/Log-TraceMessages-1.4.ebuild,v 1.13 2012/06/17 14:07:26 armin76 Exp $
+
+inherit perl-module
+
+DESCRIPTION="Logging/debugging aid"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/~edavis/"
+IUSE=""
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="amd64 ppc x86"
+SRC_TEST="do"
+DEPEND=">=dev-perl/HTML-FromText-1.004
+	dev-lang/perl"

diff --git a/dev-perl/MIME-Types/MIME-Types-1.29.ebuild b/dev-perl/MIME-Types/MIME-Types-1.29.ebuild
new file mode 100644
index 0000000..6f55d93
--- /dev/null
+++ b/dev-perl/MIME-Types/MIME-Types-1.29.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MIME-Types/MIME-Types-1.29.ebuild,v 1.8 2010/12/03 00:45:02 xmw Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=MARKOV
+inherit perl-module
+
+DESCRIPTION="Definition of MIME types"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Test-Pod )"
+
+SRC_TEST="do"

diff --git a/dev-perl/MIME-tools/MIME-tools-5.427.ebuild b/dev-perl/MIME-tools/MIME-tools-5.427.ebuild
new file mode 100644
index 0000000..46c5785
--- /dev/null
+++ b/dev-perl/MIME-tools/MIME-tools-5.427.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MIME-tools/MIME-tools-5.427.ebuild,v 1.9 2010/01/29 14:23:26 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=DONEILL
+inherit perl-module
+
+DESCRIPTION="A Perl module for parsing and creating MIME entities"
+
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-perl/IO-stringy-2.108
+	>=virtual/perl-MIME-Base64-3.05
+	virtual/perl-libnet
+	dev-perl/URI
+	virtual/perl-Digest-MD5
+	dev-perl/libwww-perl
+	dev-perl/HTML-Tagset
+	dev-perl/HTML-Parser
+	dev-perl/MailTools
+	virtual/perl-File-Temp"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/dev-perl/MIME-tools/MIME-tools-5.502.0.ebuild b/dev-perl/MIME-tools/MIME-tools-5.502.0.ebuild
new file mode 100644
index 0000000..ddce40a
--- /dev/null
+++ b/dev-perl/MIME-tools/MIME-tools-5.502.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MIME-tools/MIME-tools-5.502.0.ebuild,v 1.2 2011/09/07 16:23:28 jlec Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DSKOLL
+MODULE_VERSION=5.502
+inherit perl-module
+
+DESCRIPTION="A Perl module for parsing and creating MIME entities"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+RDEPEND=">=virtual/perl-MIME-Base64-3.05
+	virtual/perl-libnet
+	dev-perl/URI
+	virtual/perl-Digest-MD5
+	dev-perl/libwww-perl
+	dev-perl/HTML-Tagset
+	dev-perl/HTML-Parser
+	dev-perl/MailTools
+	virtual/perl-File-Temp"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Pod
+	)"
+
+SRC_TEST="do"

diff --git a/dev-perl/MLDBM/MLDBM-2.01.ebuild b/dev-perl/MLDBM/MLDBM-2.01.ebuild
new file mode 100644
index 0000000..bf57502
--- /dev/null
+++ b/dev-perl/MLDBM/MLDBM-2.01.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MLDBM/MLDBM-2.01.ebuild,v 1.20 2010/12/03 02:12:49 xmw Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=CHAMAS
+inherit perl-module
+
+DESCRIPTION="A multidimensional/tied hash Perl Module"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 s390 sparc x86"
+IUSE=""

diff --git a/dev-perl/MP3-Tag/files/MP3-Tag-makefile.patch b/dev-perl/MP3-Tag/files/MP3-Tag-makefile.patch
new file mode 100644
index 0000000..1b7873a
--- /dev/null
+++ b/dev-perl/MP3-Tag/files/MP3-Tag-makefile.patch
@@ -0,0 +1,17 @@
+--- Makefile.PL.old	2005-12-15 08:45:16.000000000 +0900
++++ Makefile.PL	2005-12-15 08:45:49.000000000 +0900
+@@ -35,14 +35,6 @@
+     'clean'             => {FILES => 'ID3v2-Data.pod'},
+ );
+ 
+-# Tell MakeMaker about manifying ID3v2-Data.pod
+-package MY;
+-sub manifypods {
+-    my $self = shift;
+-    $self->{MAN3PODS}->{'ID3v2-Data.pod'} = '$(INST_MAN3DIR)/MP3::Tag::ID3v2-Data.$(MAN3EXT)';
+-    $self->SUPER::manifypods(@_);
+-}
+-
+ sub postamble {	# Not good enough: is done after .pod is moved to INST_LIB...
+   '
+ ID3v2-Data.pod :: Tag/ID3v2.pm # pm_to_blib

diff --git a/dev-perl/Mail-Builder/files/1.16-escape-at-for-perl-5.8.patch b/dev-perl/Mail-Builder/files/1.16-escape-at-for-perl-5.8.patch
new file mode 100644
index 0000000..f1d01be
--- /dev/null
+++ b/dev-perl/Mail-Builder/files/1.16-escape-at-for-perl-5.8.patch
@@ -0,0 +1,14 @@
+diff --git a/t/008_builder.t b/t/008_builder.t
+index bde82ef..5776ba8 100755
+--- a/t/008_builder.t
++++ b/t/008_builder.t
+@@ -139,7 +139,7 @@ is($mime->head->get('Subject'),'Testmail'."\n");
+ is($mime->head->get('From'),'"me" <from2@××××.com>'."\n");
+ 
+ is($mime->head->get('Content-Language'),'de'."\n");
+-like($mime->head->get('Message-ID'),qr/<[0-9A-Za-z.@-]+>/);
++like($mime->head->get('Message-ID'),qr/<[0-9A-Za-z.\@-]+>/);
+ is($mime->parts,2);
+ is($mime->parts(0)->mime_type,'application/pdf');
+ is($mime->parts(1)->mime_type,'text/plain');
+\ No newline at end of file

diff --git a/dev-perl/Mail-IMAPClient/files/2.2.9-skiptest.patch b/dev-perl/Mail-IMAPClient/files/2.2.9-skiptest.patch
new file mode 100644
index 0000000..11ccfb2
--- /dev/null
+++ b/dev-perl/Mail-IMAPClient/files/2.2.9-skiptest.patch
@@ -0,0 +1,11 @@
+--- Makefile.PL.orig	2005-01-07 23:17:00.849874616 -0200
++++ Makefile.PL	2005-01-07 23:18:32.815893656 -0200
+@@ -49,7 +49,7 @@
+ 
+ sub set_test_data {
+ 	unless (-f "./IMAPClient.pm") { warn "ERROR: not in installation directory\n"; return }
+-	return if -f "./test.txt";
++	return if -f "./Makefile.PL";
+ 	print 	"You have the option of running an extended suite of tests during\n",
+ 		"'make test'. This requires an IMAP server name, user account, and ",
+ 		"password to test with.","\n","\n",

diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/24_google_safebrowsing.cf b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/24_google_safebrowsing.cf
new file mode 100644
index 0000000..8209802
--- /dev/null
+++ b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/24_google_safebrowsing.cf
@@ -0,0 +1,18 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/24_google_safebrowsing.cf,v 1.1 2007/10/17 08:47:41 robbat2 Exp $
+ifplugin Mail::SpamAssassin::Plugin::GoogleSafeBrowsing
+
+# Replace DEADBEEF with your API key
+# from http://code.google.com/apis/safebrowsing/key_signup.html
+google_safebrowsing_apikey DEADBEEF
+
+# Change these scores if you want
+google_safebrowsing_blocklist goog-black-hash 0.2
+google_safebrowsing_blocklist goog-malware-hash 0.1
+
+# Do not change these two lines!
+body GOOGLE_SAFEBROWSING eval:check_google_safebrowsing_blocklists()
+google_safebrowsing_dir /var/lib/spamassassin/google_safebrowsing/
+
+endif # Mail::SpamAssassin::Plugin::GoogleSafeBrowsing
+
+# vim: ft=conf:

diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/init_google_safebrowsing.pre b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/init_google_safebrowsing.pre
new file mode 100644
index 0000000..be174ff
--- /dev/null
+++ b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/init_google_safebrowsing.pre
@@ -0,0 +1,3 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/init_google_safebrowsing.pre,v 1.1 2007/10/17 08:47:41 robbat2 Exp $
+# You need to uncomment this after you have an API key and the cronjob is active!
+#loadplugin  Mail::SpamAssassin::Plugin::GoogleSafeBrowsing

diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.cron b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.cron
new file mode 100644
index 0000000..8e902fb
--- /dev/null
+++ b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.cron
@@ -0,0 +1,5 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.cron,v 1.1 2008/07/05 09:46:28 robbat2 Exp $
+#
+*/30 * * * *	root	/usr/sbin/update_google_safebrowsing.sh

diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.sh b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.sh
new file mode 100644
index 0000000..a0f9896
--- /dev/null
+++ b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.sh,v 1.2 2008/07/05 09:46:28 robbat2 Exp $
+# This cron script updates the Google SafeBrowsing lists for the use of the
+# Mail-SpamAssassin-Plugin-GoogleSafeBrowsing plugin.
+# It should be run every 25-30 minutes! http://code.google.com/apis/safebrowsing/developers_guide.html#AcceptableUsage
+CONFFILE="/etc/mail/spamassassin/24_google_safebrowsing.cf"
+OUTDIR="$(awk '/^google_safebrowsing_dir/{print $2}' "${CONFFILE}")"
+APIKEY="$(awk '/^google_safebrowsing_apikey/{print $2}' "${CONFFILE}")"
+LISTS="$(awk '/^google_safebrowsing_blocklist/{printf "%s ",$2}' "${CONFFILE}")"
+if [ "$APIKEY" == "DEADBEEF" ]; then
+	echo "No API key!" 1>&2
+	exit 1
+fi
+# Wait a little while, to avoid hammering the server
+sleep $(($RANDOM % 120))
+# Use LISTS unquoted!
+for LIST in ${LISTS}; do
+	blocklist_updater --apikey "$APIKEY" --blocklist ${LIST} --dbfile ${OUTDIR}/${LIST}-db
+done

diff --git a/dev-perl/MailTools/MailTools-2.06.ebuild b/dev-perl/MailTools/MailTools-2.06.ebuild
new file mode 100644
index 0000000..ea05165
--- /dev/null
+++ b/dev-perl/MailTools/MailTools-2.06.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MailTools/MailTools-2.06.ebuild,v 1.7 2012/03/25 16:32:58 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=MARKOV
+inherit perl-module
+
+DESCRIPTION="Manipulation of electronic mail addresses"
+
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=virtual/perl-libnet-1.0703
+	dev-perl/TimeDate"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Test-Pod )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.24.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.24.ebuild
new file mode 100644
index 0000000..623f7f4
--- /dev/null
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.24.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.24.ebuild,v 1.8 2010/09/06 18:49:11 armin76 Exp $
+
+MODULE_AUTHOR="TELS/math"
+inherit perl-module
+
+DESCRIPTION="Use the GMP library for Math::BigInt routines"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
+RDEPEND=">=perl-core/Math-BigInt-1.87
+		 >=dev-libs/gmp-4.0.0"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.360.0.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.360.0.ebuild
new file mode 100644
index 0000000..1f321d6
--- /dev/null
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.360.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.360.0.ebuild,v 1.1 2011/02/26 19:08:50 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PJACKLAM
+MODULE_VERSION=1.36
+inherit perl-module
+
+DESCRIPTION="Use the GMP library for Math::BigInt routines"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/perl-Math-BigInt-1.993.0
+		 >=dev-libs/gmp-4.0.0"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/dev-perl/Math-Derivative/files/0.01-pod-1.diff b/dev-perl/Math-Derivative/files/0.01-pod-1.diff
new file mode 100644
index 0000000..acfe83c
--- /dev/null
+++ b/dev-perl/Math-Derivative/files/0.01-pod-1.diff
@@ -0,0 +1,15 @@
+Taken from debian
+--- Derivative.pm
++++ Derivative.pm
+@@ -1,8 +1,9 @@
+ # functions for calculating derivatives of data
+ # $Id: Derivative.pm,v 1.1 1995/12/26 16:26:59 willijar Exp $
++
+ =head1 NAME
+ 
+- Math::Derivative - Numeric 1st and 2nd order differentiation
++Math::Derivative - Numeric 1st and 2nd order differentiation
+ 
+ =head1 SYNOPSIS
+ 
+

diff --git a/dev-perl/Math-Spline/files/0.01-pod.diff b/dev-perl/Math-Spline/files/0.01-pod.diff
new file mode 100644
index 0000000..a4b108d
--- /dev/null
+++ b/dev-perl/Math-Spline/files/0.01-pod.diff
@@ -0,0 +1,10 @@
+
+--- libmath-spline-perl-0.01.orig/Spline.pm
++++ libmath-spline-perl-0.01/Spline.pm
+@@ -1,4 +1,5 @@
+ # $Id: Spline.pm,v 1.1 1995/12/26 17:28:17 willijar Exp $
++
+ =head1 NAME
+ 
+     Math::Spline  - Cubic Spline Interpolation of data
+

diff --git a/dev-perl/MogileFS-Client/MogileFS-Client-1.08.ebuild b/dev-perl/MogileFS-Client/MogileFS-Client-1.08.ebuild
new file mode 100644
index 0000000..5b29f82
--- /dev/null
+++ b/dev-perl/MogileFS-Client/MogileFS-Client-1.08.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Client/MogileFS-Client-1.08.ebuild,v 1.1 2007/10/27 01:26:30 robbat2 Exp $
+
+MODULE_AUTHOR="BRADFITZ"
+inherit perl-module
+
+DESCRIPTION="Client library for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=dev-perl/IO-stringy-2.110
+		dev-perl/libwww-perl
+		dev-lang/perl"
+
+# Tests only available if you have a local mogilefsd on 127.0.0.1:7001
+#SRC_TEST="do"
+mydoc="CHANGES TODO"

diff --git a/dev-perl/MogileFS-Client/MogileFS-Client-1.09.ebuild b/dev-perl/MogileFS-Client/MogileFS-Client-1.09.ebuild
new file mode 100644
index 0000000..a3e7904
--- /dev/null
+++ b/dev-perl/MogileFS-Client/MogileFS-Client-1.09.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Client/MogileFS-Client-1.09.ebuild,v 1.1 2009/11/04 01:50:55 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Client library for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=dev-perl/IO-stringy-2.110
+		dev-perl/libwww-perl
+		dev-lang/perl"
+
+# Tests only available if you have a local mogilefsd on 127.0.0.1:7001
+#SRC_TEST="do"
+mydoc="CHANGES TODO"

diff --git a/dev-perl/MogileFS-Client/MogileFS-Client-1.10.ebuild b/dev-perl/MogileFS-Client/MogileFS-Client-1.10.ebuild
new file mode 100644
index 0000000..afbe96f
--- /dev/null
+++ b/dev-perl/MogileFS-Client/MogileFS-Client-1.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Client/MogileFS-Client-1.10.ebuild,v 1.1 2009/12/18 03:23:19 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Client library for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=dev-perl/IO-stringy-2.110
+		dev-perl/libwww-perl
+		dev-lang/perl"
+
+# Tests only available if you have a local mogilefsd on 127.0.0.1:7001
+#SRC_TEST="do"
+mydoc="CHANGES TODO"

diff --git a/dev-perl/MogileFS-Client/MogileFS-Client-1.11.ebuild b/dev-perl/MogileFS-Client/MogileFS-Client-1.11.ebuild
new file mode 100644
index 0000000..36a2923
--- /dev/null
+++ b/dev-perl/MogileFS-Client/MogileFS-Client-1.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Client/MogileFS-Client-1.11.ebuild,v 1.1 2010/04/02 23:57:32 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Client library for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=dev-perl/IO-stringy-2.110
+		dev-perl/libwww-perl
+		dev-lang/perl"
+
+# Tests only available if you have a local mogilefsd on 127.0.0.1:7001
+#SRC_TEST="do"
+mydoc="CHANGES TODO"

diff --git a/dev-perl/MogileFS-Client/MogileFS-Client-1.12.ebuild b/dev-perl/MogileFS-Client/MogileFS-Client-1.12.ebuild
new file mode 100644
index 0000000..ff0c529
--- /dev/null
+++ b/dev-perl/MogileFS-Client/MogileFS-Client-1.12.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Client/MogileFS-Client-1.12.ebuild,v 1.1 2010/08/20 21:13:57 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Client library for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=dev-perl/IO-stringy-2.110
+		dev-perl/libwww-perl
+		dev-lang/perl"
+
+# Tests only available if you have a local mogilefsd on 127.0.0.1:7001
+#SRC_TEST="do"
+mydoc="CHANGES TODO"

diff --git a/dev-perl/MogileFS-Client/MogileFS-Client-1.13.ebuild b/dev-perl/MogileFS-Client/MogileFS-Client-1.13.ebuild
new file mode 100644
index 0000000..eeb7fa3
--- /dev/null
+++ b/dev-perl/MogileFS-Client/MogileFS-Client-1.13.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Client/MogileFS-Client-1.13.ebuild,v 1.1 2010/10/29 02:02:37 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Client library for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=dev-perl/IO-stringy-2.110
+		dev-perl/libwww-perl
+		dev-lang/perl"
+
+# Tests only available if you have a local mogilefsd on 127.0.0.1:7001
+#SRC_TEST="do"
+mydoc="CHANGES TODO"

diff --git a/dev-perl/MogileFS-Client/MogileFS-Client-1.14.ebuild b/dev-perl/MogileFS-Client/MogileFS-Client-1.14.ebuild
new file mode 100644
index 0000000..90f443e
--- /dev/null
+++ b/dev-perl/MogileFS-Client/MogileFS-Client-1.14.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Client/MogileFS-Client-1.14.ebuild,v 1.1 2011/01/14 03:39:37 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Client library for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=dev-perl/IO-stringy-2.110
+		dev-perl/libwww-perl
+		dev-lang/perl"
+
+# Tests only available if you have a local mogilefsd on 127.0.0.1:7001
+#SRC_TEST="do"
+mydoc="CHANGES TODO"

diff --git a/dev-perl/MogileFS-Utils/MogileFS-Utils-2.13.ebuild b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.13.ebuild
new file mode 100644
index 0000000..68e8464
--- /dev/null
+++ b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.13.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Utils/MogileFS-Utils-2.13.ebuild,v 1.3 2009/07/19 17:40:43 tove Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/perl-IO-Compress
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.07
+		dev-lang/perl"

diff --git a/dev-perl/MogileFS-Utils/MogileFS-Utils-2.14.ebuild b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.14.ebuild
new file mode 100644
index 0000000..046d70a
--- /dev/null
+++ b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.14.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Utils/MogileFS-Utils-2.14.ebuild,v 1.2 2009/07/19 17:40:43 tove Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/perl-IO-Compress
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.07
+		dev-lang/perl"

diff --git a/dev-perl/MogileFS-Utils/MogileFS-Utils-2.15.ebuild b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.15.ebuild
new file mode 100644
index 0000000..f1589da
--- /dev/null
+++ b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.15.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Utils/MogileFS-Utils-2.15.ebuild,v 1.1 2009/12/18 03:23:51 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/perl-IO-Compress
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.07
+		dev-lang/perl"

diff --git a/dev-perl/MogileFS-Utils/MogileFS-Utils-2.16.ebuild b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.16.ebuild
new file mode 100644
index 0000000..ad1abd1
--- /dev/null
+++ b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.16.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Utils/MogileFS-Utils-2.16.ebuild,v 1.1 2010/04/02 23:58:38 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/perl-IO-Compress
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.11"

diff --git a/dev-perl/MogileFS-Utils/MogileFS-Utils-2.17.ebuild b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.17.ebuild
new file mode 100644
index 0000000..4f0de9d
--- /dev/null
+++ b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.17.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Utils/MogileFS-Utils-2.17.ebuild,v 1.1 2010/08/20 21:14:11 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/perl-IO-Compress
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.11"

diff --git a/dev-perl/MogileFS-Utils/MogileFS-Utils-2.18.ebuild b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.18.ebuild
new file mode 100644
index 0000000..582a58b
--- /dev/null
+++ b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.18.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Utils/MogileFS-Utils-2.18.ebuild,v 1.1 2010/10/29 02:03:50 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/perl-IO-Compress
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.11"

diff --git a/dev-perl/MogileFS-Utils/MogileFS-Utils-2.19.ebuild b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.19.ebuild
new file mode 100644
index 0000000..d060545
--- /dev/null
+++ b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.19.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Utils/MogileFS-Utils-2.19.ebuild,v 1.1 2011/01/14 03:40:42 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/perl-IO-Compress
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.14"

diff --git a/dev-perl/MogileFS-Utils/MogileFS-Utils-2.20.ebuild b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.20.ebuild
new file mode 100644
index 0000000..f87c7ea
--- /dev/null
+++ b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.20.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Utils/MogileFS-Utils-2.20.ebuild,v 1.1 2011/06/16 08:32:13 robbat2 Exp $
+
+MODULE_AUTHOR="DORMANDO"
+inherit perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/perl-IO-Compress
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.14"

diff --git a/dev-perl/Moo/Moo-0.91.9.ebuild b/dev-perl/Moo/Moo-0.91.9.ebuild
new file mode 100644
index 0000000..b5d586d
--- /dev/null
+++ b/dev-perl/Moo/Moo-0.91.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Moo/Moo-0.91.9.ebuild,v 1.1 2012/06/26 19:13:49 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=MSTROUT
+MODULE_VERSION=0.091009
+inherit perl-module
+
+DESCRIPTION="Minimalist Object Orientation (with Moose compatiblity)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Class-Method-Modifiers-1.40.0
+	>=dev-perl/Module-Runtime-0.12.0
+	>=dev-perl/Role-Tiny-1.1.3
+	>=dev-perl/strictures-1.1.1
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-perl/Test-Fatal-0.3.0
+		>=virtual/perl-Test-Simple-0.96
+	)
+"
+
+SRC_TEST=do

diff --git a/dev-perl/Moose/Moose-1.240.ebuild b/dev-perl/Moose/Moose-1.240.ebuild
new file mode 100644
index 0000000..2936d15
--- /dev/null
+++ b/dev-perl/Moose/Moose-1.240.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Moose/Moose-1.240.ebuild,v 1.5 2012/04/10 17:39:20 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=1.24
+inherit perl-module
+
+DESCRIPTION="A postmodern object system for Perl 5"
+
+SLOT="0"
+KEYWORDS="ppc"
+IUSE="test"
+
+RDEPEND="dev-perl/Data-OptList
+	>=virtual/perl-Scalar-List-Utils-1.19
+	>=dev-perl/Class-MOP-1.11
+	>=dev-perl/List-MoreUtils-0.12
+	>=dev-perl/Package-DeprecationManager-0.10
+	>=dev-perl/Params-Util-1.00
+	>=dev-perl/Sub-Exporter-0.980
+	dev-perl/Sub-Name
+	dev-perl/Try-Tiny
+	dev-perl/Devel-GlobalDestruction"
+DEPEND="${RDEPEND}
+	test? ( >=virtual/perl-Test-Simple-0.88
+		dev-perl/Test-Fatal
+		dev-perl/Test-LongString
+		>=dev-perl/Test-Output-0.09
+		>=dev-perl/Test-Requires-0.05
+		>=dev-perl/Test-Warn-0.11
+		dev-perl/Test-Deep
+		dev-perl/Module-Refresh
+		)"
+
+SRC_TEST=do

diff --git a/dev-perl/Mouse/files/0.64-ppport.patch b/dev-perl/Mouse/files/0.64-ppport.patch
new file mode 100644
index 0000000..0374f2f
--- /dev/null
+++ b/dev-perl/Mouse/files/0.64-ppport.patch
@@ -0,0 +1,27 @@
+--- Mouse-0.64/inc/Module/Install/XSUtil.pm
++++ Mouse-0.64/inc/Module/Install/XSUtil.pm
+@@ -116,24 +116,6 @@
+ 
+     my $filename = 'ppport.h';
+ 
+-    $dppp_version ||= 3.19; # the more, the better
+-    $self->configure_requires('Devel::PPPort' => $dppp_version);
+-    $self->build_requires('Devel::PPPort' => $dppp_version);
+-
+-    print "Writing $filename\n";
+-
+-    my $e = do{
+-        local $@;
+-        eval qq{
+-            use Devel::PPPort;
+-            Devel::PPPort::WriteFile(q{$filename});
+-        };
+-        $@;
+-    };
+-    if($e){
+-         print "Cannot create $filename because: $@\n";
+-    }
+-
+     if(-e $filename){
+         $self->clean_files($filename);
+         $self->cc_define('-DUSE_PPPORT');

diff --git a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.20.ebuild b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.20.ebuild
new file mode 100644
index 0000000..38057e0
--- /dev/null
+++ b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.20.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.20.ebuild,v 1.14 2010/02/04 20:57:03 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=DOUGW
+inherit perl-module
+
+DESCRIPTION="Perl extension for merging IPv4 or IPv6 CIDR addresses "
+
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""

diff --git a/dev-perl/Net-DNS/files/Net-DNS-0.64-ar.patch b/dev-perl/Net-DNS/files/Net-DNS-0.64-ar.patch
new file mode 100644
index 0000000..5f55edd
--- /dev/null
+++ b/dev-perl/Net-DNS/files/Net-DNS-0.64-ar.patch
@@ -0,0 +1,13 @@
+The linker on Darwin/x86 needs archives with an index, so create one.
+
+--- Makefile.PL
++++ Makefile.PL
+@@ -260,7 +260,7 @@
+ 	cover
+ 
+ netdns$(LIB_EXT): netdns$(OBJ_EXT)
+-	$(AR) '.($^O eq 'MSWin32' && $Config{'cc'} eq 'cl'?'/OUT:':'cr ').
++	$(AR) '.($^O eq 'MSWin32' && $Config{'cc'} eq 'cl'?'/OUT:':'crs ').
+ 	  'netdns$(LIB_EXT) netdns$(OBJ_EXT)
+ 
+ ';

diff --git a/dev-perl/Net-DNS/files/Net-DNS-0.68-ar.patch b/dev-perl/Net-DNS/files/Net-DNS-0.68-ar.patch
new file mode 100644
index 0000000..cad63fa
--- /dev/null
+++ b/dev-perl/Net-DNS/files/Net-DNS-0.68-ar.patch
@@ -0,0 +1,16 @@
+The linker on Darwin/x86 needs archives with an index, so create one.
+
+Ported-from: files/Net-DNS-0.64-ar.patch
+
+diff -Nuar Net-DNS-0.68.orig/Makefile.PL Net-DNS-0.68/Makefile.PL
+--- Net-DNS-0.68.orig/Makefile.PL	2012-01-27 23:02:34.000000000 +0000
++++ Net-DNS-0.68/Makefile.PL	2012-02-29 09:03:14.939727214 +0000
+@@ -336,7 +336,7 @@
+ use Config qw(%Config);
+ 
+ sub postamble {
+-	my $cr = ( $^O eq 'MSWin32' && $Config{'cc'} eq 'cl' ? '/OUT:' : 'cr ' );    # ar action
++	my $cr = ( $^O eq 'MSWin32' && $Config{'cc'} eq 'cl' ? '/OUT:' : 'crs ' );    # ar action
+ 
+ 	my $content = '
+ test_cover : pure_all

diff --git a/dev-perl/Net-IP/files/initip-0.patch b/dev-perl/Net-IP/files/initip-0.patch
new file mode 100644
index 0000000..7f72638
--- /dev/null
+++ b/dev-perl/Net-IP/files/initip-0.patch
@@ -0,0 +1,12 @@
+diff -Naurp Net-IP-1.25.old/IP.pm Net-IP-1.25/IP.pm
+--- Net-IP-1.25.old/IP.pm	2006-05-22 12:46:40.000000000 -0400
++++ Net-IP-1.25/IP.pm	2007-03-30 16:50:48.000000000 -0400
+@@ -410,7 +410,7 @@ sub intip {
+ 
+     my $int = ip_bintoint($self->binip());
+ 
+-    if (!$int) {
++    if (ref($int) ne "Math::BigInt") {
+         $self->{error} = $ERROR;
+         $self->{errno} = $ERRNO;
+         return;

diff --git a/dev-perl/Net-SMTP-TLS/files/0.120.0-multiple-attachments-fix.patch b/dev-perl/Net-SMTP-TLS/files/0.120.0-multiple-attachments-fix.patch
new file mode 100644
index 0000000..05eac0e
--- /dev/null
+++ b/dev-perl/Net-SMTP-TLS/files/0.120.0-multiple-attachments-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/Net/SMTP/TLS.pm b/lib/Net/SMTP/TLS.pm
+index 10f9f19..4936fe5 100644
+--- a/lib/Net/SMTP/TLS.pm
++++ b/lib/Net/SMTP/TLS.pm
+@@ -367,6 +367,7 @@ sub datasend {
+ 				return undef;
+ 			}
+ 			$len -= $w;
++			$offset += $w;
+ 		}
+ 		else
+ 		{

diff --git a/dev-perl/Net-Telnet-Cisco/files/1.10-warning.patch b/dev-perl/Net-Telnet-Cisco/files/1.10-warning.patch
new file mode 100644
index 0000000..1ec1172
--- /dev/null
+++ b/dev-perl/Net-Telnet-Cisco/files/1.10-warning.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=192808
+http://rt.cpan.org/Public/Bug/Display.html?id=7796
+
+diff -ru Net-Telnet-Cisco-1.10/Cisco.pm Net-Telnet-Cisco-1.10/Cisco.pm
+--- Net-Telnet-Cisco-1.10/Cisco.pm	2002-06-18 19:17:03.000000000 +0200
++++ Net-Telnet-Cisco-1.10/Cisco.pm	2008-05-08 20:59:09.000000000 +0200
+@@ -753,7 +753,7 @@
+     1 while s/[^\cH\c?][\cH\c?]//mg; # ^H ^?
+     s/^.*\cU//mg;		     # ^U
+ 
+-    return wantarray ? split /$/mg, $_ : $_; # ORS instead?
++    return wantarray ? split /$/m, $_ : $_; # ORS instead?
+ }
+ 
+ # Lifted from Net::Telnet en toto

diff --git a/dev-perl/Net-XMPP/files/1.02-defined.patch b/dev-perl/Net-XMPP/files/1.02-defined.patch
new file mode 100644
index 0000000..adac59b
--- /dev/null
+++ b/dev-perl/Net-XMPP/files/1.02-defined.patch
@@ -0,0 +1,14 @@
+https://rt.cpan.org/Public/Bug/Display.html?id=58333
+http://github.com/dap/Net-XMPP/commit/2d1164d7c50d7c034f3d1efb03ad9319b24dfd24
+
+--- Net-XMPP-1.02/lib/Net/XMPP/Debug.pm
++++ Net-XMPP-1.02/lib/Net/XMPP/Debug.pm
+@@ -151,7 +151,7 @@
+     my %args;
+     while($#_ >= 0) { $args{ lc pop(@_) } = pop(@_); }
+ 
+-    delete($args{file}) if (lc($args{file}) eq "stdout");
++    delete($args{file}) if (defined $args{file} && lc($args{file}) eq "stdout");
+ 
+     $args{time} = 0 if !exists($args{time});
+     $args{setdefault} = 0 if !exists($args{setdefault});

diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.028.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.028.ebuild
new file mode 100644
index 0000000..7b0f170
--- /dev/null
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.028.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetAddr-IP/NetAddr-IP-4.028.ebuild,v 1.9 2012/03/25 16:32:33 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR="MIKER"
+inherit perl-module
+
+DESCRIPTION="Manipulation and operations on IP addresses"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+SRC_TEST="do"
+mydoc="TODO"

diff --git a/dev-perl/Number-Format/Number-Format-1.52.ebuild b/dev-perl/Number-Format/Number-Format-1.52.ebuild
new file mode 100644
index 0000000..646f94c
--- /dev/null
+++ b/dev-perl/Number-Format/Number-Format-1.52.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Number-Format/Number-Format-1.52.ebuild,v 1.5 2007/03/05 12:19:38 ticho Exp $
+
+inherit perl-module
+
+DESCRIPTION="Package for formatting numbers for display"
+SRC_URI="mirror://cpan/authors/id/W/WR/WRW/${P}.tar.gz"
+HOMEPAGE="http://www.cpan.org/modules/by-authors/id/W/WR/WRW/${P}.readme"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="amd64 ia64 ppc x86"
+IUSE=""
+
+SRC_TEST="do"
+
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/OpenGL/files/OpenGL-0.66-no-display.patch b/dev-perl/OpenGL/files/OpenGL-0.66-no-display.patch
new file mode 100644
index 0000000..6bdc334
--- /dev/null
+++ b/dev-perl/OpenGL/files/OpenGL-0.66-no-display.patch
@@ -0,0 +1,50 @@
+Don't check current display for extensions, build all.
+
+diff -up OpenGL-0.62/Makefile.PL.dist OpenGL-0.62/Makefile.PL
+--- OpenGL-0.62/Makefile.PL.dist	2009-12-11 01:10:00.000000000 +0100
++++ OpenGL-0.62/Makefile.PL	2010-01-07 13:00:26.000000000 +0100
+@@ -579,9 +579,9 @@ my $build_config =
+   {
+     FILES =>
+       "Config.pm ".
+-      "utils/glversion.txt ".
+-      "utils/glversion$Config{exe_ext} ".
+-      "utils/glversion$Config{obj_ext}"
++      "utils/glversion.txt "
++      #"utils/glversion$Config{exe_ext} ".
++      #"utils/glversion$Config{obj_ext}"
+   }
+ };
+ 
+@@ -790,6 +790,7 @@ sub get_extensions
+     print "GLUT not found\n";
+   }
+ 
++=cut
+   # Platform-specific makefiles for glversion
+   my $make_ver;
+   if ($IS_MINGW)
+@@ -848,7 +849,9 @@ sub get_extensions
+      print "get_extensions: no extensions found in $glv_file\n" if $verbose;
+      return '';
+   }
+-
++=cut
++  use Config;
++  my $gldata = { };
+ 
+   # Parse glext_procs.h file
+   return '' if (!open(GLEXT,"glext_procs.h"));
+@@ -867,10 +870,12 @@ sub get_extensions
+ 
+   # Create gl_exclude.h
+   die "Unable to write to $exc_file\n" if (!open(GLEXC,">$exc_file"));
++=cut
+   print GLEXC "// OpenGL Extension Exclusions - may be modified before building.\n";
+   print GLEXC "//\n";
+   print GLEXC "// Generated for ".$gldata->{VENDOR}.", ".$gldata->{RENDERER}."\n";
+   print GLEXC "// OpenGL v".$gldata->{VERSION}.", using ";
++=cut
+ 
+   # Fix GLUT flags based on results
+   if ($gldata->{GLUT} > 0)

diff --git a/dev-perl/PDL/PDL-2.4.3-r1.ebuild b/dev-perl/PDL/PDL-2.4.3-r1.ebuild
new file mode 100644
index 0000000..2f2a098
--- /dev/null
+++ b/dev-perl/PDL/PDL-2.4.3-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.3-r1.ebuild,v 1.16 2010/12/14 03:17:41 mattst88 Exp $
+
+inherit perl-module eutils multilib
+
+DESCRIPTION="PDL Perl Module"
+HOMEPAGE="http://search.cpan.org/~csoe/"
+SRC_URI="mirror://cpan/authors/id/C/CS/CSOE/${P}.tar.gz"
+
+LICENSE="Artistic as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~s390 sh sparc x86"
+IUSE="opengl badval gsl"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	virtual/perl-Filter
+	virtual/perl-File-Spec
+	dev-perl/Inline
+	dev-perl/Astro-FITS-Header
+	>=dev-perl/ExtUtils-F77-1.13
+	virtual/perl-Text-Balanced
+	opengl? ( virtual/opengl virtual/glu )
+	dev-perl/Term-ReadLine-Perl
+	gsl? ( sci-libs/gsl )
+	>=sys-apps/sed-4"
+
+mydoc="DEPENDENCIES DEVELOPMENT MANIFEST* Release_Notes TODO"
+
+#SRC_TEST="do"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/PDL-2.4.2-makemakerfix.patch"
+
+	# Unconditional -fPIC for the lib (#55238, #180807)
+	epatch "${FILESDIR}/${P}-PIC.patch"
+
+	# TODO: everything in this function below this
+	# TODO: line really belongs in src_compile() :
+
+	# This 'fix' breaks compiles for non-opengl users
+	#if ! use opengl ; then
+	#	sed -e "s:WITH_3D => undef:WITH_3D => 0:" \
+	#		${FILESDIR}/perldl.conf > ${S}/perldl.conf
+	#fi
+
+	if use badval ; then
+		sed -i -e "s:WITH_BADVAL => 0:WITH_BADVAL => 1:" "${S}/perldl.conf"
+	fi
+
+	# Turn off GSL automagic:
+	if use gsl ; then
+		sed -i -e "s:WITH_GSL => undef:WITH_GSL => 1:" "${S}/perldl.conf"
+	else
+		sed -i -e "s:WITH_GSL => undef:WITH_GSL => 0:" "${S}/perldl.conf"
+	fi
+}
+
+src_install() {
+	perl-module_src_install
+	dodir /usr/share/doc/${PF}/html
+	eval `perl '-V:version'`
+	PERLVERSION=${version}
+	eval `perl '-V:archname'`
+	ARCHVERSION=${archname}
+	mv ${D}/usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}/PDL/HtmlDocs/PDL \
+		${D}/usr/share/doc/${PF}/html
+
+	mydir=${D}/usr/share/doc/${PF}/html/PDL
+
+	for i in ${mydir}/* ${mydir}/IO/* ${mydir}/Fit/* ${mydir}/Pod/* ${mydir}/Graphics/*
+	do
+		dosed ${i/${D}}
+	done
+	cp ${S}/Doc/scantree.pl ${D}/usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}/PDL/Doc/
+	cp ${S}/Doc/mkhtmldoc.pl ${D}/usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}/PDL/Doc/
+}
+
+pkg_postinst() {
+	perl /usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}/PDL/Doc/scantree.pl
+	elog "Building perldl.db done. You can recreate this at any time"
+	elog "by running"
+	elog "perl /usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}/PDL/Doc/scantree.pl"
+	epause 3
+	elog "PDL requires that glx and dri support be enabled in"
+	elog "your X configuration for certain parts of the graphics"
+	elog "engine to work. See your X's documentation for futher"
+	elog "information."
+}

diff --git a/dev-perl/PDL/PDL-2.4.7.ebuild b/dev-perl/PDL/PDL-2.4.7.ebuild
new file mode 100644
index 0000000..2a6dda2
--- /dev/null
+++ b/dev-perl/PDL/PDL-2.4.7.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.7.ebuild,v 1.3 2010/08/23 13:39:54 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=CHM
+inherit perl-module eutils multilib
+
+DESCRIPTION="PDL Perl Module"
+
+LICENSE="Artistic as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="badval fftw gsl"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	virtual/perl-Filter
+	virtual/perl-File-Spec
+	virtual/perl-PodParser
+	dev-perl/Inline
+	dev-perl/Astro-FITS-Header
+	>=dev-perl/ExtUtils-F77-1.13
+	virtual/perl-Text-Balanced
+	dev-perl/Term-ReadLine-Perl
+	gsl? ( sci-libs/gsl )
+	fftw? ( sci-libs/fftw:2.1 )"
+	#opengl? ( virtual/opengl virtual/glu )
+
+mydoc="DEPENDENCIES DEVELOPMENT MANIFEST* Release_Notes TODO"
+
+SRC_TEST="do"
+
+MAKEOPTS+=" -j1" #300272
+
+src_prepare() {
+	epatch "${FILESDIR}/PDL-2.4.2-makemakerfix.patch"
+
+	# Unconditional -fPIC for the lib (#55238, #180807, #250335)
+	epatch "${FILESDIR}/${PN}-2.4.4-PIC.patch"
+
+	# TODO: everything in this function below this
+	# TODO: line really belongs in src_compile() :
+
+	# This 'fix' breaks compiles for non-opengl users
+	#if ! use opengl ; then
+	#	sed -e "s:WITH_3D => undef:WITH_3D => 0:" \
+	#		${FILESDIR}/perldl.conf > ${S}/perldl.conf
+	#fi
+	sed -i \
+		-e "s:WITH_HDF => undef:WITH_HDF => 0:" \
+		-e "s:USE_POGL => undef:USE_POGL => 0:" \
+		-e "s:WITH_3D => undef:WITH_3D => 0:" "${S}/perldl.conf" || die
+
+	if use badval ; then
+		sed -i -e "s:WITH_BADVAL => 0:WITH_BADVAL => 1:" "${S}/perldl.conf" || die
+	fi
+
+	# Turn off GSL automagic:
+	if use gsl ; then
+		sed -i -e "s:WITH_GSL => undef:WITH_GSL => 1:" "${S}/perldl.conf" || die
+	else
+		sed -i -e "s:WITH_GSL => undef:WITH_GSL => 0:" "${S}/perldl.conf" || die
+	fi
+	# Turn off FFTW automagic too:
+	if use fftw ; then
+		sed -i -e "s:WITH_FFTW => undef:WITH_FFTW => 1:" "${S}/perldl.conf" || die
+	else
+		sed -i -e "s:WITH_FFTW => undef:WITH_FFTW => 0:" "${S}/perldl.conf" || die
+	fi
+}
+
+src_install() {
+	perl-module_src_install
+
+	cp "${S}"/Doc/{scantree.pl,mkhtmldoc.pl} "${D}"/${VENDOR_ARCH}/PDL/Doc/ || die
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} = / ]] ; then
+		perl ${VENDOR_ARCH}/PDL/Doc/scantree.pl
+		elog "Building perldl.db done. You can recreate this at any time"
+		elog "by running"
+	else
+		elog "You must create perldl.db by running"
+	fi
+	elog "perl ${VENDOR_ARCH}/PDL/Doc/scantree.pl"
+	elog "PDL requires that glx and dri support be enabled in"
+	elog "your X configuration for certain parts of the graphics"
+	elog "engine to work. See your X's documentation for futher"
+	elog "information."
+}

diff --git a/dev-perl/PDL/files/PDL-2.4.11-fortran.patch b/dev-perl/PDL/files/PDL-2.4.11-fortran.patch
new file mode 100644
index 0000000..5cd08d7
--- /dev/null
+++ b/dev-perl/PDL/files/PDL-2.4.11-fortran.patch
@@ -0,0 +1,22 @@
+--- Lib/Minuit/Makefile.PL
++++ Lib/Minuit/Makefile.PL
+@@ -149,7 +149,7 @@
+ 	    ("
+ 
+ minuitlib/$_\$(OBJ_EXT): minuitlib/$_.f 
+-	$mycompiler -c $hack_64bit -o minuitlib/$_\$(OBJ_EXT) $mycflags minuitlib/$_.f
++	\$(FC) \$(FFLAGS) -fPIC -c -o minuitlib/$_\$(OBJ_EXT) $mycflags minuitlib/$_.f
+ " )} @minuitfiles;
+ 
+ 	if (!defined($PDL::Config{MINUIT_LIB})){
+--- Lib/Slatec/Makefile.PL
++++ Lib/Slatec/Makefile.PL
+@@ -136,7 +136,7 @@
+ ("
+ 
+ slatec/$_\$(OBJ_EXT): slatec/$_.f 
+-	$mycompiler -c $hack_64bit -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
++	\$(FC) \$(FFLAGS) -c -fPIC -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
+ " )} @slatecfiles;
+  
+ }

diff --git a/dev-perl/PDL/files/PDL-2.4.11-shared-hdf.patch b/dev-perl/PDL/files/PDL-2.4.11-shared-hdf.patch
new file mode 100644
index 0000000..3cf22a3
--- /dev/null
+++ b/dev-perl/PDL/files/PDL-2.4.11-shared-hdf.patch
@@ -0,0 +1,36 @@
+--- IO/HDF/Makefile.PL.orig	2012-06-16 18:43:24.000000000 +0100
++++ IO/HDF/Makefile.PL	2012-06-16 18:44:51.000000000 +0100
+@@ -63,20 +63,20 @@
+     # Look for the libs:
+     foreach my $libdir ( @HDF_lib_locations ) 
+     {
+-        if (-e "$libdir/libdfalt.a" && !$found_df) 
++        if (-e "$libdir/libdfalt.$Config{so}" && !$found_df) 
+         {
+             $found_df = 1;
+             $hdf_lib_path = $libdir;
+ 			$hdf_libs = '-lmfhdfalt -ldfalt';
+-            print "Found libdfalt.a at $libdir/libdfalt.a\n";
++            print "Found libdfalt.$Config{so} at $libdir/libdfalt.$Config{so}\n";
+         }
+     
+-        if (-e "$libdir/libdf.a" && !$found_df) 
++        if (-e "$libdir/libdf.$Config{so}" && !$found_df) 
+         {
+             $found_df = 1;
+             $hdf_lib_path = $libdir;
+ 			$hdf_libs = '-lmfhdf -ldf';
+-            print "Found libdf.a at $libdir/libdf.a\n";
++            print "Found libdf.$Config{so} at $libdir/libdf.$Config{so}\n";
+         }
+     
+         # Look for the szip library, which HDF >= 4.2r0 needs, but older versions don't!
+@@ -90,7 +90,7 @@
+ 
+     unless( defined( $hdf_lib_path ) )
+     {
+-        $msg .= "Cannot find hdf library, libdf.a.\n"
++        $msg .= "Cannot find hdf library, libdf.$Config{so}.\n"
+               . "Please add the correct library path to Makefile.PL or install HDF\n";
+         
+     }

diff --git a/dev-perl/PDL/files/PDL-2.4.2-makemakerfix.patch b/dev-perl/PDL/files/PDL-2.4.2-makemakerfix.patch
new file mode 100644
index 0000000..6cf2c40
--- /dev/null
+++ b/dev-perl/PDL/files/PDL-2.4.2-makemakerfix.patch
@@ -0,0 +1,20 @@
+--- Demos/BAD2_demo.pm.PL	2006/04/20 07:42:24	1.1
++++ Demos/BAD2_demo.pm.PL	2006/04/20 07:42:32
+@@ -3,6 +3,7 @@
+ # - requires both bad-value support and PGPLOT
+ #
+ 
++use blib;
+ use strict;
+ 
+ use Config;
+--- Demos/BAD_demo.pm.PL	2006/04/20 07:42:17	1.1
++++ Demos/BAD_demo.pm.PL	2006/04/20 07:42:38
+@@ -3,6 +3,7 @@
+ # - needed since we allow bad pixel handling to be switched off
+ #
+  
++use blib;
+ use strict;
+  
+ use Config;

diff --git a/dev-perl/PDL/files/PDL-2.4.3-PIC.patch b/dev-perl/PDL/files/PDL-2.4.3-PIC.patch
new file mode 100644
index 0000000..ee6db25
--- /dev/null
+++ b/dev-perl/PDL/files/PDL-2.4.3-PIC.patch
@@ -0,0 +1,11 @@
+--- Lib/Slatec/Makefile.PL	2007-09-11 18:30:14.000000000 +0200
++++ Lib/Slatec/Makefile.PL	2007-09-11 18:28:55.000000000 +0200
+@@ -136,7 +136,7 @@
+ ("
+ 
+ slatec/$_\$(OBJ_EXT): slatec/$_.f 
+-	$mycompiler -c $hack_64bit -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
++	$mycompiler -c -fPIC -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
+ " )} @slatecfiles;
+  
+ }

diff --git a/dev-perl/PDL/files/PDL-2.4.4-PIC.patch b/dev-perl/PDL/files/PDL-2.4.4-PIC.patch
new file mode 100644
index 0000000..a0087c9
--- /dev/null
+++ b/dev-perl/PDL/files/PDL-2.4.4-PIC.patch
@@ -0,0 +1,22 @@
+--- Lib/Minuit/Makefile.PL
++++ Lib/Minuit/Makefile.PL
+@@ -149,7 +149,7 @@
+ 	    ("
+ 
+ minuitlib/$_\$(OBJ_EXT): minuitlib/$_.f 
+-	$mycompiler -c $hack_64bit -o minuitlib/$_\$(OBJ_EXT) $mycflags minuitlib/$_.f
++	$mycompiler -c -fPIC -o minuitlib/$_\$(OBJ_EXT) $mycflags minuitlib/$_.f
+ " )} @minuitfiles;
+ 
+ 	if (!defined($PDL::Config{MINUIT_LIB})){
+--- Lib/Slatec/Makefile.PL
++++ Lib/Slatec/Makefile.PL
+@@ -136,7 +136,7 @@
+ ("
+ 
+ slatec/$_\$(OBJ_EXT): slatec/$_.f 
+-	$mycompiler -c $hack_64bit -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
++	$mycompiler -c -fPIC -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
+ " )} @slatecfiles;
+  
+ }

diff --git a/dev-perl/PDL/files/perldl.conf b/dev-perl/PDL/files/perldl.conf
new file mode 100644
index 0000000..1fe24f3
--- /dev/null
+++ b/dev-perl/PDL/files/perldl.conf
@@ -0,0 +1,110 @@
+# -*-perl-*-
+
+# PDL Configuration options
+
+# You can edit this here or say 'perl Makefile.PL PDLCONF=file'
+# or use ~/.perldl.conf
+
+# Note in general "0" means False, "1" means "True" and "undef"
+# means "Try if possible (e.g. because the library is found)"
+
+%PDL_CONFIG = (
+
+# Use posix threading to make use of multiprocessor machines
+# undef -> try if possible
+# 0 -> don't use
+# true -> force use
+
+	WITH_POSIX_THREADS => undef,  	
+
+	MALLOCDBG => undef,
+# {
+#			include => '-I/home/csoelle/tmp',
+#			libs => '-L/home/csoelle/tmp -lmymalloc',
+#			define => << 'EOD',
+##define malloc(n) dbgmalloc(n,__FILE__,__LINE__)
+##define free(p) dbgfree(p)
+#EOD
+#			include => '',
+#			libs => '-lefence',
+#			define => '',
+#                     },
+
+# Do we want routines to handle bad values?
+#   saying no will make PDL a bit faster
+# true  -> yes
+# false -> no, undef -> no
+#
+	WITH_BADVAL => 0,
+#	WITH_BADVAL => 1,
+
+# if WITH_BADVAL == 1, do we use NaN/Inf to represent badvalues
+# (not convinced setting this results in faster code)
+#
+	BADVAL_USENAN => 0,
+#	BADVAL_USENAN => 1,
+
+# Try to build Graphics/TriD
+	WITH_3D => undef,
+#
+#  For Mesa 3.2
+#
+	OPENGL_LIBS => '-L/usr/lib -lGL -lGLU -L/usr/X11R6/lib -lXext -lX11',
+#
+#  Mesa need -DGL_GLEXT_LEGACY for glPolygonOffsetEXT amoung others
+#
+	OPENGL_DEFINE => '-DGL_GLEXT_LEGACY',
+ 	OPENGL_INC => '-I/usr/include',
+#
+# 
+# For SGI GL
+#
+#	OPENGL_LIBS => '-lGL -lGLU -lXext -lX11',
+# 	OPENGL_INC => '',
+#	OPENGL_DEFINE => '',
+#
+# Let perl try to figure it out
+#	OPENGL_LIBS => undef,
+# 	OPENGL_INC => undef,
+#	OPENGL_DEFINE => undef,
+# Whether or not to build the Karma interface module
+
+        WITH_KARMA => undef,    # Leave it up to PDL to decide
+        WHERE_KARMA => undef,   # you may explicitly specify directory location
+	
+# Whether or not to build the PDL::Slatec module
+# 0 -> don't use
+# true -> force use
+
+        WITH_SLATEC => undef,    # Leave it up to PDL to decide
+
+# Whether or not to build the PDL::GSL module
+# 0 -> don't use
+# true -> force use
+
+        WITH_GSL => undef,    # Leave it up to PDL to decide
+
+# Location to search for the GSL libs
+	GSL_LIBS => [ '/lib','/usr/lib','/usr/local/lib'],
+# Location to find GSL includes:
+ 	GSL_INC => '-I/usr/include/gsl -I/usr/local/include',
+
+# Whether or not to build the PDL::FFTW module
+# 0 -> don't use
+# true -> force use
+
+        WITH_FFTW => undef,    # Leave it up to PDL to decide
+
+# Location to search for the FFTW libs
+	FFTW_LIBS => [ '/lib','/usr/lib','/usr/local/lib'],
+# Location to find FFTW includes:
+ 	FFTW_INC => ['/usr/include/','/usr/local/include'],
+
+# FFTW Numeric Precision Type to link in: (double or single precision)
+	FFTW_TYPE => 'double',
+	
+);
+
+1; # Return OK status on 'require'
+
+

diff --git a/dev-perl/POE-Test-Loops/POE-Test-Loops-1.035.ebuild b/dev-perl/POE-Test-Loops/POE-Test-Loops-1.035.ebuild
new file mode 100644
index 0000000..00b230c
--- /dev/null
+++ b/dev-perl/POE-Test-Loops/POE-Test-Loops-1.035.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/POE-Test-Loops/POE-Test-Loops-1.035.ebuild,v 1.4 2010/06/27 19:16:35 nixnut Exp $
+
+EAPI=2
+
+MODULE_AUTHOR="RCAPUTO"
+inherit perl-module
+
+DESCRIPTION="Reusable tests for POE::Loop authors"
+
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/dev-perl/POE/POE-1.289.ebuild b/dev-perl/POE/POE-1.289.ebuild
new file mode 100644
index 0000000..0453ee2
--- /dev/null
+++ b/dev-perl/POE/POE-1.289.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/POE/POE-1.289.ebuild,v 1.4 2010/06/27 19:16:13 nixnut Exp $
+
+EAPI=2
+
+inherit versionator
+MODULE_AUTHOR=RCAPUTO
+MY_P="${PN}-$(delete_version_separator 2)"
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="A framework for creating multitasking programs in Perl"
+
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="ipv6 libwww ncurses tk test"
+
+RDEPEND=">=dev-perl/Event-1.09
+	>=virtual/perl-File-Spec-0.87
+	>=virtual/perl-IO-1.23.01
+	>=virtual/perl-IO-Compress-1.33
+	>=virtual/perl-Storable-2.12
+	>=dev-perl/IO-Tty-1.08
+	virtual/perl-Filter
+	dev-perl/FreezeThaw
+	dev-perl/yaml
+	>=dev-perl/TermReadKey-2.21
+	>=virtual/perl-Time-HiRes-1.59
+	ipv6? ( >=dev-perl/Socket6-0.14 )
+	tk? ( >=dev-perl/perl-tk-800.027 )
+	libwww? ( >=dev-perl/libwww-perl-5.79
+		>=dev-perl/URI-1.30 )
+	ncurses? ( >=dev-perl/Curses-1.08 )"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-perl/POE-Test-Loops-1.035
+		>=virtual/perl-Test-Harness-2.26
+		>=virtual/perl-Test-Simple-0.54
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)"
+
+SRC_TEST=do

diff --git a/dev-perl/Package-Stash/Package-Stash-0.250.ebuild b/dev-perl/Package-Stash/Package-Stash-0.250.ebuild
new file mode 100644
index 0000000..835e8b7
--- /dev/null
+++ b/dev-perl/Package-Stash/Package-Stash-0.250.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Package-Stash/Package-Stash-0.250.ebuild,v 1.4 2011/08/13 09:09:09 xarthisius Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DOY
+MODULE_VERSION=0.25
+inherit perl-module
+
+DESCRIPTION="Routines for manipulating stashes"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Package-DeprecationManager
+	>=dev-perl/Package-Stash-XS-0.190"
+# conflicts:
+#	!<=dev-perl/Class-MOP-1.08
+#	!<=dev-perl/namespace-clean-0.18
+#	!<=dev-perl/MooseX-Role-WithOverloading-0.80
+
+DEPEND="${RDEPEND}
+	>=dev-perl/Dist-CheckConflicts-0.10
+	>=virtual/perl-ExtUtils-MakeMaker-6.31
+	test? (
+		dev-perl/Test-Fatal
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.88
+	)"
+
+SRC_TEST="do"

diff --git a/dev-perl/PadWalker/PadWalker-1.940.0.ebuild b/dev-perl/PadWalker/PadWalker-1.940.0.ebuild
new file mode 100644
index 0000000..7c41412
--- /dev/null
+++ b/dev-perl/PadWalker/PadWalker-1.940.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PadWalker/PadWalker-1.940.0.ebuild,v 1.1 2012/06/26 19:15:51 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=ROBIN
+MODULE_VERSION=1.94
+inherit perl-module
+
+DESCRIPTION="play with other peoples' lexical variables"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.965.1.ebuild b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.965.1.ebuild
new file mode 100644
index 0000000..f05b633
--- /dev/null
+++ b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.965.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Parse-RecDescent/Parse-RecDescent-1.965.1.ebuild,v 1.2 2011/04/24 15:31:04 grobian Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DCONWAY
+MODULE_VERSION=1.965001
+inherit perl-module
+
+DESCRIPTION="Parse::RecDescent - generate recursive-descent parsers"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="virtual/perl-Text-Balanced
+	virtual/perl-version"
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? ( dev-perl/Test-Pod )"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	dohtml -r tutorial || die
+}

diff --git a/dev-perl/Parse-Syslog/Parse-Syslog-1.09.ebuild b/dev-perl/Parse-Syslog/Parse-Syslog-1.09.ebuild
new file mode 100644
index 0000000..0927015
--- /dev/null
+++ b/dev-perl/Parse-Syslog/Parse-Syslog-1.09.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Parse-Syslog/Parse-Syslog-1.09.ebuild,v 1.10 2008/04/12 20:33:07 dertobi123 Exp $
+
+inherit perl-module
+DESCRIPTION="Parse::Syslog - Parse Unix syslog files"
+HOMEPAGE="http://search.cpan.org/~dschwei/${P}"
+SRC_URI="mirror://cpan/authors/id/D/DS/DSCHWEI/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
+IUSE=""
+SRC_TEST="do"
+
+DEPEND="dev-lang/perl
+		virtual/perl-Time-Local
+		dev-perl/File-Tail"

diff --git a/dev-perl/Path-Class/Path-Class-0.21.ebuild b/dev-perl/Path-Class/Path-Class-0.21.ebuild
new file mode 100644
index 0000000..93f006b
--- /dev/null
+++ b/dev-perl/Path-Class/Path-Class-0.21.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Path-Class/Path-Class-0.21.ebuild,v 1.5 2011/01/13 17:02:02 ranger Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=KWILLIAMS
+inherit perl-module
+
+DESCRIPTION="Cross-platform path specification manipulation"
+
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=virtual/perl-File-Spec-0.87"
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? ( virtual/perl-Test-Simple )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Perlbal/files/Perlbal-1.58-Use-saner-name-in-process-listing.patch b/dev-perl/Perlbal/files/Perlbal-1.58-Use-saner-name-in-process-listing.patch
new file mode 100644
index 0000000..1ccafb9
--- /dev/null
+++ b/dev-perl/Perlbal/files/Perlbal-1.58-Use-saner-name-in-process-listing.patch
@@ -0,0 +1,34 @@
+From 75b0930eb392c6389f6e96b0c1df067ae917b962 Mon Sep 17 00:00:00 2001
+From: Robin H. Johnson <robbat2@g.o>
+Date: Sat, 12 May 2007 21:32:53 -0700
+Subject: [PATCH perlbal] Use saner name in process listing.
+
+Normally the binary will turn up in the process list as:
+/usr/bin/perl $SCRIPTNAME
+
+By adding a single line, we can make it be simply '$SCRIPTNAME'.
+This makes writing init.d scripts signficently easier.
+
+Signed-off-by: Robin H. Johnson <robbat2@g.o>
+---
+ perlbal |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/perlbal b/perlbal
+index f0149b3..7a9d28c 100755
+--- a/perlbal
++++ b/perlbal
+@@ -37,6 +37,10 @@ my $opt_daemonize;
+ my $opt_config;
+ my $opt_help;
+ my $opt_version;
++
++# Rename binary in process list to make init scripts saner
++$0 = $_ = $0;
++
+ usage(1) unless
+     Getopt::Long::GetOptions(
+                              'daemon'   => \$opt_daemonize,
+-- 
+1.5.1.4
+

diff --git a/dev-perl/Perlbal/files/perlbal_conf.d_1.58 b/dev-perl/Perlbal/files/perlbal_conf.d_1.58
new file mode 100644
index 0000000..f500cb4
--- /dev/null
+++ b/dev-perl/Perlbal/files/perlbal_conf.d_1.58
@@ -0,0 +1,5 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Perlbal/files/perlbal_conf.d_1.58,v 1.1 2007/05/13 08:18:36 robbat2 Exp $
+# PIDFILE is not yet used, pending upstream still
+#PIDFILE="/var/run/perlbal.pid"
+PERLBAL_OPTS="--daemon --config=/etc/perlbal/perlbal.conf"
+# vim: ft=gentoo-conf-d:

diff --git a/dev-perl/Perlbal/files/perlbal_init.d_1.58 b/dev-perl/Perlbal/files/perlbal_init.d_1.58
new file mode 100755
index 0000000..38f64f4
--- /dev/null
+++ b/dev-perl/Perlbal/files/perlbal_init.d_1.58
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Perlbal/files/perlbal_init.d_1.58,v 1.1 2007/05/13 08:18:36 robbat2 Exp $
+
+NAME="perlbal"
+BINARY="/usr/bin/perlbal"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $NAME"
+	# Add --pidfile when upstream supports PIDFILES
+	start-stop-daemon --start \
+		--exec ${BINARY} -- ${PERLBAL_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $NAME"
+	start-stop-daemon --stop --exec "${BINARY}"
+	eend $?
+}
+
+# vim: ft=gentoo-init-d:

diff --git a/dev-perl/Proc-ProcessTable/files/0.45-fix-format-errors.patch b/dev-perl/Proc-ProcessTable/files/0.45-fix-format-errors.patch
new file mode 100644
index 0000000..c7bbec9
--- /dev/null
+++ b/dev-perl/Proc-ProcessTable/files/0.45-fix-format-errors.patch
@@ -0,0 +1,30 @@
+https://rt.cpan.org/Public/Bug/Display.html?id=48445
+--- Proc-ProcessTable-0.45/os/Linux.c
++++ Proc-ProcessTable-0.45/os/Linux.c
+@@ -397,7 +397,7 @@
+ 
+     /* copy the path onto our obstack, set the value (somewhere in pts)
+      * and free the results of canonicalize_file_name */
+-    obstack_printf(mem_pool, link);
++    obstack_printf(mem_pool, "%s", link);
+     obstack_1grow(mem_pool, '\0');
+ 
+     *ptr = (char *) obstack_finish(mem_pool);
+@@ -618,7 +618,7 @@
+         bzero(prs, sizeof(struct procstat));
+ 
+         /* intilize the format string */
+-        obstack_printf(&mem_pool, get_string(STR_DEFAULT_FORMAT));
++        obstack_printf(&mem_pool, "%s", get_string(STR_DEFAULT_FORMAT));
+         obstack_1grow(&mem_pool, '\0');
+         format_str = (char *) obstack_finish(&mem_pool);
+ 
+--- Proc-ProcessTable-0.45/ProcessTable.xs
++++ Proc-ProcessTable-0.45/ProcessTable.xs
+@@ -388,5 +388,5 @@
+      char* error;
+ 
+      if( (error = OS_initialize()) != NULL ){
+-       croak(error);
++       croak("%s", error);
+      }

diff --git a/dev-perl/Proc-ProcessTable/files/0.45-pthread.patch b/dev-perl/Proc-ProcessTable/files/0.45-pthread.patch
new file mode 100644
index 0000000..537e292
--- /dev/null
+++ b/dev-perl/Proc-ProcessTable/files/0.45-pthread.patch
@@ -0,0 +1,15 @@
+https://rt.cpan.org/Public/Bug/Display.html?id=46861
+--- Proc-ProcessTable-0.45/hints/linux.pl
++++ Proc-ProcessTable-0.45/hints/linux.pl
+@@ -1 +1,11 @@
++# We might have a non-threading perl, which doesn't add this
++# necessary link option.
++use Config;
++my $thread_lib = "-lpthread";
++
++if( $Config{libs} !~ /$thread_lib/ ) {
++  $self->{LIBS} ||= [];
++  push @{ $self->{LIBS} }, $thread_lib;
++}
++
+ symlink "os/Linux.c", "OS.c" || die "Could not link os/Linux.c to os/OS.c\n";

diff --git a/dev-perl/Proc-ProcessTable/files/amd64_canonicalize_file_name_definition.patch b/dev-perl/Proc-ProcessTable/files/amd64_canonicalize_file_name_definition.patch
new file mode 100644
index 0000000..d454b1a
--- /dev/null
+++ b/dev-perl/Proc-ProcessTable/files/amd64_canonicalize_file_name_definition.patch
@@ -0,0 +1,13 @@
+Index: Proc-ProcessTable-0.45/os/Linux.c
+===================================================================
+--- Proc-ProcessTable-0.45.orig/os/Linux.c
++++ Proc-ProcessTable-0.45/os/Linux.c
+@@ -33,7 +33,7 @@ static unsigned 			system_hertz;
+ 
+ static bool     init_failed = false;
+ 
+-
++char *canonicalize_file_name (const char *path);
+ /* get_string()
+  *
+  * Access strings in read only section

diff --git a/dev-perl/Role-Tiny/Role-Tiny-1.1.3.ebuild b/dev-perl/Role-Tiny/Role-Tiny-1.1.3.ebuild
new file mode 100644
index 0000000..08f1107
--- /dev/null
+++ b/dev-perl/Role-Tiny/Role-Tiny-1.1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Role-Tiny/Role-Tiny-1.1.3.ebuild,v 1.1 2012/06/26 19:10:41 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=MSTROUT
+MODULE_VERSION=1.001003
+inherit perl-module
+
+DESCRIPTION="Roles. Like a nouvelle cuisine portion size slice of Moose"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-perl/strictures
+		>=dev-perl/Test-Fatal-0.003
+		>=virtual/perl-Test-Simple-0.96
+		dev-perl/Class-Method-Modifiers
+	)
+"
+RDEPEND="
+	!<dev-perl/Moo-0.9.14
+"
+
+SRC_TEST="do"

diff --git a/dev-perl/SOAP-Lite/files/SOAP-Lite-0.60.a.patch b/dev-perl/SOAP-Lite/files/SOAP-Lite-0.60.a.patch
new file mode 100644
index 0000000..14a5038
--- /dev/null
+++ b/dev-perl/SOAP-Lite/files/SOAP-Lite-0.60.a.patch
@@ -0,0 +1,12 @@
+diff -burN SOAP-Lite-0.60/Makefile.PL.old SOAP-Lite-0.60/Makefile.PL
+--- SOAP-Lite-0.60/Makefile.PL.old	2004-10-29 11:07:34.665925280 -0400
++++ SOAP-Lite-0.60/Makefile.PL	2004-10-29 11:08:02.491695120 -0400
+@@ -22,7 +22,7 @@
+   ["MIME messages","SOAP::MIMEParser",{"MIME::Parser" => 0},1],
+   ["SSL Support for TCP Transport","SOAP::Transport::TCP",{"IO::Socket::SSL" => 0},0],
+   ["Compression support for HTTP","SOAP::Transport::HTTP",{"Compress::Zlib" => 0},0],
+-  ["MIME interoperability w/ Axis","SOAP::Lite",{"MIME::Parser" => "6.106"},0],
++  ["MIME interoperability w/ Axis","SOAP::Lite",{"MIME::Parser" => "5.413"},0],
+ );
+ 
+ use Getopt::Long;

diff --git a/dev-perl/SOAP-Lite/files/SOAP-Lite-0.710.08.patch b/dev-perl/SOAP-Lite/files/SOAP-Lite-0.710.08.patch
new file mode 100644
index 0000000..0b1e6e8
--- /dev/null
+++ b/dev-perl/SOAP-Lite/files/SOAP-Lite-0.710.08.patch
@@ -0,0 +1,12 @@
+diff -Nuar SOAP-Lite-0.710.08.orig/Makefile.PL SOAP-Lite-0.710.08/Makefile.PL
+--- SOAP-Lite-0.710.08.orig/Makefile.PL	2008-06-28 11:37:20.000000000 -0700
++++ SOAP-Lite-0.710.08/Makefile.PL	2008-12-07 23:42:03.341939336 -0800
+@@ -43,7 +43,7 @@
+     ["DIME messages","SOAP::Packager::DIME",{"IO::Scalar" => "2.105", "DIME::Tools" => 0.03, "Data::UUID" => "0.11"},0],
+     ["SSL Support for TCP Transport","SOAP::Transport::TCP",{"IO::Socket::SSL" => 0},0],
+     ["Compression support for HTTP","SOAP::Transport::HTTP",{"Compress::Zlib" => 0},0],
+-    ["MIME interoperability w/ Axis","SOAP::Lite",{"MIME::Parser" => "6.106"},0],
++    ["MIME interoperability w/ Axis","SOAP::Lite",{"MIME::Parser" => "5.413"},0],
+ );
+ 
+ use Getopt::Long;

diff --git a/dev-perl/SOAP-Lite/files/SOAP-Lite-0.712_sysread.patch b/dev-perl/SOAP-Lite/files/SOAP-Lite-0.712_sysread.patch
new file mode 100644
index 0000000..85289fc
--- /dev/null
+++ b/dev-perl/SOAP-Lite/files/SOAP-Lite-0.712_sysread.patch
@@ -0,0 +1,38 @@
+From 8f49c0e970261f59bc043a8104a9a730ec69dcf4 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@g.o>
+Date: Wed, 23 Mar 2011 18:04:19 +0100
+Subject: [PATCH] Use read() instead of sysread() when using mod_perl
+
+https://rt.cpan.org/Public/Bug/Display.html?id=58538
+---
+ lib/SOAP/Transport/HTTP.pm |   14 +++++++++++---
+ 1 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/lib/SOAP/Transport/HTTP.pm b/lib/SOAP/Transport/HTTP.pm
+index f16b990..57ebbf3 100644
+--- a/lib/SOAP/Transport/HTTP.pm
++++ b/lib/SOAP/Transport/HTTP.pm
+@@ -566,9 +566,17 @@ sub handle {
+         if ( !$chunked ) {
+             my $buffer;
+             binmode(STDIN);
+-            while ( sysread( STDIN, $buffer, $length ) ) {
+-                $content .= $buffer;
+-                last if ( length($content) >= $length );
++            if ( defined($ENV{"MOD_PERL"}) ) {
++                while ( read( STDIN, $buffer, $length ) ) {
++                    $content .= $buffer;
++                    last if ( length($content) >= $length );
++                }
++            }
++            else {
++                while ( sysread( STDIN, $buffer, $length ) ) {
++                    $content .= $buffer;
++                    last if ( length($content) >= $length );
++                }
+             }
+         }
+ 
+-- 
+1.7.3.4
+

diff --git a/dev-perl/SQL-Abstract/SQL-Abstract-1.63.ebuild b/dev-perl/SQL-Abstract/SQL-Abstract-1.63.ebuild
new file mode 100644
index 0000000..25c3777
--- /dev/null
+++ b/dev-perl/SQL-Abstract/SQL-Abstract-1.63.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SQL-Abstract/SQL-Abstract-1.63.ebuild,v 1.2 2010/04/17 08:28:22 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR="RIBASUSHI"
+#MODULE_AUTHOR="MSTROUT"
+inherit perl-module
+
+DESCRIPTION="Generate SQL from Perl data structures"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-perl/Test-Deep"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Test-Exception
+		dev-perl/Test-Pod
+		dev-perl/Test-Warn
+		>=dev-perl/Clone-0.31 )"
+
+SRC_TEST="do"

diff --git a/dev-perl/SQL-Statement/SQL-Statement-1.31.ebuild b/dev-perl/SQL-Statement/SQL-Statement-1.31.ebuild
new file mode 100644
index 0000000..62cd2e9
--- /dev/null
+++ b/dev-perl/SQL-Statement/SQL-Statement-1.31.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SQL-Statement/SQL-Statement-1.31.ebuild,v 1.9 2012/02/25 18:04:48 klausman Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=REHSACK
+inherit perl-module
+
+DESCRIPTION="Small SQL parser and engine"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86"
+IUSE="test"
+
+RDEPEND=">=dev-perl/DBI-1.612
+	>=dev-perl/Clone-0.30
+	>=dev-perl/Params-Util-0.35
+	virtual/perl-Scalar-List-Utils"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST="do"
+
+pkg_setup() {
+	export SQL_STATEMENT_WARN_UPDATE=sure
+
+	if has_version "<=dev-perl/SQL-Statement-1.20" ; then
+		ewarn "Changes include (1.22):"
+		ewarn "  * behavior for unquoted identifiers modified to lower case them"
+		ewarn "  * IN and BETWEEN operators are supported native"
+	fi
+}

diff --git a/dev-perl/SVN-Mirror/SVN-Mirror-0.73.ebuild b/dev-perl/SVN-Mirror/SVN-Mirror-0.73.ebuild
new file mode 100644
index 0000000..0ad96d1
--- /dev/null
+++ b/dev-perl/SVN-Mirror/SVN-Mirror-0.73.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SVN-Mirror/SVN-Mirror-0.73.ebuild,v 1.7 2011/12/04 17:59:39 armin76 Exp $
+
+inherit perl-module
+
+DESCRIPTION="SVN::Mirror - Mirror remote repositories to local subversion repository"
+SRC_URI="mirror://cpan/authors/id/C/CL/CLKAO/${P}.tar.gz"
+HOMEPAGE="http://www.cpan.org/authors/id/C/CL/CLKAO/${P}.readme"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=dev-vcs/subversion-1.1.3
+	>=dev-perl/URI-1.34
+	>=dev-perl/TermReadKey-2.21
+	>=dev-perl/SVN-Simple-0.26
+	dev-perl/Data-UUID
+	dev-perl/Class-Accessor
+	dev-perl/TimeDate
+	dev-perl/File-chdir
+	dev-lang/perl"
+
+pkg_setup() {
+	if ! perl -MSVN::Core < /dev/null 2> /dev/null
+	then
+		eerror "You need subversion-1.0.4+ compiled with Perl bindings."
+		eerror "USE=\"perl\" emerge subversion"
+		die "Need Subversion compiled with Perl bindings."
+	fi
+}

diff --git a/dev-perl/Socket6/Socket6-0.20.ebuild b/dev-perl/Socket6/Socket6-0.20.ebuild
new file mode 100644
index 0000000..85e3ce7
--- /dev/null
+++ b/dev-perl/Socket6/Socket6-0.20.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Socket6/Socket6-0.20.ebuild,v 1.8 2011/04/20 12:56:14 jlec Exp $
+
+MODULE_AUTHOR=UMEMOTO
+inherit perl-module
+
+DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulators"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+SRC_TEST="do"
+
+DEPEND="dev-lang/perl"
+src_unpack() {
+	base_src_unpack
+	tc-export CC
+}

diff --git a/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.57.ebuild b/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.57.ebuild
new file mode 100644
index 0000000..a71e5d4
--- /dev/null
+++ b/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.57.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.57.ebuild,v 1.5 2012/06/17 17:29:30 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=JMCNAMARA
+inherit perl-module
+
+DESCRIPTION="Get information from Excel file"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test cjk unicode"
+
+RDEPEND=">=dev-perl/OLE-StorageLite-0.19
+	dev-perl/IO-stringy
+	dev-perl/Text-CSV_XS
+	unicode? ( dev-perl/Unicode-Map )
+	cjk? ( dev-perl/Jcode )"
+DEPEND="
+	test? ( dev-perl/Test-Pod
+		dev-perl/Unicode-Map
+		dev-perl/Spreadsheet-WriteExcel
+		dev-perl/Jcode )
+	${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/dev-perl/Sys-Statistics-Linux/Sys-Statistics-Linux-0.49.ebuild b/dev-perl/Sys-Statistics-Linux/Sys-Statistics-Linux-0.49.ebuild
new file mode 100644
index 0000000..d3569b4
--- /dev/null
+++ b/dev-perl/Sys-Statistics-Linux/Sys-Statistics-Linux-0.49.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sys-Statistics-Linux/Sys-Statistics-Linux-0.49.ebuild,v 1.3 2009/04/29 21:06:32 tcunha Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=BLOONIX
+inherit perl-module
+
+DESCRIPTION="Collect linux system statistics"
+
+SLOT="0"
+KEYWORDS="amd64 sparc x86"
+IUSE="test"
+
+RDEPEND="dev-perl/YAML-Syck"
+DEPEND="
+	virtual/perl-Module-Build
+	test? ( dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Template-Latex/files/Makefile.patch b/dev-perl/Template-Latex/files/Makefile.patch
new file mode 100644
index 0000000..9464d14
--- /dev/null
+++ b/dev-perl/Template-Latex/files/Makefile.patch
@@ -0,0 +1,15 @@
+--- Makefile.PL.orig	2006-07-12 09:37:17.753171250 +0200
++++ Makefile.PL	2006-07-12 09:38:54.031188250 +0200
+@@ -41,9 +41,9 @@
+ 
+ #------------------------------------------------------------------------
+ 
+-our $LATEX    = ttprompt('latex path',    find_program($ENV{PATH}, "latex"));
+-our $PDFLATEX = ttprompt('pdflatex path', find_program($ENV{PATH}, "pdflatex"));
+-our $DVIPS    = ttprompt('dvips path',    find_program($ENV{PATH}, "dvips"));
++our $LATEX    = '/usr/bin/latex';
++our $PDFLATEX = '/usr/bin/pdflatex';
++our $DVIPS    = '/usr/bin/dvips';
+ 
+ fix_file(catfile('lib','Template','Latex.pm'), '$LATEX',    $LATEX);
+ fix_file(catfile('lib','Template','Latex.pm'), '$PDFLATEX', $PDFLATEX);

diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-2.22.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-2.22.ebuild
new file mode 100644
index 0000000..bd22101
--- /dev/null
+++ b/dev-perl/Template-Toolkit/Template-Toolkit-2.22.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Template-Toolkit/Template-Toolkit-2.22.ebuild,v 1.8 2012/03/19 20:40:57 armin76 Exp $
+
+MODULE_AUTHOR=ABW
+inherit perl-module
+
+DESCRIPTION="The Template Toolkit"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="alpha amd64 ppc ppc64 x86 ~x86-fbsd ~x86-solaris"
+IUSE="xml gd mysql postgres latex"
+
+DEPEND="dev-perl/text-autoformat
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	>=dev-perl/AppConfig-1.56
+	dev-lang/perl"
+PDEPEND="dev-perl/text-autoformat
+	xml? ( dev-perl/Template-XML )
+	gd? ( dev-perl/Template-GD )
+	mysql? ( dev-perl/Template-DBI )
+	latex? ( dev-perl/Template-Latex )
+	postgres? ( dev-perl/Template-DBI )"
+
+#The installer tries to install to /usr/local/tt2...,
+#and asks for user input, so we change myconf to ensure that
+# 1) make install doesn't violate the sandbox rule
+# 2) perl Makefile.pl just uses reasonable defaults, and doesn't ask for input
+myconf="TT_XS_ENABLE=y TT_ACCEPT=y TT_QUIET=y
+	TT_DOCS=y TT_SPLASH_DOCS=y TT_EXAMPLES=y
+	TT_PREFIX=${D%/}${EPREFIX}/usr/share/template-toolkit2
+	TT_IMAGES=/usr/share/template-toolkit2/images"
+
+mydoc="README"
+
+src_unpack() {
+	perl-module_src_unpack
+
+	# uncomment these functions
+	# do we really want this?
+	# splash_images(); html_docs(); html_docstyle();html_examples();
+	sed -i 's/^#\(splash_images\|html_\)/\1/' "${S}"/Makefile.PL || die
+}
+SRC_TEST=do

diff --git a/dev-perl/Template-XML/files/bug-144689-branch-2.17.patch b/dev-perl/Template-XML/files/bug-144689-branch-2.17.patch
new file mode 100644
index 0000000..c9c5c1c
--- /dev/null
+++ b/dev-perl/Template-XML/files/bug-144689-branch-2.17.patch
@@ -0,0 +1,13 @@
+--- Template-XML-2.17/lib/Template/Plugin/XML/LibXML.pm 2007-02-09
+09:48:07.000000000 -0600
++++ Template-XML-2.17-fixed/lib/Template/Plugin/XML/LibXML.pm   2007-02-19
+17:22:29.000000000 -0600
+@@ -112,7 +112,7 @@
+         eval { $parser->$method($args->{$method}) };
+
+         # if there's a problem throw a Tempalte::Exception
+-        $self->throw("option '$method' not supported") if $@;
++        $class->throw("option '$method' not supported") if $@;
+     }
+
+     # parse

diff --git a/dev-perl/Test-Class/Test-Class-0.370.0.ebuild b/dev-perl/Test-Class/Test-Class-0.370.0.ebuild
new file mode 100644
index 0000000..45ad3ae
--- /dev/null
+++ b/dev-perl/Test-Class/Test-Class-0.370.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Class/Test-Class-0.370.0.ebuild,v 1.1 2012/06/26 19:21:00 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=ADIE
+MODULE_VERSION=0.37
+inherit perl-module
+
+DESCRIPTION="Easily create test classes in an xUnit style."
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=virtual/perl-Storable-2
+	>=virtual/perl-Test-Simple-0.78
+	dev-perl/MRO-Compat"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.380.0
+	test? ( >=dev-perl/Test-Exception-0.25 )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Test-Exception/Test-Exception-0.27.ebuild b/dev-perl/Test-Exception/Test-Exception-0.27.ebuild
new file mode 100644
index 0000000..6916e12
--- /dev/null
+++ b/dev-perl/Test-Exception/Test-Exception-0.27.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Exception/Test-Exception-0.27.ebuild,v 1.9 2010/01/14 14:29:52 grobian Exp $
+
+inherit perl-module
+
+DESCRIPTION="test functions for exception based code"
+HOMEPAGE="http://search.cpan.org/~adie/"
+SRC_URI="mirror://cpan/authors/id/A/AD/ADIE/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE=""
+SRC_TEST="do"
+
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.28"
+
+RDEPEND=">=virtual/perl-Test-Simple-0.64
+	>=dev-perl/Sub-Uplevel-0.13
+	dev-lang/perl"

diff --git a/dev-perl/Test-Inline/Test-Inline-2.201.ebuild b/dev-perl/Test-Inline/Test-Inline-2.201.ebuild
new file mode 100644
index 0000000..c5ea7ad
--- /dev/null
+++ b/dev-perl/Test-Inline/Test-Inline-2.201.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Inline/Test-Inline-2.201.ebuild,v 1.10 2012/03/19 19:30:07 armin76 Exp $
+
+inherit perl-module
+
+DESCRIPTION="Inline test suite support for Perl"
+HOMEPAGE="http://search.cpan.org/search?dist=Test-Inline"
+SRC_URI="mirror://cpan/authors/id/A/AD/ADAMK/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc x86"
+IUSE=""
+
+SRC_TEST="do"
+
+DEPEND="virtual/perl-Test-Simple
+	dev-lang/perl
+	virtual/perl-Memoize
+	>=dev-perl/Test-ClassAPI-1.02
+	virtual/perl-Test-Harness
+	>=virtual/perl-File-Spec-0.80
+	>=dev-perl/Algorithm-Dependency-1.02
+	>=dev-perl/Class-Autouse-1.15
+	>=dev-perl/Config-Tiny-2.00
+	>=dev-perl/File-Find-Rule-0.26
+	>=dev-perl/File-Flat-1.00
+	>=dev-perl/File-Slurp-9999.04
+	>=dev-perl/Params-Util-0.05
+	>=dev-perl/Pod-Tests-0.18"

diff --git a/dev-perl/Test-Inline/Test-Inline-2.208.ebuild b/dev-perl/Test-Inline/Test-Inline-2.208.ebuild
new file mode 100644
index 0000000..caff526
--- /dev/null
+++ b/dev-perl/Test-Inline/Test-Inline-2.208.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Inline/Test-Inline-2.208.ebuild,v 1.9 2012/03/19 19:30:07 armin76 Exp $
+
+MODULE_AUTHOR=ADAMK
+
+inherit perl-module
+
+DESCRIPTION="Inline test suite support for Perl"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha ~amd64 hppa ~ppc x86"
+IUSE=""
+
+SRC_TEST="do"
+
+DEPEND="virtual/perl-Test-Simple
+	dev-lang/perl
+	virtual/perl-Memoize
+	>=dev-perl/Test-ClassAPI-1.02
+	virtual/perl-Test-Harness
+	dev-perl/Test-Script
+	dev-perl/File-chmod
+	>=virtual/perl-File-Spec-0.80
+	>=dev-perl/Algorithm-Dependency-1.02
+	>=dev-perl/Class-Autouse-1.15
+	>=dev-perl/Config-Tiny-2.00
+	>=dev-perl/File-Find-Rule-0.26
+	>=dev-perl/File-Flat-1.00
+	>=dev-perl/File-Slurp-9999.04
+	>=dev-perl/Params-Util-0.05
+	>=dev-perl/Pod-Tests-0.18"

diff --git a/dev-perl/Test-Output/Test-Output-0.16.ebuild b/dev-perl/Test-Output/Test-Output-0.16.ebuild
new file mode 100644
index 0000000..4b9e476
--- /dev/null
+++ b/dev-perl/Test-Output/Test-Output-0.16.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Output/Test-Output-0.16.ebuild,v 1.4 2010/06/27 17:57:49 nixnut Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=BDFOY
+inherit perl-module
+
+DESCRIPTION="Utilities to test STDOUT and STDERR messages"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Sub-Exporter
+	virtual/perl-Test-Simple"
+DEPEND="${RDEPEND}
+	test? ( >=dev-perl/Test-Tester-0.107
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST=do

diff --git a/dev-perl/Test-WWW-Mechanize/Test-WWW-Mechanize-1.28.ebuild b/dev-perl/Test-WWW-Mechanize/Test-WWW-Mechanize-1.28.ebuild
new file mode 100644
index 0000000..0934e9e
--- /dev/null
+++ b/dev-perl/Test-WWW-Mechanize/Test-WWW-Mechanize-1.28.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-WWW-Mechanize/Test-WWW-Mechanize-1.28.ebuild,v 1.4 2012/03/25 15:33:41 armin76 Exp $
+
+MODULE_AUTHOR=PETDANCE
+inherit perl-module
+
+DESCRIPTION="Testing-specific WWW::Mechanize subclass"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=dev-perl/WWW-Mechanize-1.24
+	dev-perl/Carp-Assert-More
+	dev-perl/URI
+	>=dev-perl/Test-LongString-0.12
+	dev-lang/perl"
+DEPEND="${RDEPEND}
+	test? ( >=dev-perl/HTTP-Server-Simple-0.35
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Test-Warn/Test-Warn-0.21.ebuild b/dev-perl/Test-Warn/Test-Warn-0.21.ebuild
new file mode 100644
index 0000000..a7e1953
--- /dev/null
+++ b/dev-perl/Test-Warn/Test-Warn-0.21.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Warn/Test-Warn-0.21.ebuild,v 1.7 2011/10/09 17:00:25 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=CHORNY
+MODULE_A=${P}.zip
+inherit perl-module
+
+DESCRIPTION="Perl extension to test methods for warnings"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=dev-perl/Sub-Uplevel-0.12
+	dev-perl/Tree-DAG_Node
+	virtual/perl-Test-Simple
+	virtual/perl-File-Spec"
+DEPEND="app-arch/unzip
+	test? ( ${RDEPEND}
+		dev-perl/Test-Pod )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Test-Warn/Test-Warn-0.230.0.ebuild b/dev-perl/Test-Warn/Test-Warn-0.230.0.ebuild
new file mode 100644
index 0000000..440e5c0
--- /dev/null
+++ b/dev-perl/Test-Warn/Test-Warn-0.230.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Warn/Test-Warn-0.230.0.ebuild,v 1.10 2012/06/17 13:51:35 armin76 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=CHORNY
+MODULE_VERSION=0.23
+inherit perl-module
+
+DESCRIPTION="Perl extension to test methods for warnings"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-perl/Sub-Uplevel-0.12
+	dev-perl/Tree-DAG_Node
+	virtual/perl-Test-Simple
+	virtual/perl-File-Spec"
+DEPEND="test? ( ${RDEPEND}
+		dev-perl/Test-Pod )"
+
+SRC_TEST="do"

diff --git a/dev-perl/Text-Kakasi/files/Text-Kakasi-1.05-gentoo.diff b/dev-perl/Text-Kakasi/files/Text-Kakasi-1.05-gentoo.diff
new file mode 100644
index 0000000..17eae7c
--- /dev/null
+++ b/dev-perl/Text-Kakasi/files/Text-Kakasi-1.05-gentoo.diff
@@ -0,0 +1,13 @@
+diff -Naur Text-Kakasi-1.05.orig/Makefile.PL Text-Kakasi-1.05/Makefile.PL
+--- Text-Kakasi-1.05.orig/Makefile.PL	2002-08-24 00:18:28.000000000 +0900
++++ Text-Kakasi-1.05/Makefile.PL	2002-08-24 00:20:37.000000000 +0900
+@@ -3,7 +3,7 @@
+ WriteMakefile(
+ 	      'NAME' => 'Text::Kakasi',
+ 	      'VERSION_FROM' => 'Kakasi.pm',
+-	      'INC' => '-I/usr/local/include',
+-	      'LIBS' => ['-L/usr/local/lib -lkakasi'],
++	      'INC' => '-I/usr/include',
++	      'LIBS' => ['-L/usr/lib -lkakasi'],
+ 	      'DEFINE' => '-DWAKATIGAKI',
+ );

diff --git a/dev-perl/Text-Unaccent/files/text-unaccent_size_t.diff b/dev-perl/Text-Unaccent/files/text-unaccent_size_t.diff
new file mode 100644
index 0000000..5bd45f6
--- /dev/null
+++ b/dev-perl/Text-Unaccent/files/text-unaccent_size_t.diff
@@ -0,0 +1,27 @@
+diff -ur Text-Unaccent-1.08/unac.c Text-Unaccent-1.08-mod/unac.c
+--- Text-Unaccent-1.08/unac.c	2004-10-17 12:00:36.000000000 -0700
++++ Text-Unaccent-1.08-mod/unac.c	2006-08-24 22:37:35.000000000 -0700
+@@ -13881,9 +13881,9 @@
+     *out_lengthp = 0;
+   } else {
+     char* utf16 = 0;
+-    int utf16_length = 0;
++    size_t utf16_length = 0;
+     char* utf16_unaccented = 0;
+-    int utf16_unaccented_length = 0;
++    size_t utf16_unaccented_length = 0;
+   
+     if(convert(charset, utf16be(), in, in_length, &utf16, &utf16_length) < 0) {
+       return -1;
+diff -ur Text-Unaccent-1.08/Unaccent.xs Text-Unaccent-1.08-mod/Unaccent.xs
+--- Text-Unaccent-1.08/Unaccent.xs	2004-12-29 03:45:18.000000000 -0800
++++ Text-Unaccent-1.08-mod/Unaccent.xs	2006-08-24 22:35:57.000000000 -0700
+@@ -35,7 +35,7 @@
+ #include "unac.h"
+ 
+ static char* buffer;
+-static int buffer_length;
++static size_t buffer_length;
+ 
+ static void unac_debug_print(const char* message, void* data)
+ {

diff --git a/dev-perl/TimeDate/TimeDate-1.16.ebuild b/dev-perl/TimeDate/TimeDate-1.16.ebuild
new file mode 100644
index 0000000..4c97f7e
--- /dev/null
+++ b/dev-perl/TimeDate/TimeDate-1.16.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/TimeDate/TimeDate-1.16.ebuild,v 1.18 2008/02/23 20:33:15 vapier Exp $
+
+inherit perl-module
+
+DESCRIPTION="A Date/Time Parsing Perl Module"
+HOMEPAGE="http://search.cpan.org/~gbarr/"
+SRC_URI="mirror://cpan/authors/id/G/GB/GBARR/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/Tk-CursorControl/files/0.4-demo.patch b/dev-perl/Tk-CursorControl/files/0.4-demo.patch
new file mode 100644
index 0000000..8bb70f8
--- /dev/null
+++ b/dev-perl/Tk-CursorControl/files/0.4-demo.patch
@@ -0,0 +1,12 @@
+Collision with perl-tk -- bug 272083
+--- Tk-CursorControl-0.4/Makefile.PL
++++ Tk-CursorControl-0.4/Makefile.PL
+@@ -16,7 +16,7 @@
+ 		'trans_cur.mask'	=> '$(INST_LIB)/Tk/trans_cur.mask',
+ 		'demos/cursor.pl'	=> ($] >= 5.005
+ 					? '$(INST_ARCHLIB)'
+-					: '$(INST_LIB)') . '/Tk/demos/widtrib/cursor.pl',
++					: '$(INST_LIB)') . '/Tk/demos/widtrib/cursor_control.pl',
+ 			},
+ 	
+ 	'PREREQ_PM'	=> {

diff --git a/dev-perl/Tk-TableMatrix/files/pTk-1.22.patch b/dev-perl/Tk-TableMatrix/files/pTk-1.22.patch
new file mode 100644
index 0000000..ff99385
--- /dev/null
+++ b/dev-perl/Tk-TableMatrix/files/pTk-1.22.patch
@@ -0,0 +1,18 @@
+--- pTk/Makefile.PL.old	2006-05-01 18:09:31.000000000 -0400
++++ pTk/Makefile.PL	2006-05-01 18:10:05.000000000 -0400
+@@ -234,11 +234,11 @@ sub MY::postamble {
+ my $self = shift;
+ my $dep = $self->Tk::MMutil::mTk_postamble;
+ 
+-$dep .= $self->dir_target(@{$self->{'dir_targets'}}); 
+-
+-$dep .= "config :: " . join(" \\\n\t",map($self->catfile($_,".exists"),@{$self->{'dir_targets'}})) .
+-        "\n\t".$self->{NOECHO}."\$(NOOP)\n";
+ 
++if ($Tk::MMutil::IsWin32 or ($win_arch eq 'MSWin32' and $^O eq 'cygwin'))
++ {
++    my $cc = $Config{'cc'};
++ }
+ 
+ $dep . '
+ 

diff --git a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.05.ebuild b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.05.ebuild
new file mode 100644
index 0000000..e3934fb
--- /dev/null
+++ b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.05.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.05.ebuild,v 1.15 2012/03/27 17:22:16 armin76 Exp $
+
+inherit perl-module
+
+DESCRIPTION="(super)class for representing nodes in a tree"
+HOMEPAGE="http://search.cpan.org/~sburke/"
+SRC_URI="mirror://cpan/authors/id/S/SB/SBURKE/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ia64 ppc ~s390 ~sh sparc x86"
+IUSE=""
+
+SRC_TEST="do"
+
+DEPEND="dev-lang/perl"

diff --git a/dev-perl/URI/URI-1.55.ebuild b/dev-perl/URI/URI-1.55.ebuild
new file mode 100644
index 0000000..572ef4c
--- /dev/null
+++ b/dev-perl/URI/URI-1.55.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/URI/URI-1.55.ebuild,v 1.9 2011/07/30 10:45:59 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=GAAS
+inherit perl-module
+
+DESCRIPTION="A URI Perl Module"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="virtual/perl-MIME-Base64"
+RDEPEND="${DEPEND}"
+
+SRC_TEST=no # see ChangeLog
+
+mydoc="rfc2396.txt"

diff --git a/dev-perl/Unicode-Map/files/0.112-no-scripts.patch b/dev-perl/Unicode-Map/files/0.112-no-scripts.patch
new file mode 100644
index 0000000..d762d7d
--- /dev/null
+++ b/dev-perl/Unicode-Map/files/0.112-no-scripts.patch
@@ -0,0 +1,15 @@
+diff -ur Unicode-Map-0.112-orig/Makefile.PL Unicode-Map-0.112/Makefile.PL
+--- Unicode-Map-0.112-orig/Makefile.PL	2001-01-07 22:48:36.000000000 +0100
++++ Unicode-Map-0.112/Makefile.PL	2009-12-25 09:21:03.251784809 +0100
+@@ -12,11 +12,5 @@
+       "COMPRESS"  => "gzip", 
+       "SUFFIX"    => "gz"
+    },
+-   "EXE_FILES"    => [
+-      "tools/map",
+-      "tools/mirrorMappings",
+-      "tools/mkCSGB2312",
+-      "tools/mkmapfile"
+-   ],
+ );
+ 

diff --git a/dev-perl/Unicode-Map8/Unicode-Map8-0.12.ebuild b/dev-perl/Unicode-Map8/Unicode-Map8-0.12.ebuild
new file mode 100644
index 0000000..73040c4
--- /dev/null
+++ b/dev-perl/Unicode-Map8/Unicode-Map8-0.12.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-Map8/Unicode-Map8-0.12.ebuild,v 1.19 2007/03/21 14:12:36 mcummings Exp $
+
+inherit perl-module
+
+DESCRIPTION="Convert between most 8bit encodings"
+HOMEPAGE="http://search.cpan.org/~gaas/"
+SRC_URI="mirror://cpan/authors/id/G/GA/GAAS/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND=">=dev-perl/Unicode-String-2.06
+	dev-lang/perl"
+
+mydoc="TODO"

diff --git a/dev-perl/Variable-Magic/Variable-Magic-0.500.0.ebuild b/dev-perl/Variable-Magic/Variable-Magic-0.500.0.ebuild
new file mode 100644
index 0000000..eb7d8c3
--- /dev/null
+++ b/dev-perl/Variable-Magic/Variable-Magic-0.500.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Variable-Magic/Variable-Magic-0.500.0.ebuild,v 1.1 2012/06/26 19:06:06 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=VPIT
+MODULE_VERSION=0.50
+inherit perl-module
+
+DESCRIPTION="Associate user-defined magic to variables from Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST=do

diff --git a/dev-perl/WWW-Dict-Leo-Org/files/1.34-umlaut.patch b/dev-perl/WWW-Dict-Leo-Org/files/1.34-umlaut.patch
new file mode 100644
index 0000000..accce92
--- /dev/null
+++ b/dev-perl/WWW-Dict-Leo-Org/files/1.34-umlaut.patch
@@ -0,0 +1,41 @@
+From d70ba71c7a0173991cddf9a43b4855864294c203 Mon Sep 17 00:00:00 2001
+From: Slaven Rezic <slaven@×××××.de>
+Date: Fri, 12 Feb 2010 21:47:01 +0100
+Subject: [PATCH] added support for non-iso8859-1 terminals, see
+ https://rt.cpan.org/Public/Bug/Display.html?id=35543
+
+---
+ leo |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/leo b/leo
+index f734249..e65c1b1 100755
+--- a/leo
++++ b/leo
+@@ -58,6 +58,8 @@ sub debug;
+ 
+ my($o_s, $o_m, $o_c, $o_l, $o_v, $o_h, $o_n, $o_f, $o_d, $o_u, $o_p);
+ 
++isatty(1) && eval q{ use open OUT => ':locale'};
++
+ #
+ # commandline options
+ #
+@@ -95,6 +97,14 @@ if (!$string) {
+   $string = <STDIN>;
+   chomp $string;
+ }
++if (eval { require I18N::Langinfo; require Encode; 1 }) {
++  my $codeset = I18N::Langinfo::langinfo(I18N::Langinfo::CODESET());
++  if ($codeset) {
++    for ($string) {
++      $_ = Encode::decode($codeset, $_);
++    }
++  }
++}
+ 
+ #
+ # open the config, if any
+-- 
+1.6.4.3
+

diff --git a/dev-perl/XML-GDOME/files/0.86-includes.patch b/dev-perl/XML-GDOME/files/0.86-includes.patch
new file mode 100644
index 0000000..780bc63
--- /dev/null
+++ b/dev-perl/XML-GDOME/files/0.86-includes.patch
@@ -0,0 +1,22 @@
+--- XML-GDOME-0.86/generate~	2004-03-30 23:08:48.000000000 +0100
++++ XML-GDOME-0.86/generate	2010-03-21 12:16:55.000000000 +0000
+@@ -64,6 +64,8 @@
+ #include "XSUB.h"
+ 
+ #include <libxml/xmlerror.h>
++#include <libxml/xinclude.h>
++#include <libxml/xpath.h>
+ #include "gdome.h"
+ #include "gdome-xpath.h"
+ /*#include "gdome-traversal.h"
+--- XML-GDOME-0.86/GDOME.xs~	2003-12-02 09:30:40.000000000 +0000
++++ XML-GDOME-0.86/GDOME.xs	2010-03-21 12:27:30.000000000 +0000
+@@ -9,6 +9,8 @@
+ 
+ /*#include <libxml/hash.h>*/
+ #include <libxml/xmlerror.h>
++#include <libxml/xinclude.h>
++#include <libxml/xpath.h>
+ #include "gdome.h"
+ #include "gdome-xpath.h"
+ /*#include "gdome-traversal.h"

diff --git a/dev-perl/XML-Mini/XML-Mini-1.2.8.ebuild b/dev-perl/XML-Mini/XML-Mini-1.2.8.ebuild
new file mode 100644
index 0000000..b9c95d0
--- /dev/null
+++ b/dev-perl/XML-Mini/XML-Mini-1.2.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Mini/XML-Mini-1.2.8.ebuild,v 1.5 2007/07/10 23:33:28 mr_bones_ Exp $
+
+inherit perl-module
+
+DESCRIPTION="pure perl API to create and parse XML"
+HOMEPAGE="http://search.cpan.org/~pdeegan/"
+SRC_URI="mirror://cpan/authors/id/P/PD/PDEEGAN/XML-Mini-1.2.8.tar.gz"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="amd64 sparc ~x86"
+
+DEPEND="dev-lang/perl"
+
+SRC_TEST="do"

diff --git a/dev-perl/XML-SAX/files/encodings.patch b/dev-perl/XML-SAX/files/encodings.patch
new file mode 100644
index 0000000..0608024
--- /dev/null
+++ b/dev-perl/XML-SAX/files/encodings.patch
@@ -0,0 +1,11 @@
+--- SAX/PurePerl/EncodingDetect.pm.orig	2006-05-08 12:08:40.000000000 -0400
++++ SAX/PurePerl/EncodingDetect.pm	2006-05-08 12:14:23.000000000 -0400
+@@ -93,7 +93,7 @@ sub encoding_detect {
+         return;
+     }
+     
+-    warn("Unable to recognise encoding of this document");
++    #warn("Unable to recognise encoding of this document");
+     return;
+ }
+ 

diff --git a/dev-perl/XML-Stream/XML-Stream-1.22.ebuild b/dev-perl/XML-Stream/XML-Stream-1.22.ebuild
new file mode 100644
index 0000000..d51f5ac
--- /dev/null
+++ b/dev-perl/XML-Stream/XML-Stream-1.22.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Stream/XML-Stream-1.22.ebuild,v 1.17 2007/12/04 20:37:15 corsair Exp $
+
+inherit perl-module
+
+DESCRIPTION="Creates and XML Stream connection and parses return data"
+SRC_URI="mirror://cpan/authors/id/R/RE/REATMON/${P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/~reatmon/${P}/"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="ssl"
+
+SRC_TEST="do"
+
+DEPEND="dev-perl/Authen-SASL
+	dev-perl/Net-DNS
+	ssl? ( dev-perl/IO-Socket-SSL )
+	virtual/perl-MIME-Base64
+	dev-lang/perl"

diff --git a/dev-perl/YAML-Syck/YAML-Syck-1.05.ebuild b/dev-perl/YAML-Syck/YAML-Syck-1.05.ebuild
new file mode 100644
index 0000000..46bd286
--- /dev/null
+++ b/dev-perl/YAML-Syck/YAML-Syck-1.05.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/YAML-Syck/YAML-Syck-1.05.ebuild,v 1.8 2010/10/21 18:05:32 tove Exp $
+
+MODULE_AUTHOR=AUDREYT
+inherit perl-module
+
+DESCRIPTION="Fast, lightweight YAML loader and dumper"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sh sparc x86"
+IUSE=""
+
+SRC_TEST="do"
+
+DEPEND="|| ( dev-libs/syck >=dev-lang/ruby-1.8 )
+	dev-lang/perl"

diff --git a/dev-perl/cache-mmap/cache-mmap-0.09.ebuild b/dev-perl/cache-mmap/cache-mmap-0.09.ebuild
new file mode 100644
index 0000000..6d95982
--- /dev/null
+++ b/dev-perl/cache-mmap/cache-mmap-0.09.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/cache-mmap/cache-mmap-0.09.ebuild,v 1.9 2008/06/13 16:12:37 armin76 Exp $
+
+inherit perl-module
+
+MY_P=Cache-Mmap-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Shared data cache using memory mapped files"
+SRC_URI="mirror://cpan/authors/id/P/PM/PMH/${MY_P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/author/PMH/${MY_P}"
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="amd64 ia64 ~ppc sparc x86"
+IUSE=""
+SRC_TEST="do"
+
+DEPEND="virtual/perl-Test-Simple
+	virtual/perl-Storable
+	dev-lang/perl"

diff --git a/dev-perl/cdk-perl/cdk-perl-20031210.ebuild b/dev-perl/cdk-perl/cdk-perl-20031210.ebuild
new file mode 100644
index 0000000..35be151
--- /dev/null
+++ b/dev-perl/cdk-perl/cdk-perl-20031210.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/cdk-perl/cdk-perl-20031210.ebuild,v 1.13 2007/03/13 16:00:50 mcummings Exp $
+
+inherit perl-module
+
+DESCRIPTION="Perl extension for Cdk"
+HOMEPAGE="http://dickey.his.com/cdk/cdk.html"
+SRC_URI="ftp://invisible-island.net/cdk/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc s390 sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/cdk-4.9.10.20031210
+	dev-lang/perl"
+
+mydoc="MANIFEST"
+
+src_unpack() {
+	unpack ${P}.tgz
+	cd "${S}"
+	sed -i -e "s:/usr/local:/usr:g" Makefile.PL
+}

diff --git a/dev-perl/crypt-dsa/crypt-dsa-1.16.ebuild b/dev-perl/crypt-dsa/crypt-dsa-1.16.ebuild
new file mode 100644
index 0000000..6677f3d
--- /dev/null
+++ b/dev-perl/crypt-dsa/crypt-dsa-1.16.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/crypt-dsa/crypt-dsa-1.16.ebuild,v 1.10 2011/04/24 15:57:52 grobian Exp $
+
+EAPI=2
+
+MY_PN=Crypt-DSA
+MY_P=${MY_PN}-${PV}
+MODULE_AUTHOR=ADAMK
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="DSA Signatures and Key Generation"
+
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~ppc sparc x86 ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-perl/data-buffer
+	dev-perl/Digest-SHA1
+	virtual/perl-File-Spec
+	dev-perl/File-Which
+	virtual/perl-MIME-Base64
+	>=virtual/perl-Math-BigInt-1.78"
+DEPEND="test? ( ${RDEPEND}
+		dev-perl/Math-BigInt-GMP )"
+
+SRC_TEST="do"
+
+PATCHES=( "${FILESDIR}/${P}-dsaparam.patch" )

diff --git a/dev-perl/crypt-dsa/files/crypt-dsa-1.16-dsaparam.patch b/dev-perl/crypt-dsa/files/crypt-dsa-1.16-dsaparam.patch
new file mode 100644
index 0000000..fe3dfbb
--- /dev/null
+++ b/dev-perl/crypt-dsa/files/crypt-dsa-1.16-dsaparam.patch
@@ -0,0 +1,14 @@
+https://rt.cpan.org/Public/Bug/Display.html?id=49668
+http://cvs.fedoraproject.org/viewvc/rpms/perl-Crypt-DSA/devel/perl-Crypt-DSA-dsaparam.patch?view=log
+
+--- lib/Crypt/DSA/KeyChain.pm
++++ lib/Crypt/DSA/KeyChain.pm
+@@ -53,7 +53,7 @@
+             my $cur_part;
+             foreach (@res) {
+                 if (/^\s+(\w):\s*$/) {
+-                    $cur_part = $1;
++                    $cur_part = lc($1);
+                     next;
+                 }
+                 if (/^\s*((?:[0-9a-f]{2,2}:?)+)\s*$/) {

diff --git a/dev-perl/gnome2-gconf/gnome2-gconf-1.043.ebuild b/dev-perl/gnome2-gconf/gnome2-gconf-1.043.ebuild
new file mode 100644
index 0000000..fa12cf2
--- /dev/null
+++ b/dev-perl/gnome2-gconf/gnome2-gconf-1.043.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-gconf/gnome2-gconf-1.043.ebuild,v 1.12 2011/03/29 10:21:43 angelos Exp $
+
+EAPI=1
+inherit perl-module
+
+MY_P=Gnome2-GConf-${PV}
+
+DESCRIPTION="Perl wrappers for the GConf configuration engine."
+SRC_URI="mirror://cpan/authors/id/E/EB/EBASSI/${MY_P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/~rmcfarla/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ~ppc sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/gconf:2
+	>=dev-perl/glib-perl-1.120
+	>=dev-perl/gtk2-perl-1.120"
+DEPEND="${RDEPEND}
+	>=dev-perl/extutils-pkgconfig-1.03
+	>=dev-perl/extutils-depends-0.202"

diff --git a/dev-perl/gtk2-perl/gtk2-perl-1.222.ebuild b/dev-perl/gtk2-perl/gtk2-perl-1.222.ebuild
new file mode 100644
index 0000000..20b2e5e
--- /dev/null
+++ b/dev-perl/gtk2-perl/gtk2-perl-1.222.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-perl/gtk2-perl-1.222.ebuild,v 1.12 2011/03/04 17:20:43 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=TSCH
+MY_PN=Gtk2
+inherit perl-module
+#inherit virtualx
+
+DESCRIPTION="Perl bindings for GTK2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-perl/Cairo
+	>=dev-perl/glib-perl-1.220
+	>=dev-perl/Pango-1.220"
+DEPEND="${RDEPEND}
+	>=dev-perl/extutils-depends-0.300
+	>=dev-perl/extutils-pkgconfig-1.030"
+
+#RDEPEND+=" || ( <x11-libs/gtk+-2.22.1-r1[jpeg] x11-libs/gdk-pixbuf[jpeg] )"
+#SRC_TEST=do
+#src_test(){
+#	Xmake test || die
+#}

diff --git a/dev-perl/gtk2-spell/gtk2-spell-1.30.0.ebuild b/dev-perl/gtk2-spell/gtk2-spell-1.30.0.ebuild
new file mode 100644
index 0000000..42bfb8a
--- /dev/null
+++ b/dev-perl/gtk2-spell/gtk2-spell-1.30.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-spell/gtk2-spell-1.30.0.ebuild,v 1.3 2012/05/04 04:10:55 jdhore Exp $
+
+EAPI=3
+
+MY_PN=Gtk2-Spell
+MODULE_AUTHOR=MLEHMANN
+MODULE_VERSION=1.03
+inherit perl-module
+
+DESCRIPTION="Bindings for GtkSpell with Gtk2.x"
+HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+SRC_URI+=" mirror://gentoo/gtk2-spell-1.03-caa0ef46.patch.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 hppa ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	>=app-text/gtkspell-2:2
+	>=dev-perl/glib-perl-1.012
+	>=dev-perl/gtk2-perl-1.012"
+DEPEND="${RDEPEND}
+	dev-perl/extutils-depends
+	dev-perl/extutils-pkgconfig
+	virtual/pkgconfig"
+
+PATCHES=( "${DISTDIR}"/gtk2-spell-1.03-caa0ef46.patch.gz )
+
+src_unpack() {
+	unpack ${MY_PN}-${MODULE_VERSION}.tar.gz
+}
+
+src_prepare() {
+	# Without this it cannot find gtkspell <rigo@××××.nl>
+	sed -ie "s:\#my:my:g" "${S}"/Makefile.PL || die "sed failed"
+	perl-module_src_prepare
+}

diff --git a/dev-perl/libwww-perl/files/ca-certs.patch b/dev-perl/libwww-perl/files/ca-certs.patch
new file mode 100644
index 0000000..b0565f0
--- /dev/null
+++ b/dev-perl/libwww-perl/files/ca-certs.patch
@@ -0,0 +1,30 @@
+X-Bugs-Gentoo: https://bugs.gentoo.org/358081
+--- libwww-perl-6.01/lib/LWP/Protocol/https.pm
++++ libwww-perl-6.01/lib/LWP/Protocol/https.pm
+@@ -21,25 +21,7 @@
+     }
+     if ($ssl_opts{SSL_verify_mode}) {
+ 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
+-	    eval {
+-		require Mozilla::CA;
+-	    };
+-	    if ($@) {
+-		if ($@ =! /^Can't locate Mozilla\/CA\.pm/) {
+-		    $@ = <<'EOT';
+-Can't verify SSL peers without knowning which Certificate Authorities to trust
+-
+-This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE
+-envirionment variable or by installing the Mozilla::CA module.
+-
+-To disable verification of SSL peers set the PERL_LWP_SSL_VERIFY_HOSTNAME
+-envirionment variable to 0.  If you do this you can't be sure that you
+-communicate with the expected peer.
+-EOT
+-		}
+-		die $@;
+-	    }
+-	    $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
++	    $ssl_opts{SSL_ca_path} = '/etc/ssl/certs';
+ 	}
+     }
+     $self->{ssl_opts} = \%ssl_opts;

diff --git a/dev-perl/log-dispatch/log-dispatch-2.290.0.ebuild b/dev-perl/log-dispatch/log-dispatch-2.290.0.ebuild
new file mode 100644
index 0000000..cbebc9e
--- /dev/null
+++ b/dev-perl/log-dispatch/log-dispatch-2.290.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/log-dispatch/log-dispatch-2.290.0.ebuild,v 1.4 2011/12/18 20:19:49 phajdan.jr Exp $
+
+EAPI=3
+
+MY_PN=Log-Dispatch
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=2.29
+inherit perl-module
+
+DESCRIPTION="Dispatches messages to multiple Log::Dispatch::* objects"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="dev-perl/Params-Validate
+	>=virtual/perl-Sys-Syslog-0.16"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.31"
+
+SRC_TEST="do"

diff --git a/dev-perl/math-pari/math-pari-2.01080604.ebuild b/dev-perl/math-pari/math-pari-2.01080604.ebuild
new file mode 100644
index 0000000..f846c27
--- /dev/null
+++ b/dev-perl/math-pari/math-pari-2.01080604.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/math-pari/math-pari-2.01080604.ebuild,v 1.5 2010/06/26 17:10:47 nixnut Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=ILYAZ
+MODULE_SECTION=modules
+MY_PN=Math-Pari
+MY_P=${MY_PN}-${PV}
+inherit perl-module
+
+PARI_VER=2.3.4
+
+DESCRIPTION="Perl interface to PARI"
+SRC_URI="${SRC_URI}
+	http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-${PARI_VER}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+# Math::Pari requires that a copy of the pari source in a parallel
+# directory to where you build it. It does not need to compile it, but
+# it does need to be the same version as is installed, hence the hard
+# DEPEND below
+RDEPEND="~sci-mathematics/pari-${PARI_VER}"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+S_PARI=${WORKDIR}/pari-${PARI_VER}
+SRC_TEST=do
+
+src_prepare() {
+	# On 64-bit hardware, these files are needed in both the 64/ and 32/
+	# directories for the testsuite to pass.
+	cd "${S_PARI}"/src/test/
+	for t in analyz compat ellglobalred elliptic galois graph intnum kernel \
+		linear nfields number objets ploth polyser program qfbsolve rfrac \
+		round4 stark sumiter trans ; do
+		i="in/${t}"
+		o32="32/${t}"
+		o64="64/${t}"
+		[ -f "$i" -a ! -f "$o32" ] && cp -al "$i" "$o32"
+		[ -f "$i" -a ! -f "$o64" ] && cp -al "$i" "$o64"
+	done
+	perl-module_src_prepare
+}
+
+src_configure() {
+	# Unfortunately the assembly routines math-pari has for SPARC do not appear
+	# to be working at current.  Perl cannot test math-pari or anything that
+	# pulls in the math-pari module as DynaLoader cannot load the resulting
+	# .so files math-pari generates.  As such, we have to use the generic
+	# non-machine specific assembly methods here.
+	use sparc && myconf="${myconf} machine=none"
+
+	perl-module_src_configure
+}

diff --git a/dev-perl/mogilefs-server/files/mogautomount-init.d-2.50 b/dev-perl/mogilefs-server/files/mogautomount-init.d-2.50
new file mode 100644
index 0000000..dabf123
--- /dev/null
+++ b/dev-perl/mogilefs-server/files/mogautomount-init.d-2.50
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogautomount-init.d-2.50,v 1.1 2011/06/16 08:39:15 robbat2 Exp $
+
+NAME="mogautomount"
+BINARY="/usr/bin/mogautomount"
+
+depend() {
+	use net
+	before mogstored
+}
+
+start() {
+	ebegin "Mounting MogileFS disks"
+	${BINARY} --chmod-mountpoints
+	eend $?
+}
+
+stop() {
+	:
+}
+
+# vim: ft=gentoo-init-d:

diff --git a/dev-perl/mogilefs-server/files/mogilefsd-conf.d-2.16 b/dev-perl/mogilefs-server/files/mogilefsd-conf.d-2.16
new file mode 100644
index 0000000..871c430
--- /dev/null
+++ b/dev-perl/mogilefs-server/files/mogilefsd-conf.d-2.16
@@ -0,0 +1,4 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogilefsd-conf.d-2.16,v 1.1 2007/05/16 11:11:17 robbat2 Exp $
+PIDFILE="/var/run/mogile/mogilefsd.pid"
+MOGILEFSD_OPTS="--daemonize --pidfile=${PIDFILE}"
+# vim: ft=gentoo-conf-d:

diff --git a/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16 b/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16
new file mode 100644
index 0000000..af9d298
--- /dev/null
+++ b/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16,v 1.2 2009/11/04 02:29:23 robbat2 Exp $
+
+NAME="mogilefsd"
+BINARY="/usr/bin/mogilefsd"
+MOGILE_UID="mogile"
+MOGILE_GID="mogile"
+
+depend() {
+	use net mysql postgresql
+	after mysql postgresql
+}
+
+start() {
+	ebegin "Starting $NAME"
+	start-stop-daemon --chuid ${MOGILE_UID}:${MOGILE_GID} --start \
+		--pidfile ${PIDFILE} --exec ${BINARY} \
+		-- ${MOGILEFSD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $NAME"
+	start-stop-daemon --stop --quiet --pidfile="${PIDFILE}"
+	eend $?
+}
+
+# vim: ft=gentoo-init-d:

diff --git a/dev-perl/mogilefs-server/files/mogilefsd.conf-2.30 b/dev-perl/mogilefs-server/files/mogilefsd.conf-2.30
new file mode 100644
index 0000000..4ff4763
--- /dev/null
+++ b/dev-perl/mogilefs-server/files/mogilefsd.conf-2.30
@@ -0,0 +1,36 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogilefsd.conf-2.30,v 1.1 2009/02/23 09:59:21 robbat2 Exp $
+
+# System user
+user = mogile
+# These are set inside the Gentoo conf.d/mogilefsd
+#pidfile = /var/run/mogile/mogilefsd.pid
+#daemonize = 1
+
+# Database settings
+db_dsn	= DBI:mysql:mogilefs
+db_user	= mogile
+# You must insert your password here!
+db_pass	= __PASSWORD__
+
+# Network settings
+#conf_port = 7001
+#listen = 10.0.0.1:7001, 
+
+# Storage
+#mog_root = /mnt/mogilefs
+
+# Plugins
+#plugins = ...
+
+# Tuning knobs
+#query_jobs = 20
+#delete_jobs = 1
+#replicate_jobs = 1
+#monitor_jobs = 1
+#reaper_jobs = 1
+#min_free_space = 100
+#max_disk_age = 5
+#node_timeout = 2
+#old_repl_compat = 1
+#default_mindevcount = 2
+#no_unreachable_tracking = 1

diff --git a/dev-perl/mogilefs-server/files/mogstored-conf.d-2.30 b/dev-perl/mogilefs-server/files/mogstored-conf.d-2.30
new file mode 100644
index 0000000..96b2951
--- /dev/null
+++ b/dev-perl/mogilefs-server/files/mogstored-conf.d-2.30
@@ -0,0 +1,4 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored-conf.d-2.30,v 1.2 2011/12/16 19:53:23 swegener Exp $
+PIDFILE="/var/run/mogile/mogstored.pid"
+MOGSTORED_OPTS=""
+# vim: ft=gentoo-conf-d:

diff --git a/dev-perl/mogilefs-server/files/mogstored-init.d-2.30 b/dev-perl/mogilefs-server/files/mogstored-init.d-2.30
new file mode 100644
index 0000000..59090a7
--- /dev/null
+++ b/dev-perl/mogilefs-server/files/mogstored-init.d-2.30
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored-init.d-2.30,v 1.2 2009/11/04 02:29:23 robbat2 Exp $
+
+NAME="mogstored"
+BINARY="/usr/bin/mogstored"
+
+depend() {
+	use net
+	before mogilefsd
+}
+
+start() {
+	ebegin "Starting $NAME"
+	start-stop-daemon --start --quiet \
+		--pidfile ${PIDFILE} \
+		--exec ${BINARY} -- ${MOGSTORED_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $NAME"
+	start-stop-daemon --stop --quiet --pidfile="${PIDFILE}"
+	eend $?
+}
+
+# vim: ft=gentoo-init-d:

diff --git a/dev-perl/mogilefs-server/files/mogstored-init.d-2.50 b/dev-perl/mogilefs-server/files/mogstored-init.d-2.50
new file mode 100644
index 0000000..cdc015d
--- /dev/null
+++ b/dev-perl/mogilefs-server/files/mogstored-init.d-2.50
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored-init.d-2.50,v 1.2 2011/12/16 19:53:23 swegener Exp $
+
+NAME="mogstored"
+BINARY="/usr/bin/mogstored"
+
+depend() {
+	use net
+	before mogilefsd
+	need mogautomount
+}
+
+start() {
+	ebegin "Starting $NAME"
+	start-stop-daemon --start --quiet \
+		--pidfile=${PIDFILE} --exec ${BINARY} \
+		-- --daemonize --pidfile=${PIDFILE} ${MOGSTORED_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $NAME"
+	start-stop-daemon --stop --quiet --pidfile="${PIDFILE}"
+	eend $?
+}
+
+# vim: ft=gentoo-init-d:

diff --git a/dev-perl/mogilefs-server/files/mogstored.conf-2.16 b/dev-perl/mogilefs-server/files/mogstored.conf-2.16
new file mode 100644
index 0000000..834391d
--- /dev/null
+++ b/dev-perl/mogilefs-server/files/mogstored.conf-2.16
@@ -0,0 +1,23 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored.conf-2.16,v 1.1 2007/05/16 11:11:17 robbat2 Exp $
+
+# These are set inside the Gentoo conf.d/mogilefsd
+#pidfile = /var/run/mogile/mogstored.pid
+#daemonize = 1
+
+# Network settings
+#httplisten = 0.0.0.0:7500
+#mgmtlisten = 0.0.0.0:7501
+
+# Storage
+#docroot = /var/mogdata
+
+# Server type
+# Perlbal is the default
+#server = perlbal
+# But lighttpd is supported too
+#server = lighttpd
+#serverbin = /usr/sbin/lighttpd
+
+# Tuning knobs
+#max_conns = 10000
+#opt_iostat 1

diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild
new file mode 100644
index 0000000..14f8866
--- /dev/null
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild,v 1.4 2012/06/03 16:31:19 tove Exp $
+
+EAPI=2
+MODULE_AUTHOR="DORMANDO"
+MY_PN=mogilefs-server
+MY_P="${MY_PN}-${PV}"
+MODULE_A="${MY_P}.tar.gz"
+inherit user perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+HOMEPAGE="http://www.danga.com/mogilefs/"
+
+IUSE="mysql sqlite postgres"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Upstream site recommends this,
+# but it breaks Perlbal
+# dev-perl/Perlbal-XS-HTTPHeaders
+RDEPEND="dev-perl/Net-Netmask
+		>=dev-perl/Danga-Socket-1.61
+		>=dev-perl/Sys-Syscall-0.22
+		>=dev-perl/Perlbal-1.74
+		dev-perl/IO-AIO
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.11
+		>=dev-perl/MogileFS-Utils-2.16
+		dev-perl/Cache-Memcached
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}"
+mydoc="CHANGES TODO"
+
+# You need a local MySQL or Postgresql server for this
+#SRC_TEST="do"
+
+#PATCHES=(  )
+
+MOGILE_USER="mogile"
+
+pkg_setup() {
+	# Warning! It is important that the uid is constant over Gentoo machines
+	# As mogilefs may be used with non-local block devices that move!
+	enewuser ${MOGILE_USER} 460 -1 -1
+}
+
+src_prepare() {
+	for f in Makefile.PL MANIFEST ; do
+		if [ -f "${S}"/${f}.orig ]; then
+			cp -f "${S}"/${f}{.orig,}
+		else
+			cp -f "${S}"/${f}{,.orig}
+		fi
+	done
+	# If we are not in a cutting edge Git source, we would prefer to not install
+	# duplicates of these.
+	sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
+	sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST
+	mv -f "${S}/lib/mogdeps" "${S}"
+}
+
+src_compile() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_compile || die "perl-module_src_compile failed"
+}
+
+src_install() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_install || die "perl-module_src_install failed"
+	cd "${S}"
+
+	newconfd "${FILESDIR}"/mogilefsd-conf.d-2.16 mogilefsd
+	newinitd "${FILESDIR}"/mogilefsd-init.d-2.16 mogilefsd
+
+	newconfd "${FILESDIR}"/mogstored-conf.d-2.30 mogstored
+	newinitd "${FILESDIR}"/mogstored-init.d-2.30 mogstored
+
+	diropts -m 700 -o ${MOGILE_USER}
+	keepdir /var/run/mogile
+	keepdir /var/mogdata
+	diropts -m 755 -o root
+
+	dodir /etc/mogilefs
+	insinto /etc/mogilefs
+	insopts -m 600 -o root -g ${MOGILE_USER}
+	newins "${FILESDIR}"/mogilefsd.conf-2.30 mogilefsd.conf
+	newins "${FILESDIR}"/mogstored.conf-2.16 mogstored.conf
+}
+
+pkg_postinst() {
+	chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+	chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+}

diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.43.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.43.ebuild
new file mode 100644
index 0000000..4fb4b79
--- /dev/null
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.43.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.43.ebuild,v 1.3 2012/06/03 16:31:18 tove Exp $
+
+EAPI=2
+MODULE_AUTHOR="DORMANDO"
+MY_PN=MogileFS-Server
+MY_P="${MY_PN}-${PV}"
+MODULE_A="${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+inherit user perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+HOMEPAGE="http://www.danga.com/mogilefs/"
+
+IUSE="mysql sqlite postgres"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Upstream site recommends this,
+# but it breaks Perlbal
+# dev-perl/Perlbal-XS-HTTPHeaders
+RDEPEND="dev-perl/Net-Netmask
+		>=dev-perl/Danga-Socket-1.61
+		>=dev-perl/Sys-Syscall-0.22
+		>=dev-perl/Perlbal-1.74
+		dev-perl/IO-AIO
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.11
+		>=dev-perl/MogileFS-Utils-2.16
+		dev-perl/Cache-Memcached
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}"
+mydoc="CHANGES TODO"
+
+# You need a local MySQL or Postgresql server for this
+#SRC_TEST="do"
+
+#PATCHES=(  )
+
+MOGILE_USER="mogile"
+
+pkg_setup() {
+	# Warning! It is important that the uid is constant over Gentoo machines
+	# As mogilefs may be used with non-local block devices that move!
+	enewuser ${MOGILE_USER} 460 -1 -1
+}
+
+src_prepare() {
+	for f in Makefile.PL MANIFEST ; do
+		if [ -f "${S}"/${f}.orig ]; then
+			cp -f "${S}"/${f}{.orig,}
+		else
+			cp -f "${S}"/${f}{,.orig}
+		fi
+	done
+	# If we are not in a cutting edge Git source, we would prefer to not install
+	# duplicates of these.
+	sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
+	sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST
+	mv -f "${S}/lib/mogdeps" "${S}"
+}
+
+src_compile() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_compile || die "perl-module_src_compile failed"
+}
+
+src_install() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_install || die "perl-module_src_install failed"
+	cd "${S}"
+
+	newconfd "${FILESDIR}"/mogilefsd-conf.d-2.16 mogilefsd
+	newinitd "${FILESDIR}"/mogilefsd-init.d-2.16 mogilefsd
+
+	newconfd "${FILESDIR}"/mogstored-conf.d-2.30 mogstored
+	newinitd "${FILESDIR}"/mogstored-init.d-2.30 mogstored
+
+	diropts -m 700 -o ${MOGILE_USER}
+	keepdir /var/run/mogile
+	keepdir /var/mogdata
+	diropts -m 755 -o root
+
+	dodir /etc/mogilefs
+	insinto /etc/mogilefs
+	insopts -m 600 -o root -g ${MOGILE_USER}
+	newins "${FILESDIR}"/mogilefsd.conf-2.30 mogilefsd.conf
+	newins "${FILESDIR}"/mogstored.conf-2.16 mogstored.conf
+}
+
+pkg_postinst() {
+	chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+	chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+}

diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.46.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.46.ebuild
new file mode 100644
index 0000000..d8c107f
--- /dev/null
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.46.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.46.ebuild,v 1.4 2012/06/03 16:31:19 tove Exp $
+
+EAPI=2
+MODULE_AUTHOR="DORMANDO"
+MY_PN=MogileFS-Server
+MY_P="${MY_PN}-${PV}"
+MODULE_A="${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+inherit user perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+HOMEPAGE="http://www.danga.com/mogilefs/"
+
+IUSE="mysql sqlite postgres"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Upstream site recommends this,
+# but it breaks Perlbal
+# dev-perl/Perlbal-XS-HTTPHeaders
+RDEPEND="dev-perl/Net-Netmask
+		>=dev-perl/Danga-Socket-1.61
+		>=dev-perl/Sys-Syscall-0.22
+		>=dev-perl/Perlbal-1.76
+		dev-perl/IO-AIO
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.11
+		>=dev-perl/MogileFS-Utils-2.16
+		dev-perl/Cache-Memcached
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}"
+mydoc="CHANGES TODO"
+
+# You need a local MySQL or Postgresql server for this
+#SRC_TEST="do"
+
+#PATCHES=(  )
+
+MOGILE_USER="mogile"
+
+pkg_setup() {
+	# Warning! It is important that the uid is constant over Gentoo machines
+	# As mogilefs may be used with non-local block devices that move!
+	enewuser ${MOGILE_USER} 460 -1 -1
+}
+
+src_prepare() {
+	for f in Makefile.PL MANIFEST ; do
+		if [ -f "${S}"/${f}.orig ]; then
+			cp -f "${S}"/${f}{.orig,}
+		else
+			cp -f "${S}"/${f}{,.orig}
+		fi
+	done
+	# If we are not in a cutting edge Git source, we would prefer to not install
+	# duplicates of these.
+	sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
+	sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST
+	mv -f "${S}/lib/mogdeps" "${S}"
+}
+
+src_compile() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_compile || die "perl-module_src_compile failed"
+}
+
+src_install() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_install || die "perl-module_src_install failed"
+	cd "${S}"
+
+	newconfd "${FILESDIR}"/mogilefsd-conf.d-2.16 mogilefsd
+	newinitd "${FILESDIR}"/mogilefsd-init.d-2.16 mogilefsd
+
+	newconfd "${FILESDIR}"/mogstored-conf.d-2.30 mogstored
+	newinitd "${FILESDIR}"/mogstored-init.d-2.30 mogstored
+
+	diropts -m 700 -o ${MOGILE_USER}
+	keepdir /var/run/mogile
+	keepdir /var/mogdata
+	diropts -m 755 -o root
+
+	dodir /etc/mogilefs
+	insinto /etc/mogilefs
+	insopts -m 600 -o root -g ${MOGILE_USER}
+	newins "${FILESDIR}"/mogilefsd.conf-2.30 mogilefsd.conf
+	newins "${FILESDIR}"/mogstored.conf-2.16 mogstored.conf
+}
+
+pkg_postinst() {
+	chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+	chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+}

diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.50.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.50.ebuild
new file mode 100644
index 0000000..a45d175
--- /dev/null
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.50.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.50.ebuild,v 1.3 2012/06/03 16:31:19 tove Exp $
+
+EAPI=2
+MODULE_AUTHOR="DORMANDO"
+MY_PN=MogileFS-Server
+MY_P="${MY_PN}-${PV}"
+MODULE_A="${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+inherit user perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+HOMEPAGE="http://www.danga.com/mogilefs/"
+
+IUSE="mysql sqlite postgres"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Upstream site recommends this,
+# but it breaks Perlbal
+# dev-perl/Perlbal-XS-HTTPHeaders
+RDEPEND="dev-perl/Net-Netmask
+		>=dev-perl/Danga-Socket-1.61
+		>=dev-perl/Sys-Syscall-0.22
+		>=dev-perl/Perlbal-1.790
+		dev-perl/IO-AIO
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.14
+		>=dev-perl/MogileFS-Utils-2.20
+		dev-perl/Cache-Memcached
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}"
+mydoc="CHANGES TODO"
+
+# You need a local MySQL or Postgresql server for this
+#SRC_TEST="do"
+
+#PATCHES=(  )
+
+MOGILE_USER="mogile"
+
+pkg_setup() {
+	# Warning! It is important that the uid is constant over Gentoo machines
+	# As mogilefs may be used with non-local block devices that move!
+	enewuser ${MOGILE_USER} 460 -1 -1
+}
+
+src_prepare() {
+	for f in Makefile.PL MANIFEST ; do
+		if [ -f "${S}"/${f}.orig ]; then
+			cp -f "${S}"/${f}{.orig,}
+		else
+			cp -f "${S}"/${f}{,.orig}
+		fi
+	done
+	# If we are not in a cutting edge Git source, we would prefer to not install
+	# duplicates of these.
+	sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
+	sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST
+	mv -f "${S}/lib/mogdeps" "${S}"
+}
+
+src_compile() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_compile || die "perl-module_src_compile failed"
+}
+
+src_install() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_install || die "perl-module_src_install failed"
+	cd "${S}"
+
+	newconfd "${FILESDIR}"/mogilefsd-conf.d-2.16 mogilefsd
+	newinitd "${FILESDIR}"/mogilefsd-init.d-2.16 mogilefsd
+
+	newconfd "${FILESDIR}"/mogstored-conf.d-2.30 mogstored
+	newinitd "${FILESDIR}"/mogstored-init.d-2.50 mogstored
+
+	newinitd "${FILESDIR}"/mogautomount-init.d-2.50 mogautomount
+
+	diropts -m 700 -o ${MOGILE_USER}
+	keepdir /var/run/mogile
+	keepdir /var/mogdata
+	diropts -m 755 -o root
+
+	dodir /etc/mogilefs
+	insinto /etc/mogilefs
+	insopts -m 600 -o root -g ${MOGILE_USER}
+	newins "${FILESDIR}"/mogilefsd.conf-2.30 mogilefsd.conf
+	newins "${FILESDIR}"/mogstored.conf-2.16 mogstored.conf
+}
+
+pkg_postinst() {
+	chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+	chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+}

diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.51.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.51.ebuild
new file mode 100644
index 0000000..848962a
--- /dev/null
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.51.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.51.ebuild,v 1.3 2012/06/03 16:31:18 tove Exp $
+
+EAPI=2
+MODULE_AUTHOR="DORMANDO"
+MY_PN=MogileFS-Server
+MY_P="${MY_PN}-${PV}"
+MODULE_A="${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+inherit user perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+HOMEPAGE="http://www.danga.com/mogilefs/"
+
+IUSE="mysql sqlite postgres"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Upstream site recommends this,
+# but it breaks Perlbal
+# dev-perl/Perlbal-XS-HTTPHeaders
+RDEPEND="dev-perl/Net-Netmask
+		>=dev-perl/Danga-Socket-1.61
+		>=dev-perl/Sys-Syscall-0.22
+		>=dev-perl/Perlbal-1.790
+		dev-perl/IO-AIO
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.14
+		>=dev-perl/MogileFS-Utils-2.20
+		dev-perl/Cache-Memcached
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}"
+mydoc="CHANGES TODO"
+
+# You need a local MySQL or Postgresql server for this
+#SRC_TEST="do"
+
+#PATCHES=(  )
+
+MOGILE_USER="mogile"
+
+pkg_setup() {
+	# Warning! It is important that the uid is constant over Gentoo machines
+	# As mogilefs may be used with non-local block devices that move!
+	enewuser ${MOGILE_USER} 460 -1 -1
+}
+
+src_prepare() {
+	for f in Makefile.PL MANIFEST ; do
+		if [ -f "${S}"/${f}.orig ]; then
+			cp -f "${S}"/${f}{.orig,}
+		else
+			cp -f "${S}"/${f}{,.orig}
+		fi
+	done
+	# If we are not in a cutting edge Git source, we would prefer to not install
+	# duplicates of these.
+	sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
+	sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST
+	mv -f "${S}/lib/mogdeps" "${S}"
+}
+
+src_compile() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_compile || die "perl-module_src_compile failed"
+}
+
+src_install() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_install || die "perl-module_src_install failed"
+	cd "${S}"
+
+	newconfd "${FILESDIR}"/mogilefsd-conf.d-2.16 mogilefsd
+	newinitd "${FILESDIR}"/mogilefsd-init.d-2.16 mogilefsd
+
+	newconfd "${FILESDIR}"/mogstored-conf.d-2.30 mogstored
+	newinitd "${FILESDIR}"/mogstored-init.d-2.50 mogstored
+
+	newinitd "${FILESDIR}"/mogautomount-init.d-2.50 mogautomount
+
+	diropts -m 700 -o ${MOGILE_USER}
+	keepdir /var/run/mogile
+	keepdir /var/mogdata
+	diropts -m 755 -o root
+
+	dodir /etc/mogilefs
+	insinto /etc/mogilefs
+	insopts -m 600 -o root -g ${MOGILE_USER}
+	newins "${FILESDIR}"/mogilefsd.conf-2.30 mogilefsd.conf
+	newins "${FILESDIR}"/mogstored.conf-2.16 mogstored.conf
+}
+
+pkg_postinst() {
+	chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+	chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+}

diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.53.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.53.ebuild
new file mode 100644
index 0000000..3a39164
--- /dev/null
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.53.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.53.ebuild,v 1.3 2012/06/03 16:31:19 tove Exp $
+
+EAPI=2
+MODULE_AUTHOR="DORMANDO"
+MY_PN=MogileFS-Server
+MY_P="${MY_PN}-${PV}"
+MODULE_A="${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+inherit user perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+HOMEPAGE="http://www.danga.com/mogilefs/"
+
+IUSE="mysql sqlite postgres"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Upstream site recommends this,
+# but it breaks Perlbal
+# dev-perl/Perlbal-XS-HTTPHeaders
+RDEPEND="dev-perl/Net-Netmask
+		>=dev-perl/Danga-Socket-1.61
+		>=dev-perl/Sys-Syscall-0.22
+		>=dev-perl/Perlbal-1.790
+		dev-perl/IO-AIO
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.14
+		>=dev-perl/MogileFS-Utils-2.20
+		dev-perl/Cache-Memcached
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}"
+mydoc="CHANGES TODO"
+
+# You need a local MySQL or Postgresql server for this
+#SRC_TEST="do"
+
+#PATCHES=(  )
+
+MOGILE_USER="mogile"
+
+pkg_setup() {
+	# Warning! It is important that the uid is constant over Gentoo machines
+	# As mogilefs may be used with non-local block devices that move!
+	enewuser ${MOGILE_USER} 460 -1 -1
+}
+
+src_prepare() {
+	for f in Makefile.PL MANIFEST ; do
+		if [ -f "${S}"/${f}.orig ]; then
+			cp -f "${S}"/${f}{.orig,}
+		else
+			cp -f "${S}"/${f}{,.orig}
+		fi
+	done
+	# If we are not in a cutting edge Git source, we would prefer to not install
+	# duplicates of these.
+	sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
+	sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST
+	mv -f "${S}/lib/mogdeps" "${S}"
+}
+
+src_compile() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_compile || die "perl-module_src_compile failed"
+}
+
+src_install() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_install || die "perl-module_src_install failed"
+	cd "${S}"
+
+	newconfd "${FILESDIR}"/mogilefsd-conf.d-2.16 mogilefsd
+	newinitd "${FILESDIR}"/mogilefsd-init.d-2.16 mogilefsd
+
+	newconfd "${FILESDIR}"/mogstored-conf.d-2.30 mogstored
+	newinitd "${FILESDIR}"/mogstored-init.d-2.50 mogstored
+
+	newinitd "${FILESDIR}"/mogautomount-init.d-2.50 mogautomount
+
+	diropts -m 700 -o ${MOGILE_USER}
+	keepdir /var/run/mogile
+	keepdir /var/mogdata
+	diropts -m 755 -o root
+
+	dodir /etc/mogilefs
+	insinto /etc/mogilefs
+	insopts -m 600 -o root -g ${MOGILE_USER}
+	newins "${FILESDIR}"/mogilefsd.conf-2.30 mogilefsd.conf
+	newins "${FILESDIR}"/mogstored.conf-2.16 mogstored.conf
+}
+
+pkg_postinst() {
+	chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+	chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+}

diff --git a/dev-perl/net-server/net-server-0.97.ebuild b/dev-perl/net-server/net-server-0.97.ebuild
new file mode 100644
index 0000000..aba8aed
--- /dev/null
+++ b/dev-perl/net-server/net-server-0.97.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/net-server/net-server-0.97.ebuild,v 1.7 2010/02/18 20:32:37 darkside Exp $
+
+inherit perl-module
+
+MY_P=Net-Server-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Extensible, general Perl server engine"
+HOMEPAGE="http://search.cpan.org/~rhandom/"
+SRC_URI="mirror://cpan/authors/id/R/RH/RHANDOM/${MY_P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+SRC_TEST="do"
+
+mydoc="README"
+
+DEPEND="dev-perl/IO-Multiplex
+	dev-lang/perl"

diff --git a/dev-perl/perl-ldap/perl-ldap-0.400.100.ebuild b/dev-perl/perl-ldap/perl-ldap-0.400.100.ebuild
new file mode 100644
index 0000000..aea2a53
--- /dev/null
+++ b/dev-perl/perl-ldap/perl-ldap-0.400.100.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-ldap/perl-ldap-0.400.100.ebuild,v 1.1 2011/01/14 13:41:10 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=GBARR
+MODULE_VERSION=0.4001
+inherit perl-module
+
+DESCRIPTION="A collection of perl modules which provide an object-oriented interface to LDAP servers."
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="sasl xml ssl"
+
+RDEPEND="dev-perl/Convert-ASN1
+	dev-perl/URI
+	sasl? ( virtual/perl-Digest-MD5 dev-perl/Authen-SASL )
+	xml? ( dev-perl/XML-Parser
+			dev-perl/XML-SAX
+			dev-perl/XML-SAX-Writer )
+	ssl? ( >=dev-perl/IO-Socket-SSL-0.93 )"
+DEPEND="${RDEPEND}"
+
+#SRC_TEST=do

diff --git a/dev-perl/perl-tk/files/804.028-path.patch b/dev-perl/perl-tk/files/804.028-path.patch
new file mode 100644
index 0000000..8a3689c
--- /dev/null
+++ b/dev-perl/perl-tk/files/804.028-path.patch
@@ -0,0 +1,24 @@
+--- perl-tk-804.028/pTk/Tcl-pTk
++++ perl-tk-804.028/pTk/Tcl-pTk
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ use open IO => ':bytes'; # Avoid UTF-8 issues with some perl5.8.0 (RedHat)
+ use Carp;
+ my $verbose = 0;
+--- perl-tk-804.028.orig/pTk/mkVFunc
++++ perl-tk-804.028/pTk/mkVFunc
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ use strict;
+ 
+ 
+--- perl-tk-804.028/TextList/reindex.pl
++++ perl-tk-804.028/TextList/reindex.pl
+@@ -1,4 +1,4 @@
+-#!/bin/perl
++#!/usr/bin/perl
+ 
+ use lib qw(/home1/gbartels/textlist);
+ use Tk;

diff --git a/dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch b/dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch
new file mode 100644
index 0000000..7a43a7a
--- /dev/null
+++ b/dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/show_bug.cgi?id=345987
+--- Tk-804.029/pTk/Xlib.h
++++ Tk-804.029/pTk/Xlib.h
+@@ -1,6 +1,7 @@
+ #ifndef _XLIB
+ #define _XLIB
+ #ifndef _XLIB_H_
++#ifndef _X11_XLIB_H_
+ extern XFontStruct *XLoadQueryFont  _ANSI_ARGS_((Display *, const char *));
+ extern XModifierKeymap *XGetModifierMapping  _ANSI_ARGS_((Display *));
+ extern XImage *XCreateImage  _ANSI_ARGS_((Display *, Visual *, unsigned int, int, int, char *, unsigned int, unsigned int, int, int));
+@@ -143,6 +144,7 @@
+ extern Window XGetSelectionOwner _ANSI_ARGS_((Display *, Atom));
+ extern int XRectInRegion _ANSI_ARGS_((Region,int,int,unsigned,unsigned));
+ extern int XSubtractRegion _ANSI_ARGS_((Region, Region, Region));
++#endif /* _X11_XLIB_H_ */
+ #endif /* _XLIB_H_ */
+ extern int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image));
+ #endif /* _XLIB */

diff --git a/dev-perl/perl-tk/files/xorg.patch b/dev-perl/perl-tk/files/xorg.patch
new file mode 100644
index 0000000..998f3c7
--- /dev/null
+++ b/dev-perl/perl-tk/files/xorg.patch
@@ -0,0 +1,50 @@
+diff -Naurp Tk-804.027/Tk/MakeDepend.pm Tk-804.027.new/Tk/MakeDepend.pm
+--- Tk-804.027/Tk/MakeDepend.pm	2003-12-13 07:28:22.000000000 -0500
++++ Tk-804.027.new/Tk/MakeDepend.pm	2006-06-13 22:34:21.000000000 -0400
+@@ -248,6 +248,7 @@ sub command_line
+  # force /usr/include to be last element of @include
+  push @include, $Config{'usrinc'}
+    if (defined $Config{'usrinc'} and $Config{'usrinc'} ne '');
++ push @include, "/usr/include";
+  # warn "Include:@include\n";
+  while (@files)
+   {
+diff -Naurp Tk-804.027/myConfig Tk-804.027.new/myConfig
+--- Tk-804.027/myConfig	2004-02-28 11:59:28.000000000 -0500
++++ Tk-804.027.new/myConfig	2006-06-13 22:27:53.000000000 -0400
+@@ -253,7 +253,7 @@ if ($win_arch eq 'x') {
+ 	}
+ 	close(XMKMF);
+ 	while (defined $uidir) {
+-	  last unless ($uidir =~ s!^.*-I(\S+)/lib/X11/config!!o);
++	  last unless ($uidir =~ s!^.*-I(\S+)/lib(64)/X11/config!!o);
+ 	  $try = $1;
+ 	  $try =~ s/'x11root'/$ENV{X11ROOT}/;
+ 	  push(@xdirs,$try);
+@@ -294,7 +294,7 @@ if ($win_arch eq 'x') {
+   #
+   unless (defined $xlib)
+     {
+-      $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib')
++      $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib','/usr/lib64')
+     }
+ 
+   #
+@@ -309,7 +309,7 @@ if ($win_arch eq 'x') {
+ 
+   die "Cannot find -lX11 anywhere" unless(defined $xlib);
+ 
+-  ($base) = $xlib =~ m#-L(.*)(?:/lib)$#x;
++  ($base) = $xlib =~ m#-L(.*)(?:/lib(64))$#x;
+   if (defined $X11INC)
+     {
+       $xinc = &IX11("$X11INC");
+@@ -321,6 +321,8 @@ if ($win_arch eq 'x') {
+     {
+       warn "Cannot find X include files via $base/include\n";
+       $xinc = &IX11(map("$_/include",@xdirs),
++            chooseX11(</usr/include/X11*>),
++		    '/usr/include',
+ 		    '/usr/openwin/include',
+ 		    chooseX11(</usr/X11*/include>),
+ 		    chooseX11(</usr/include/X11*>),

diff --git a/dev-perl/yaml/yaml-0.71.ebuild b/dev-perl/yaml/yaml-0.71.ebuild
new file mode 100644
index 0000000..64e62dd
--- /dev/null
+++ b/dev-perl/yaml/yaml-0.71.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/yaml/yaml-0.71.ebuild,v 1.9 2011/07/30 10:50:33 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=ADAMK
+MY_PN="YAML"
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="YAML Ain't Markup Language (tm)"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el
new file mode 100644
index 0000000..1646a39
--- /dev/null
+++ b/dev-vcs/git/files/50git-gentoo.el
@@ -0,0 +1,13 @@
+
+;;; dev-vcs/git site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'git-status "git" "Entry point into git-status mode." t)
+;;(autoload 'git-blame-mode "git-blame"
+;;  "Minor mode for incremental blame for Git." t)
+
+;; GNU Emacs >=22.2 already includes vc-git.el.
+;; Enable the following only if Emacs has no GIT support.
+(unless (fboundp 'vc-git-registered)
+  (add-to-list 'load-path "@SITELISP@/compat")
+  (add-to-list 'vc-handled-backends 'GIT))

diff --git a/dev-vcs/git/files/git-1.6.6.1-interix6.patch b/dev-vcs/git/files/git-1.6.6.1-interix6.patch
new file mode 100644
index 0000000..0a8db37
--- /dev/null
+++ b/dev-vcs/git/files/git-1.6.6.1-interix6.patch
@@ -0,0 +1,17 @@
+diff -ru git-1.6.6.1.orig/compat/inet_ntop.c git-1.6.6.1/compat/inet_ntop.c
+--- git-1.6.6.1.orig/compat/inet_ntop.c	2010-03-09 04:39:03 -0800
++++ git-1.6.6.1/compat/inet_ntop.c	2010-03-09 04:40:50 -0800
+@@ -169,6 +169,8 @@
+ }
+ #endif
+ 
++/* conflicts with interix' headers... */
++#ifndef __INTERIX
+ /* char *
+  * inet_ntop(af, src, dst, size)
+  *	convert a network format address to presentation format.
+@@ -197,3 +199,4 @@
+ 	}
+ 	/* NOTREACHED */
+ }
++#endif

diff --git a/dev-vcs/git/files/git-1.7.1-interix.patch b/dev-vcs/git/files/git-1.7.1-interix.patch
new file mode 100644
index 0000000..130d808
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.1-interix.patch
@@ -0,0 +1,100 @@
+patch reported upstream at the mailing list.
+mail reference is: http://marc.info/?l=git&m=126813299716136&w=2
+
+--- builtin/upload-archive.c
++++ builtin/upload-archive.c
+@@ -132,8 +132,9 @@
+ 	packet_flush(1);
+ 
+ 	while (1) {
+-		struct pollfd pfd[2];
+ 		int status;
++#ifndef __INTERIX
++		struct pollfd pfd[2];
+ 
+ 		pfd[0].fd = fd1[0];
+ 		pfd[0].events = POLLIN;
+@@ -156,6 +157,8 @@
+ 			if (process_input(pfd[0].fd, 1))
+ 				continue;
+ 
++#endif
++
+ 		if (waitpid(writer, &status, 0) < 0)
+ 			error_clnt("%s", lostchild);
+ 		else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
+--- daemon.c
++++ daemon.c
+@@ -14,6 +14,8 @@
+ #define NI_MAXSERV 32
+ #endif
+ 
++#ifndef __INTERIX /* not available on interix! */
++
+ static int log_syslog;
+ static int verbose;
+ static int reuseaddr;
+@@ -922,8 +924,13 @@
+ 	return service_loop(socknum, socklist);
+ }
+ 
++#endif /* __INTERIX */
++
+ int main(int argc, char **argv)
+ {
++#ifdef __INTERIX
++	die("not implemented on interix!");
++#else /* !__INTERIX */
+ 	int listen_port = 0;
+ 	char *listen_addr = NULL;
+ 	int inetd_mode = 0;
+@@ -1121,4 +1128,5 @@
+ 		store_pid(pid_file);
+ 
+ 	return serve(listen_addr, listen_port, pass, gid);
++#endif /* __INTERIX */
+ }
+--- git-compat-util.h
++++ git-compat-util.h
+@@ -93,7 +93,9 @@
+ #include <utime.h>
+ #ifndef __MINGW32__
+ #include <sys/wait.h>
++#ifndef __INTERIX
+ #include <sys/poll.h>
++#endif
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #ifndef NO_SYS_SELECT_H
+@@ -104,7 +106,11 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <pwd.h>
++#ifndef __INTERIX
+ #include <inttypes.h>
++#else
++#include <stdint.h>
++#endif
+ #if defined(__CYGWIN__)
+ #undef _XOPEN_SOURCE
+ #include <grp.h>
+--- upload-pack.c
++++ upload-pack.c
+@@ -150,6 +150,7 @@
+ 
+ static void create_pack_file(void)
+ {
++#ifndef __INTERIX
+ 	struct async rev_list;
+ 	struct child_process pack_objects;
+ 	int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
+@@ -328,6 +329,9 @@
+  fail:
+ 	send_client_data(3, abort_msg, sizeof(abort_msg));
+ 	die("git upload-pack: %s", abort_msg);
++#else /* __INTERIX */
++	die("git upload-pack: not implemented on interix!");
++#endif /* __INTERIX */
+ }
+ 
+ static int got_sha1(char *hex, unsigned char *sha1)

diff --git a/dev-vcs/git/files/git-1.7.10.2-optional-cvs.patch b/dev-vcs/git/files/git-1.7.10.2-optional-cvs.patch
new file mode 100644
index 0000000..6b8a6a6
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.10.2-optional-cvs.patch
@@ -0,0 +1,375 @@
+From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@g.o>
+Date: Sat, 19 May 2012 20:16:01 +0200
+Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
+ utilities
+
+Forward-ported from 1.7.3.5 to current git.git v1.7.10.2 tag.
+
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.10.2.orig/Makefile git-1.7.10.2/Makefile
+--- git-1.7.10.2.orig/Makefile	2012-05-11 20:25:45.000000000 +0000
++++ git-1.7.10.2/Makefile	2012-05-20 04:16:31.257289982 +0000
+@@ -224,6 +224,8 @@
+ #
+ # Define NO_TCLTK if you do not want Tcl/Tk GUI.
+ #
++# Define NO_CVS if you do not want any CVS interface utilities.
++#
+ # The TCL_PATH variable governs the location of the Tcl interpreter
+ # used to optimize git-gui for your system.  Only used if NO_TCLTK
+ # is not set.  Defaults to the bare 'tclsh'.
+@@ -392,6 +394,7 @@
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -432,17 +435,18 @@
+ SCRIPT_PERL += git-add--interactive.perl
+ SCRIPT_PERL += git-difftool.perl
+ SCRIPT_PERL += git-archimport.perl
+-SCRIPT_PERL += git-cvsexportcommit.perl
+-SCRIPT_PERL += git-cvsimport.perl
+-SCRIPT_PERL += git-cvsserver.perl
+ SCRIPT_PERL += git-relink.perl
+ SCRIPT_PERL += git-send-email.perl
+ SCRIPT_PERL += git-svn.perl
+ 
++SCRIPT_PERL_CVS += git-cvsexportcommit.perl
++SCRIPT_PERL_CVS += git-cvsimport.perl
++SCRIPT_PERL_CVS += git-cvsserver.perl
++
+ SCRIPT_PYTHON += git-remote-testgit.py
+ 
+ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
+-	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
++	  $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
+ 	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
+ 	  git-instaweb
+ 
+@@ -1946,13 +1950,25 @@
+ 	$(QUIET_GEN)$(cmd_munge_script) && \
+ 	mv $@+ $@
+ 
++_SCRIPT_PERL_BUILD = 
++_SCRIPT_PERL_NOBUILD = 
++
+ ifndef NO_PERL
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
++
++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
++
++ifndef NO_CVS
++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
++else # NO_CVS
++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
++endif # NO_CVS
++
++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): perl/perl.mak
+ 
+ perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
+ 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
+ 
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ 	sed -e '1{' \
+@@ -1983,14 +1999,17 @@
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ else # NO_PERL
+-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
++endif # NO_PERL
++
++# This is any perl scripts that were disabled it might be empty...
++$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
+ 	    unimplemented.sh >$@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+-endif # NO_PERL
+ 
+ ifndef NO_PYTHON
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS
+@@ -2025,7 +2044,7 @@
+ # These can record GIT_VERSION
+ git.o git.spec \
+ 	$(patsubst %.sh,%,$(SCRIPT_SH)) \
+-	$(patsubst %.perl,%,$(SCRIPT_PERL)) \
++	$(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
+ 	: GIT-VERSION-FILE
+ 
+ TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.10.2.orig/t/t9200-git-cvsexportcommit.sh git-1.7.10.2/t/t9200-git-cvsexportcommit.sh
+--- git-1.7.10.2.orig/t/t9200-git-cvsexportcommit.sh	2012-05-11 20:25:45.000000000 +0000
++++ git-1.7.10.2/t/t9200-git-cvsexportcommit.sh	2012-05-20 04:16:31.257289982 +0000
+@@ -12,6 +12,11 @@
+ 	test_done
+ fi
+ 
++if ! test_have_prereq CVS; then
++	skip_all='skipping git cvsexportcommit tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.10.2.orig/t/t9400-git-cvsserver-server.sh git-1.7.10.2/t/t9400-git-cvsserver-server.sh
+--- git-1.7.10.2.orig/t/t9400-git-cvsserver-server.sh	2012-05-11 20:25:45.000000000 +0000
++++ git-1.7.10.2/t/t9400-git-cvsserver-server.sh	2012-05-20 04:16:31.257289982 +0000
+@@ -11,9 +11,15 @@
+ . ./test-lib.sh
+ 
+ if ! test_have_prereq PERL; then
+-	skip_all='skipping git cvsserver tests, perl not available'
++	skip_all='skipping git-cvsserver tests, perl not available'
+ 	test_done
+ fi
++
++if ! test_have_prereq CVS; then
++	skip_all='skipping git-cvsserver tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.10.2.orig/t/t9401-git-cvsserver-crlf.sh git-1.7.10.2/t/t9401-git-cvsserver-crlf.sh
+--- git-1.7.10.2.orig/t/t9401-git-cvsserver-crlf.sh	2012-05-11 20:25:45.000000000 +0000
++++ git-1.7.10.2/t/t9401-git-cvsserver-crlf.sh	2012-05-20 04:16:31.257289982 +0000
+@@ -38,15 +38,20 @@
+     fi
+ }
+ 
+-cvs >/dev/null 2>&1
+-if test $? -ne 1
++if ! test_have_prereq PERL
+ then
+-    skip_all='skipping git-cvsserver tests, cvs not found'
++    skip_all='skipping git-cvsserver tests, perl not available'
+     test_done
+ fi
+-if ! test_have_prereq PERL
++if ! test_have_prereq CVS
+ then
+-    skip_all='skipping git-cvsserver tests, perl not available'
++    skip_all='skipping git-cvsserver tests, cvs not available'
++    test_done
++fi
++cvs >/dev/null 2>&1
++if test $? -ne 1
++then
++    skip_all='skipping git-cvsserver tests, cvs not found'
+     test_done
+ fi
+ "$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.10.2.orig/t/t9600-cvsimport.sh git-1.7.10.2/t/t9600-cvsimport.sh
+--- git-1.7.10.2.orig/t/t9600-cvsimport.sh	2012-05-11 20:25:45.000000000 +0000
++++ git-1.7.10.2/t/t9600-cvsimport.sh	2012-05-20 04:16:31.260623323 +0000
+@@ -3,14 +3,25 @@
+ test_description='git cvsimport basic tests'
+ . ./lib-cvs.sh
+ 
+-test_expect_success PERL 'setup cvsroot environment' '
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
++test_expect_success 'setup cvsroot environment' '
+ 	CVSROOT=$(pwd)/cvsroot &&
+ 	export CVSROOT
+ '
+ 
+-test_expect_success PERL 'setup cvsroot' '$CVS init'
++test_expect_success 'setup cvsroot' '$CVS init'
+ 
+-test_expect_success PERL 'setup a cvs module' '
++test_expect_success 'setup a cvs module' '
+ 
+ 	mkdir "$CVSROOT/module" &&
+ 	$CVS co -d module-cvs module &&
+@@ -42,23 +53,23 @@
+ 	)
+ '
+ 
+-test_expect_success PERL 'import a trivial module' '
++test_expect_success 'import a trivial module' '
+ 
+ 	git cvsimport -a -R -z 0 -C module-git module &&
+ 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+ 
+ '
+ 
+-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
++test_expect_success 'pack refs' '(cd module-git && git gc)'
+ 
+-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
++test_expect_success 'initial import has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 	(cd module-cvs &&
+ 	cat <<EOF >o_fortuna &&
+ O Fortune,
+@@ -86,7 +97,7 @@
+ 	)
+ '
+ 
+-test_expect_success PERL 'update git module' '
++test_expect_success 'update git module' '
+ 
+ 	(cd module-git &&
+ 	git config cvsimport.trackRevisions true &&
+@@ -97,7 +108,7 @@
+ 
+ '
+ 
+-test_expect_success PERL 'update has correct .git/cvs-revisions' '
++test_expect_success 'update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+@@ -105,7 +116,7 @@
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 
+ 	(cd module-cvs &&
+ 		echo 1 >tick &&
+@@ -114,7 +125,7 @@
+ 	)
+ '
+ 
+-test_expect_success PERL 'cvsimport.module config works' '
++test_expect_success 'cvsimport.module config works' '
+ 
+ 	(cd module-git &&
+ 		git config cvsimport.module module &&
+@@ -126,7 +137,7 @@
+ 
+ '
+ 
+-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
++test_expect_success 'second update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+@@ -135,7 +146,7 @@
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'import from a CVS working tree' '
++test_expect_success 'import from a CVS working tree' '
+ 
+ 	$CVS co -d import-from-wt module &&
+ 	(cd import-from-wt &&
+@@ -148,12 +159,12 @@
+ 
+ '
+ 
+-test_expect_success PERL 'no .git/cvs-revisions created by default' '
++test_expect_success 'no .git/cvs-revisions created by default' '
+ 
+ 	! test -e import-from-wt/.git/cvs-revisions
+ 
+ '
+ 
+-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
++test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
+ 
+ test_done
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.10.2.orig/t/t9601-cvsimport-vendor-branch.sh git-1.7.10.2/t/t9601-cvsimport-vendor-branch.sh
+--- git-1.7.10.2.orig/t/t9601-cvsimport-vendor-branch.sh	2012-05-11 20:25:45.000000000 +0000
++++ git-1.7.10.2/t/t9601-cvsimport-vendor-branch.sh	2012-05-20 04:16:31.260623323 +0000
+@@ -34,6 +34,17 @@
+ test_description='git cvsimport handling of vendor branches'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9601
+ 
+ test_expect_success PERL 'import a module with a vendor branch' '
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.10.2.orig/t/t9602-cvsimport-branches-tags.sh git-1.7.10.2/t/t9602-cvsimport-branches-tags.sh
+--- git-1.7.10.2.orig/t/t9602-cvsimport-branches-tags.sh	2012-05-11 20:25:45.000000000 +0000
++++ git-1.7.10.2/t/t9602-cvsimport-branches-tags.sh	2012-05-20 04:16:31.260623323 +0000
+@@ -6,6 +6,17 @@
+ test_description='git cvsimport handling of branches and tags'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9602
+ 
+ test_expect_success PERL 'import module' '
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.10.2.orig/t/t9603-cvsimport-patchsets.sh git-1.7.10.2/t/t9603-cvsimport-patchsets.sh
+--- git-1.7.10.2.orig/t/t9603-cvsimport-patchsets.sh	2012-05-11 20:25:45.000000000 +0000
++++ git-1.7.10.2/t/t9603-cvsimport-patchsets.sh	2012-05-20 04:16:31.260623323 +0000
+@@ -14,6 +14,17 @@
+ test_description='git cvsimport testing for correct patchset estimation'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9603
+ 
+ test_expect_failure 'import with criss cross times on revisions' '
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.10.2.orig/t/test-lib.sh git-1.7.10.2/t/test-lib.sh
+--- git-1.7.10.2.orig/t/test-lib.sh	2012-05-11 20:25:45.000000000 +0000
++++ git-1.7.10.2/t/test-lib.sh	2012-05-20 04:16:54.310680942 +0000
+@@ -616,6 +616,7 @@
+ esac
+ 
+ ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
++test -z "$NO_CVS" && test_set_prereq CVS
+ test -z "$NO_PERL" && test_set_prereq PERL
+ test -z "$NO_PYTHON" && test_set_prereq PYTHON
+ test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE

diff --git a/dev-vcs/git/files/git-1.7.11-optional-cvs.patch b/dev-vcs/git/files/git-1.7.11-optional-cvs.patch
new file mode 100644
index 0000000..fb95626
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.11-optional-cvs.patch
@@ -0,0 +1,400 @@
+From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@g.o>
+Date: Sat, 19 May 2012 20:16:01 +0200
+Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
+ utilities
+
+Forward-ported from 1.7.3.5 to current git.git master HEAD, commit
+9de96815493b577ae791d5113a3e354142ffbcae
+---
+ Makefile                           |   37 ++++++++++++++++++++++++--------
+ t/t9200-git-cvsexportcommit.sh     |    5 ++++
+ t/t9400-git-cvsserver-server.sh    |    8 ++++++-
+ t/t9401-git-cvsserver-crlf.sh      |   15 ++++++++----
+ t/t9600-cvsimport.sh               |   41 ++++++++++++++++++++++-------------
+ t/t9601-cvsimport-vendor-branch.sh |   11 +++++++++
+ t/t9602-cvsimport-branches-tags.sh |   11 +++++++++
+ t/t9603-cvsimport-patchsets.sh     |   11 +++++++++
+ t/test-lib.sh                      |    1 +
+ 9 files changed, 110 insertions(+), 30 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 96ebcf9..db74648 100644
+--- a/Makefile
++++ b/Makefile
+@@ -224,6 +224,8 @@ all::
+ #
+ # Define NO_TCLTK if you do not want Tcl/Tk GUI.
+ #
++# Define NO_CVS if you do not want any CVS interface utilities.
++#
+ # The TCL_PATH variable governs the location of the Tcl interpreter
+ # used to optimize git-gui for your system.  Only used if NO_TCLTK
+ # is not set.  Defaults to the bare 'tclsh'.
+@@ -401,6 +403,7 @@ LIB_OBJS =
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -441,18 +444,19 @@ SCRIPT_LIB += git-sh-i18n
+ SCRIPT_PERL += git-add--interactive.perl
+ SCRIPT_PERL += git-difftool.perl
+ SCRIPT_PERL += git-archimport.perl
+-SCRIPT_PERL += git-cvsexportcommit.perl
+-SCRIPT_PERL += git-cvsimport.perl
+-SCRIPT_PERL += git-cvsserver.perl
+ SCRIPT_PERL += git-relink.perl
+ SCRIPT_PERL += git-send-email.perl
+ SCRIPT_PERL += git-svn.perl
+ 
++SCRIPT_PERL_CVS += git-cvsexportcommit.perl
++SCRIPT_PERL_CVS += git-cvsimport.perl
++SCRIPT_PERL_CVS += git-cvsserver.perl
++
+ SCRIPT_PYTHON += git-remote-testgit.py
+ SCRIPT_PYTHON += git-p4.py
+ 
+ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
+-	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
++	  $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
+ 	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
+ 	  git-instaweb
+ 
+@@ -2012,13 +2016,25 @@ $(SCRIPT_LIB) : % : %.sh
+ 	$(QUIET_GEN)$(cmd_munge_script) && \
+ 	mv $@+ $@
+ 
++_SCRIPT_PERL_BUILD =
++_SCRIPT_PERL_NOBUILD =
++
+ ifndef NO_PERL
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
++
++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
++
++ifndef NO_CVS
++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
++else # NO_CVS
++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
++endif # NO_CVS
++
++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): perl/perl.mak
+ 
+ perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
+ 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
+ 
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ 	sed -e '1{' \
+@@ -2049,14 +2065,17 @@ git-instaweb: git-instaweb.sh gitweb
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ else # NO_PERL
+-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
++endif # NO_PERL
++
++# This is any perl scripts that were disabled it might be empty...
++$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
+ 	    unimplemented.sh >$@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+-endif # NO_PERL
+ 
+ ifndef NO_PYTHON
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS
+@@ -2091,7 +2110,7 @@ configure: configure.ac
+ # These can record GIT_VERSION
+ git.o git.spec \
+ 	$(patsubst %.sh,%,$(SCRIPT_SH)) \
+-	$(patsubst %.perl,%,$(SCRIPT_PERL)) \
++	$(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
+ 	: GIT-VERSION-FILE
+ 
+ TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
+diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
+index b59be9a..0cac2f6 100755
+--- a/t/t9200-git-cvsexportcommit.sh
++++ b/t/t9200-git-cvsexportcommit.sh
+@@ -12,6 +12,11 @@ if ! test_have_prereq PERL; then
+ 	test_done
+ fi
+ 
++if ! test_have_prereq CVS; then
++	skip_all='skipping git cvsexportcommit tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
+index 806623e..60ed038 100755
+--- a/t/t9400-git-cvsserver-server.sh
++++ b/t/t9400-git-cvsserver-server.sh
+@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
+ . ./test-lib.sh
+ 
+ if ! test_have_prereq PERL; then
+-	skip_all='skipping git cvsserver tests, perl not available'
++	skip_all='skipping git-cvsserver tests, perl not available'
+ 	test_done
+ fi
++
++if ! test_have_prereq CVS; then
++	skip_all='skipping git-cvsserver tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
+index ff6d6fb..f0d7aad 100755
+--- a/t/t9401-git-cvsserver-crlf.sh
++++ b/t/t9401-git-cvsserver-crlf.sh
+@@ -38,15 +38,20 @@ not_present() {
+     fi
+ }
+ 
+-cvs >/dev/null 2>&1
+-if test $? -ne 1
++if ! test_have_prereq PERL
+ then
+-    skip_all='skipping git-cvsserver tests, cvs not found'
++    skip_all='skipping git-cvsserver tests, perl not available'
+     test_done
+ fi
+-if ! test_have_prereq PERL
++if ! test_have_prereq CVS
+ then
+-    skip_all='skipping git-cvsserver tests, perl not available'
++    skip_all='skipping git-cvsserver tests, cvs not available'
++    test_done
++fi
++cvs >/dev/null 2>&1
++if test $? -ne 1
++then
++    skip_all='skipping git-cvsserver tests, cvs not found'
+     test_done
+ fi
+ "$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
+index 4c384ff..d601f32 100755
+--- a/t/t9600-cvsimport.sh
++++ b/t/t9600-cvsimport.sh
+@@ -3,14 +3,25 @@
+ test_description='git cvsimport basic tests'
+ . ./lib-cvs.sh
+ 
+-test_expect_success PERL 'setup cvsroot environment' '
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
++test_expect_success 'setup cvsroot environment' '
+ 	CVSROOT=$(pwd)/cvsroot &&
+ 	export CVSROOT
+ '
+ 
+-test_expect_success PERL 'setup cvsroot' '$CVS init'
++test_expect_success 'setup cvsroot' '$CVS init'
+ 
+-test_expect_success PERL 'setup a cvs module' '
++test_expect_success 'setup a cvs module' '
+ 
+ 	mkdir "$CVSROOT/module" &&
+ 	$CVS co -d module-cvs module &&
+@@ -42,23 +53,23 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'import a trivial module' '
++test_expect_success 'import a trivial module' '
+ 
+ 	git cvsimport -a -R -z 0 -C module-git module &&
+ 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+ 
+ '
+ 
+-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
++test_expect_success 'pack refs' '(cd module-git && git gc)'
+ 
+-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
++test_expect_success 'initial import has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 	(cd module-cvs &&
+ 	cat <<EOF >o_fortuna &&
+ O Fortune,
+@@ -86,7 +97,7 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'update git module' '
++test_expect_success 'update git module' '
+ 
+ 	(cd module-git &&
+ 	git config cvsimport.trackRevisions true &&
+@@ -97,7 +108,7 @@ test_expect_success PERL 'update git module' '
+ 
+ '
+ 
+-test_expect_success PERL 'update has correct .git/cvs-revisions' '
++test_expect_success 'update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+@@ -105,7 +116,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 
+ 	(cd module-cvs &&
+ 		echo 1 >tick &&
+@@ -114,7 +125,7 @@ test_expect_success PERL 'update cvs module' '
+ 	)
+ '
+ 
+-test_expect_success PERL 'cvsimport.module config works' '
++test_expect_success 'cvsimport.module config works' '
+ 
+ 	(cd module-git &&
+ 		git config cvsimport.module module &&
+@@ -126,7 +137,7 @@ test_expect_success PERL 'cvsimport.module config works' '
+ 
+ '
+ 
+-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
++test_expect_success 'second update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+@@ -135,7 +146,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'import from a CVS working tree' '
++test_expect_success 'import from a CVS working tree' '
+ 
+ 	$CVS co -d import-from-wt module &&
+ 	(cd import-from-wt &&
+@@ -148,12 +159,12 @@ test_expect_success PERL 'import from a CVS working tree' '
+ 
+ '
+ 
+-test_expect_success PERL 'no .git/cvs-revisions created by default' '
++test_expect_success 'no .git/cvs-revisions created by default' '
+ 
+ 	! test -e import-from-wt/.git/cvs-revisions
+ 
+ '
+ 
+-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
++test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
+ 
+ test_done
+diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
+index 827d39f..d730a41 100755
+--- a/t/t9601-cvsimport-vendor-branch.sh
++++ b/t/t9601-cvsimport-vendor-branch.sh
+@@ -34,6 +34,17 @@
+ test_description='git cvsimport handling of vendor branches'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9601
+ 
+ test_expect_success PERL 'import a module with a vendor branch' '
+diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
+index e1db323..68f0974 100755
+--- a/t/t9602-cvsimport-branches-tags.sh
++++ b/t/t9602-cvsimport-branches-tags.sh
+@@ -6,6 +6,17 @@
+ test_description='git cvsimport handling of branches and tags'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9602
+ 
+ test_expect_success PERL 'import module' '
+diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
+index 52034c8..db4d682 100755
+--- a/t/t9603-cvsimport-patchsets.sh
++++ b/t/t9603-cvsimport-patchsets.sh
+@@ -14,6 +14,17 @@
+ test_description='git cvsimport testing for correct patchset estimation'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9603
+ 
+ test_expect_failure 'import with criss cross times on revisions' '
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+index 9e2b711..0310fba 100644
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -616,6 +616,7 @@ case $(uname -s) in
+ esac
+ 
+ ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
++test -z "$NO_CVS" && test_set_prereq CVS
+ test -z "$NO_PERL" && test_set_prereq PERL
+ test -z "$NO_PYTHON" && test_set_prereq PYTHON
+ test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
+-- 
+1.7.4.1.343.ga91df.dirty
+

diff --git a/dev-vcs/git/files/git-1.7.2-always-install-js.patch b/dev-vcs/git/files/git-1.7.2-always-install-js.patch
new file mode 100644
index 0000000..fea661b
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.2-always-install-js.patch
@@ -0,0 +1,31 @@
+diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.2.orig/Makefile git-1.7.2/Makefile
+--- git-1.7.2.orig/Makefile	2010-07-21 21:35:25.000000000 +0000
++++ git-1.7.2/Makefile	2010-07-22 16:52:22.994872806 +0000
+@@ -1650,17 +1650,16 @@
+ 	$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
+ 
+ ifdef JSMIN
+-GITWEB_PROGRAMS += gitweb/static/gitweb.min.js
+ GITWEB_JS = gitweb/static/gitweb.min.js
+ else
+ GITWEB_JS = gitweb/static/gitweb.js
+ endif
+ ifdef CSSMIN
+-GITWEB_PROGRAMS += gitweb/static/gitweb.min.css
+ GITWEB_CSS = gitweb/static/gitweb.min.css
+ else
+ GITWEB_CSS = gitweb/static/gitweb.css
+ endif
++GITWEB_PROGRAMS += $(GITWEB_JS) $(GITWEB_CSS)
+ OTHER_PROGRAMS +=  gitweb/gitweb.cgi  $(GITWEB_PROGRAMS)
+ gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS)
+ 	$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)
+@@ -1675,7 +1674,7 @@
+ endif # CSSMIN
+ 
+ 
+-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js
++git-instaweb: git-instaweb.sh gitweb/gitweb.cgi $(GITWEB_CSS) $(GITWEB_JS)
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ 	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \

diff --git a/dev-vcs/git/files/git-1.7.3.2-interix.patch b/dev-vcs/git/files/git-1.7.3.2-interix.patch
new file mode 100644
index 0000000..2e333b5
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.3.2-interix.patch
@@ -0,0 +1,90 @@
+upstream report: http://marc.info/?l=git&m=128774216918941&w=2
+
+diff -ru git-1.7.3.1.orig/Makefile git-1.7.3.1/Makefile
+--- git-1.7.3.1.orig/Makefile	2010-10-22 10:58:17 +0200
++++ git-1.7.3.1/Makefile	2010-10-22 11:17:28 +0200
+@@ -1091,6 +1091,25 @@
+ endif
+ 	X = .exe
+ endif
++ifeq ($(uname_S),Interix)
++	NO_SYS_POLL_H = YesPlease
++	NO_INTTYPES_H = YesPlease
++	NO_INITGROUPS = YesPlease
++	NO_IPV6 = YesPlease
++	NO_MEMMEM = YesPlease
++	NO_MKDTEMP = YesPlease
++	NO_STRTOUMAX = YesPlease
++	NO_NSEC = YesPlease
++	NO_MKSTEMPS = YesPlease
++	ifeq ($(uname_R),3.5)
++		NO_INET_NTOP = YesPlease
++		NO_INET_PTON = YesPlease
++	endif
++	ifeq ($(uname_R),5.2)
++		NO_INET_NTOP = YesPlease
++		NO_INET_PTON = YesPlease
++	endif
++endif
+ ifneq (,$(findstring MINGW,$(uname_S)))
+ 	pathsep = ;
+ 	NO_PREAD = YesPlease
+@@ -1354,6 +1373,15 @@
+ ifdef NO_SYS_SELECT_H
+ 	BASIC_CFLAGS += -DNO_SYS_SELECT_H
+ endif
++ifdef NO_SYS_POLL_H
++	BASIC_CFLAGS += -DNO_SYS_POLL_H
++endif
++ifdef NO_INTTYPES_H
++	BASIC_CFLAGS += -DNO_INTTYPES_H
++endif
++ifdef NO_INITGROUPS
++	BASIC_CFLAGS += -DNO_INITGROUPS
++endif
+ ifdef NO_MMAP
+ 	COMPAT_CFLAGS += -DNO_MMAP
+ 	COMPAT_OBJS += compat/mmap.o
+diff -ru git-1.7.3.1.orig/daemon.c git-1.7.3.1/daemon.c
+--- git-1.7.3.1.orig/daemon.c	2010-10-22 10:58:11 +0200
++++ git-1.7.3.1/daemon.c	2010-10-22 11:10:21 +0200
+@@ -956,7 +956,11 @@
+ 		    listen_addr, listen_port);
+ 
+ 	if (pass && gid &&
+-	    (initgroups(pass->pw_name, gid) || setgid (gid) ||
++	    (
++#ifndef NO_INITGROUPS
++            initgroups(pass->pw_name, gid) || 
++#endif
++         setgid (gid) ||
+ 	     setuid(pass->pw_uid)))
+ 		die("cannot drop privileges");
+ 
+diff -ru git-1.7.3.1.orig/git-compat-util.h git-1.7.3.1/git-compat-util.h
+--- git-1.7.3.1.orig/git-compat-util.h	2010-10-22 10:58:16 +0200
++++ git-1.7.3.1/git-compat-util.h	2010-10-22 11:12:22 +0200
+@@ -94,7 +94,11 @@
+ #include <utime.h>
+ #ifndef __MINGW32__
+ #include <sys/wait.h>
++#ifndef NO_SYS_POLL_H
+ #include <sys/poll.h>
++#else
++#include <poll.h>
++#endif
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <termios.h>
+@@ -106,7 +110,11 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <pwd.h>
++#ifndef NO_INTTYPES_H
+ #include <inttypes.h>
++#else
++#include <stdint.h>
++#endif
+ #if defined(__CYGWIN__)
+ #undef _XOPEN_SOURCE
+ #include <grp.h>

diff --git a/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch b/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch
new file mode 100644
index 0000000..993f516
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch
@@ -0,0 +1,26 @@
+Fix false positives in t3404 due to SHELL=/bin/false
+
+If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's
+package building), the git-rebase exec tests will fail, because they call
+$SHELL around the command, and in the existing testcase, $SHELL was not being
+cleared sufficently.
+
+This lead to false positive failures of t3404 on systems where the package
+build user was locked down as noted above.
+
+Signed-off-by: Robin H. Johnson <robbat2@g.o>
+
+diff -Nuar git-1.7.3.4.orig/t/t3404-rebase-interactive.sh git-1.7.3.4/t/t3404-rebase-interactive.sh
+--- git-1.7.3.4.orig/t/t3404-rebase-interactive.sh	2010-12-16 02:52:11.000000000 +0000
++++ git-1.7.3.4/t/t3404-rebase-interactive.sh	2010-12-26 22:30:47.826421313 +0000
+@@ -67,8 +67,8 @@
+ # "exec" commands are ran with the user shell by default, but this may
+ # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
+ # to create a file. Unseting SHELL avoids such non-portable behavior
+-# in tests.
+-SHELL=
++# in tests. It must be exported for it to take effect where needed.
++export SHELL=
+ 
+ test_expect_success 'rebase -i with the exec command' '
+ 	git checkout master &&

diff --git a/dev-vcs/git/files/git-1.7.3.4-fix-perl-test-prereq.patch b/dev-vcs/git/files/git-1.7.3.4-fix-perl-test-prereq.patch
new file mode 100644
index 0000000..90a7589
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.3.4-fix-perl-test-prereq.patch
@@ -0,0 +1,37 @@
+From e8725dd4b11c487c138ff0b68cd647265f24a105 Mon Sep 17 00:00:00 2001
+From: Robin H. Johnson <robbat2@g.o>
+Date: Wed, 29 Dec 2010 20:59:22 +0000
+Subject: [PATCH] t9001: Fix test prerequisites
+
+Add in missing Perl prerequisites for new tests of send-email.
+
+Signed-off-by: Robin H. Johnson <robbat2@g.o>
+---
+ t/t9001-send-email.sh |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
+index 1dc4a92..3271426 100755
+--- a/t/t9001-send-email.sh
++++ b/t/t9001-send-email.sh
+@@ -1135,7 +1135,7 @@ test_expect_success $PREREQ '--8bit-encoding also treats subject' '
+ # Note that the patches in this test are deliberately out of order; we
+ # want to make sure it works even if the cover-letter is not in the
+ # first mail.
+-test_expect_success 'refusing to send cover letter template' '
++test_expect_success $PREREQ 'refusing to send cover letter template' '
+ 	clean_fake_sendmail &&
+ 	rm -fr outdir &&
+ 	git format-patch --cover-letter -2 -o outdir &&
+@@ -1151,7 +1151,7 @@ test_expect_success 'refusing to send cover letter template' '
+ 	test -z "$(ls msgtxt*)"
+ '
+ 
+-test_expect_success '--force sends cover letter template anyway' '
++test_expect_success $PREREQ '--force sends cover letter template anyway' '
+ 	clean_fake_sendmail &&
+ 	rm -fr outdir &&
+ 	git format-patch --cover-letter -2 -o outdir &&
+-- 
+1.7.3.2
+

diff --git a/dev-vcs/git/files/git-1.7.3.5-optional-cvs.patch b/dev-vcs/git/files/git-1.7.3.5-optional-cvs.patch
new file mode 100644
index 0000000..f55b4ec
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.3.5-optional-cvs.patch
@@ -0,0 +1,366 @@
+--- git-1.7.3.5.orig/Makefile	2011-01-06 20:32:54.512331834 +0000
++++ git-1.7.3.5/Makefile	2011-01-07 08:22:04.682967076 +0000
+@@ -183,6 +183,8 @@ all::
+ #
+ # Define NO_TCLTK if you do not want Tcl/Tk GUI.
+ #
++# Define NO_CVS if you do not want any CVS interface utilities.
++#
+ # The TCL_PATH variable governs the location of the Tcl interpreter
+ # used to optimize git-gui for your system.  Only used if NO_TCLTK
+ # is not set.  Defaults to the bare 'tclsh'.
+@@ -339,6 +341,7 @@ LIB_OBJS =
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -376,17 +379,18 @@ SCRIPT_LIB += git-sh-setup
+ SCRIPT_PERL += git-add--interactive.perl
+ SCRIPT_PERL += git-difftool.perl
+ SCRIPT_PERL += git-archimport.perl
+-SCRIPT_PERL += git-cvsexportcommit.perl
+-SCRIPT_PERL += git-cvsimport.perl
+-SCRIPT_PERL += git-cvsserver.perl
+ SCRIPT_PERL += git-relink.perl
+ SCRIPT_PERL += git-send-email.perl
+ SCRIPT_PERL += git-svn.perl
+ 
++SCRIPT_PERL_CVS += git-cvsexportcommit.perl
++SCRIPT_PERL_CVS += git-cvsimport.perl
++SCRIPT_PERL_CVS += git-cvsserver.perl
++
+ SCRIPT_PYTHON += git-remote-testgit.py
+ 
+ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
+-	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
++	  $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
+ 	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
+ 	  git-instaweb
+ 
+@@ -1676,13 +1680,25 @@ $(SCRIPT_LIB) : % : %.sh
+ 	$(QUIET_GEN)$(cmd_munge_script) && \
+ 	mv $@+ $@
+ 
++_SCRIPT_PERL_BUILD = 
++_SCRIPT_PERL_NOBUILD = 
++
+ ifndef NO_PERL
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
++
++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
++
++ifndef NO_CVS
++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
++else # NO_CVS
++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
++endif # NO_CVS
++
++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): perl/perl.mak
+ 
+ perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
+ 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
+ 
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ 	sed -e '1{' \
+@@ -1738,14 +1754,17 @@ git-instaweb: git-instaweb.sh gitweb/git
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ else # NO_PERL
+-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
++endif # NO_PERL
++
++# This is any perl scripts that were disabled it might be empty...
++$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
+ 	    unimplemented.sh >$@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+-endif # NO_PERL
+ 
+ ifndef NO_PYTHON
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS
+@@ -1780,7 +1799,7 @@ configure: configure.ac
+ # These can record GIT_VERSION
+ git.o git.spec \
+ 	$(patsubst %.sh,%,$(SCRIPT_SH)) \
+-	$(patsubst %.perl,%,$(SCRIPT_PERL)) \
++	$(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
+ 	: GIT-VERSION-FILE
+ 
+ TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
+diff -Nuarp git-1.7.3.5.orig/t/t9200-git-cvsexportcommit.sh git-1.7.3.5/t/t9200-git-cvsexportcommit.sh
+--- git-1.7.3.5.orig/t/t9200-git-cvsexportcommit.sh	2011-01-06 00:08:33.000000000 +0000
++++ git-1.7.3.5/t/t9200-git-cvsexportcommit.sh	2011-01-07 08:41:46.478972459 +0000
+@@ -12,6 +12,11 @@ if ! test_have_prereq PERL; then
+ 	test_done
+ fi
+ 
++if ! test_have_prereq CVS; then
++	skip_all='skipping git cvsexportcommit tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff -Nuarp git-1.7.3.5.orig/t/t9400-git-cvsserver-server.sh git-1.7.3.5/t/t9400-git-cvsserver-server.sh
+--- git-1.7.3.5.orig/t/t9400-git-cvsserver-server.sh	2011-01-06 00:08:33.000000000 +0000
++++ git-1.7.3.5/t/t9400-git-cvsserver-server.sh	2011-01-07 08:42:28.033449530 +0000
+@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
+ . ./test-lib.sh
+ 
+ if ! test_have_prereq PERL; then
+-	skip_all='skipping git cvsserver tests, perl not available'
++	skip_all='skipping git-cvsserver tests, perl not available'
+ 	test_done
+ fi
++
++if ! test_have_prereq CVS; then
++	skip_all='skipping git-cvsserver tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff -Nuarp git-1.7.3.5.orig/t/t9401-git-cvsserver-crlf.sh git-1.7.3.5/t/t9401-git-cvsserver-crlf.sh
+--- git-1.7.3.5.orig/t/t9401-git-cvsserver-crlf.sh	2011-01-06 00:08:33.000000000 +0000
++++ git-1.7.3.5/t/t9401-git-cvsserver-crlf.sh	2011-01-07 08:42:59.907660136 +0000
+@@ -38,15 +38,20 @@ not_present() {
+     fi
+ }
+ 
+-cvs >/dev/null 2>&1
+-if test $? -ne 1
++if ! test_have_prereq PERL
+ then
+-    skip_all='skipping git-cvsserver tests, cvs not found'
++    skip_all='skipping git-cvsserver tests, perl not available'
+     test_done
+ fi
+-if ! test_have_prereq PERL
++if ! test_have_prereq CVS
+ then
+-    skip_all='skipping git-cvsserver tests, perl not available'
++    skip_all='skipping git-cvsserver tests, cvs not available'
++    test_done
++fi
++cvs >/dev/null 2>&1
++if test $? -ne 1
++then
++    skip_all='skipping git-cvsserver tests, cvs not found'
+     test_done
+ fi
+ "$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff -Nuarp git-1.7.3.5.orig/t/t9600-cvsimport.sh git-1.7.3.5/t/t9600-cvsimport.sh
+--- git-1.7.3.5.orig/t/t9600-cvsimport.sh	2011-01-06 00:08:33.000000000 +0000
++++ git-1.7.3.5/t/t9600-cvsimport.sh	2011-01-07 08:44:34.960276512 +0000
+@@ -3,14 +3,25 @@
+ test_description='git cvsimport basic tests'
+ . ./lib-cvs.sh
+ 
+-test_expect_success PERL 'setup cvsroot environment' '
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
++test_expect_success 'setup cvsroot environment' '
+ 	CVSROOT=$(pwd)/cvsroot &&
+ 	export CVSROOT
+ '
+ 
+-test_expect_success PERL 'setup cvsroot' '$CVS init'
++test_expect_success 'setup cvsroot' '$CVS init'
+ 
+-test_expect_success PERL 'setup a cvs module' '
++test_expect_success 'setup a cvs module' '
+ 
+ 	mkdir "$CVSROOT/module" &&
+ 	$CVS co -d module-cvs module &&
+@@ -42,23 +53,23 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'import a trivial module' '
++test_expect_success 'import a trivial module' '
+ 
+ 	git cvsimport -a -R -z 0 -C module-git module &&
+ 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+ 
+ '
+ 
+-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
++test_expect_success 'pack refs' '(cd module-git && git gc)'
+ 
+-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
++test_expect_success 'initial import has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 	(cd module-cvs &&
+ 	cat <<EOF >o_fortuna &&
+ O Fortune,
+@@ -86,7 +97,7 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'update git module' '
++test_expect_success 'update git module' '
+ 
+ 	(cd module-git &&
+ 	git cvsimport -a -R -z 0 module &&
+@@ -96,7 +107,7 @@ test_expect_success PERL 'update git mod
+ 
+ '
+ 
+-test_expect_success PERL 'update has correct .git/cvs-revisions' '
++test_expect_success 'update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+@@ -104,7 +115,7 @@ test_expect_success PERL 'update has cor
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 
+ 	(cd module-cvs &&
+ 		echo 1 >tick &&
+@@ -113,7 +124,7 @@ test_expect_success PERL 'update cvs mod
+ 	)
+ '
+ 
+-test_expect_success PERL 'cvsimport.module config works' '
++test_expect_success 'cvsimport.module config works' '
+ 
+ 	(cd module-git &&
+ 		git config cvsimport.module module &&
+@@ -124,7 +135,7 @@ test_expect_success PERL 'cvsimport.modu
+ 
+ '
+ 
+-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
++test_expect_success 'second update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+@@ -133,7 +144,7 @@ test_expect_success PERL 'second update
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'import from a CVS working tree' '
++test_expect_success 'import from a CVS working tree' '
+ 
+ 	$CVS co -d import-from-wt module &&
+ 	(cd import-from-wt &&
+@@ -145,12 +156,12 @@ test_expect_success PERL 'import from a
+ 
+ '
+ 
+-test_expect_success PERL 'no .git/cvs-revisions created by default' '
++test_expect_success 'no .git/cvs-revisions created by default' '
+ 
+ 	! test -e import-from-wt/.git/cvs-revisions
+ 
+ '
+ 
+-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
++test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
+ 
+ test_done
+diff -Nuarp git-1.7.3.5.orig/t/t9601-cvsimport-vendor-branch.sh git-1.7.3.5/t/t9601-cvsimport-vendor-branch.sh
+--- git-1.7.3.5.orig/t/t9601-cvsimport-vendor-branch.sh	2011-01-06 00:08:33.000000000 +0000
++++ git-1.7.3.5/t/t9601-cvsimport-vendor-branch.sh	2011-01-07 08:45:11.251279877 +0000
+@@ -34,6 +34,17 @@
+ test_description='git cvsimport handling of vendor branches'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9601
+ 
+ test_expect_success PERL 'import a module with a vendor branch' '
+diff -Nuarp git-1.7.3.5.orig/t/t9602-cvsimport-branches-tags.sh git-1.7.3.5/t/t9602-cvsimport-branches-tags.sh
+--- git-1.7.3.5.orig/t/t9602-cvsimport-branches-tags.sh	2011-01-06 00:08:33.000000000 +0000
++++ git-1.7.3.5/t/t9602-cvsimport-branches-tags.sh	2011-01-07 08:45:17.234778646 +0000
+@@ -6,6 +6,17 @@
+ test_description='git cvsimport handling of branches and tags'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9602
+ 
+ test_expect_success PERL 'import module' '
+diff -Nuarp git-1.7.3.5.orig/t/t9603-cvsimport-patchsets.sh git-1.7.3.5/t/t9603-cvsimport-patchsets.sh
+--- git-1.7.3.5.orig/t/t9603-cvsimport-patchsets.sh	2011-01-06 00:08:33.000000000 +0000
++++ git-1.7.3.5/t/t9603-cvsimport-patchsets.sh	2011-01-07 08:45:24.371642637 +0000
+@@ -14,6 +14,17 @@
+ test_description='git cvsimport testing for correct patchset estimation'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9603
+ 
+ test_expect_failure 'import with criss cross times on revisions' '
+diff -Nuarp git-1.7.3.5.orig/t/test-lib.sh git-1.7.3.5/t/test-lib.sh
+--- git-1.7.3.5.orig/t/test-lib.sh	2011-01-06 00:08:33.000000000 +0000
++++ git-1.7.3.5/t/test-lib.sh	2011-01-07 08:40:05.006179654 +0000
+@@ -1015,6 +1015,7 @@ case $(uname -s) in
+ 	;;
+ esac
+ 
++test -z "$NO_CVS" && test_set_prereq CVS
+ test -z "$NO_PERL" && test_set_prereq PERL
+ test -z "$NO_PYTHON" && test_set_prereq PYTHON
+ 

diff --git a/dev-vcs/git/files/git-1.7.5-interix.patch b/dev-vcs/git/files/git-1.7.5-interix.patch
new file mode 100644
index 0000000..6eaaf65
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.5-interix.patch
@@ -0,0 +1,43 @@
+reported upstream: http://thread.gmane.org/gmane.comp.version-control.git/174407/focus=174438
+
+diff -ru git-1.7.5.rc3.orig/Makefile git-1.7.5.rc3/Makefile
+--- git-1.7.5.rc3.orig/Makefile	2011-05-27 08:40:59 +0200
++++ git-1.7.5.rc3/Makefile	2011-05-27 09:00:58 +0200
+@@ -1121,8 +1121,6 @@
+ 	X = .exe
+ endif
+ ifeq ($(uname_S),Interix)
+-	NO_SYS_POLL_H = YesPlease
+-	NO_INTTYPES_H = YesPlease
+ 	NO_INITGROUPS = YesPlease
+ 	NO_IPV6 = YesPlease
+ 	NO_MEMMEM = YesPlease
+@@ -1133,10 +1131,14 @@
+ 	ifeq ($(uname_R),3.5)
+ 		NO_INET_NTOP = YesPlease
+ 		NO_INET_PTON = YesPlease
++		NO_SOCKADDR_STORAGE = YesPlease
++		NO_FNMATCH_CASEFOLD = YesPlease
+ 	endif
+ 	ifeq ($(uname_R),5.2)
+ 		NO_INET_NTOP = YesPlease
+ 		NO_INET_PTON = YesPlease
++		NO_SOCKADDR_STORAGE = YesPlease
++		NO_FNMATCH_CASEFOLD = YesPlease
+ 	endif
+ endif
+ ifneq (,$(findstring MINGW,$(uname_S)))
+diff -ru git-1.7.5.rc3.orig/compat/fnmatch/fnmatch.c git-1.7.5.rc3/compat/fnmatch/fnmatch.c
+--- git-1.7.5.rc3.orig/compat/fnmatch/fnmatch.c	2011-05-27 08:40:57 +0200
++++ git-1.7.5.rc3/compat/fnmatch/fnmatch.c	2011-05-27 09:01:47 +0200
+@@ -127,6 +127,10 @@
+ extern int errno;
+ # endif
+ 
++# ifndef NULL
++#  define NULL 0
++# endif
++
+ /* This function doesn't exist on most systems.  */
+ 
+ # if !defined HAVE___STRCHRNUL && !defined _LIBC

diff --git a/dev-vcs/git/files/git-1.7.6-interix.patch b/dev-vcs/git/files/git-1.7.6-interix.patch
new file mode 100644
index 0000000..575b0e3
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.6-interix.patch
@@ -0,0 +1,29 @@
+reported upstream: http://thread.gmane.org/gmane.comp.version-control.git/174407/focus=174438
+
+diff -ru git-1.7.5.rc3.orig/Makefile git-1.7.5.rc3/Makefile
+--- git-1.7.5.rc3.orig/Makefile	2011-05-27 08:40:59 +0200
++++ git-1.7.5.rc3/Makefile	2011-05-27 09:00:58 +0200
+@@ -1121,8 +1121,6 @@
+ 	X = .exe
+ endif
+ ifeq ($(uname_S),Interix)
+-	NO_SYS_POLL_H = YesPlease
+-	NO_INTTYPES_H = YesPlease
+ 	NO_INITGROUPS = YesPlease
+ 	NO_IPV6 = YesPlease
+ 	NO_MEMMEM = YesPlease
+@@ -1133,10 +1131,14 @@
+ 	ifeq ($(uname_R),3.5)
+ 		NO_INET_NTOP = YesPlease
+ 		NO_INET_PTON = YesPlease
++		NO_SOCKADDR_STORAGE = YesPlease
++		NO_FNMATCH_CASEFOLD = YesPlease
+ 	endif
+ 	ifeq ($(uname_R),5.2)
+ 		NO_INET_NTOP = YesPlease
+ 		NO_INET_PTON = YesPlease
++		NO_SOCKADDR_STORAGE = YesPlease
++		NO_FNMATCH_CASEFOLD = YesPlease
+ 	endif
+ endif
+ ifneq (,$(findstring MINGW,$(uname_S)))

diff --git a/dev-vcs/git/files/git-1.7.8-git-svn-1.7-canonical-path.patch b/dev-vcs/git/files/git-1.7.8-git-svn-1.7-canonical-path.patch
new file mode 100644
index 0000000..5b169a1
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.8-git-svn-1.7-canonical-path.patch
@@ -0,0 +1,63 @@
+diff --git a/git-svn.perl b/git-svn.perl
+index eeb83d3..ae77c6a 100755
+--- a/git-svn.perl
++++ b/git-svn.perl
+@@ -1248,6 +1248,7 @@ sub canonicalize_path {
+ 	$path =~ s#^\./## if $dot_slash_added;
+ 	$path =~ s#^/##;
+ 	$path =~ s#^\.$##;
++	#$path =~ s# #%20#;
+ 	return $path;
+ }
+ 
+@@ -2134,6 +2135,7 @@ sub fetch_all {
+ 	             die "[svn-remote \"$repo_id\"] unknown\n";
+ 	my $fetch = $remote->{fetch};
+ 	my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
++	#$url = main::canonicalize_url($url);
+ 	my (@gs, @globs);
+ 	my $ra = Git::SVN::Ra->new($url);
+ 	my $uuid = $ra->get_uuid;
+@@ -2285,6 +2287,7 @@ sub find_existing_remote {
+ 
+ sub init_remote_config {
+ 	my ($self, $url, $no_write) = @_;
++	#$url = main::canonicalize_url($url);
+ 	$url =~ s!/+$!!; # strip trailing slash
+ 	my $r = read_all_remotes();
+ 	my $existing = find_existing_remote($url, $r);
+@@ -2325,6 +2328,7 @@ sub init_remote_config {
+ 			command_oneline('config', '--get',
+ 					"svn-remote.$self->{repo_id}.url")
+ 		};
++		#$orig_url = main::canonicalize_url($orig_url);
+ 		if ($orig_url && ($orig_url ne $url)) {
+ 			die "svn-remote.$self->{repo_id}.url already set: ",
+ 			    "$orig_url\nwanted to set to: $url\n";
+@@ -2446,6 +2450,8 @@ sub new {
+                   die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
+ 	$self->{pushurl} = eval { command_oneline('config', '--get',
+ 	                          "svn-remote.$repo_id.pushurl") };
++	#$self->{url} = main::canonicalize_url($self->{url});
++	#$self->{pushurl} = main::canonicalize_url($self->{pushurl}) if defined $self->{pushurl};
+ 	$self->rebuild;
+ 	$self;
+ }
+@@ -6475,6 +6481,7 @@ sub migrate_from_v1 {
+ 		next unless -f "$git_dir/$x/info/url";
+ 		my $u = eval { ::file_to_s("$git_dir/$x/info/url") };
+ 		next unless $u;
++		#$u = main::canonicalize_url($u);
+ 		my $dn = dirname("$git_dir/svn/$x");
+ 		mkpath([$dn]) unless -d $dn;
+ 		if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
+@@ -6509,7 +6516,8 @@ sub read_old_urls {
+ 			$pfx .= '/' if $pfx && $pfx !~ m!/$!;
+ 			my $ref_id = $pfx . basename $_;
+ 			my $url = ::file_to_s("$_/info/url");
+-			$l_map->{$ref_id} = $url;
++			$l_map->{$ref_id} = $url;
++			#$l_map->{$ref_id} = main::canonicalize_url($url);
+ 		} elsif (-d $_) {
+ 			push @dir, $_;
+ 		}

diff --git a/dev-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd
new file mode 100644
index 0000000..75b4216
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.confd
@@ -0,0 +1,19 @@
+# conf.d file for git-daemon
+#
+# Please check man 1 git-daemon for more information about the options
+# git-daemon accepts. You MUST edit this to include your repositories you wish
+# to serve.
+#
+# Some of the meaningful options are:
+#   --syslog      --- Enables syslog logging
+#   --verbose     --- Enables verbose logging
+#   --export-all  --- Exports all repositories
+#   --port=XXXX   --- Starts in port XXXX instead of 9418
+#
+GITDAEMON_OPTS="--syslog /var/git"
+
+# To run an anonymous git safely, the following user should be able to only
+# read your Git repositories. It should not able able to write to anywhere on
+# your system, esp. not the repositories.
+GIT_USER="nobody"
+GIT_GROUP="nobody"

diff --git a/dev-vcs/git/files/git-daemon.initd b/dev-vcs/git/files/git-daemon.initd
new file mode 100644
index 0000000..c6ee19f
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.initd
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $
+
+PIDFILE=/var/run/git-daemon.pid
+
+depend() {
+	need net
+	use logger
+}
+
+start() {
+	[ -e /lib/librc.so ] || BL1_COMPAT="--name git-daemon"
+	ebegin "Starting git-daemon"
+		start-stop-daemon --start --quiet --background \
+		--pidfile ${PIDFILE} ${BL1_COMPAT} \
+		--exec /usr/bin/git -- daemon \
+			--pid-file=${PIDFILE} \
+			--user=${GIT_USER} --group=${GIT_GROUP} \
+			${GITDAEMON_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping git-daemon"
+		start-stop-daemon --stop --quiet \
+		--pidfile ${PIDFILE}
+	eend $?
+}

diff --git a/dev-vcs/git/files/git-daemon.xinetd b/dev-vcs/git/files/git-daemon.xinetd
new file mode 100644
index 0000000..02c938d
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.xinetd
@@ -0,0 +1,13 @@
+service git-daemon
+{
+	disable		= yes
+	socket_type	= stream
+	wait		= no
+	user		= nobody
+	type		= UNLISTED
+	protocol	= tcp
+	log_on_failure	+= USERID
+	port		= 9418
+	server		= /usr/bin/git
+	server_args	= daemon --inetd --syslog --export-all --base-path=/var/git
+}

diff --git a/dev-vcs/git/git-1.6.4.5.ebuild b/dev-vcs/git/git-1.6.4.5.ebuild
new file mode 100644
index 0000000..63ce7fa
--- /dev/null
+++ b/dev-vcs/git/git-1.6.4.5.ebuild
@@ -0,0 +1,381 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.5.ebuild,v 1.10 2011/04/04 08:58:41 pacho Exp $
+
+EAPI=2
+
+GENTOO_DEPEND_ON_PERL=no
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+[ "$PV" == "9999" ] && inherit git
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [ "$PV" != "9999" ]; then
+	SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
+			mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
+			doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
+else
+	SRC_URI=""
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	dev-libs/openssl
+	sys-libs/zlib
+	app-arch/cpio
+	perl?   ( dev-lang/perl[-build] )
+	tk?     ( dev-lang/tk )
+	curl?   (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	)"
+
+DEPEND="${CDEPEND}"
+
+# These are needed to build the docs
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		doc?    (
+			app-text/asciidoc
+			app-text/xmlto
+			app-text/docbook2X
+		)"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if ! use perl ; then
+		use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
+		use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
+		use subversion && ewarn "git-svn needs USE=perl, it won't work"
+	fi
+	if use webdav && ! use curl ; then
+		ewarn "USE=webdav needs USE=curl. Ignoring"
+	fi
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use mozsha1 ; then
+		myopts="${myopts} MOZILLA_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [ "${PV}" != "9999" ]; then
+		unpack ${MY_P}.tar.bz2
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.bz2
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
+		cd "${S}"
+	else
+		git_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# Noperl is being merged to upstream as of 2009/04/05
+	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
+
+	# GetOpt-Long v2.38 is strict
+	# Merged in 1.6.3 final 2009/05/07
+	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
+
+	# CVE-2010-3906: XSS in gitweb
+	# applied upstream
+	#epatch "${FILESDIR}"/git-1.6.4.5-gitweb-cve-2010-3906.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		Makefile || die "sed failed"
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+}
+
+git_emake() {
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix=/usr \
+		htmldir=/usr/share/doc/${PF}/html \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	if [[ "$PV" == "9999" ]] && use doc; then
+		cd Documentation
+		git_emake man info html \
+			|| die "emake man html info failed"
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+
+	dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# svnimport - use git-svn
+	# p4import - excluded because fast-import has a better one
+	# examples - these are stuff that is not used in Git anymore actually
+	# patches - stuff the Git guys made to go upstream to other places
+	for i in continuous fast-import hg-to-git \
+		hooks remotes2config.sh stats \
+		workdir convert-objects blameview ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${D}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		dodir /usr/share/${PN}/gitweb
+		insinto /usr/share/${PN}/gitweb
+		doins "${S}"/gitweb/gitweb.cgi
+		doins "${S}"/gitweb/gitweb.css
+		doins "${S}"/gitweb/git-{favicon,logo}.png
+
+		# Make sure it can run
+		fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${D}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	fi
+	if ! use subversion ; then
+		rm -f "${D}"/usr/libexec/git-core/git-svn \
+			"${D}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		# Bug #225601 - t0004 is not suitable for root perm
+		# Bug #219839 - t1004 is not suitable for root perm
+		# Bug #288575 - t3700 is not suitable for root perm
+		# Bug #288575 - t7300 is not suitable for root perm
+		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh
+		t3700-add.sh t7300-clean.sh"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+	cd "${S}"
+	# Now run the tests
+	einfo "Start test run"
+	git_emake \
+		test || die "tests failed"
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
+		ewarn "You must build dev-vcs/subversion with USE=perl"
+		ewarn "to get the full functionality of git-svn!"
+	fi
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

diff --git a/dev-vcs/git/git-1.7.2.5.ebuild b/dev-vcs/git/git-1.7.2.5.ebuild
new file mode 100644
index 0000000..1e7fa9b
--- /dev/null
+++ b/dev-vcs/git/git-1.7.2.5.ebuild
@@ -0,0 +1,470 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.5.ebuild,v 1.13 2011/08/19 18:43:47 darkside Exp $
+
+EAPI=3
+
+GENTOO_DEPEND_ON_PERL=no
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+[ "$PV" == "9999" ] && inherit git
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [ "$PV" != "9999" ]; then
+	SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
+			mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
+			doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!blksha1? ( dev-libs/openssl )
+	sys-libs/zlib
+	perl?   ( dev-lang/perl[-build] )
+	tk?     ( dev-lang/tk )
+	curl?   (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	)"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc?    (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+	)"
+
+# Live ebuild builds HTML docs, additionally
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		doc?    (
+			app-text/xmlto
+		)"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if ! use perl ; then
+		use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
+		use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
+		use subversion && ewarn "git-svn needs USE=perl, it won't work"
+	fi
+	if use webdav && ! use curl ; then
+		ewarn "USE=webdav needs USE=curl. Ignoring"
+	fi
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
+	#	|| myopts="${myopts} NO_ICONV=YesPlease"
+	# because, above, we need to do this unconditionally (no "&& use iconv")
+	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == *-interix* ]] ; then
+		myopts="${myopts} NO_IPV6=YesPlease"
+		myopts="${myopts} NO_MEMMEM=YesPlease"
+		myopts="${myopts} NO_MKDTEMP=YesPlease"
+		myopts="${myopts} NO_STRTOUMAX=YesPlease"
+		myopts="${myopts} NO_STRTOULL=YesPlease"
+		myopts="${myopts} NO_INET_NTOP=YesPlease"
+		myopts="${myopts} NO_INET_PTON=YesPlease"
+		myopts="${myopts} NO_NSEC=YesPlease"
+		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [ "${PV}" != "9999" ]; then
+		unpack ${MY_P}.tar.bz2
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.bz2
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
+		cd "${S}"
+	else
+		git_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# Noperl is being merged to upstream as of 2009/04/05
+	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
+
+	# GetOpt-Long v2.38 is strict
+	# Merged in 1.6.3 final 2009/05/07
+	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
+
+	# JS install fixup
+	epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
+
+	# USE=-iconv causes segfaults, fixed post 1.7.1
+	# Gentoo bug #321895
+	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+
+	# CVE-2010-3906: XSS in gitweb
+	# applied upstream
+	#epatch "${FILESDIR}"/git-1.6.4.5-gitweb-cve-2010-3906.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# bug #318289
+	epatch "${FILESDIR}"/git-1.7.1-interix.patch
+	epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch
+}
+
+git_emake() {
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ "$PV" == "9999" ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# svnimport - use git-svn
+	# p4import - excluded because fast-import has a better one
+	# examples - these are stuff that is not used in Git anymore actually
+	# patches - stuff the Git guys made to go upstream to other places
+	for i in continuous fast-import hg-to-git \
+		hooks remotes2config.sh stats \
+		workdir convert-objects blameview ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		exeinto /usr/share/${PN}/gitweb
+		doexe "${S}"/gitweb/gitweb.cgi
+		insinto /usr/share/${PN}/gitweb/static
+		doins "${S}"/gitweb/static/gitweb.css
+		js=gitweb.js
+		[ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js
+		doins "${S}"/gitweb/static/${js}
+		doins "${S}"/gitweb/static/git-{favicon,logo}.png
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	fi
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+	cd "${S}"
+	# Now run the tests
+	einfo "Start test run"
+	git_emake test
+	rc=$?
+	# Display nice results
+	cd "${S}/t"
+	git_emake aggregate-results
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

diff --git a/dev-vcs/git/git-1.7.3.4-r1.ebuild b/dev-vcs/git/git-1.7.3.4-r1.ebuild
new file mode 100644
index 0000000..048177f
--- /dev/null
+++ b/dev-vcs/git/git-1.7.3.4-r1.ebuild
@@ -0,0 +1,490 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.17 2011/08/19 18:43:47 darkside Exp $
+
+EAPI=3
+
+GENTOO_DEPEND_ON_PERL=no
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+[ "$PV" == "9999" ] && inherit git
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [ "$PV" != "9999" ]; then
+	SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
+			mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
+			doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!blksha1? ( dev-libs/openssl )
+	sys-libs/zlib
+	perl?   ( dev-lang/perl[-build] )
+	tk?     ( dev-lang/tk )
+	curl?   (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	)"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc?    (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc
+		app-text/xmlto"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if ! use perl ; then
+		use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
+		use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
+		use subversion && ewarn "git-svn needs USE=perl, it won't work"
+	fi
+	if use webdav && ! use curl ; then
+		ewarn "USE=webdav needs USE=curl. Ignoring"
+	fi
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
+	#	|| myopts="${myopts} NO_ICONV=YesPlease"
+	# because, above, we need to do this unconditionally (no "&& use iconv")
+	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [ "${PV}" != "9999" ]; then
+		unpack ${MY_P}.tar.bz2
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.bz2
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
+		cd "${S}"
+	else
+		git_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# Noperl is being merged to upstream as of 2009/04/05
+	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
+
+	# GetOpt-Long v2.38 is strict
+	# Merged in 1.6.3 final 2009/05/07
+	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
+
+	# JS install fixup
+	epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
+
+	# USE=-iconv causes segfaults, fixed post 1.7.1
+	# Gentoo bug #321895
+	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
+
+	# bug #350075: t9001: fix missing prereq on some tests
+	epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# bug #318289
+	epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${EPREFIX}/usr/bin/python" \
+		PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ "$PV" == "9999" ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+	newbin contrib/git-resurrect.sh git-resurrect
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		blameview buildsystems ciabot continuous convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
+		stats svn-fe vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${D}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first
+	cd "${S}/t"
+	git_emake clean
+
+	# Now run the tests
+	cd "${S}"
+	einfo "Start test run"
+	git_emake test
+	rc=$?
+
+	# Display nice results
+	cd "${S}/t"
+	git_emake aggregate-results
+
+	# And exit
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

diff --git a/eclass/vdr-plugin-2.eclass.~1~ b/eclass/vdr-plugin-2.eclass.~1~
new file mode 100644
index 0000000..2de0d31
--- /dev/null
+++ b/eclass/vdr-plugin-2.eclass.~1~
@@ -0,0 +1,614 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.8 2012/06/27 18:54:58 hd_brummy Exp $
+
+# @ECLASS: vdr-plugin-2.eclass
+# @MAINTAINER:
+# vdr@g.o
+# @BLURB: common vdr plugin ebuild functions
+# @DESCRIPTION:
+# Eclass for easing maitenance of vdr plugin ebuilds
+
+# Authors:
+# Matthias Schwarzott <zzam@g.o>
+# Joerg Bornkessel <hd_brummy@g.o>
+# Christian Ruppert <idl0r@g.o>
+
+# Plugin config file installation:
+#
+# A plugin config file can be specified through the $VDR_CONFD_FILE variable, it
+# defaults to ${FILESDIR}/confd. Each config file will be installed as e.g.
+# ${D}/etc/conf.d/vdr.${VDRPLUGIN}
+
+# Installation of rc-addon files:
+# NOTE: rc-addon files must be valid shell scripts!
+#
+# Installing rc-addon files is basically the same as for plugin config files
+# (see above), it's just using the $VDR_RCADDON_FILE variable instead.
+# The default value when $VDR_RCADDON_FILE is undefined is:
+# ${FILESDIR}/rc-addon.sh and will be installed as
+# ${VDR_RC_DIR}/plugin-${VDRPLUGIN}.sh
+#
+# The rc-addon files will be sourced by the startscript when the specific plugin
+# has been enabled.
+# rc-addon files may be used to prepare everything that is necessary for the
+# plugin start/stop, like passing extra command line options and so on.
+
+# Applying your own local/user patches:
+# This is done by using the epatch_user() function of the eutils.eclass.
+# Simply put your patches into one of these directories:
+# /etc/portage/patches/<CATEGORY>/<PF|P|PN>/
+# Quote: where the first of these three directories to exist will be the one to
+# use, ignoring any more general directories which might exist as well.
+#
+# For more details about it please take a look at the eutils.class.
+
+inherit base eutils flag-o-matic multilib toolchain-funcs
+
+case ${EAPI:-0} in
+    4) ;;
+    *) die "EAPI ${EAPI} unsupported."
+esac
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config
+
+IUSE=""
+
+# Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes
+VDRPLUGIN="${PN/#vdrplugin-/}"
+VDRPLUGIN="${VDRPLUGIN/#vdr-/}"
+VDRPLUGIN="${VDRPLUGIN/%-cvs/}"
+
+DESCRIPTION="vdr Plugin: ${VDRPLUGIN} (based on vdr-plugin-2.eclass)"
+
+# Works in most cases
+S="${WORKDIR}/${VDRPLUGIN}-${PV}"
+
+# depend on headers for DVB-driver
+COMMON_DEPEND=">=media-tv/gentoo-vdr-scripts-0.4.2"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/linuxtv-dvb-headers"
+RDEPEND="${COMMON_DEPEND}
+	>=app-admin/eselect-vdr-0.0.2"
+
+# This is a hack for ebuilds like vdr-xineliboutput that want to
+# conditionally install a vdr-plugin
+if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]]; then
+	IUSE="${IUSE} vdr"
+	DEPEND="vdr? ( ${DEPEND} )"
+	RDEPEND="vdr? ( ${RDEPEND} )"
+fi
+
+# New method of storing plugindb
+#   Called from src_install
+#   file maintained by normal portage-methods
+create_plugindb_file() {
+	local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
+	local DB_FILE="${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"
+	insinto "${NEW_VDRPLUGINDB_DIR}"
+
+#	BUG: portage-2.1.4_rc9 will delete the EBUILD= line, so we cannot use this code.
+#	cat <<-EOT > "${D}/${DB_FILE}"
+#		VDRPLUGIN_DB=1
+#		CREATOR=ECLASS
+#		EBUILD=${CATEGORY}/${PN}
+#		EBUILD_V=${PVR}
+#	EOT
+	{
+		echo "VDRPLUGIN_DB=1"
+		echo "CREATOR=ECLASS"
+		echo "EBUILD=${CATEGORY}/${PN}"
+		echo "EBUILD_V=${PVR}"
+		echo "PLUGINS=\"$@\""
+	} > "${D}/${DB_FILE}"
+}
+
+# Delete files created outside of vdr-plugin-2.eclass
+#   vdrplugin-rebuild.ebuild converted plugindb and files are
+#   not deleted by portage itself - should only be needed as
+#   long as not every system has switched over to
+#   vdrplugin-rebuild-0.2 / gentoo-vdr-scripts-0.4.2
+delete_orphan_plugindb_file() {
+	#elog Testing for orphaned plugindb file
+	local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
+	local DB_FILE="${ROOT}/${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"
+
+	# file exists
+	[[ -f ${DB_FILE} ]] || return
+
+	# will portage handle the file itself
+	if grep -q CREATOR=ECLASS "${DB_FILE}"; then
+		#elog file owned by eclass - don't touch it
+		return
+	fi
+
+	elog "Removing orphaned plugindb-file."
+	elog "\t#rm ${DB_FILE}"
+	rm "${DB_FILE}"
+}
+
+
+create_header_checksum_file() {
+	# Danger: Not using $ROOT here, as compile will also not use it !!!
+	# If vdr in $ROOT and / differ, plugins will not run anyway
+
+	local CHKSUM="header-md5-vdr"
+
+	if [[ -f ${VDR_CHECKSUM_DIR}/header-md5-vdr ]]; then
+		cp "${VDR_CHECKSUM_DIR}/header-md5-vdr" "${CHKSUM}"
+	elif type -p md5sum >/dev/null 2>&1; then
+		(
+			cd "${VDR_INCLUDE_DIR}"
+			md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
+		) > "${CHKSUM}"
+	else
+		die "Could not create md5 checksum of headers"
+	fi
+
+	insinto "${VDR_CHECKSUM_DIR}"
+	local p_name
+	for p_name; do
+		newins "${CHKSUM}" "header-md5-${p_name}"
+	done
+}
+
+fix_vdr_libsi_include() {
+	dev_check "Fixing include of libsi-headers"
+	local f
+	for f; do
+		sed -i "${f}" \
+			-e '/#include/s:"\(.*libsi.*\)":<\1>:' \
+			-e '/#include/s:<.*\(libsi/.*\)>:<vdr/\1>:'
+	done
+}
+
+vdr_patchmakefile() {
+	einfo "Patching Makefile"
+	[[ -e Makefile ]] || die "Makefile of plugin can not be found!"
+	cp Makefile "${WORKDIR}"/Makefile.before
+
+	# plugin makefiles use VDRDIR in strange ways
+	# assumptions:
+	#   1. $(VDRDIR) contains Make.config
+	#   2. $(VDRDIR) contains config.h
+	#   3. $(VDRDIR)/include/vdr contains the headers
+	#   4. $(VDRDIR) contains main vdr Makefile
+	#   5. $(VDRDIR)/locale exists
+	#   6. $(VDRDIR) allows to access vdr source files
+	#
+	# We only have one directory (for now /usr/include/vdr),
+	# that contains vdr-headers and Make.config.
+	# To satisfy 1-3 we do this:
+	#   Set VDRDIR=/usr/include/vdr
+	#   Set VDRINCDIR=/usr/include
+	#   Change $(VDRDIR)/include to $(VDRINCDIR)
+
+	sed -i Makefile \
+		-e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \
+		-e "/^VDRDIR/a VDRINCDIR = ${VDR_INCLUDE_DIR%/vdr}" \
+		-e '/VDRINCDIR.*=/!s:$(VDRDIR)/include:$(VDRINCDIR):' \
+		\
+		-e 's:-I$(DVBDIR)/include::' \
+		-e 's:-I$(DVBDIR)::'
+
+	# may be needed for multiproto:
+	#sed -i Makefile \
+	#	-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
+	#	-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):'
+
+	if ! grep -q APIVERSION Makefile; then
+		ebegin "  Converting to APIVERSION"
+		sed -i Makefile \
+			-e 's:^APIVERSION = :APIVERSION ?= :' \
+			-e 's:$(LIBDIR)/$@.$(VDRVERSION):$(LIBDIR)/$@.$(APIVERSION):' \
+			-e '/VDRVERSION =/a\APIVERSION = $(shell sed -ne '"'"'/define APIVERSION/s/^.*"\\(.*\\)".*$$/\\1/p'"'"' $(VDRDIR)/config.h)'
+		eend $?
+	fi
+
+	# Correcting Compile-Flags
+	# Do not overwrite CXXFLAGS, add LDFLAGS if missing
+	sed -i Makefile \
+		-e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \
+		-e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'
+
+	# Disabling file stripping, the package manager takes care of it
+	sed -i Makefile \
+		-e '/@.*strip/d' \
+		-e '/strip \$(LIBDIR)\/\$@/d' \
+		-e 's/STRIP.*=.*$/STRIP = true/'
+
+	# Use a file instead of a variable as single-stepping via ebuild
+	# destroys environment.
+	touch "${WORKDIR}"/.vdr-plugin_makefile_patched
+}
+
+# Begin new vdr-plugin-2.eclass content
+dev_check() {
+	# A lot useful debug infos
+	# set VDR_MAINTAINER_MODE="1" in /etc/make.conf
+	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+		eerror "\t Maintainer Info: $@"
+	fi
+}
+
+gettext_missing() {
+	# plugins without converting to gettext
+
+	local GETTEXT_MISSING=$( grep xgettext Makefile )
+	if [[ -z ${GETTEXT_MISSING} ]]; then
+		dev_check "Plugin isn't converted to gettext handling \n"
+	fi
+}
+
+linguas_support() {
+#	Patching Makefile for linguas support.
+#	Only locales, enabled through the LINGUAS (make.conf) variable will be
+#	"compiled" and installed.
+#
+#	Some plugins have po/ in a subdir
+#	set PO_SUBDIR in .ebuild
+#	i.e media-plugins/vdr-streamdev
+#	PO_SUBDIR="client server"
+
+	einfo "Patching for Linguas support"
+	einfo "available Languages for ${P} are:"
+
+	[[ -f po ]] && local po_dir="${S}"
+	local po_subdir=( ${S}/${PO_SUBDIR} )
+	local f
+
+	makefile_dir=( ${po_dir} ${po_subdir[*]} )
+
+	for f in ${makefile_dir[*]}; do
+
+		PLUGIN_LINGUAS=$( ls ${f}/po | tr \\\012 ' ' | tr -d [:upper:] | tr -d [:punct:] |sed -e "s:po::g" )
+		einfo "LINGUAS=\"${PLUGIN_LINGUAS}\""
+
+		sed -i ${f}/Makefile \
+			-e 's:\$(wildcard[[:space:]]*\$(PODIR)/\*.po):\$(foreach dir,\$(LINGUAS),\$(wildcard \$(PODIR)\/\$(dir)\*.po)):' \
+			|| die "sed failed for Linguas"
+	done
+
+	strip-linguas ${PLUGIN_LINGUAS} en
+
+	# maintainer check
+	if [[ ! -d po ]]; then
+		dev_check "po dir not found? May be in subdir? \n"
+	fi
+}
+
+vdr_i18n() {
+# 	i18n handling was deprecated since >=media-video/vdr-1.5.9,
+#	finally with >=media-video/vdr-1.7.27 it has been dropped entirely and some
+#	plugins will fail to "compile" because they're still using the old variant.
+#	Simply remove the i18n.o object from Makefile (OBJECT) and
+#	remove "static const tI18nPhrase*" from i18n.h.
+#
+#	Plugins that are still using the old method will be pmasked until they're
+#	fixed or in case of maintainer timeout they'll be masked for removal.
+
+	gettext_missing
+
+	local I18N_OBJECT=$( grep i18n.o Makefile )
+	if [[ -n ${I18N_OBJECT} ]]; then
+
+		if [[ "${KEEP_I18NOBJECT:-no}" = "yes" ]]; then
+			dev_check "Forced to keep i18n.o"
+		else
+			sed -i "s:i18n.o::g" Makefile
+			dev_check "OBJECT i18n.o found"
+			dev_check "removed per sed \n"
+		fi
+
+	else
+		dev_check "OBJECT i18n.o not found in Makefile"
+		dev_check "all fine or manual review needed? \n"
+	fi
+
+	local I18N_STRING=$( [[ -e i18n.h ]] && grep tI18nPhrase i18n.h )
+	if [[ -n ${I18N_STRING} ]]; then
+		sed -i "s:^extern[[:space:]]*const[[:space:]]*tI18nPhrase://static const tI18nPhrase:" i18n.h
+		dev_check "obsolete tI18nPhrase found"
+		dev_check "disabled per sed, please recheck \n"
+	else
+		dev_check "obsolete tI18nPhrase not found, fine..."
+		dev_check "please review, may be in subdir... \n"
+	fi
+}
+# end new vdr-plugin-2.eclass content
+
+vdr-plugin-2_copy_source_tree() {
+	pushd . >/dev/null
+	cp -r "${S}" "${T}"/source-tree
+	cd "${T}"/source-tree
+	cp "${WORKDIR}"/Makefile.before Makefile
+	# TODO: Fix this, maybe no longer needed
+	sed -i Makefile \
+		-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
+		-e 's:^CXXFLAGS:#CXXFLAGS:' \
+		-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
+		-e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):'
+	popd >/dev/null
+}
+
+vdr-plugin-2_install_source_tree() {
+	einfo "Installing sources"
+	destdir="${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}"
+	insinto "${destdir}-${PV}"
+	doins -r "${T}"/source-tree/*
+
+	dosym "${VDRPLUGIN}-${PV}" "${destdir}"
+}
+
+vdr-plugin-2_print_enable_command() {
+	local p_name c=0 l=""
+	for p_name in ${vdr_plugin_list}; do
+		c=$(( c+1 ))
+		l="$l ${p_name#vdr-}"
+	done
+
+	elog
+	case $c in
+	1)	elog "Installed plugin${l}" ;;
+	*)	elog "Installed $c plugins:${l}" ;;
+	esac
+	elog "To activate a plugin execute this command:"
+	elog "\teselect vdr-plugin enable <plugin_name> ..."
+	elog
+}
+
+has_vdr() {
+	[[ -f "${VDR_INCLUDE_DIR}"/config.h ]]
+}
+
+## exported functions
+
+vdr-plugin-2_pkg_setup() {
+	# -fPIC is needed for shared objects on some platforms (amd64 and others)
+	append-flags -fPIC
+
+	# Plugins need to be compiled with position independent code, otherwise linking
+	# VDR against it will fail
+	if has_version ">=media-video/vdr-1.7.13"; then
+		append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+	fi
+
+	# missing ${chost}- tag
+	tc-export CC CXX
+
+	# Where should the plugins live in the filesystem
+	VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins"
+	VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums"
+
+	# was /usr/lib/... some time ago
+	# since gentoo-vdr-scripts-0.3.6 it works with /usr/share/...
+	VDR_RC_DIR="/usr/share/vdr/rcscript"
+
+	# Pathes to includes
+	VDR_INCLUDE_DIR="/usr/include/vdr"
+	DVB_INCLUDE_DIR="/usr/include"
+
+	TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
+	LOCDIR="/usr/share/locale"
+
+	if ! has_vdr; then
+		# set to invalid values to detect abuses
+		VDRVERSION="eclass_no_vdr_installed"
+		APIVERSION="eclass_no_vdr_installed"
+
+		if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]] && ! use vdr; then
+			einfo "VDR not found!"
+		else
+			# if vdr is required
+			die "VDR not found!"
+		fi
+		return
+	fi
+
+	VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
+	APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
+	[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
+
+	einfo "Compiling against"
+	einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]"
+
+	if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then
+		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
+		eerror "Please move all your patches into"
+		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
+		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
+		die
+	fi
+}
+
+vdr-plugin-2_src_util() {
+	while [ "$1" ]; do
+		case "$1" in
+		all)
+			vdr-plugin-2_src_util unpack add_local_patch patchmakefile linguas_patch i18n
+			;;
+		prepare)
+			vdr-plugin-2_src_util add_local_patch patchmakefile linguas_patch i18n
+			;;
+		unpack)
+			base_src_unpack
+			;;
+		add_local_patch)
+			cd "${S}" || die "Could not change to plugin-source-directory!"
+			epatch_user
+			;;
+		patchmakefile)
+			cd "${S}" || die "Could not change to plugin-source-directory!"
+			vdr_patchmakefile
+			;;
+		i18n)
+			vdr_i18n
+			;;
+		linguas_patch)
+			linguas_support
+			;;
+		esac
+
+		shift
+	done
+}
+
+vdr-plugin-2_src_unpack() {
+	if [[ -z ${VDR_INCLUDE_DIR} ]]; then
+		eerror "Wrong use of vdr-plugin-2.eclass."
+		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_unpack."
+		echo
+		eerror "Please report this at bugs.gentoo.org."
+		die "vdr-plugin-2_src_unpack not called!"
+	fi
+
+	if [ -z "$1" ]; then
+		vdr-plugin-2_src_util unpack
+	else
+		vdr-plugin-2_src_util $@
+	fi
+}
+
+vdr-plugin-2_src_prepare() {
+	if [[ -z ${VDR_INCLUDE_DIR} ]]; then
+		eerror "Wrong use of vdr-plugin-2.eclass."
+		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_prepare."
+		echo
+		eerror "Please report this at bugs.gentoo.org."
+		die "vdr-plugin-2_src_prepare not called!"
+	fi
+
+	base_src_prepare
+	vdr-plugin-2_src_util prepare
+}
+
+vdr-plugin-2_src_compile() {
+	[ -z "$1" ] && vdr-plugin-2_src_compile copy_source compile
+
+	while [ "$1" ]; do
+		case "$1" in
+		copy_source)
+			[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree
+			;;
+		compile)
+			if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then
+				eerror "Wrong use of vdr-plugin-2.eclass."
+				eerror "An ebuild for a vdr-plugin will not work without"
+				eerror "calling vdr-plugin-2_src_compile to patch the Makefile."
+				echo
+				eerror "Please report this at bugs.gentoo.org."
+				die "vdr-plugin-2_src_compile not called!"
+			fi
+			cd "${S}"
+
+			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all}}
+
+			emake ${BUILD_PARAMS} \
+				${BUILD_TARGETS} \
+				LOCALEDIR="${TMP_LOCALE_DIR}" \
+				LIBDIR="${S}" \
+				TMPDIR="${T}" \
+			|| die "emake failed"
+			;;
+		esac
+
+		shift
+	done
+}
+
+vdr-plugin-2_src_install() {
+	if [[ -z ${VDR_INCLUDE_DIR} ]]; then
+		eerror "Wrong use of vdr-plugin-2.eclass."
+		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_install."
+		echo
+		eerror "Please report this at bugs.gentoo.org."
+		die "vdr-plugin-2_src_install not called!"
+	fi
+
+	[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_install_source_tree
+	cd "${WORKDIR}"
+
+	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+		local mname="${P}-Makefile"
+		cp "${S}"/Makefile "${mname}.patched"
+		cp Makefile.before "${mname}.before"
+
+		diff -u "${mname}.before" "${mname}.patched" > "${mname}.diff"
+
+		insinto "/usr/share/vdr/maintainer-data/makefile-changes"
+		doins "${mname}.diff"
+
+		insinto "/usr/share/vdr/maintainer-data/makefile-before"
+		doins "${mname}.before"
+
+		insinto "/usr/share/vdr/maintainer-data/makefile-patched"
+		doins "${mname}.patched"
+
+	fi
+
+	cd "${S}"
+	insinto "${VDR_PLUGIN_DIR}"
+	doins libvdr-*.so.*
+
+	# create list of all created plugin libs
+	vdr_plugin_list=""
+	local p_name
+	for p in libvdr-*.so.*; do
+		p_name="${p%.so*}"
+		p_name="${p_name#lib}"
+		vdr_plugin_list="${vdr_plugin_list} ${p_name}"
+	done
+
+	create_header_checksum_file ${vdr_plugin_list}
+	create_plugindb_file ${vdr_plugin_list}
+
+	if [[ -d ${TMP_LOCALE_DIR} ]]; then
+		einfo "Installing locales"
+		cd "${TMP_LOCALE_DIR}"
+		local linguas
+		for linguas in ${LINGUAS[*]}; do
+			insinto "${LOCDIR}"
+			cp -r --parents ${linguas}* ${D}/${LOCDIR}
+		done
+	fi
+
+	cd "${S}"
+	local docfile
+	for docfile in README* HISTORY CHANGELOG; do
+		[[ -f ${docfile} ]] && dodoc ${docfile}
+	done
+
+	# if VDR_CONFD_FILE is empty and ${FILESDIR}/confd exists take it
+	[[ -z ${VDR_CONFD_FILE} ]] && [[ -e ${FILESDIR}/confd ]] && VDR_CONFD_FILE=${FILESDIR}/confd
+
+	if [[ -n ${VDR_CONFD_FILE} ]]; then
+		newconfd "${VDR_CONFD_FILE}" vdr.${VDRPLUGIN}
+	fi
+
+	# if VDR_RCADDON_FILE is empty and ${FILESDIR}/rc-addon.sh exists take it
+	[[ -z ${VDR_RCADDON_FILE} ]] && [[ -e ${FILESDIR}/rc-addon.sh ]] && VDR_RCADDON_FILE=${FILESDIR}/rc-addon.sh
+
+	if [[ -n ${VDR_RCADDON_FILE} ]]; then
+		insinto "${VDR_RC_DIR}"
+		newins "${VDR_RCADDON_FILE}" plugin-${VDRPLUGIN}.sh
+	fi
+}
+
+vdr-plugin-2_pkg_postinst() {
+	vdr-plugin-2_print_enable_command
+
+	if [[ -n "${VDR_CONFD_FILE}" ]]; then
+		elog "Please have a look at the config-file"
+		elog "\t/etc/conf.d/vdr.${VDRPLUGIN}"
+		elog
+	fi
+}
+
+vdr-plugin-2_pkg_postrm() {
+	delete_orphan_plugindb_file
+}
+
+vdr-plugin-2_pkg_config() {
+:
+}

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 31b7827..ba7ccfe 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -186,10 +186,18 @@ DEPEND+=" virtual/pkgconfig"
 # Eg. XORG_DRI="opengl" will pull all dri dependant deps for opengl useflag
 : ${XORG_DRI:="no"}
 
+if [[ "${EAPI:-0}" == "4-slot-abi" ]]; then
+DRI_COMMON_DEPEND="
+	x11-base/xorg-server:=[-minimal]
+	x11-libs/libdrm
+"
+else
 DRI_COMMON_DEPEND="
 	x11-base/xorg-server[-minimal]
 	x11-libs/libdrm
 "
+fi
+
 DRI_DEPEND="
 	x11-proto/xf86driproto
 	x11-proto/glproto
@@ -212,9 +220,15 @@ unset DRI_DEPEND
 unset DRI_COMMONDEPEND
 
 if [[ -n "${DRIVER}" ]]; then
+	if [[ "${EAPI:-0}" == "4-slot-abi" ]]; then
+	COMMON_DEPEND+="
+		x11-base/xorg-server:=[xorg]
+	"
+	else
 	COMMON_DEPEND+="
 		x11-base/xorg-server[xorg]
 	"
+	fi
 fi
 if [[ -n "${DRIVER}" && ${PN} == xf86-input-* ]]; then
 	DEPEND+="

diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
new file mode 100644
index 0000000..35d4abf
--- /dev/null
+++ b/media-gfx/freewrl/Manifest
@@ -0,0 +1,5 @@
+AUX freewrl-1.22.13-mozjs187-config.patch 486 RMD160 fc43389030643b36b6322b90b10944e8221402c5 SHA1 88f9807b4e38de2ebb4f33123b595d54125ceba0 SHA256 340a489d70b1e0d450b779f35686f09c1a50ba62cd8de5bb34340dec8c5ad561
+DIST freewrl-1.22.13.1.tar.bz2 1830305 RMD160 ce4ccd5fcdcc547f7ad6f00f5b38df176a7f80ac SHA1 ace2425c3006955e3846c5f879237c697e805e45 SHA256 29069d63604dbbfde0f684f342f34e9d0eb216a026f83317a00fbdd31ece17e8
+EBUILD freewrl-1.22.13.ebuild 4358 RMD160 b0ac51e718f494f839a8029e970b033a7c85c85c SHA1 dfe91e0955181baa129870d94c84c526f827c140 SHA256 2c3248f007d87bd59b74912cfff5c69f693df7f3e9d9e6366426a056b513ac65
+MISC ChangeLog 6575 RMD160 dae1a748203b10b284e4ea9678fa371d0695f6f2 SHA1 59ebef449c11997676f4027f83a445c883b6fff8 SHA256 c7436c224f85b4ba6d10e024e0692fc318996954f3d0197deaee48cd908ee072
+MISC metadata.xml 547 RMD160 9d5b1f027da48321e26e79fafbe6f8a0695dd307 SHA1 26476c1d5f7e99b2498462a351018dbf16ddd934 SHA256 7d745ed3fa96fd3febcb5f3f9891b87c29a8c24ac7614840c6f7a378b20feb37

diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch b/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch
new file mode 100644
index 0000000..645a231
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac	2012-06-13 13:17:43.000000000 -0400
++++ b/configure.ac	2012-06-18 15:34:59.000000000 -0400
+@@ -192,6 +192,7 @@
+         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[spidermonkey],[>=],[1.7.0])
+         ;;
+      *)
++        AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs187])
+         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs185])
+         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozilla-js],[>=],[1.9])
+         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[xulrunner-js],[>=],[1.8])

diff --git a/media-gfx/freewrl/freewrl-1.22.13.ebuild b/media-gfx/freewrl/freewrl-1.22.13.ebuild
new file mode 100644
index 0000000..b85259f
--- /dev/null
+++ b/media-gfx/freewrl/freewrl-1.22.13.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13.ebuild,v 1.3 2012/06/13 18:05:51 axs Exp $
+
+EAPI="4-slot-abi"
+
+inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
+
+DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
+HOMEPAGE="http://freewrl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/freewrl/${P}.1.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug +glew java libeai motif +nsplugin osc +sox static-libs"
+
+COMMONDEPEND="x11-libs/libXau:=
+	x11-libs/libXdmcp:=
+	x11-libs/libXext:=
+	x11-libs/libX11:=
+	motif? ( x11-libs/openmotif:= )
+	!motif? ( x11-libs/libXaw:= )
+	media-libs/mesa
+	glew? ( media-libs/glew )
+	virtual/opengl
+	media-libs/libpng
+	virtual/jpeg
+	media-libs/imlib2:=
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	curl? ( net-misc/curl )
+	osc? ( media-libs/liblo )
+	dev-lang/spidermonkey:="
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.4 )
+	nsplugin? ( net-misc/npapi-sdk )"
+RDEPEND="${COMMONDEPEND}
+	media-fonts/dejavu
+	|| ( media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] )
+	app-arch/unzip
+	java? ( >=virtual/jre-1.4 )
+	sox? ( media-sound/sox )"
+
+src_prepare() {
+	if has_version ">=dev-lang/spidermonkey-1.8.7" ; then
+		epatch "${FILESDIR}"/${P}-mozjs187-config.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myconf="--enable-fontconfig
+		--without-expat
+		--with-x
+		--with-imageconvert=/usr/bin/convert
+		--with-unzip=/usr/bin/unzip"
+	if use motif; then
+		myconf+=" --with-target=motif --with-statusbar=standard"
+	else
+		myconf+=" --with-target=x11 --with-statusbar=hud"
+	fi
+	if use nsplugin; then
+		myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
+		myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
+	fi
+	if use sox; then
+		myconf+=" --with-soundconv=/usr/bin/sox"
+	fi
+	# disable the checks for other js libs, in case they are installed
+	if has_version ">=dev-lang/spidermonkey-1.8.5" ; then
+		# spidermonkey-1.8.5 provides a .pc to pkg-config, it should be findable via mozjs185
+		for x in mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js; do
+			myconf+=" --disable-${x}"
+		done
+	else
+		for x in mozjs187 mozjs185 mozilla-js xulrunner-js firefox-js seamonkey-js; do
+			myconf+=" --disable-${x}"
+		done
+		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
+		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
+		if has_version ">=dev-lang/spidermonkey-1.8" ; then
+			# spidermonkey-1.8 changed the name of the lib
+			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
+		else
+			JAVASCRIPT_ENGINE_LIBS="-ljs"
+		fi
+		if has_version dev-lang/spidermonkey[threadsafe] ; then
+			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
+			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
+		fi
+		export JAVASCRIPT_ENGINE_CFLAGS
+		export JAVASCRIPT_ENGINE_LIBS
+	fi
+	econf	${myconf} \
+		$(use_enable curl libcurl) \
+		$(use_with glew) \
+		$(use_enable debug) $(use_enable debug thread_colorized) \
+		$(use_enable libeai) \
+		$(use_enable java) \
+		$(use_enable nsplugin plugin) \
+		$(use_enable osc) \
+		$(use_enable static-libs static) \
+		$(use_enable sox sound)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use java; then
+		insinto /usr/share/${PN}/lib
+		doins src/java/java.policy
+		java-pkg_regjar src/java/vrml.jar
+		# install vrml.jar as a JRE extension
+		dodir /usr/java/packages/lib/ext
+		dosym /usr/share/${PN}/lib/vrml.jar /usr/java/packages/lib/ext/vrml.jar
+		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
+		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
+		elog "java policy:"
+		elog "	cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
+	fi
+
+	# remove unneeded .la files (as per Flameeyes' rant)
+	cd "${D}"
+	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
+}
+
+pkg_postinst() {
+	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
+	elog "path.  If you do not have firefox installed or you wish to use a different"
+	elog "web browser to open links that are within VRML / X3D files, please be sure to"
+	elog "specify the command via your BROWSER environment variable."
+}

diff --git a/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch b/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch
new file mode 100644
index 0000000..eb41334
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch
@@ -0,0 +1,12 @@
+diff -urN graphite2-1.0.2.old/tests/comparerenderer/CMakeLists.txt graphite2-1.0.2/tests/comparerenderer/CMakeLists.txt
+--- graphite2-1.0.2.old/tests/comparerenderer/CMakeLists.txt	2011-09-04 13:39:16.206450690 +0200
++++ graphite2-1.0.2/tests/comparerenderer/CMakeLists.txt	2011-09-04 13:39:44.516450716 +0200
+@@ -43,7 +43,7 @@
+     find_package(PkgConfig)
+ 
+     pkg_check_modules(GR silgraphite)
+-    pkg_check_modules(HB harfbuzz)
++    #pkg_check_modules(HB harfbuzz)
+     pkg_check_modules(GLIB glib-2.0)
+     # pkg_check_modules(GRNG graphite)
+ 

diff --git a/media-gfx/graphite2/files/graphite2-1.0.3-no-test-binaries.patch b/media-gfx/graphite2/files/graphite2-1.0.3-no-test-binaries.patch
new file mode 100644
index 0000000..bbc28f5
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.0.3-no-test-binaries.patch
@@ -0,0 +1,9 @@
+diff -urN graphite2-1.0.3.old/tests/comparerenderer/CMakeLists.txt graphite2-1.0.3/tests/comparerenderer/CMakeLists.txt
+--- graphite2-1.0.3.old/tests/comparerenderer/CMakeLists.txt	2011-10-28 10:28:43.688602080 +0200
++++ graphite2-1.0.3/tests/comparerenderer/CMakeLists.txt	2011-10-28 10:30:06.694603526 +0200
+@@ -132,4 +132,4 @@
+ # comparetest(scheherazade_arb Scheherazadegr.ttf udhr_arb.txt --rtl)
+ 
+ # comparerenderer can also be used for font testing
+-install(TARGETS comparerenderer EXPORT comparerenderer RUNTIME DESTINATION bin)
++# install(TARGETS comparerenderer EXPORT comparerenderer RUNTIME DESTINATION bin)

diff --git a/media-gfx/graphite2/files/graphite2-1.1.0-includes-libs-perl.patch b/media-gfx/graphite2/files/graphite2-1.1.0-includes-libs-perl.patch
new file mode 100644
index 0000000..be41229
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.1.0-includes-libs-perl.patch
@@ -0,0 +1,13 @@
+--- graphite2-0.9.3.orig/contrib/perl/Build.PL
++++ graphite2-0.9.3/contrib/perl/Build.PL
+@@ -8,8 +8,8 @@ my $builder = Module::Build->new(
+     dist_author         => 'Simon Cozens <simon@××××.org>',
+     dist_version_from   => 'lib/Text/Graphite2.pm',
+     extra_compiler_flags => $^O ne 'MSWin32' ? '-Wall -Wno-unused-variable' : '',
+-    extra_linker_flags  => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-lgraphite2',
+-    include_dirs        => ['.'],
++    extra_linker_flags  => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-L @BUILD_DIR@ -lgraphite2',
++    include_dirs        => ['.', '../../include'],
+     requires => {
+         'Test::More' => 0,
+     },

diff --git a/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch b/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch
new file mode 100644
index 0000000..edacd73
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch
@@ -0,0 +1,11 @@
+diff -urN graphite2-1.0.1.old/src/CMakeLists.txt graphite2-1.0.1/src/CMakeLists.txt
+--- graphite2-1.0.1.old/src/CMakeLists.txt	2011-08-11 10:57:24.737639566 +0200
++++ graphite2-1.0.1/src/CMakeLists.txt	2011-08-11 10:57:47.880350242 +0200
+@@ -103,7 +103,6 @@
+      -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fdiagnostics-show-option
+      -fno-rtti -fno-exceptions -nodefaultlibs
+      -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector)
+-    set_target_properties(graphite2 PROPERTIES LINK_FLAGS "-nodefaultlibs" LINKER_LANGUAGE C)
+     if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+         target_link_libraries(graphite2 "-lkernel32 -lmsvcr90 -lmingw32 -lgcc -luser32")
+     else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")

diff --git a/media-libs/exiftool/exiftool-8.50.ebuild b/media-libs/exiftool/exiftool-8.50.ebuild
new file mode 100644
index 0000000..29b6b68
--- /dev/null
+++ b/media-libs/exiftool/exiftool-8.50.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exiftool/exiftool-8.50.ebuild,v 1.7 2012/02/05 18:28:15 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=EXIFTOOL
+MY_PN=Image-ExifTool
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="${SRC_URI} http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	dohtml -r html/
+}

diff --git a/media-libs/exiftool/exiftool-8.60.ebuild b/media-libs/exiftool/exiftool-8.60.ebuild
new file mode 100644
index 0000000..99556bf
--- /dev/null
+++ b/media-libs/exiftool/exiftool-8.60.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exiftool/exiftool-8.60.ebuild,v 1.2 2012/02/05 18:28:15 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=EXIFTOOL
+MY_PN=Image-ExifTool
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="${SRC_URI} http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	dohtml -r html/
+}

diff --git a/media-libs/exiftool/exiftool-8.65.ebuild b/media-libs/exiftool/exiftool-8.65.ebuild
new file mode 100644
index 0000000..54cdb8e
--- /dev/null
+++ b/media-libs/exiftool/exiftool-8.65.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exiftool/exiftool-8.65.ebuild,v 1.4 2012/02/05 18:28:15 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=EXIFTOOL
+MY_PN=Image-ExifTool
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="${SRC_URI} http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	dohtml -r html/
+}

diff --git a/media-libs/exiftool/exiftool-8.75.ebuild b/media-libs/exiftool/exiftool-8.75.ebuild
new file mode 100644
index 0000000..b9f4f9c
--- /dev/null
+++ b/media-libs/exiftool/exiftool-8.75.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exiftool/exiftool-8.75.ebuild,v 1.2 2012/02/05 18:28:15 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=EXIFTOOL
+MY_PN=Image-ExifTool
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="${SRC_URI} http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	dohtml -r html/
+}

diff --git a/media-tv/dvbstreamer/dvbstreamer-1.1-r1.ebuild b/media-tv/dvbstreamer/dvbstreamer-1.1-r1.ebuild
new file mode 100644
index 0000000..56635b0
--- /dev/null
+++ b/media-tv/dvbstreamer/dvbstreamer-1.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstreamer/dvbstreamer-1.1-r1.ebuild,v 1.4 2012/02/15 18:34:36 hd_brummy Exp $
+
+EAPI=2
+inherit autotools eutils multilib
+
+DESCRIPTION="DVB over UDP streaming solution"
+HOMEPAGE="http://dvbstreamer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite:3
+	sys-libs/readline
+	>=sys-devel/libtool-2.2.6"
+DEPEND="${RDEPEND}
+	virtual/linuxtv-dvb-headers"
+
+src_prepare() {
+	rm -rf libltdl
+	epatch "${FILESDIR}"/${P}-Werror.patch \
+		"${FILESDIR}"/${P}-libtool.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	rm -rf "${D}"/usr/doc
+
+	dodoc doc/*.txt ChangeLog README AUTHORS NEWS TODO
+}

diff --git a/media-tv/dvbstreamer/files/dvbstreamer-1.1-Werror.patch b/media-tv/dvbstreamer/files/dvbstreamer-1.1-Werror.patch
new file mode 100644
index 0000000..182b4ca
--- /dev/null
+++ b/media-tv/dvbstreamer/files/dvbstreamer-1.1-Werror.patch
@@ -0,0 +1,36 @@
+diff -ur dvbstreamer-1.1.orig/src/dvbpsi/Makefile.am dvbstreamer-1.1/src/dvbpsi/Makefile.am
+--- dvbstreamer-1.1.orig/src/dvbpsi/Makefile.am	2008-10-31 16:25:01.000000000 +0200
++++ dvbstreamer-1.1/src/dvbpsi/Makefile.am	2009-08-10 10:49:55.000000000 +0300
+@@ -1,7 +1,7 @@
+ AM_CFLAGS =\
+      -I$(top_srcdir)/include \
+      -I$(top_srcdir)/include/dvbpsi \
+-     -Wall -Werror
++     -Wall
+      
+ noinst_LIBRARIES = libdvbpsi.a 
+ 
+diff -ur dvbstreamer-1.1.orig/src/Makefile.am dvbstreamer-1.1/src/Makefile.am
+--- dvbstreamer-1.1.orig/src/Makefile.am	2008-10-31 16:25:02.000000000 +0200
++++ dvbstreamer-1.1/src/Makefile.am	2009-08-10 10:50:04.000000000 +0300
+@@ -3,7 +3,7 @@
+ INCLUDES = @INCLTDL@
+ 
+ AM_CFLAGS =\
+-     -I$(top_srcdir)/include -Wall -Werror -D_GNU_SOURCE 
++     -I$(top_srcdir)/include -Wall -D_GNU_SOURCE 
+ 
+ 
+ bin_PROGRAMS = dvbstreamer dvbctrl setupdvbstreamer
+diff -ur dvbstreamer-1.1.orig/src/plugins/Makefile.am dvbstreamer-1.1/src/plugins/Makefile.am
+--- dvbstreamer-1.1.orig/src/plugins/Makefile.am	2008-10-31 16:24:58.000000000 +0200
++++ dvbstreamer-1.1/src/plugins/Makefile.am	2009-08-10 10:50:17.000000000 +0300
+@@ -2,7 +2,7 @@
+ # Plugins
+ #
+ AM_CFLAGS =\
+-     -I$(top_srcdir)/include  -Wall -Werror -D_GNU_SOURCE
++     -I$(top_srcdir)/include  -Wall -D_GNU_SOURCE
+ 
+ pluginsdir = @DVBSTREAMER_PLUGINDIR@
+ 

diff --git a/media-tv/dvbstreamer/files/dvbstreamer-1.1-libtool.patch b/media-tv/dvbstreamer/files/dvbstreamer-1.1-libtool.patch
new file mode 100644
index 0000000..1b95f79
--- /dev/null
+++ b/media-tv/dvbstreamer/files/dvbstreamer-1.1-libtool.patch
@@ -0,0 +1,71 @@
+diff -ur dvbstreamer-1.1.orig/configure.in dvbstreamer-1.1/configure.in
+--- dvbstreamer-1.1.orig/configure.in	2008-10-31 16:49:00.000000000 +0200
++++ dvbstreamer-1.1/configure.in	2010-02-03 12:30:56.000000000 +0200
+@@ -23,7 +23,6 @@
+ 
+ AM_INIT_AUTOMAKE("dvbstreamer", $SPEC_VERSION)
+ 
+-AC_CONFIG_SUBDIRS(libltdl)
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_ISC_POSIX
+@@ -35,12 +34,8 @@
+ dnl ---------------------------------------------------------------------------
+ dnl Libltdl setup
+ dnl ---------------------------------------------------------------------------
+-AC_LIBTOOL_WIN32_DLL dnl Make sure under cygwin we can load plugins !!!
+-AC_LIBTOOL_DLOPEN
+-AC_LIBLTDL_CONVENIENCE
+-AC_PROG_LIBTOOL
+-AC_SUBST(INCLTDL)
+-AC_SUBST(LIBLTDL)
++LT_PREREQ([2.2.6])
++LT_INIT([dlopen win32-dll disable-static])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl Work out the libdir name (copied from xine-lib configure.ac)
+diff -ur dvbstreamer-1.1.orig/Makefile.am dvbstreamer-1.1/Makefile.am
+--- dvbstreamer-1.1.orig/Makefile.am	2008-10-31 16:25:03.000000000 +0200
++++ dvbstreamer-1.1/Makefile.am	2010-02-03 12:25:57.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## DVBStreamer main Makefile
+ 
+-SUBDIRS = libltdl include include/dvbpsi src/dvbpsi src src/plugins
++SUBDIRS = include include/dvbpsi src/dvbpsi src src/plugins
+ 
+ dvbstreamerdocdir = ${prefix}/doc/DVBStreamer
+ dvbstreamerdoc_DATA = \
+diff -ur dvbstreamer-1.1.orig/src/Makefile.am dvbstreamer-1.1/src/Makefile.am
+--- dvbstreamer-1.1.orig/src/Makefile.am	2008-10-31 16:25:02.000000000 +0200
++++ dvbstreamer-1.1/src/Makefile.am	2010-02-03 12:33:30.000000000 +0200
+@@ -1,7 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-INCLUDES = @INCLTDL@
+-
+ AM_CFLAGS =\
+      -I$(top_srcdir)/include -Wall -Werror -D_GNU_SOURCE 
+ 
+@@ -104,7 +102,7 @@
+ dvbstreamer_LDFLAGS = -rdynamic -Wl,-whole-archive -Wl,dvbpsi/libdvbpsi.a -Wl,-no-whole-archive 
+ 
+ dvbstreamer_LDADD = \
+-	  -lpthread -lsqlite3 -lreadline @GETTIME_LIB@ @ICONV_LIB@ @READLINE_TERMCAP@ @LIBLTDL@
++	  -lpthread -lsqlite3 -lreadline @GETTIME_LIB@ @ICONV_LIB@ @READLINE_TERMCAP@ -lltdl
+ 
+ #
+ # dvbctrl
+diff -ur dvbstreamer-1.1.orig/src/pluginmgr.c dvbstreamer-1.1/src/pluginmgr.c
+--- dvbstreamer-1.1.orig/src/pluginmgr.c	2008-10-31 16:25:02.000000000 +0200
++++ dvbstreamer-1.1/src/pluginmgr.c	2010-02-03 12:27:53.000000000 +0200
+@@ -22,9 +22,9 @@
+ */
+ #include <stdlib.h>
+ #include <string.h>
++#include <ltdl.h>
+ 
+ #include "config.h"
+-#include "ltdl.h"
+ #include "list.h"
+ #include "deliverymethod.h"
+ #include "patprocessor.h"

diff --git a/media-tv/dvbstreamer/files/dvbstreamer-2.0.0_rc1-evloop-configure.patch b/media-tv/dvbstreamer/files/dvbstreamer-2.0.0_rc1-evloop-configure.patch
new file mode 100644
index 0000000..09272cf
--- /dev/null
+++ b/media-tv/dvbstreamer/files/dvbstreamer-2.0.0_rc1-evloop-configure.patch
@@ -0,0 +1,11 @@
+--- a/configure.in	2010-02-15 11:46:33.000000000 -0500
++++ b/configure.in	2012-06-26 11:32:17.000000000 -0400
+@@ -188,7 +188,7 @@
+ dnl Check for libev
+ dnl ---------------------------------------------------------------------------
+ AC_CHECK_HEADER([ev.h], [], [AC_MSG_FAILURE([libev header file not found])])
+-AC_CHECK_LIB([ev], [ev_loop], [], [AC_MSG_FAILURE([libev not found])])
++AC_CHECK_DECL([ev_loop()], [], [AC_MSG_FAILURE([libev doesn't provide ev_loop])], [[#include <ev.h>]])
+ LIBS=""
+ 
+ dnl ---------------------------------------------------------------------------

diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
new file mode 100644
index 0000000..0a91523
--- /dev/null
+++ b/media-video/gxine/Manifest
@@ -0,0 +1,9 @@
+AUX gxine-0.5.905-desktop.patch 377 RMD160 ea7d11a796ff9142cf0f578b3b5a2fe3de4f2125 SHA1 b4a327db63dc99a755a34cb60b15e03a7b3d39d9 SHA256 e0051e9737382b3c21e2d3e6f0d9eacd1fb5d589f480a155a396e1924512d7a5
+AUX gxine-0.5.905-fix-nspr-useage.patch 433 RMD160 65af0ddee220ca456acf20eea521fe6a4600cd23 SHA1 fc7a2ce90a8e84d1f519a786de9f477264ea925b SHA256 4d05d9144eba4f30976ed3e33e3985c782b95227d165ab90b4f453c377451ea6
+AUX gxine-0.5.906-endif.patch 349 RMD160 0683bb409616d8ef878e4144e747bd0032fc236f SHA1 0c48cf0457f21dea9bdc70bed62421cd6bbdebfb SHA256 d3d14fdffe9f8e1872bcbf28670d48b72ed76d7a882902bb298902bb8ca4b6fa
+AUX gxine-0.5.907-glib-2.31.patch 636 RMD160 07142250875de0c55b8ec74d462f0802ea6354a3 SHA1 413fd32963958b5efbdb9310f45fbdca801c8083 SHA256 c45a8fa2df4a779bbc7866a3d7fd56c4c9946e71656f06452f5f147a9ee4e15c
+AUX gxine-0.5.907-mozjs187.patch 793 RMD160 8ea018f085598b4a04669b453f90d4329758df71 SHA1 80722b851aff4c6125552791edd08f9b1e36702b SHA256 3f3ecdff5dbbce75c2d54bd545a02b01c1840657556c3c42899804bb7f904d39
+DIST gxine-0.5.907.tar.xz 910528 RMD160 35be9f7737c1b45787a46dd61916c81c33bea15e SHA1 1b49b5b6a800611db032e4b7fd36af97a731a167 SHA256 b5c925806a35cb23a24a80a39d494cefb529e22c957987741f269a994ab258d5
+EBUILD gxine-0.5.907.ebuild 2729 RMD160 6046753fc2a63b8b4ead73ee09298c516c39ebc7 SHA1 9b4cf4c7efca4a7a5b2a392ae07c9066b0c5a43a SHA256 df6a163856992224fe78c9237aed48800529488a07f34ec92b0bd84e6d62ed87
+MISC ChangeLog 17755 RMD160 6d86b12fc0a4d27514e831ba5b8679f9671b8580 SHA1 68a6d384f2d57bc191163d95981000e4bcc70a29 SHA256 02cc1cd4ddccee05a645fc8d9e42fe85125da53e86c0f701d412122c1db30d61
+MISC metadata.xml 373 RMD160 879bbceb1af5297cc90a6191f9a40375a4732c81 SHA1 9e40c5d9bb710cc676c38c9a097af598db072e60 SHA256 202b197a4f7feb227636e8de2bc00c6af351fd80f72a7916df100aeadd056bd9

diff --git a/media-video/gxine/files/gxine-0.5.905-desktop.patch b/media-video/gxine/files/gxine-0.5.905-desktop.patch
new file mode 100644
index 0000000..c5777a1
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.905-desktop.patch
@@ -0,0 +1,12 @@
+--- gxine.desktop.in
++++ gxine.desktop.in
+@@ -14,5 +14,5 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=AudioVideo;GTK;Player;TV;
+-MimeType=x-content/video-dvd;x-content/audio-cdda;x-content/video-vcd;x-content/video-svcd;
+\ No newline at end of file
++Categories=AudioVideo;Video;GTK;Player;TV;
++MimeType=x-content/audio-cdda;
+\ No newline at end of file

diff --git a/media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch b/media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch
new file mode 100644
index 0000000..9d0e5f8
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am	2011-01-02 11:33:09.675000001 -0600
++++ b/src/Makefile.am	2011-01-02 11:34:05.205000001 -0600
+@@ -4,7 +4,7 @@
+ 	   -I$(top_builddir)/pixmaps $(LIRC_INCLUDE)
+ 
+ AM_CFLAGS = $(GNU99) $(XINE_CFLAGS) $(X_CFLAGS) \
+-	    $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) \
++	    $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) $(NSPR_CFLAGS) \
+ 	    $(HAL_CFLAGS) $(UDEV_CFLAGS) $(DBUS_CFLAGS) $(JS_CFLAGS) \
+ 	    -DLOCALEDIR=\"$(localedir)\"
+ 

diff --git a/media-video/gxine/files/gxine-0.5.906-endif.patch b/media-video/gxine/files/gxine-0.5.906-endif.patch
new file mode 100644
index 0000000..40c4a8a
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.906-endif.patch
@@ -0,0 +1,14 @@
+lirc.c:227:3: error: ‘gxine_lirc_thread’ undeclared (first use in this function)
+
+--- src/lirc.c
++++ src/lirc.c
+@@ -223,8 +223,8 @@
+   if (gxine_lirc_thread_created)
+     pthread_join (gxine_lirc_thread, NULL);
+   gxine_lirc_start ();
+-#endif
+   JS_SET_RVAL (cx, vp, gxine_lirc_thread ? JSVAL_TRUE : JSVAL_FALSE);
++#endif
+   return JS_TRUE;
+ }
+

diff --git a/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch b/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch
new file mode 100644
index 0000000..9edea6c
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/412323
+
+--- src/console_output.h
++++ src/console_output.h
+@@ -21,7 +21,7 @@
+ #ifndef GXINE_CONSOLE_OUTPUT_H
+ #define GXINE_CONSOLE_OUTPUT_H
+ 
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ void console_output_init (void);
+ 
+--- src/engine.c
++++ src/engine.c
+@@ -30,7 +30,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ 
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #include "engine.h"
+ #include "ui.h"
+--- src/main.c
++++ src/main.c
+@@ -46,7 +46,6 @@
+ #include <gdk/gdk.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <glib.h>
+-#include <glib/gmessages.h>
+ 
+ #include "desktop_integration.h"
+ #include "engine.h"

diff --git a/media-video/gxine/files/gxine-0.5.907-mozjs187.patch b/media-video/gxine/files/gxine-0.5.907-mozjs187.patch
new file mode 100644
index 0000000..f0412f3
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.907-mozjs187.patch
@@ -0,0 +1,21 @@
+--- gxine-0.5.907/m4/_js.m4	2012-06-22 09:25:50.000000000 -0400
++++ gxine-0.5.907/m4/_js.m4.new	2012-06-22 09:26:11.000000000 -0400
+@@ -51,9 +51,15 @@
+     if test x"$JS_CFLAGS" = x; then
+       AC_MSG_NOTICE([looking for the Spidermonkey Javascript library in various places.])
+ 
+-      JSLIB=mozjs185
+-      AC_MSG_NOTICE([trying mozjs via pkgconfig mozjs185])
+-      PKG_CHECK_MODULES([JS],[mozjs185],[],[:])
++      JSLIB=mozjs187
++      AC_MSG_NOTICE([trying mozjs via pkgconfig mozjs187])
++      PKG_CHECK_MODULES([JS],[mozjs187],[],[:])
++
++      if test x"$JS_CFLAGS" = x; then
++        JSLIB=mozjs185
++        AC_MSG_NOTICE([trying mozjs via pkgconfig mozjs185])
++        PKG_CHECK_MODULES([JS],[mozjs185],[],[:])
++      fi
+ 
+       if test x"$JS_CFLAGS" = x; then
+         JSLIB=mozjs

diff --git a/media-video/gxine/gxine-0.5.907.ebuild b/media-video/gxine/gxine-0.5.907.ebuild
new file mode 100644
index 0000000..9e01fb6
--- /dev/null
+++ b/media-video/gxine/gxine-0.5.907.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.907.ebuild,v 1.6 2012/05/17 20:32:07 ssuominen Exp $
+
+EAPI="4-slot-abi"
+inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="gnome-screensaver linguas_cs linguas_de lirc nls nsplugin udev +xcb xinerama"
+
+COMMON_DEPEND=">=media-libs/xine-lib-1.1.20
+	x11-libs/gtk+:2
+	>=dev-libs/glib-2
+	>=dev-lang/spidermonkey-1.8.2.15:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	gnome-screensaver? ( >=dev-libs/dbus-glib-0.90 )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	nsplugin? ( dev-libs/nspr
+		x11-libs/libXaw
+		x11-libs/libXt )
+	udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) )
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	gnome-screensaver? ( gnome-extra/gnome-screensaver )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	# ld: cannot find -ljs
+	sed -i -e '/JS_LIBS="`spidermonkey_locate_lib/s:js:mozjs:' m4/_js.m4 || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.5.905-desktop.patch \
+		"${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \
+		"${FILESDIR}"/${PN}-0.5.906-endif.patch \
+		"${FILESDIR}"/${PN}-0.5.907-glib-2.31.patch \
+		"${FILESDIR}"/${PN}-0.5.907-mozjs187.patch
+
+	# need to disable calling of xine-list when running without
+	# userpriv, otherwise we get sandbox violations (bug #233847)
+	if [[ ${EUID} == "0" ]]; then
+		sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable lirc) \
+		--enable-watchdog \
+		$(use_with xcb) \
+		$(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \
+		$(use_with nsplugin browser-plugin) \
+		$(use_with udev gudev) \
+		--without-hal \
+		$(use_with gnome-screensaver dbus) \
+		$(use_with xinerama)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install
+
+	dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO
+
+	use linguas_cs && dodoc README.cs
+	use linguas_de && dodoc README.de
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}

diff --git a/net-print/cups/.#Manifest.1.577 b/net-print/cups/.#Manifest.1.577
new file mode 100644
index 0000000..8f15135
--- /dev/null
+++ b/net-print/cups/.#Manifest.1.577
@@ -0,0 +1,36 @@
+AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
+AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0
+AUX cups-1.4.4-dont-compress-manpages.patch 580 RMD160 cbc2bf11025c1f27286bd7f2ece7ba76be6aa7ee SHA1 d7b2447263724eeb092b8cfc8ce54553ad1e5e11 SHA256 cdefd273dcdc78aa5fe14bb0246e25572da7d28a91de5c7ac8be2a0bdd915860
+AUX cups-1.4.4-fix-install-perms.patch 838 RMD160 206bd49e918bab96d24ca72f85f679d3c9122975 SHA1 6e8ef0f3e5c0efa636b4d2324bab2c8edc9461db SHA256 66e68f3bebd7339434e3de99582190d0bedce4b2e5370ff65104cc863daee6c2
+AUX cups-1.4.4-nostrip.patch 487 RMD160 27fe9a5512abb3496416e492dc4ec4fcd9c733c2 SHA1 2a1b6e7b718a5feb5921f38ec02f37b9d0edd310 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c45e716c29d5164cefee18bc61
+AUX cups-1.4.4-perl-includes.patch 637 RMD160 88d4f170ed5c9392860462f140adf9f860a24cfd SHA1 93185acfe7252ff9a69499f63192b3483d857cb0 SHA256 c730419e7b4bc16a8773a01eeb66523882901480af68686d0790558a2f5fe57d
+AUX cups-1.4.4-php-destdir.patch 679 RMD160 1b15d42373a952a608a01cb8c97efbbd3c78ac77 SHA1 e312bbae57224dead45284f9c62942b1a25282fc SHA256 d5126c5e917d8c41c7a4da1477800edd4aa752aaa4c6a67a73adbe1e3b050110
+AUX cups-1.4.6-force-gnutls.patch 3319 RMD160 c6cc024a702305eb81661d5cdadd9857e9a6778e SHA1 5ac62ed3ca20bc7a4541c990c676c433299b2177 SHA256 beb4014eac5218d9f424b81946ac1e209625026bf20a7f4820758e5ee1fe5b66
+AUX cups-1.4.6-serialize-gnutls.patch 3625 RMD160 873b2806cfec732c4a4f3f2981f666a958dd5b0e SHA1 aae046121d0139fbba1cb9147c8742f73b2f1fa0 SHA256 6bc9e16fc6865b2f3e0ee2d1947bdde691e41f90fce32b9839b3661dcea4a827
+AUX cups-1.4.8-CVE-2011-3170.patch 1045 RMD160 9a27eb1ec34ced57da5bbe7c55261d8aa35b01c0 SHA1 6155d7c4b34ff6447a93aa56fa4b5958eb943202 SHA256 c94d49c3ff980b830874dae4158768554f87f429ae400838a605505aae350af6
+AUX cups-1.4.8-largeimage.patch 572 RMD160 62e0a92fb1dc62adff43bcdc22f201da426d8916 SHA1 1528f2b1f67e7c532418dd7f495db1788ae7d2d4 SHA256 364a3ed3e161ad75836e6bc56746c25207680ab6f44563219c93146f0cf74541
+AUX cups-1.5.0-systemd-socket.patch 12829 RMD160 d4ca24c299daf65f2621568443a339f82bd03a2a SHA1 f45e18ba92d3afbca6a26ac676f2f42738032c10 SHA256 350eb1bdb76618dd082e9cda26c5b1400f4f870ffd521186f4d74940d15b4cd5
+AUX cups-1.5.2-browsing.patch 513 RMD160 592b2a814f23beea82d61446989636a393ab34a7 SHA1 43f78e93f84a4da430cb2e1ced268ea00d5f00b3 SHA256 47a229fb7be6ada4e48806c24cdba70cd2b6161ac8fcf1290e07063e486b7bfe
+AUX cups-1.5.2-linkperl.patch 724 RMD160 5e94f21ab236a88ec2026e69aed58ce17dafaa5c SHA1 8556aea40a07176b0daa184bcce1b1abe3d81c48 SHA256 48891623d98a1767c11865d59c72146aa277f1bd0abda9871ae90540676b648e
+AUX cups-1.5.2-threads.patch 730 RMD160 e021b2d2f5293fb58f24279f2550488f90dc91e5 SHA1 bc1b1a8048d36393995f056493b57f5022e6d854 SHA256 adb76ff55cd6857e7bc6c36e9cb9d63201fe14b0f853f52271b45a54ad07a710
+AUX cups-1.5.2-threads2.patch 3192 RMD160 9736e8b03458be45fd1f427d3726368e81d51539 SHA1 2d87e9fe0267f3d6192cc81d1410b5eb534af39d SHA256 07a495e49b7646bfbb0d9f12841f3db8ccd4493c69c8a626b96e913bca384f5c
+AUX cups-1.5.3-fix-install-perms.patch 989 RMD160 d1c3f9eb1b1f3444a5e1bc1ced03d6bfe0d90e8a SHA1 003ee9555f03e57ee3d7e440f5f2f7c365a2295e SHA256 784254b8d0580b1b9823c5a499052c4fc76e2cadf2c22f975b69ab8655fbc59c
+AUX cups-1.6.0-dont-compress-manpages.patch 435 RMD160 14221113caa783c63f04443580c013215660b73a SHA1 8ac8f95cf34c05a9b1bc3f8f5677f545ca71dc26 SHA256 d3e41e8d4a841ac71e5ed8598fc444a2f11b4c94215b55dcf5147694bbbc88c3
+AUX cups-1.6.0-fix-install-perms.patch 948 RMD160 ed566ab57fded47c6dd40364aae7f8ac19aa90ef SHA1 8d2cee2c103be6b9f5c2c20d1100bb347584a3d5 SHA256 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8
+AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea48170f3369486792ed9f98fe7d1c53487b455c SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95
+AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
+DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
+DIST cups-1.5.2-avahi.patch.bz2 17252 RMD160 40c7165de7f23e01aa3edf3968406e69fd0280f7 SHA1 e69c9b62b2773431dd7bb86573255d7c39fc2012 SHA256 6100029c6eec05729b6ef49f743876b9bf4d67f7b20b624be98372f4fb3e1ede
+DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467aea4910f10b SHA1 4bc3b40771261c37b63cbe4f65213b5db6c66534 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a
+DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
+DIST cups-1.5.3-avahi.patch.bz2 17298 RMD160 fb2856801c08ddd73eb2677211cc0bba3f74cc57 SHA1 2d15bd82350806a4dfbedc6b3c48da08b3a7efcb SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef
+DIST cups-1.5.3-source.tar.bz2 9580485 RMD160 3516c1a0909921c9ae6f33eed9e06c9d9c475e3f SHA1 f7c4fc7d115da20dbbb6a3a568259df6702a7caa SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d
+DIST cups-1.6b1-source.tar.bz2 8144645 RMD160 2cd340359661776361cc8d91d3514b0cd0d1f96c SHA1 ef3d67a49cb4c61207f66c9d5f792f04ef65fdf4 SHA256 ab2bd150635bfd84b710c92a942cdbff98fd74702d4aba04dd720064ccaa1fa1
+EBUILD cups-1.4.8-r1.ebuild 7244 RMD160 a1c15926b837ec497fe496a7f0f9051a0de8d923 SHA1 4068757755bb1b9d7e5a7057e041238232d458c7 SHA256 36ab04f13134fdc205b2ca137473e9489fd4dfd1cd0046362d94fbeecffa920a
+EBUILD cups-1.4.8-r23.ebuild 8854 RMD160 b84a4dbe91f91f012f457d2436e44a69c1f78727 SHA1 7bf8931ed2731b5600aeb70f78dd06dbdace0dbc SHA256 901288e3a86de7a3f2d797c63e20086da01c01141f63ac4b531281c3273ee587
+EBUILD cups-1.5.2-r4.ebuild 8358 RMD160 063d504cf9dc8fa86c930ee5ba97b933a4d714c6 SHA1 2236e37b7a8eef1d0facb0a3752073a627d38dc6 SHA256 bbb8f9fa84c4ea187e2bcf108df5f59fd7dbbea0ca76df9adf7c9451ab16b886
+EBUILD cups-1.5.3.ebuild 8610 RMD160 9ea42d49bcfee6e8359a79cc860b5fdaa368fa5f SHA1 6ddd54a737710e0f043c88c38eb581548c9c3ad1 SHA256 8ea5b6c3da1b667beb0cf89367f2599b84dc424e76fac6be17d026707284e119
+EBUILD cups-1.6_beta1-r1.ebuild 7844 RMD160 c27354ac1adc6d1ec9d27f74fd722262c61c4bb5 SHA1 ac8340228112ffddab0ff1bc04fa1e30024ce263 SHA256 961dbc3935ac11e00bc76655a8727f000658cb6fbfa42b591849a17b355e623c
+EBUILD cups-9999.ebuild 7919 RMD160 f2be286e9079872dae87d8ff34138b1e65fe134b SHA1 2f255964e7dde4deca9dc2acb8cc9c44c5784f0e SHA256 a0d869507700ec75306b5cca625634ee39a6f8065e558a928df83472addadb96
+MISC ChangeLog 74972 RMD160 4df3609d797d43806858bda787ca4561e811f3df SHA1 726ce7cd05c255b9c6d5ae77b1607b8e7dc885f4 SHA256 0078288a935e8b752cfc36702778ffaf2d4215521793a6a4f1d2053854cc425f
+MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8

diff --git a/net-print/cups/.#cups-1.5.2-r4.ebuild.1.13 b/net-print/cups/.#cups-1.5.2-r4.ebuild.1.13
new file mode 100644
index 0000000..bcec60a
--- /dev/null
+++ b/net-print/cups/.#cups-1.5.2-r4.ebuild.1.13
@@ -0,0 +1,302 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.5"
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
+
+MY_P=${P/_}
+MY_PV=${PV/_}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
+	http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
+	http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
+	+png python slp +ssl static-libs +threads +tiff usb X xinetd"
+
+LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	avahi? ( net-dns/avahi )
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.6 )
+	jpeg? ( virtual/jpeg:0 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap[ssl?,gnutls?] )
+	pam? ( virtual/pam )
+	perl? ( dev-lang/perl )
+	png? ( >=media-libs/libpng-1.4.3:0 )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	>=app-text/poppler-0.12.3-r3[utils]
+	filters? ( net-print/foomatic-filters )
+"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	# python 3 is no-go
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					eerror "Your usb printers will be managed via libusb. In this case, "
+					eerror "${P} requires the USB_PRINTER support disabled."
+					eerror "Please disable it:"
+					eerror "    CONFIG_USB_PRINTER=n"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        USB support  --->"
+					eerror "            [ ] USB Printer support"
+					eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	# various build time fixes
+	epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
+	epatch "${FILESDIR}/${PN}-1.5.2-linkperl.patch"
+	epatch "${FILESDIR}/${PN}-1.5.2-threads.patch"
+	epatch "${FILESDIR}/${PN}-1.5.2-threads2.patch"
+
+	# revert ipp backend to 1.4 state, as ubuntu and debian
+	epatch "${DISTDIR}/${PN}-1.5.2-ipp-r8950.patch.bz2"
+
+	# avahi support from debian
+	epatch "${DISTDIR}/${PN}-1.5.2-avahi.patch.bz2"
+
+	# browsing off by default
+	epatch "${FILESDIR}/${PN}-1.5.2-browsing.patch"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+}
+
+src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	# locale support
+	strip-linguas ${LANGS}
+	if [ -z "${LINGUAS}" ] ; then
+		export LINGUAS=none
+	fi
+
+	local myconf
+	if use ssl ; then
+		myconf+="
+			$(use_enable gnutls)
+			$(use_enable !gnutls openssl)
+		"
+	else
+		myconf+="
+			--disable-gnutls
+			--disable-openssl
+		"
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir=/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-pdftops=/usr/bin/pdftops \
+		--with-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable avahi) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable jpeg) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		$(use_enable png) \
+		$(use_enable slp) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable tiff) \
+		$(use_enable usb libusb) \
+		$(use_with java) \
+		$(use_with perl) \
+		--without-php \
+		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		--disable-dnssd \
+		${myconf}
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die
+	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
+	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
+}
+
+src_compile() {
+	emake
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	emake BUILDROOT="${D}" install
+	dodoc {CHANGES,CREDITS,README}.txt
+
+	if use perl ; then
+		pushd scripting/perl > /dev/null
+		perl-module_src_install
+		fixlocalpod
+		popd > /dev/null
+	fi
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use avahi && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+	else
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/cache/cups /var/cache/cups/rss /var/log/cups \
+		/var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${ED}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	echo
+	elog "For information about installing a printer and general cups setup"
+	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
+	echo
+	elog "Network browsing for printers is now switched off by default in the config file."
+	elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
+	elog "afterwards re-start or reload cups."
+	echo
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}

diff --git a/net-print/cups/.#cups-1.5.3.ebuild.1.4 b/net-print/cups/.#cups-1.5.3.ebuild.1.4
new file mode 100644
index 0000000..0ca6d64
--- /dev/null
+++ b/net-print/cups/.#cups-1.5.3.ebuild.1.4
@@ -0,0 +1,311 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.3.ebuild,v 1.4 2012/06/14 12:03:45 naota Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.5"
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 systemd
+
+MY_P=${P/_}
+MY_PV=${PV/_}
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
+		http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+else
+	inherit subversion
+	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
+	+png python slp +ssl static-libs systemd +threads +tiff usb X xinetd"
+
+LANGS="da de es eu fi fr hu id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	avahi? ( net-dns/avahi )
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.6 )
+	jpeg? ( virtual/jpeg:0 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap[ssl?,gnutls?] )
+	pam? ( virtual/pam )
+	perl? ( dev-lang/perl )
+	png? ( >=media-libs/libpng-1.4.3:0 )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	systemd? ( sys-apps/systemd )
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	>=app-text/poppler-0.12.3-r3[utils]
+	filters? ( net-print/foomatic-filters )
+"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-1.5.3-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
+	"${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
+	"${FILESDIR}/${PN}-1.5.2-linkperl.patch"
+	"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"		# systemd support
+	"${WORKDIR}/${PN}-1.5.3-avahi.patch"			# avahi support from debian
+	"${FILESDIR}/${PN}-1.5.2-browsing.patch"		# browsing off by default
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	# python 3 is no-go
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					eerror "Your usb printers will be managed via libusb. In this case, "
+					eerror "${P} requires the USB_PRINTER support disabled."
+					eerror "Please disable it:"
+					eerror "    CONFIG_USB_PRINTER=n"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        USB support  --->"
+					eerror "            [ ] USB Printer support"
+					eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+}
+
+src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	# locale support
+	strip-linguas ${LANGS}
+	if [ -z "${LINGUAS}" ] ; then
+		export LINGUAS=none
+	fi
+
+	local myconf
+	if use ssl ; then
+		myconf+="
+			$(use_enable gnutls)
+			$(use_enable !gnutls openssl)
+		"
+	else
+		myconf+="
+			--disable-gnutls
+			--disable-openssl
+		"
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir=/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-pdftops=/usr/bin/pdftops \
+		--with-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable avahi) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable jpeg) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		$(use_enable png) \
+		$(use_enable slp) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable tiff) \
+		$(use_enable usb libusb) \
+		$(use_with java) \
+		$(use_with perl) \
+		--without-php \
+		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		--disable-dnssd \
+		$(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \
+		${myconf}
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die
+	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
+	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
+}
+
+src_compile() {
+	emake
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	emake BUILDROOT="${D}" install
+	dodoc {CHANGES,CREDITS,README}.txt
+
+	if use perl ; then
+		pushd scripting/perl > /dev/null
+		perl-module_src_install
+		fixlocalpod
+		popd > /dev/null
+	fi
+
+	# move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm -f "${ED}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use avahi && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+	else
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/cache/cups /var/cache/cups/rss /var/log/cups \
+		/var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${ED}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	echo
+	elog "For information about installing a printer and general cups setup"
+	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
+	echo
+	elog "Network browsing for printers is now switched off by default in the config file."
+	elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
+	elog "afterwards re-start or reload cups."
+	echo
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}

diff --git a/net-print/cups/cups-1.4.8-r1.ebuild b/net-print/cups/cups-1.4.8-r1.ebuild
new file mode 100644
index 0000000..ea7b850
--- /dev/null
+++ b/net-print/cups/cups-1.4.8-r1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator user java-pkg-opt-2
+
+MY_P=${P/_}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl php +png python slp +ssl static-libs +threads +tiff X xinetd"
+
+LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.6 )
+	jpeg? ( virtual/jpeg:0 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap[ssl?,gnutls?] )
+	pam? ( virtual/pam )
+	perl? ( dev-lang/perl )
+	php? ( dev-lang/php )
+	png? ( >=media-libs/libpng-1.4.3:0 )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	!net-print/cupsddk
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	>=app-text/poppler-0.12.3-r3[utils]
+	filters? ( net-print/foomatic-filters )
+"
+
+# upstream includes an interactive test which is a nono for gentoo.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	# python 3 is no-go
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	linux-info_pkg_setup
+	if  ! linux_config_exists; then
+		ewarn "Can't check the linux kernel configuration."
+		ewarn "You might have some incompatible options enabled."
+	else
+		#here we should warn user that he should enable it so he can print
+		if ! linux_chkconfig_present USB_PRINTER; then
+			ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+			ewarn "support in your kernel."
+			ewarn "Please enable it:"
+			ewarn "    CONFIG_USB_PRINTER=y"
+			ewarn "in /usr/src/linux/.config or"
+			ewarn "    Device Drivers --->"
+			ewarn "        USB support  --->"
+			ewarn "            [*] USB Printer support"
+		fi
+	fi
+}
+
+src_prepare() {
+	# create a missing symlink to allow https printing via IPP, bug #217293
+	epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch"
+	# various build time fixes
+	epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
+	epatch "${FILESDIR}/${PN}-1.4.6-force-gnutls.patch"
+	epatch "${FILESDIR}/${PN}-1.4.6-serialize-gnutls.patch"
+	# security fixes
+	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-3170.patch"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+}
+
+src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	# locale support
+	strip-linguas ${LANGS}
+	if [ -z "${LINGUAS}" ] ; then
+		export LINGUAS=none
+	fi
+
+	local myconf
+	if use ssl || use gnutls ; then
+		myconf+="
+			$(use_enable gnutls)
+			$(use_enable !gnutls openssl)
+		"
+	else
+		myconf+="
+			--disable-gnutls
+			--disable-openssl
+		"
+	fi
+
+	# bug 352252, recheck for later versions if still necessary....
+	if use gnutls && ! use threads ; then
+		ewarn "The useflag gnutls requires also threads enabled. Switching on threads."
+	fi
+	if use gnutls || use threads ; then
+		myconf+=" --enable-threads "
+	else
+		myconf+=" --disable-threads "
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir=/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-pdftops=/usr/bin/pdftops \
+		--with-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable jpeg) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		$(use_enable png) \
+		$(use_enable slp) \
+		$(use_enable static-libs static) \
+		$(use_enable tiff) \
+		$(use_with java) \
+		$(use_with perl) \
+		$(use_with php) \
+		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		--disable-libusb \
+		--disable-dnssd \
+		${myconf}
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die
+	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
+	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+
+	if use php ; then
+		cd "${S}"/scripting/php
+		emake || die "emake php failed"
+	fi
+}
+
+src_install() {
+	emake BUILDROOT="${D}" install || die "emake install failed"
+	dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed"
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_install
+		fixlocalpod
+	fi
+
+	if use php ; then
+		cd "${S}"/scripting/php
+		emake DESTDIR="${D}" install || die "emake install for php bindings failed"
+	fi
+
+	# clean out cups init scripts
+	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd || die "doinitd failed"
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${D}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+	else
+		rm -rf "${D}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \
+		/var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${D}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
+}
+
+pkg_postinst() {
+	echo
+	elog "For information about installing a printer and general cups setup"
+	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
+	echo
+}

diff --git a/net-print/cups/cups-1.4.8-r23.ebuild b/net-print/cups/cups-1.4.8-r23.ebuild
new file mode 100644
index 0000000..f09c2e9
--- /dev/null
+++ b/net-print/cups/cups-1.4.8-r23.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.7 2012/06/01 04:19:51 zmedico Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
+
+MY_P=${P/_}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl php +png python slp +ssl static-libs +threads +tiff usb X xinetd"
+
+LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.6 )
+	jpeg? ( virtual/jpeg:0 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap[ssl?,gnutls?] )
+	pam? ( virtual/pam )
+	perl? ( dev-lang/perl )
+	php? ( dev-lang/php )
+	png? ( >=media-libs/libpng-1.4.3:0 )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	!net-print/cupsddk
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	>=app-text/poppler-0.12.3-r3[utils]
+	filters? ( net-print/foomatic-filters )
+"
+
+# upstream includes an interactive test which is a nono for gentoo.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	# python 3 is no-go
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	if use usb; then
+		elog "You are going to use new libusb backed to access your usb printer."
+		elog "This interface has quite few known issues and does not report all"
+		elog "issues and just refuses to print."
+		elog "Please consider disabling usb useflag if you are having issues."
+		elog
+		elog "Please note that if you disable the usb useflag your device will be"
+		elog "still working using kernel usblp interface instead of libusb."
+		echo
+	fi
+
+	linux-info_pkg_setup
+	if  ! linux_config_exists; then
+		ewarn "Can't check the linux kernel configuration."
+		ewarn "You might have some incompatible options enabled."
+	else
+		# recheck that we don't have usblp to collide with libusb
+		if use usb; then
+			if linux_chkconfig_present USB_PRINTER; then
+				eerror "Your usb printers will be managed via libusb which collides with kernel module."
+				eerror "${P} requires the USB_PRINTER support disabled."
+				eerror "Please disable it:"
+				eerror "    CONFIG_USB_PRINTER=n"
+				eerror "in /usr/src/linux/.config or"
+				eerror "    Device Drivers --->"
+				eerror "        USB support  --->"
+				eerror "            [ ] USB Printer support"
+				eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+			fi
+		else
+			#here we should warn user that he should enable it so he can print
+			if ! linux_chkconfig_present USB_PRINTER; then
+				ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+				ewarn "support in your kernel."
+				ewarn "Please enable it:"
+				ewarn "    CONFIG_USB_PRINTER=y"
+				ewarn "in /usr/src/linux/.config or"
+				ewarn "    Device Drivers --->"
+				ewarn "        USB support  --->"
+				ewarn "            [*] USB Printer support"
+				ewarn "Alternatively, enable the usb useflag for cups and use the new, less-tested libusb code."
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	# create a missing symlink to allow https printing via IPP, bug #217293
+	epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch"
+	# various build time fixes
+	epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
+	epatch "${FILESDIR}/${PN}-1.4.6-force-gnutls.patch"
+	epatch "${FILESDIR}/${PN}-1.4.6-serialize-gnutls.patch"
+	epatch "${FILESDIR}/${PN}-1.4.8-largeimage.patch"
+	# security fixes
+	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-3170.patch"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+}
+
+src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	# locale support
+	strip-linguas ${LANGS}
+	if [ -z "${LINGUAS}" ] ; then
+		export LINGUAS=none
+	fi
+
+	local myconf
+	if use ssl || use gnutls ; then
+		myconf+="
+			$(use_enable gnutls)
+			$(use_enable !gnutls openssl)
+		"
+	else
+		myconf+="
+			--disable-gnutls
+			--disable-openssl
+		"
+	fi
+
+	# bug 352252, recheck for later versions if still necessary....
+	if use gnutls && ! use threads ; then
+		ewarn "The useflag gnutls requires also threads enabled. Switching on threads."
+	fi
+	if use gnutls || use threads ; then
+		myconf+=" --enable-threads "
+	else
+		myconf+=" --disable-threads "
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir=/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-pdftops=/usr/bin/pdftops \
+		--with-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable jpeg) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		$(use_enable png) \
+		$(use_enable slp) \
+		$(use_enable static-libs static) \
+		$(use_enable tiff) \
+		$(use_enable usb libusb) \
+		$(use_with java) \
+		$(use_with perl) \
+		$(use_with php) \
+		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		--disable-dnssd \
+		${myconf}
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die
+	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
+	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+
+	if use php ; then
+		cd "${S}"/scripting/php
+		emake || die "emake php failed"
+	fi
+}
+
+src_install() {
+	emake BUILDROOT="${D}" install || die "emake install failed"
+	dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed"
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_install
+		fixlocalpod
+	fi
+
+	if use php ; then
+		cd "${S}"/scripting/php
+		emake DESTDIR="${D}" install || die "emake install for php bindings failed"
+	fi
+
+	# clean out cups init scripts
+	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd || die "doinitd failed"
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${D}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+	else
+		rm -rf "${D}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/cache/cups /var/cache/cups/rss /var/log/cups \
+		/var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${D}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	echo
+	elog "For information about installing a printer and general cups setup"
+	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
+	echo
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}

diff --git a/net-print/cups/files/cups-1.4.0-backend-https.patch b/net-print/cups/files/cups-1.4.0-backend-https.patch
new file mode 100644
index 0000000..8a70a20
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.0-backend-https.patch
@@ -0,0 +1,11 @@
+diff -Naur cups-1.4.0/backend/Makefile cups-1.4.0.new/backend/Makefile
+--- cups-1.4.0/backend/Makefile	2009-03-03 20:39:21.000000000 +0100
++++ cups-1.4.0.new/backend/Makefile	2009-09-01 14:00:05.592615359 +0200
+@@ -91,6 +91,7 @@
+ 	done
+ 	$(RM) $(SERVERBIN)/backend/http
+ 	$(LN) ipp $(SERVERBIN)/backend/http
++	$(LN) ipp $(SERVERBIN)/backend/https
+ 	if test "x$(DNSSD_BACKEND)" != x; then \
+ 		$(RM) $(SERVERBIN)/backend/mdns; \
+ 		$(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \

diff --git a/net-print/cups/files/cups-1.4.2-str3200.patch b/net-print/cups/files/cups-1.4.2-str3200.patch
new file mode 100644
index 0000000..47d9114
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.2-str3200.patch
@@ -0,0 +1,43 @@
+Index: scheduler/select.c
+===================================================================
+--- scheduler/select.c	(revision 8887)
++++ scheduler/select.c	(working copy)
+@@ -454,7 +454,7 @@
+     if (fdptr->read_cb && event->filter == EVFILT_READ)
+       (*(fdptr->read_cb))(fdptr->data);
+ 
+-    if (fdptr->write_cb && event->filter == EVFILT_WRITE)
++    if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
+       (*(fdptr->write_cb))(fdptr->data);
+ 
+     release_fd(fdptr);
+@@ -499,7 +499,8 @@
+ 	if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP)))
+ 	  (*(fdptr->read_cb))(fdptr->data);
+ 
+-	if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
++	if (fdptr->use > 1 && fdptr->write_cb &&
++	    (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
+ 	  (*(fdptr->write_cb))(fdptr->data);
+ 
+ 	release_fd(fdptr);
+@@ -590,7 +591,8 @@
+       if (fdptr->read_cb && (pfd->revents & (POLLIN | POLLERR | POLLHUP)))
+         (*(fdptr->read_cb))(fdptr->data);
+ 
+-      if (fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
++      if (fdptr->use > 1 && fdptr->write_cb &&
++          (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
+         (*(fdptr->write_cb))(fdptr->data);
+ 
+       release_fd(fdptr);
+@@ -645,7 +647,8 @@
+       if (fdptr->read_cb && FD_ISSET(fdptr->fd, &cupsd_current_input))
+         (*(fdptr->read_cb))(fdptr->data);
+ 
+-      if (fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
++      if (fdptr->use > 1 && fdptr->write_cb &&
++          FD_ISSET(fdptr->fd, &cupsd_current_output))
+         (*(fdptr->write_cb))(fdptr->data);
+ 
+       release_fd(fdptr);

diff --git a/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch b/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch
new file mode 100644
index 0000000..4a639c0
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch
@@ -0,0 +1,20 @@
+# Source: Fedora
+
+diff -up cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man cups-1.4b2-svn8404/config-scripts/cups-manpages.m4
+--- cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man	2009-01-16 08:58:42.000000000 +0000
++++ cups-1.4b2-svn8404/config-scripts/cups-manpages.m4	2009-03-05 11:11:12.000000000 +0000
+@@ -69,10 +69,10 @@ case "$uname" in
+ 		;;
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and Mac OS X
+-		MAN1EXT=1.gz
+-		MAN5EXT=5.gz
+-		MAN7EXT=7.gz
+-		MAN8EXT=8.gz
++		MAN1EXT=1
++		MAN5EXT=5
++		MAN7EXT=7
++		MAN8EXT=8
+ 		MAN8DIR=8
+ 		;;
+ 	*)

diff --git a/net-print/cups/files/cups-1.4.4-fix-install-perms.patch b/net-print/cups/files/cups-1.4.4-fix-install-perms.patch
new file mode 100644
index 0000000..726f030
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-fix-install-perms.patch
@@ -0,0 +1,22 @@
+# Source: Fedora
+
+diff -up cups-1.4.2/Makedefs.in.0755 cups-1.4.2/Makedefs.in
+--- cups-1.4.2/Makedefs.in.0755	2010-01-13 17:06:48.507913044 +0000
++++ cups-1.4.2/Makedefs.in	2010-01-13 17:07:10.049912905 +0000
+@@ -41,13 +41,13 @@ SHELL		=	/bin/sh
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+ INSTALL_DATA	=	$(INSTALL) -c -m 444
+ INSTALL_DIR	=	$(INSTALL) -d
+-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+ INSTALL_MAN	=	$(INSTALL) -c -m 444
+-INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
++INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
+ 
+ #
+ # Default user, group, and system groups for the scheduler...

diff --git a/net-print/cups/files/cups-1.4.4-nostrip.patch b/net-print/cups/files/cups-1.4.4-nostrip.patch
new file mode 100644
index 0000000..cd2b070
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-nostrip.patch
@@ -0,0 +1,14 @@
+# Source: Gentoo
+
+diff -urN cups-1.4.4/config-scripts/cups-compiler.m4 cups-1.4.4.new/config-scripts/cups-compiler.m4
+--- cups-1.4.4/config-scripts/cups-compiler.m4	2009-05-17 02:13:47.000000000 +0200
++++ cups-1.4.4.new/config-scripts/cups-compiler.m4	2010-08-12 19:19:45.937020635 +0200
+@@ -30,7 +30,7 @@
+ if test x$enable_debug = xyes; then
+ 	OPTIM="-g"
+ else
+-	INSTALL_STRIP="-s"
++	INSTALL_STRIP=""
+ fi
+ 
+ dnl Debug printfs can slow things down, so provide a separate option for that

diff --git a/net-print/cups/files/cups-1.4.4-perl-includes.patch b/net-print/cups/files/cups-1.4.4-perl-includes.patch
new file mode 100644
index 0000000..677c57d
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-perl-includes.patch
@@ -0,0 +1,12 @@
+diff -urN cups-1.4.4/scripting/perl/Makefile.PL cups-1.4.4.new//scripting/perl/Makefile.PL
+--- cups-1.4.4/scripting/perl/Makefile.PL	2002-08-19 22:43:03.000000000 +0200
++++ cups-1.4.4.new//scripting/perl/Makefile.PL	2010-09-12 19:12:53.173000149 +0200
+@@ -11,7 +11,7 @@
+     'LIBS'		=> ['-lcups '], # e.g., '-lm'
+     'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
+ 	# Insert -I. if you add *.h files later:
+-    'INC'		=> '', # e.g., '-I/usr/include/other'
++    'INC'		=> '-I../../', # e.g., '-I/usr/include/other'
+ 	# Un-comment this if you add C files to link with later:
+     # 'OBJECT'		=> '$(O_FILES)', # link all the C files too
+ );

diff --git a/net-print/cups/files/cups-1.4.4-php-destdir.patch b/net-print/cups/files/cups-1.4.4-php-destdir.patch
new file mode 100644
index 0000000..01a64c8
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-php-destdir.patch
@@ -0,0 +1,21 @@
+# Source: Gentoo
+
+diff -urN cups-1.4.4/scripting/php/Makefile cups-1.4.4.new//scripting/php/Makefile
+--- cups-1.4.4/scripting/php/Makefile	2008-08-27 23:12:43.000000000 +0200
++++ cups-1.4.4.new//scripting/php/Makefile	2010-08-13 10:32:35.764063909 +0200
+@@ -95,11 +95,11 @@
+ 
+ install-exec:
+ 	echo Installing $(PHPCUPS) in $(PHPDIR)
+-	$(INSTALL_DIR) $(PHPDIR)
+-	$(INSTALL_LIB) $(PHPCUPS) $(PHPDIR)
++	$(INSTALL_DIR) $(DESTDIR)/$(PHPDIR)
++	$(INSTALL_LIB) $(PHPCUPS) $(DESTDIR)/$(PHPDIR)
+ 	if test "x$(SYMROOT)" != x; then \
+-		$(INSTALL_DIR) $(SYMROOT); \
+-		cp $(PHPCUPS) $(SYMROOT); \
++		$(INSTALL_DIR) $(DESTDIR)/$(SYMROOT); \
++		cp $(PHPCUPS) $(DESTDIR)/$(SYMROOT); \
+ 	fi
+ 
+ 

diff --git a/net-print/cups/files/cups-1.4.6-force-gnutls.patch b/net-print/cups/files/cups-1.4.6-force-gnutls.patch
new file mode 100644
index 0000000..06daeb3
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.6-force-gnutls.patch
@@ -0,0 +1,93 @@
+Source: http://pkgs.fedoraproject.org/gitweb/?p=cups.git;a=blob;f=cups-force-gnutls.patch;h=85adaa8bdcc013e5401fffe74306a5fe644cf088;hb=HEAD
+Reason: Force the use of gnutls despite thread-safety concerns (Gentoo bug #350406)
+Upstream: http://cups.org/str.php?L3605
+
+diff -up cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls cups-1.4.4/config-scripts/cups-ssl.m4
+--- cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls	2010-09-15 16:49:22.343502552 +0100
++++ cups-1.4.4/config-scripts/cups-ssl.m4	2010-09-15 16:49:42.347502595 +0100
+@@ -65,23 +65,21 @@ if test x$enable_ssl != xno; then
+ 	if $PKGCONFIG --exists gnutls; then
+ 	    if test "x$have_pthread" = xyes; then
+ 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
+-	    else
+-	        have_ssl=1
+-	        SSLLIBS=`$PKGCONFIG --libs gnutls`
+-	        SSLFLAGS=`$PKGCONFIG --cflags gnutls`
+-	        AC_DEFINE(HAVE_SSL)
+-	        AC_DEFINE(HAVE_GNUTLS)
+ 	    fi
++	    have_ssl=1
++	    SSLLIBS=`$PKGCONFIG --libs gnutls`
++	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
++	    AC_DEFINE(HAVE_SSL)
++	    AC_DEFINE(HAVE_GNUTLS)
+ 	elif test "x$LIBGNUTLSCONFIG" != x; then
+ 	    if test "x$have_pthread" = xyes; then
+ 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
+-	    else
+-	        have_ssl=1
+-	        SSLLIBS=`$LIBGNUTLSCONFIG --libs`
+-	        SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
+-	        AC_DEFINE(HAVE_SSL)
+-	        AC_DEFINE(HAVE_GNUTLS)
+ 	    fi
++	    have_ssl=1
++	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
++	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
++	    AC_DEFINE(HAVE_SSL)
++	    AC_DEFINE(HAVE_GNUTLS)
+ 	fi
+ 
+ 	if test $have_ssl = 1; then
+diff -up cups-1.4.4/configure.force-gnutls cups-1.4.4/configure
+--- cups-1.4.4/configure.force-gnutls	2010-06-17 19:25:47.000000000 +0100
++++ cups-1.4.4/configure	2010-09-15 16:50:01.689503165 +0100
+@@ -17542,36 +17542,34 @@ fi
+ 	    if test "x$have_pthread" = xyes; then
+ 		{ echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
+ echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
+-	    else
+-	        have_ssl=1
+-	        SSLLIBS=`$PKGCONFIG --libs gnutls`
+-	        SSLFLAGS=`$PKGCONFIG --cflags gnutls`
+-	        cat >>confdefs.h <<\_ACEOF
++	    fi
++	    have_ssl=1
++	    SSLLIBS=`$PKGCONFIG --libs gnutls`
++	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
++	    cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SSL 1
+ _ACEOF
+ 
+-	        cat >>confdefs.h <<\_ACEOF
++	    cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GNUTLS 1
+ _ACEOF
+ 
+-	    fi
+ 	elif test "x$LIBGNUTLSCONFIG" != x; then
+ 	    if test "x$have_pthread" = xyes; then
+ 		{ echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
+ echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
+-	    else
+-	        have_ssl=1
+-	        SSLLIBS=`$LIBGNUTLSCONFIG --libs`
+-	        SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
+-	        cat >>confdefs.h <<\_ACEOF
++	    fi
++	    have_ssl=1
++	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
++	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
++	    cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SSL 1
+ _ACEOF
+ 
+-	        cat >>confdefs.h <<\_ACEOF
++	    cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GNUTLS 1
+ _ACEOF
+ 
+-	    fi
+ 	fi
+ 
+ 	if test $have_ssl = 1; then

diff --git a/net-print/cups/files/cups-1.4.6-serialize-gnutls.patch b/net-print/cups/files/cups-1.4.6-serialize-gnutls.patch
new file mode 100644
index 0000000..bfe9f5e
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.6-serialize-gnutls.patch
@@ -0,0 +1,113 @@
+Source: http://pkgs.fedoraproject.org/gitweb/?p=cups.git;a=blob;f=cups-serialize-gnutls.patch;h=cdd82cb95574801bf714364a585e31eb05191750;hb=HEAD
+Reason: Perform locking for gnutls and avoid libgcrypt's broken locking (Gentoo bug #350406)
+Upstream: http://cups.org/str.php?L3605
+
+diff -up cups-1.4.4/cups/http.c.serialize-gnutls cups-1.4.4/cups/http.c
+--- cups-1.4.4/cups/http.c.serialize-gnutls	2010-09-17 13:37:01.858871762 +0100
++++ cups-1.4.4/cups/http.c	2010-09-17 13:55:22.579871934 +0100
+@@ -149,7 +149,7 @@ static int		http_write_ssl(http_t *http,
+ 
+ #  ifdef HAVE_GNUTLS
+ #    ifdef HAVE_PTHREAD_H
+-GCRY_THREAD_OPTION_PTHREAD_IMPL;
++static pthread_mutex_t gnutls_lock;
+ #    endif /* HAVE_PTHREAD_H */
+ 
+ #  elif defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
+@@ -1231,7 +1231,7 @@ httpInitialize(void)
+   */
+ 
+ #  ifdef HAVE_PTHREAD_H
+-  gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
++  pthread_mutex_init(&gnutls_lock, NULL);
+ #  endif /* HAVE_PTHREAD_H */
+ 
+  /*
+@@ -2228,6 +2228,7 @@ _httpWait(http_t *http,			/* I - Connect
+     if (SSL_pending((SSL *)(http->tls)))
+       return (1);
+ #  elif defined(HAVE_GNUTLS)
++    /* lock already held here... */
+     if (gnutls_record_check_pending(((http_tls_t *)(http->tls))->session))
+       return (1);
+ #  elif defined(HAVE_CDSASSL)
+@@ -2294,6 +2295,8 @@ int					/* O - 1 if data is available, 0
+ httpWait(http_t *http,			/* I - Connection to server */
+          int    msec)			/* I - Milliseconds to wait */
+ {
++  int ret;
++
+  /*
+   * First see if there is data in the buffer...
+   */
+@@ -2318,7 +2321,17 @@ httpWait(http_t *http,			/* I - Connecti
+   * If not, check the SSL/TLS buffers and do a select() on the connection...
+   */
+ 
+-  return (_httpWait(http, msec, 1));
++#if defined(HAVE_SSL) && defined(HAVE_GNUTLS) && defined(HAVE_PTHREAD_H)
++  pthread_mutex_lock(&gnutls_lock);
++#endif
++
++  ret = _httpWait(http, msec, 1);
++
++#if defined(HAVE_SSL) && defined(HAVE_GNUTLS) && defined(HAVE_PTHREAD_H)
++  pthread_mutex_unlock(&gnutls_lock);
++#endif
++
++  return (ret);
+ }
+ 
+ 
+@@ -2769,7 +2782,9 @@ http_read_ssl(http_t *http,		/* I - Conn
+   ssize_t	result;			/* Return value */
+ 
+ 
++  pthread_mutex_lock(&gnutls_lock);
+   result = gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len);
++  pthread_mutex_unlock(&gnutls_lock);
+ 
+   if (result < 0 && !errno)
+   {
+@@ -3085,6 +3100,7 @@ http_setup_ssl(http_t *http)		/* I - Con
+     return (-1);
+   }
+ 
++  pthread_mutex_lock(&gnutls_lock);
+   gnutls_certificate_allocate_credentials(credentials);
+ 
+   gnutls_init(&(conn->session), GNUTLS_CLIENT);
+@@ -3104,9 +3120,11 @@ http_setup_ssl(http_t *http)		/* I - Con
+     free(credentials);
+     free(conn);
+ 
++    pthread_mutex_unlock(&gnutls_lock);
+     return (-1);
+   }
+ 
++  pthread_mutex_unlock(&gnutls_lock);
+   conn->credentials = credentials;
+ 
+ #  elif defined(HAVE_CDSASSL)
+@@ -3196,9 +3214,11 @@ http_shutdown_ssl(http_t *http)		/* I - 
+   conn = (http_tls_t *)(http->tls);
+   credentials = (gnutls_certificate_client_credentials *)(conn->credentials);
+ 
++  pthread_mutex_lock(&gnutls_lock);
+   gnutls_bye(conn->session, GNUTLS_SHUT_RDWR);
+   gnutls_deinit(conn->session);
+   gnutls_certificate_free_credentials(*credentials);
++  pthread_mutex_unlock(&gnutls_lock);
+   free(credentials);
+   free(conn);
+ 
+@@ -3445,7 +3465,9 @@ http_write_ssl(http_t     *http,	/* I - 
+ #  elif defined(HAVE_GNUTLS)
+   ssize_t	result;			/* Return value */
+ 
++  pthread_mutex_lock(&gnutls_lock);
+   result = gnutls_record_send(((http_tls_t *)(http->tls))->session, buf, len);
++  pthread_mutex_unlock(&gnutls_lock);
+ 
+   if (result < 0 && !errno)
+   {

diff --git a/net-print/cups/files/cups-1.4.8-CVE-2011-3170.patch b/net-print/cups/files/cups-1.4.8-CVE-2011-3170.patch
new file mode 100644
index 0000000..843456f
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.8-CVE-2011-3170.patch
@@ -0,0 +1,37 @@
+Source: Upstream http://cups.org/str.php?L3914
+Reason: Avoid GIF reader loop (CVE-2011-2896)
+Upstream: Fixed in trunk
+
+diff -up cups-1.4.8/filter/image-gif.c.CVE-2011-2896 cups-1.4.8/filter/image-gif.c
+--- cups-1.4.8/filter/image-gif.c.CVE-2011-2896	2011-06-20 21:37:51.000000000 +0100
++++ cups-1.4.8/filter/image-gif.c	2011-08-19 11:33:37.547911212 +0100
+@@ -648,11 +648,13 @@ gif_read_lzw(FILE *fp,			/* I - File to 
+ 
+     if (code == max_code)
+     {
+-      *sp++ = firstcode;
+-      code  = oldcode;
++      if (sp < (stack + 8192))
++	*sp++ = firstcode;
++
++      code = oldcode;
+     }
+ 
+-    while (code >= clear_code)
++    while (code >= clear_code && sp < (stack + 8192))
+     {
+       *sp++ = table[1][code];
+       if (code == table[0][code])
+@@ -661,8 +663,10 @@ gif_read_lzw(FILE *fp,			/* I - File to 
+       code = table[0][code];
+     }
+ 
+-    *sp++ = firstcode = table[1][code];
+-    code  = max_code;
++    if (sp < (stack + 8192))
++      *sp++ = firstcode = table[1][code];
++
++    code = max_code;
+ 
+     if (code < 4096)
+     {

diff --git a/net-print/cups/files/cups-1.4.8-largeimage.patch b/net-print/cups/files/cups-1.4.8-largeimage.patch
new file mode 100644
index 0000000..abf0b44
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.8-largeimage.patch
@@ -0,0 +1,18 @@
+Index: filter/image.c
+===================================================================
+--- filter/image.c	(Revision 9872)
++++ filter/image.c	(Revision 9873)
+@@ -349,9 +349,10 @@
+   * Load the image as appropriate...
+   */
+ 
+-  img->max_ics = CUPS_TILE_MINIMUM;
+-  img->xppi    = 128;
+-  img->yppi    = 128;
++  img->cachefile = -1;
++  img->max_ics   = CUPS_TILE_MINIMUM;
++  img->xppi      = 128;
++  img->yppi      = 128;
+ 
+   if (!memcmp(header, "GIF87a", 6) || !memcmp(header, "GIF89a", 6))
+     status = _cupsImageReadGIF(img, fp, primary, secondary, saturation, hue,

diff --git a/net-print/cups/files/cups-1.5.0-systemd-socket.patch b/net-print/cups/files/cups-1.5.0-systemd-socket.patch
new file mode 100644
index 0000000..60918b3
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.0-systemd-socket.patch
@@ -0,0 +1,396 @@
+diff -up cups-1.5.0/config.h.in.systemd-socket cups-1.5.0/config.h.in
+--- cups-1.5.0/config.h.in.systemd-socket	2011-10-18 15:32:40.741672460 +0100
++++ cups-1.5.0/config.h.in	2011-10-18 15:32:40.843670530 +0100
+@@ -503,6 +503,13 @@
+ 
+ 
+ /*
++ * Do we have systemd support?
++ */
++
++#undef HAVE_SYSTEMD
++
++
++/*
+  * Various scripting languages...
+  */
+ 
+diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/config-scripts/cups-systemd.m4
+--- cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket	2011-10-18 15:32:40.844670511 +0100
++++ cups-1.5.0/config-scripts/cups-systemd.m4	2011-10-18 15:33:16.861989058 +0100
+@@ -0,0 +1,36 @@
++dnl
++dnl "$Id: cups-1.5.0-systemd-socket.patch,v 1.1 2012/01/28 20:43:10 dilfridge Exp $"
++dnl
++dnl   systemd stuff for CUPS.
++
++dnl Find whether systemd is available
++
++SDLIBS=""
++AC_ARG_WITH([systemdsystemunitdir],
++        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
++        [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
++if test "x$with_systemdsystemunitdir" != xno; then
++        AC_MSG_CHECKING(for libsystemd-daemon)
++        if $PKGCONFIG --exists libsystemd-daemon; then
++		AC_MSG_RESULT(yes)
++        	SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
++        	SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
++		AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
++		AC_DEFINE(HAVE_SYSTEMD)
++	else
++		AC_MSG_RESULT(no)
++	fi
++fi
++
++if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then
++        SYSTEMD_UNITS="cups.service cups.socket cups.path"
++else
++        SYSTEMD_UNITS=""
++fi
++
++AC_SUBST(SYSTEMD_UNITS)
++AC_SUBST(SDLIBS)
++
++dnl
++dnl "$Id: cups-1.5.0-systemd-socket.patch,v 1.1 2012/01/28 20:43:10 dilfridge Exp $"
++dnl
+diff -up cups-1.5.0/configure.in.systemd-socket cups-1.5.0/configure.in
+--- cups-1.5.0/configure.in.systemd-socket	2010-11-20 01:03:46.000000000 +0000
++++ cups-1.5.0/configure.in	2011-10-18 15:32:40.844670511 +0100
+@@ -37,6 +37,7 @@ sinclude(config-scripts/cups-pam.m4)
+ sinclude(config-scripts/cups-largefile.m4)
+ sinclude(config-scripts/cups-dnssd.m4)
+ sinclude(config-scripts/cups-launchd.m4)
++sinclude(config-scripts/cups-systemd.m4)
+ sinclude(config-scripts/cups-defaults.m4)
+ sinclude(config-scripts/cups-pdf.m4)
+ sinclude(config-scripts/cups-scripting.m4)
+@@ -71,6 +72,9 @@ AC_OUTPUT(Makedefs
+ 	  conf/snmp.conf
+ 	  cups-config
+ 	  data/testprint
++          data/cups.service
++          data/cups.socket
++          data/cups.path
+ 	  desktop/cups.desktop
+ 	  doc/help/ref-cupsd-conf.html
+ 	  doc/help/standard.html
+diff -up cups-1.5.0/cups/usersys.c.systemd-socket cups-1.5.0/cups/usersys.c
+--- cups-1.5.0/cups/usersys.c.systemd-socket	2011-10-18 15:32:40.645674277 +0100
++++ cups-1.5.0/cups/usersys.c	2011-10-18 15:32:40.845670492 +0100
+@@ -770,7 +770,7 @@ cups_read_client_conf(
+     struct stat	sockinfo;		/* Domain socket information */
+ 
+     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
+-	(sockinfo.st_mode & S_IRWXO) == S_IRWXO)
++	(sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
+       cups_server = CUPS_DEFAULT_DOMAINSOCKET;
+     else
+ #endif /* CUPS_DEFAULT_DOMAINSOCKET */
+diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.in
+--- cups-1.5.0/data/cups.path.in.systemd-socket	2011-10-18 15:32:40.846670473 +0100
++++ cups-1.5.0/data/cups.path.in	2011-10-18 15:32:40.846670473 +0100
+@@ -0,0 +1,8 @@
++[Unit]
++Description=CUPS Printer Service Spool
++
++[Path]
++PathExistsGlob=@CUPS_REQUESTS@/d*
++
++[Install]
++WantedBy=multi-user.target
+diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.service.in
+--- cups-1.5.0/data/cups.service.in.systemd-socket	2011-10-18 15:32:40.846670473 +0100
++++ cups-1.5.0/data/cups.service.in	2011-10-18 15:32:40.846670473 +0100
+@@ -0,0 +1,9 @@
++[Unit]
++Description=CUPS Printing Service
++
++[Service]
++ExecStart=@sbindir@/cupsd -f
++
++[Install]
++Also=cups.socket cups.path
++WantedBy=printer.target
+diff -up cups-1.5.0/data/cups.socket.in.systemd-socket cups-1.5.0/data/cups.socket.in
+--- cups-1.5.0/data/cups.socket.in.systemd-socket	2011-10-18 15:32:40.847670454 +0100
++++ cups-1.5.0/data/cups.socket.in	2011-10-18 15:32:40.847670454 +0100
+@@ -0,0 +1,10 @@
++[Unit]
++Description=CUPS Printing Service Sockets
++
++[Socket]
++ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
++ListenStream=631
++BindIPv6Only=ipv6-only
++
++[Install]
++WantedBy=sockets.target
+diff -up cups-1.5.0/data/Makefile.systemd-socket cups-1.5.0/data/Makefile
+--- cups-1.5.0/data/Makefile.systemd-socket	2011-05-12 06:21:56.000000000 +0100
++++ cups-1.5.0/data/Makefile	2011-10-18 15:32:40.847670454 +0100
+@@ -112,6 +112,12 @@ install-data:
+ 		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
++	if test "x$(SYSTEMD_UNITS)" != "x" ; then \
++		$(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \
++		for file in $(SYSTEMD_UNITS); do \
++			$(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \
++		done; \
++	fi
+ 
+ 
+ #
+@@ -159,6 +165,9 @@ uninstall:
+ 	-$(RMDIR) $(DATADIR)/charsets
+ 	-$(RMDIR) $(DATADIR)/banners
+ 	-$(RMDIR) $(DATADIR)
++	for file in $(SYSTEMD_UNITS); do \
++		$(RM) $(SYSTEMDUNITDIR)/$$file; \
++	done
+ 
+ 
+ #
+diff -up cups-1.5.0/Makedefs.in.systemd-socket cups-1.5.0/Makedefs.in
+--- cups-1.5.0/Makedefs.in.systemd-socket	2011-10-18 15:32:40.719672876 +0100
++++ cups-1.5.0/Makedefs.in	2011-10-18 15:32:40.848670435 +0100
+@@ -143,6 +143,7 @@ CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
+ CXXLIBS		=	@CXXLIBS@
+ DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
+ DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
++SYSTEMD_UNITS   =       @SYSTEMD_UNITS@
+ DNSSD_BACKEND	=	@DNSSD_BACKEND@
+ DSOFLAGS	=	-L../cups @DSOFLAGS@
+ DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
+@@ -151,6 +152,7 @@ FONTS		=	@FONTS@
+ IMGLIBS		=	@IMGLIBS@
+ IMGFILTERS	=	@IMGFILTERS@
+ LAUNCHDLIBS	=	@LAUNCHDLIBS@
++SDLIBS		=	@SDLIBS@
+ LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
+ 			-L../scheduler @LDARCHFLAGS@ \
+ 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
+@@ -267,6 +269,7 @@ PAMFILE		=	@PAMFILE@
+ 
+ DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
+ DBUSDIR		=	@DBUSDIR@
++SYSTEMDUNITDIR  =       $(BUILDROOT)@systemdsystemunitdir@
+ 
+ 
+ #
+diff -up cups-1.5.0/scheduler/client.h.systemd-socket cups-1.5.0/scheduler/client.h
+--- cups-1.5.0/scheduler/client.h.systemd-socket	2011-03-25 21:25:38.000000000 +0000
++++ cups-1.5.0/scheduler/client.h	2011-10-18 15:32:40.848670435 +0100
+@@ -75,6 +75,9 @@ typedef struct
+   int			fd;		/* File descriptor for this server */
+   http_addr_t		address;	/* Bind address of socket */
+   http_encryption_t	encryption;	/* To encrypt or not to encrypt... */
++#ifdef HAVE_SYSTEMD
++  int			is_systemd;	/* Is this a systemd socket? */
++#endif /* HAVE_SYSTEMD */
+ } cupsd_listener_t;
+ 
+ 
+diff -up cups-1.5.0/scheduler/listen.c.systemd-socket cups-1.5.0/scheduler/listen.c
+--- cups-1.5.0/scheduler/listen.c.systemd-socket	2011-04-16 00:38:13.000000000 +0100
++++ cups-1.5.0/scheduler/listen.c	2011-10-18 15:32:40.849670416 +0100
+@@ -401,7 +401,11 @@ cupsdStopListening(void)
+        lis;
+        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
+   {
+-    if (lis->fd != -1)
++    if (lis->fd != -1
++#ifdef HAVE_SYSTEMD
++        && !lis->is_systemd
++#endif /* HAVE_SYSTEMD */
++        )
+     {
+ #ifdef WIN32
+       closesocket(lis->fd);
+diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c
+--- cups-1.5.0/scheduler/main.c.systemd-socket	2011-10-18 15:32:40.802671306 +0100
++++ cups-1.5.0/scheduler/main.c	2011-10-18 15:32:40.851670379 +0100
+@@ -26,6 +26,8 @@
+  *   launchd_checkin()     - Check-in with launchd and collect the listening
+  *                           fds.
+  *   launchd_checkout()    - Update the launchd KeepAlive file as needed.
++ *   systemd_checkin()     - Check-in with systemd and collect the
++ *                           listening fds.
+  *   parent_handler()      - Catch USR1/CHLD signals...
+  *   process_children()    - Process all dead children...
+  *   select_timeout()      - Calculate the select timeout value.
+@@ -62,6 +64,10 @@
+ #  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
+ #endif /* HAVE_LAUNCH_H */
+ 
++#ifdef HAVE_SYSTEMD
++#include <systemd/sd-daemon.h>
++#endif /* HAVE_SYSTEMD */
++
+ #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
+ #  include <malloc.h>
+ #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
+@@ -78,6 +84,9 @@
+ static void		launchd_checkin(void);
+ static void		launchd_checkout(void);
+ #endif /* HAVE_LAUNCHD */
++#ifdef HAVE_SYSTEMD
++static void		systemd_checkin(void);
++#endif /* HAVE_SYSTEMD */
+ static void		parent_handler(int sig);
+ static void		process_children(void);
+ static void		sigchld_handler(int sig);
+@@ -537,6 +546,13 @@ main(int  argc,				/* I - Number of comm
+   }
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++ /*
++  * If we were started by systemd get the listen sockets file descriptors...
++  */
++  systemd_checkin();
++#endif /* HAVE_SYSTEMD */
++
+  /*
+   * Startup the server...
+   */
+@@ -759,6 +775,15 @@ main(int  argc,				/* I - Number of comm
+ 	}
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++       /*
++	* If we were started by systemd get the listen sockets file
++	* descriptors...
++        */
++
++        systemd_checkin();
++#endif /* HAVE_SYSTEMD */
++
+        /*
+         * Startup the server...
+         */
+@@ -1584,6 +1609,100 @@ launchd_checkout(void)
+ }
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++static void
++systemd_checkin(void)
++{
++  int n, fd;
++
++  n = sd_listen_fds(0);
++  if (n < 0)
++  {
++    cupsdLogMessage(CUPSD_LOG_ERROR,
++           "systemd_checkin: Failed to acquire sockets from systemd - %s",
++           strerror(-n));
++    exit(EXIT_FAILURE);
++    return;
++  }
++
++  if (n == 0)
++    return;
++
++  for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++)
++  {
++    http_addr_t addr;
++    socklen_t addrlen = sizeof (addr);
++    int r;
++    cupsd_listener_t *lis;
++    char s[256];
++
++    r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1);
++    if (r < 0) {
++      cupsdLogMessage(CUPSD_LOG_ERROR,
++             "systemd_checkin: Unable to verify socket type - %s",
++             strerror(-r));
++      continue;
++    }
++
++    if (!r) {
++      cupsdLogMessage(CUPSD_LOG_ERROR,
++             "systemd_checkin: Socket not of the right type");
++      continue;
++    }
++
++    if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
++    {
++      cupsdLogMessage(CUPSD_LOG_ERROR,
++             "systemd_checkin: Unable to get local address - %s",
++             strerror(errno));
++      continue;
++    }
++
++     /*
++    * Try to match the systemd socket address to one of the listeners...
++    */
++
++    for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
++       lis;
++       lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
++      if (httpAddrEqual(&lis->address, &addr))
++      break;
++
++    if (lis)
++    {
++      cupsdLogMessage(CUPSD_LOG_DEBUG,
++                      "systemd_checkin: Matched existing listener %s with fd %d...",
++                      httpAddrString(&(lis->address), s, sizeof(s)), fd);
++    }
++    else
++    {
++      cupsdLogMessage(CUPSD_LOG_DEBUG,
++                      "systemd_checkin: Adding new listener %s with fd %d...",
++                      httpAddrString(&addr, s, sizeof(s)), fd);
++
++      if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
++      {
++        cupsdLogMessage(CUPSD_LOG_ERROR,
++                        "systemd_checkin: Unable to allocate listener - "
++                        "%s.", strerror(errno));
++        exit(EXIT_FAILURE);
++      }
++
++      cupsArrayAdd(Listeners, lis);
++
++      memcpy(&lis->address, &addr, sizeof(lis->address));
++    }
++
++    lis->fd = fd;
++    lis->is_systemd = 1;
++
++#  ifdef HAVE_SSL
++    if (_httpAddrPort(&(lis->address)) == 443)
++      lis->encryption = HTTP_ENCRYPT_ALWAYS;
++#  endif /* HAVE_SSL */
++  }
++}
++#endif /* HAVE_SYSTEMD */
+ 
+ /*
+  * 'parent_handler()' - Catch USR1/CHLD signals...
+diff -up cups-1.5.0/scheduler/Makefile.systemd-socket cups-1.5.0/scheduler/Makefile
+--- cups-1.5.0/scheduler/Makefile.systemd-socket	2011-10-18 15:32:40.817671022 +0100
++++ cups-1.5.0/scheduler/Makefile	2011-10-18 15:32:40.852670360 +0100
+@@ -382,7 +382,7 @@ cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cu
+ 	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
+ 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
+ 		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
+-		$(LIBGSSAPI) $(LIBWRAP)
++		$(LIBGSSAPI) $(LIBWRAP) $(SDLIBS)
+ 
+ cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
+ 	echo Linking $@...
+@@ -390,7 +390,7 @@ cupsd-static:	$(CUPSDOBJS) libcupsmime.a
+ 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
+ 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
+ 		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
+-		$(LIBWRAP)
++		$(LIBWRAP) $(SDLIBS)
+ 
+ 
+ #

diff --git a/net-print/cups/files/cups-1.5.2-browsing.patch b/net-print/cups/files/cups-1.5.2-browsing.patch
new file mode 100644
index 0000000..6ab08b1
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.2-browsing.patch
@@ -0,0 +1,13 @@
+diff -ruN cups-1.5.2.orig/conf/cupsd.conf.in cups-1.5.2/conf/cupsd.conf.in
+--- cups-1.5.2.orig/conf/cupsd.conf.in	2010-12-09 22:24:51.000000000 +0100
++++ cups-1.5.2/conf/cupsd.conf.in	2012-04-19 00:12:31.004045949 +0200
+@@ -18,7 +18,8 @@
+ @CUPS_LISTEN_DOMAINSOCKET@
+ 
+ # Show shared printers on the local network.
+-Browsing On
++# We switch this off by default in Gentoo, to avoid an unnecessary open port.
++Browsing Off
+ BrowseOrder allow,deny
+ BrowseAllow all
+ BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@

diff --git a/net-print/cups/files/cups-1.5.2-linkperl.patch b/net-print/cups/files/cups-1.5.2-linkperl.patch
new file mode 100644
index 0000000..1bffda5
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.2-linkperl.patch
@@ -0,0 +1,12 @@
+diff -ruN cups-1.5.2.orig/scripting/perl/Makefile.PL cups-1.5.2/scripting/perl/Makefile.PL
+--- cups-1.5.2.orig/scripting/perl/Makefile.PL	2002-08-19 22:43:03.000000000 +0200
++++ cups-1.5.2/scripting/perl/Makefile.PL	2012-04-19 22:11:45.000000000 +0200
+@@ -8,7 +8,7 @@
+     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
+       (ABSTRACT_FROM => 'CUPS.pm', # retrieve abstract from module
+        AUTHOR     => 'A. U. Thor <a.u.thor@××××××××××××××××.away>') : ()),
+-    'LIBS'		=> ['-lcups '], # e.g., '-lm'
++    'LIBS'		=> ['-L../../cups -lcups '], # e.g., '-lm'
+     'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
+ 	# Insert -I. if you add *.h files later:
+     'INC'		=> '', # e.g., '-I/usr/include/other'

diff --git a/net-print/cups/files/cups-1.5.2-threads.patch b/net-print/cups/files/cups-1.5.2-threads.patch
new file mode 100644
index 0000000..cb94221
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.2-threads.patch
@@ -0,0 +1,21 @@
+Index: cups/thread-private.h
+===================================================================
+--- cups/thread-private.h	(Revision 10432)
++++ cups/thread-private.h	(Revision 10433)
+@@ -49,7 +49,7 @@
+ typedef void *(__stdcall *_cups_thread_func_t)(void *arg);
+ typedef struct _cups_mutex_s
+ {
+-  int			m_init;		/* Flag for on-demand initialization */		
++  int			m_init;		/* Flag for on-demand initialization */
+   CRITICAL_SECTION	m_criticalSection;
+ 					/* Win32 Critical Section */
+ } _cups_mutex_t;
+@@ -62,6 +62,7 @@
+ #    define _cupsThreadSetData(k,p) TlsSetValue(k,p)
+ 
+ #  else
++typedef void	*(*_cups_thread_func_t)(void *arg);
+ typedef char	_cups_mutex_t;
+ typedef char	_cups_rwlock_t;
+ typedef void	*_cups_threadkey_t;

diff --git a/net-print/cups/files/cups-1.5.2-threads2.patch b/net-print/cups/files/cups-1.5.2-threads2.patch
new file mode 100644
index 0000000..0dece11
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.2-threads2.patch
@@ -0,0 +1,111 @@
+Index: cups/thread-private.h
+===================================================================
+--- cups/thread-private.h	(Revision 10434)
++++ cups/thread-private.h	(Revision 10435)
+@@ -3,7 +3,7 @@
+  *
+  *   Private threading definitions for CUPS.
+  *
+- *   Copyright 2009-2010 by Apple Inc.
++ *   Copyright 2009-2012 by Apple Inc.
+  *
+  *   These coded instructions, statements, and computer programs are the
+  *   property of Apple Inc. and are protected by Federal copyright
+Index: cups/thread.c
+===================================================================
+--- cups/thread.c	(Revision 10434)
++++ cups/thread.c	(Revision 10435)
+@@ -3,7 +3,7 @@
+  *
+  *   Threading primitives for CUPS.
+  *
+- *   Copyright 2009-2010 by Apple Inc.
++ *   Copyright 2009-2012 by Apple Inc.
+  *
+  *   These coded instructions, statements, and computer programs are the
+  *   property of Apple Inc. and are protected by Federal copyright
+@@ -113,7 +113,7 @@
+  * '_cupsThreadCreate()' - Create a thread.
+  */
+ 
+-int					/* O - 0 on failure, 1 on success */	
++int					/* O - 0 on failure, 1 on success */
+ _cupsThreadCreate(
+     _cups_thread_func_t func,		/* I - Entry point */
+     void                *arg)		/* I - Entry point context */
+@@ -223,7 +223,7 @@
+  * '_cupsThreadCreate()' - Create a thread.
+  */
+ 
+-int					/* O - 0 on failure, 1 on success */	
++int					/* O - 0 on failure, 1 on success */
+ _cupsThreadCreate(
+     _cups_thread_func_t func,		/* I - Entry point */
+     void                *arg)		/* I - Entry point context */
+@@ -309,6 +309,25 @@
+ {
+   (void)rwlock;
+ }
++
++
++/*
++ * '_cupsThreadCreate()' - Create a thread.
++ */
++
++int					/* O - 0 on failure, 1 on success */
++_cupsThreadCreate(
++    _cups_thread_func_t func,		/* I - Entry point */
++    void                *arg)		/* I - Entry point context */
++{
++  fputs("DEBUG: CUPS was compiled without threading support, no thread "
++        "created.\n", stderr);
++
++  (void)func;
++  (void)arg;
++
++  return (0);
++}
+ #endif /* HAVE_PTHREAD_H */
+ 
+ 
+Index: cups/globals.c
+===================================================================
+--- cups/globals.c	(Revision 10434)
++++ cups/globals.c	(Revision 10435)
+@@ -44,8 +44,10 @@
+ static pthread_once_t	cups_globals_key_once = PTHREAD_ONCE_INIT;
+ 					/* One-time initialization object */
+ #endif /* HAVE_PTHREAD_H */
++#if defined(HAVE_PTHREAD_H) || defined(WIN32)
+ static _cups_mutex_t	cups_global_mutex = _CUPS_MUTEX_INITIALIZER;
+ 					/* Global critical section */
++#endif /* HAVE_PTHREAD_H || WIN32 */
+ 
+ 
+ /*
+@@ -56,7 +58,9 @@
+ static void		cups_fix_path(char *path);
+ #endif /* WIN32 */
+ static _cups_globals_t	*cups_globals_alloc(void);
++#if defined(HAVE_PTHREAD_H) || defined(WIN32)
+ static void		cups_globals_free(_cups_globals_t *g);
++#endif /* HAVE_PTHREAD_H || WIN32 */
+ #ifdef HAVE_PTHREAD_H
+ static void		cups_globals_init(void);
+ #endif /* HAVE_PTHREAD_H */
+@@ -322,6 +326,7 @@
+  * 'cups_globals_free()' - Free global data.
+  */
+ 
++#if defined(HAVE_PTHREAD_H) || defined(WIN32)
+ static void
+ cups_globals_free(_cups_globals_t *cg)	/* I - Pointer to global data */
+ {
+@@ -354,6 +359,7 @@
+ 
+   free(cg);
+ }
++#endif /* HAVE_PTHREAD_H || WIN32 */
+ 
+ 
+ #ifdef HAVE_PTHREAD_H

diff --git a/net-print/cups/files/cups-1.5.3-fix-install-perms.patch b/net-print/cups/files/cups-1.5.3-fix-install-perms.patch
new file mode 100644
index 0000000..50ad424
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.3-fix-install-perms.patch
@@ -0,0 +1,24 @@
+diff -ruN cups-1.5.3.orig/Makedefs.in cups-1.5.3/Makedefs.in
+--- cups-1.5.3.orig/Makedefs.in	2012-03-01 01:05:55.000000000 +0100
++++ cups-1.5.3/Makedefs.in	2012-06-02 19:32:42.000000000 +0200
+@@ -41,14 +41,14 @@
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+-INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
+-INSTALL_DATA	=	$(INSTALL) -c -m 444
++INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
++INSTALL_DATA	=	$(INSTALL) -c -m 644
+ INSTALL_DIR	=	$(INSTALL) -d
+-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_MAN	=	$(INSTALL) -c -m 444
+-INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
++INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_MAN	=	$(INSTALL) -c -m 644
++INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
+ 
+ #
+ # Default user, group, and system groups for the scheduler...

diff --git a/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
new file mode 100644
index 0000000..62db46e
--- /dev/null
+++ b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
@@ -0,0 +1,19 @@
+Index: config-scripts/cups-manpages.m4
+===================================================================
+--- config-scripts/cups-manpages.m4	(Revision 10458)
++++ config-scripts/cups-manpages.m4	(Arbeitskopie)
+@@ -69,10 +69,10 @@
+ 		;;
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and OS X
+-		MAN1EXT=1.gz
+-		MAN5EXT=5.gz
+-		MAN7EXT=7.gz
+-		MAN8EXT=8.gz
++		MAN1EXT=1
++		MAN5EXT=5
++		MAN7EXT=7
++		MAN8EXT=8
+ 		MAN8DIR=8
+ 		;;
+ 	*)

diff --git a/net-print/cups/files/cups-1.6.0-fix-install-perms.patch b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
new file mode 100644
index 0000000..2d7a77c
--- /dev/null
+++ b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
@@ -0,0 +1,25 @@
+Index: Makedefs.in
+===================================================================
+--- Makedefs.in	(Revision 10520)
++++ Makedefs.in	(Arbeitskopie)
+@@ -40,14 +40,14 @@
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
++INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+-INSTALL_DATA	=	$(INSTALL) -c -m 444
++INSTALL_DATA	=	$(INSTALL) -c -m 644
+ INSTALL_DIR	=	$(INSTALL) -d
+-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_MAN	=	$(INSTALL) -c -m 444
+-INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
++INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_MAN	=	$(INSTALL) -c -m 644
++INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
+ 
+ #
+ # Default user, group, and system groups for the scheduler...

diff --git a/net-print/cups/files/cupsd.init.d b/net-print/cups/files/cupsd.init.d
new file mode 100644
index 0000000..1e9ccf8
--- /dev/null
+++ b/net-print/cups/files/cupsd.init.d
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+
+depend() {
+	use net
+	@neededservices@
+	before nfs
+	after logger
+}
+
+start() {
+	ebegin "Starting cupsd"
+	checkpath -q -d -m 0755 -o root:lp /var/run/cups
+	checkpath -q -d -m 0511 -o lp:lpadmin /var/run/cups/certs
+	start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cupsd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd
+	eend $?
+}

diff --git a/net-print/cups/files/pdftops-1.20.gentoo b/net-print/cups/files/pdftops-1.20.gentoo
new file mode 100644
index 0000000..8fdafe3
--- /dev/null
+++ b/net-print/cups/files/pdftops-1.20.gentoo
@@ -0,0 +1,340 @@
+#!/usr/bin/perl -w
+# pdftops.pl - wrapper script for xpdf's pdftops utility to act as a CUPS filter
+# ==============================================================================
+# 1.00 - 2004-10-05/Bl
+#	Initial implementation
+# 1.10 - 2006-09-27/Bl
+#	Alternatively, use Adobe Reader in place of Xpdf's pdftops
+# 1.20 - 2007-12-03/Bl
+#	Safe temp file creation (fix gentoo bug # 201042)
+#
+# Copyright: Helge Blischke / SRZ Berlin 2004-2006
+# This program is free seoftware and governed by the GNU Public License Version 2.
+#
+# Description:
+# ------------
+#	This program wraps the pdftops utility from the xpdf 3.00 (and higher) suite
+#	to behave as a CUPS filter as a replacement for the original pdftops filter.
+#	As an alternative the Adobe Reader may be used.
+#
+#	The main purpose of this approach is to keep the properties of a PDF to be
+#	printed as undesturbed as possible, especially with respect to page size,
+#	scaling, and positioning.
+#
+#	The pdftops utility reads a configuration file 'pdftops.conf' or 'acroread.conf',
+#	respectively, in the CUPS_SERVERROOT directory, which must exist but may be empty. 
+#	The sample configuration file accompanying this program sets the defaults which
+#	seem plausible to me with respect to high end production printers.
+#
+#	To give the user highest possible flexibility, this program accepts and
+#	evaluates a set of job attributes special to this filter, which are 
+#	described below:
+#	
+#		pdf-pages=<f>,<l>
+#				expands to the -f and -l options of pdftops
+#				or the -start and -end options of acroread, respectively
+#				to select a page range to process. This is independent
+#				of the page-ranges attribute and may significantly
+#				increase throughput when printing page ranges.
+#				Either of these numbers may be omitted.
+#
+#		pdf-paper=<name>
+#				For pdftops, <name> may be one of "letter", "legal",
+#				"A4", "A3", or "match"; for acroread, the permetted values
+#				are "letter", "legal", "tabloid", "ledger", "executive",
+#				"a3", "a4", "a5", "b4", "b5", respectively (without the
+#				quotes; the names are treated case independent).
+#				In case of acroread, no paper specification is equivalent
+#				to pdsftops's "match".
+#		pdf-paper=<width>x<height>
+#				<name> may be one of letter, legal , A4, A3, or match;
+#				<width> and <height> are the paper width and height
+#				in printers points (1/72 inch). This expands to
+#				either the -paper or the -paperh and -paperw options
+#				of pdftops or the -size option of acroread.
+#
+#		pdf-opw=<password>
+#		pdf-upw=<password>
+#				expand to the -opw and -upw options of pdftops,
+#				respectively and permit printing of password
+#				protected PDFs.
+#
+#		pdf-<option>	where <option> is one of
+#				level1, level1sep, level2, level2sep, level3, level3sep,
+#				opi, nocrop, expand, noshrink, nocenter.
+#				See the pdftops manpage for a detailed description of
+#				the respective options.
+#				In case of acroread, the options level1, level?sep, opi,
+#				nocrop, noshrink, and nocenter are silently ignored.
+#
+#	All other pdftops commandline options are refused.
+#
+#	The return code of the pdftops utility or acroread, if nonzero, is used as the exit code
+#	of this program; error messages of the pdftops utility are only visible
+#	if 'debug' is specified as LogLevel in cupsd.conf.
+#
+#	NOTE:
+#	-----
+#	This wrapper script has been initially designed to use the original pdftops utility
+#	as a CUPS filter and now extended to alternately use acroread.
+#	But there are situations where you need to be able to select either variant, thus it
+#	is possible to configure the wrapper to both programs but select one of them by default;
+#	the other one then may be selected by command line option:
+#
+#	use-pdftops		selects pdftops
+#	use-acroread		selects acroread
+#
+#	if both are configured (by defining the appropriate configuration file).
+#
+
+#
+# Site specific parameters - modify as needed
+# ----------------------------------------------------------------------------------
+$pdftops_path = "/usr/bin/pdftops";		# path to the xpdf utility
+$acroread_path = "/opt/bin/acroread";		# path to Adobe Reader
+$default_app = 'use-pdftops';			# the default if both are configured
+$use_pdftops = 1;				# default on gentoo and highly recommended
+$use_acroread = 0;				# not supported/working on gentoo yet, use at your own risk
+# ----------------------------------------------------------------------------------
+
+use File::Temp qw( tempfile );
+
+#
+# Check which app to use - pdftops or acroread
+#
+$rootdir = $ENV{CUPS_SERVERROOT} || die ("ERROR: CUPS server root directory undefined\n");
+$use_both = $use_pdftops && $use_acroread;
+
+#
+# Check the arguments
+#
+die ("ERROR: wrong number of arguments\n") if (scalar @ARGV < 5);
+
+$jobid = $username = $title = $copies = undef;
+$jobid = shift;					# Job ID
+$username = shift;				# Job requesting user name
+$title = shift;					# Job title
+$copies = shift;				# Number of requested copies
+$options = shift;				# Textual representation of job attributes
+$pdffile = shift;				# Pathname of PDF file to process
+
+if (defined $use_both && $use_both)
+{
+	my $optstr = " $options ";
+	my $to_use = '';
+	if ($optstr =~ /\s+(use-acroread|use-pdftops)\s+/)
+	{
+		$to_use = $1;
+	}
+	else
+	{
+		$to_use = $default_app;
+	}
+	if ($to_use eq 'use-acroread')
+	{
+		undef $use_pdftops;
+	}
+	elsif ($to_use eq 'use-pdftops')
+	{
+		undef $use_acroread;
+	}
+	else
+	{
+		die ("ERROR: cannot use both pdftops and acroread simultaneously\n");
+	}
+}
+
+
+if (defined $use_pdftops)
+{
+	# If we are reading from STDIN, we must copy the input to a temporary file
+	# as the PDF consumer needs a seekable input.
+	if (! defined $pdffile)
+	{
+		my $template = "pdfinXXXXXX";
+		my $tmpdir = $ENV{TMPDIR};
+		my ($bytes, $buffer);
+		my ($tmpfh, $tmpfile) = tempfile ($template, OPEN => 1, DIR => $tmpdir, UNLINK => 0, SUFFIX => '.tmp');
+		while (($bytes = read (STDIN, $buffer, 1024)) > 0)
+		{
+			print $tmpfh "$buffer";
+		}
+		if ($bytes < 0)
+		{
+			close ($tmpfh);
+			unlink $tmpfile;
+			die ("ERROR: pdftops wrapper: $tmpfile: $!\n");
+		}
+		close ($tmpfh);
+		$pdffile = $tmpfile;
+		$delete_input = 1;			# for deleting the temp file after converting
+	}
+}
+		
+
+# 
+# Check the options string for options to modify the bahaviour of the pdftops utility:
+#
+@optarr = split (/\s+/, $options);
+if (defined $use_pdftops)
+{
+	$cmdopt = ""; # do not pass the -cfg argument to the poppler pdftops util
+	# The following are the (parameterless) command line options that may be used to change the 
+	# defaults defiend by pdftops.conf
+	$simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';
+	%papernames = (
+		'letter'	=>	'-paper letter',
+		'tabloid'	=>	'-paperw 792 -paperh 1224',
+		'ledger'	=>	'-paperw 1224 -paperh 792',
+		'legal'		=>	'-paper legal',
+		'executive'	=>	'-paperw 756 -paperh 522',
+		'a3'		=>	'-paper A3',
+		'a4'		=>	'-paper A4',
+		'a5'		=>	'-paperw 421 -paperh 595',
+		'b4'		=>	'-paperw 709 -paperh 1002',
+		'b5'		=>	'-paperw 501 -paperh 709',
+		'match'		=>	'-paper match'
+	);
+}
+else
+{
+	open (CFG, "<$rootdir/acroread.conf") || die ("ERROR: acroread.conf: $!\n");
+	$cmdopt = '-toPostScript';
+	while (<CFG>)
+	{
+		chomp;
+		next if (/^\s*#/);			# skip comment lines
+		next if (/^\s*$/);			# skip blank lines
+		s/^-\s*//;				# discard leading '-' and white space, as it will be generated later
+		s/\s+$//;				# discard trailing white space
+		$cmdopt .= " -$_";
+	}
+	close (CFG);
+	$simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';
+	%papernames = (
+		'letter'	=>	'-size letter',
+		'tabloid'	=>	'-size tabloid',
+		'ledger'	=>	'-size ledger',
+		'legal'		=>	'-size legal',
+		'executive'	=>	'-size executive',
+		'a3'		=>	'-size a3',
+		'a4'		=>	'-size a4',
+		'a5'		=>	'-size a5',
+		'b4'		=>	'-size b4',
+		'b5'		=>	'-size b5',
+		'match'		=>	''		# this is the default with acroread
+	);
+}
+
+foreach my $option (@optarr)
+{
+	if ($option =~ /^pdf-(.+)$/)
+	{	# We assume this is an option to evaluate
+		my $optkey = $1;		# possible pdftops option
+		if ($optkey =~ /^pages=(\d*),(\d*)$/)
+		{
+			# We do this hack here to avoid clashes with the page-ranges atrribute
+			# which is handled by the pstops filter. And we allow one of the numbers
+			# to be omitted.
+			my $first = $1;
+			my $lastp = $2;
+			if (defined $use_pdftops)
+			{
+				$cmdopt .= " -f $1" if ($1);		# first page
+				$cmdopt .= " -l $2" if ($2);		# last page
+			}
+			else
+			{
+				$cmdopt .= " -start $1" if ($1);	# first page
+				$cmdopt .= " -end $2" if ($2);		# last page
+			}
+		}
+		elsif ($optkey =~ /^paper=(letter|tabloid|ledger|legal|[Aa]3|[Aa]4|[Aa]5|[Bb]4|[Bb]5|match)$/)
+		{
+			# evaluate paper name
+			my $paper = $1;
+			$paper =~ tr/A-Z/a-z/;
+			my $value = $papernames{$paper};
+			$cmdopt .= " $value" if ($value);
+		}
+		elsif ($optkey =~ /^paper=(\d+)x(\d+)$/)
+		{
+			# evaluate paper dimensions
+			if (defined $use_pdftops)
+			{
+				$cmdopt .= " -paperw $1 -paperh $2";
+			}
+			else
+			{
+				$cmdopt .= " -size $1" . 'x' . "$2";
+			}
+		}
+		elsif ($optkey =~ /^(o|u)pw=(\S+)$/)
+		{
+			$cmdopt .= " $1" . 'pw ' . $2 if (defined $use_pdftops);	# owner/user password
+		}
+		elsif ($optkey =~ /^($simple)$/)
+		{
+			my $thisopt = $1;
+			if (defined $use_pdftops)
+			{
+				$cmdopt .= ' -' . $1;				# allowed simple options
+			}
+			else
+			{
+				$thisopt =~ s/sep$//;				# ignore the ...sep suffix
+				if ($thisopt =~ /level1|opi|nocrop|nocenter/)
+				{
+					$thisopt = '';
+				}
+				elsif ($thisopt eq 'noshrink')
+				{
+					$thisopt = '';
+					$cmdopt =~ s/ -shrink//;
+				}
+				$cmdopt .= " -" . $thisopt if ($thisopt);
+			}
+		}
+		else
+		{
+			warn ("ERROR: pdftops wrapper: illegal attribute \"pdf-$optkey\"\n");
+		}
+	}
+	# All other attributes are processed elsewhere
+}
+#
+# Complete the command
+#
+if (defined $use_pdftops)
+{
+	warn ("ERROR: pdftops-options: $cmdopt\n");
+}
+else
+{
+	warn ("ERROR: acroread-options: $cmdopt\n");
+}
+if (defined $use_pdftops)
+{
+	$rc = system ("$pdftops_path $cmdopt $pdffile -");
+}
+else
+{
+	if (defined $pdffile && $pdffile)
+	{
+		$rc = system ("$acroread_path $cmdopt < $pdffile")
+	}
+	else
+	{
+		$rc = system ("$acroread_path $cmdopt");
+	}
+}
+if ($rc)
+{
+	$ir = $rc & 127;
+	$rc >>= 8;
+	my $temp = (defined $use_pdftops) ? $pdftops_path : $acroread_path;
+	warn ("ERROR: $temp exited with ", ($ir) ? "signal $ir, " : " exit code $rc", "\n");
+	exit $rc;
+}
+unlink ($pdffile) if (defined $delete_input);		# Delete the temp file if any
+exit 0;

diff --git a/perl-core/Archive-Tar/Archive-Tar-1.54.ebuild b/perl-core/Archive-Tar/Archive-Tar-1.54.ebuild
new file mode 100644
index 0000000..b88b28e
--- /dev/null
+++ b/perl-core/Archive-Tar/Archive-Tar-1.54.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Archive-Tar/Archive-Tar-1.54.ebuild,v 1.11 2011/07/30 12:09:43 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=BINGOS
+inherit perl-module
+
+DESCRIPTION="A Perl module for creation and manipulation of tar files"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/perl-IO-Zlib-1.01
+	virtual/perl-IO-Compress
+	virtual/perl-Package-Constants"
+#	dev-perl/IO-String
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Archive-Tar/Archive-Tar-1.72.ebuild b/perl-core/Archive-Tar/Archive-Tar-1.72.ebuild
new file mode 100644
index 0000000..d2251f1
--- /dev/null
+++ b/perl-core/Archive-Tar/Archive-Tar-1.72.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Archive-Tar/Archive-Tar-1.72.ebuild,v 1.3 2011/07/30 12:09:43 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+inherit perl-module
+
+DESCRIPTION="A Perl module for creation and manipulation of tar files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/perl-IO-Zlib-1.01
+	virtual/perl-IO-Compress
+	virtual/perl-Package-Constants"
+#	dev-perl/IO-String
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Archive-Tar/Archive-Tar-1.760.0.ebuild b/perl-core/Archive-Tar/Archive-Tar-1.760.0.ebuild
new file mode 100644
index 0000000..af327be
--- /dev/null
+++ b/perl-core/Archive-Tar/Archive-Tar-1.760.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Archive-Tar/Archive-Tar-1.760.0.ebuild,v 1.3 2011/07/30 12:09:43 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=1.76
+inherit perl-module
+
+DESCRIPTION="A Perl module for creation and manipulation of tar files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/perl-IO-Zlib-1.01
+	virtual/perl-IO-Compress
+	virtual/perl-Package-Constants"
+#	dev-perl/IO-String
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Attribute-Handlers/Attribute-Handlers-0.88.ebuild b/perl-core/Attribute-Handlers/Attribute-Handlers-0.88.ebuild
new file mode 100644
index 0000000..0fba0e0
--- /dev/null
+++ b/perl-core/Attribute-Handlers/Attribute-Handlers-0.88.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Attribute-Handlers/Attribute-Handlers-0.88.ebuild,v 1.9 2011/01/08 18:41:00 jer Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=SMUELLER
+inherit perl-module
+
+DESCRIPTION="Simpler definition of attribute handlers"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
+IUSE=""
+
+SRC_TEST=do

diff --git a/perl-core/AutoLoader/AutoLoader-5.710.0.ebuild b/perl-core/AutoLoader/AutoLoader-5.710.0.ebuild
new file mode 100644
index 0000000..290d0ac
--- /dev/null
+++ b/perl-core/AutoLoader/AutoLoader-5.710.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/AutoLoader/AutoLoader-5.710.0.ebuild,v 1.1 2011/05/21 06:47:37 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=SMUELLER
+MODULE_VERSION=5.71
+inherit perl-module
+
+DESCRIPTION="load subroutines only on demand"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-solaris"
+IUSE=""
+
+SRC_TEST=do

diff --git a/perl-core/CGI/CGI-3.510.ebuild b/perl-core/CGI/CGI-3.510.ebuild
new file mode 100644
index 0000000..66fe649
--- /dev/null
+++ b/perl-core/CGI/CGI-3.510.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CGI/CGI-3.510.ebuild,v 1.6 2011/01/22 11:04:07 armin76 Exp $
+
+EAPI=3
+
+MY_PN=${PN}.pm
+MODULE_AUTHOR=MARKSTOS
+MODULE_VERSION=3.51
+inherit perl-module
+
+DESCRIPTION="Simple Common Gateway Interface Class"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+#DEPEND="dev-lang/perl"
+#	dev-perl/FCGI" #236921
+
+SRC_TEST="do"

diff --git a/perl-core/CGI/CGI-3.520.ebuild b/perl-core/CGI/CGI-3.520.ebuild
new file mode 100644
index 0000000..2ff5e5d
--- /dev/null
+++ b/perl-core/CGI/CGI-3.520.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CGI/CGI-3.520.ebuild,v 1.1 2011/01/26 13:13:25 tove Exp $
+
+EAPI=3
+
+MY_PN=${PN}.pm
+MODULE_AUTHOR=MARKSTOS
+MODULE_VERSION=3.52
+inherit perl-module
+
+DESCRIPTION="Simple Common Gateway Interface Class"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+#DEPEND="dev-lang/perl"
+#	dev-perl/FCGI" #236921
+
+SRC_TEST="do"

diff --git a/perl-core/CGI/files/3.47-fcgi.patch b/perl-core/CGI/files/3.47-fcgi.patch
new file mode 100644
index 0000000..922a577
--- /dev/null
+++ b/perl-core/CGI/files/3.47-fcgi.patch
@@ -0,0 +1,24 @@
+http://rt.cpan.org/Public/Bug/Display.html?id=49599
+
+--- CGI.pm-3.47/t/fast.t
++++ CGI.pm-3.47/t/fast.t
+@@ -7,16 +7,16 @@
+ 	$fcgi = $@ ? 0 : 1;
+ }
+ 
+-use Test::More tests => 10;
++use Test::More tests => 11;
+ 
+ # Shut up "used only once" warnings.
+ () = $CGI::Q;
+ () = $CGI::Fast::Ext_Request;
+ 
+ SKIP: {
+-	skip( 'FCGI not installed, cannot continue', 7 ) unless $fcgi;
++	skip( 'FCGI not installed, cannot continue', 11 ) unless $fcgi;
+ 
+-	use CGI::Fast;
++	use_ok( CGI::Fast );
+ 	ok( my $q = CGI::Fast->new(), 'created new CGI::Fast object' );
+ 	is( $q, $CGI::Q, 'checking to see if the object was stored properly' );
+ 	is( $q->param(), (), 'no params' );

diff --git a/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.3.0.ebuild b/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.3.0.ebuild
new file mode 100644
index 0000000..e28f1c5
--- /dev/null
+++ b/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.3.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.3.0.ebuild,v 1.3 2011/07/07 04:13:01 aballier Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=0.003
+inherit perl-module
+
+DESCRIPTION="Read and write a subset of YAML for CPAN Meta files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/perl-core/CPAN-Meta/CPAN-Meta-2.110.440.ebuild b/perl-core/CPAN-Meta/CPAN-Meta-2.110.440.ebuild
new file mode 100644
index 0000000..6f681bb
--- /dev/null
+++ b/perl-core/CPAN-Meta/CPAN-Meta-2.110.440.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta/CPAN-Meta-2.110.440.ebuild,v 1.5 2011/03/19 12:59:10 armin76 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=2.110440
+inherit perl-module
+
+DESCRIPTION="The distribution metadata for a CPAN dist"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=virtual/perl-Parse-CPAN-Meta-1.440
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	>=virtual/perl-Version-Requirements-0.101.20
+	>=virtual/perl-version-0.82"
+DEPEND="${RDEPEND}
+	virtual/perl-File-Spec
+	>=virtual/perl-File-Temp-0.20
+	virtual/perl-IO
+	>=virtual/perl-Parse-CPAN-Meta-1.440
+	>=virtual/perl-Test-Simple-0.96
+	>=virtual/perl-ExtUtils-MakeMaker-6.56"
+
+SRC_TEST="do"

diff --git a/perl-core/CPAN-Meta/CPAN-Meta-2.110.580.ebuild b/perl-core/CPAN-Meta/CPAN-Meta-2.110.580.ebuild
new file mode 100644
index 0000000..48c0c0d
--- /dev/null
+++ b/perl-core/CPAN-Meta/CPAN-Meta-2.110.580.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta/CPAN-Meta-2.110.580.ebuild,v 1.4 2011/03/19 12:59:10 armin76 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=2.110580
+inherit perl-module
+
+DESCRIPTION="The distribution metadata for a CPAN dist"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=virtual/perl-CPAN-Meta-YAML-0.2.0
+	>=virtual/perl-Parse-CPAN-Meta-1.440
+	>=virtual/perl-JSON-PP-2.271.30
+	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Version-Requirements-0.101.20
+	>=virtual/perl-version-0.82"
+DEPEND="${RDEPEND}
+	virtual/perl-File-Spec
+	>=virtual/perl-File-Temp-0.20
+	virtual/perl-IO
+	>=virtual/perl-Test-Simple-0.96
+	>=virtual/perl-ExtUtils-MakeMaker-6.56"
+
+SRC_TEST="do"

diff --git a/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.024.ebuild b/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.024.ebuild
new file mode 100644
index 0000000..63a7e78
--- /dev/null
+++ b/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.024.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.024.ebuild,v 1.10 2011/07/30 12:10:49 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=PMQS
+inherit perl-module
+
+DESCRIPTION="Low-Level Interface to bzip2 compression library"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-arch/bzip2"
+DEPEND="${RDEPEND}"
+#	test? ( dev-perl/Test-Pod )"
+
+SRC_TEST=do
+
+src_configure(){
+	BUILD_BZIP2=0 BZIP2_INCLUDE=. BZIP2_LIB= \
+		perl-module_src_configure
+}

diff --git a/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.33.ebuild b/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.33.ebuild
new file mode 100644
index 0000000..7fb240d
--- /dev/null
+++ b/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.33.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.33.ebuild,v 1.3 2011/07/30 12:10:49 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PMQS
+MODULE_VERSION=2.033
+inherit perl-module
+
+DESCRIPTION="Low-Level Interface to bzip2 compression library"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-arch/bzip2"
+DEPEND="${RDEPEND}"
+#	test? ( dev-perl/Test-Pod )"
+
+SRC_TEST=do
+
+src_prepare() {
+	rm -rf "${S}"/bzip2-src/ || die
+	sed -i '/^bzip2-src/d' "${S}"/MANIFEST || die
+	perl-module_src_prepare
+}
+
+src_configure(){
+	BUILD_BZIP2=0 BZIP2_INCLUDE=. BZIP2_LIB= \
+		perl-module_src_configure
+}

diff --git a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.024.ebuild b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.024.ebuild
new file mode 100644
index 0000000..30b9c48
--- /dev/null
+++ b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.024.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.024.ebuild,v 1.10 2011/07/30 12:11:52 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=PMQS
+inherit multilib perl-module
+
+DESCRIPTION="Low-Level Interface to zlib compression library"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=sys-libs/zlib-1.2.2.1"
+DEPEND="${RDEPEND}"
+#	test? ( dev-perl/Test-Pod )"
+
+SRC_TEST="do"
+
+src_prepare() {
+	use prefix || EPREFIX=
+	perl-module_src_prepare
+
+	cat <<-EOF > "${S}/config.in"
+		BUILD_ZLIB = False
+		INCLUDE = ${EPREFIX}/usr/include
+		LIB = ${EPREFIX}/usr/$(get_libdir)
+
+		OLD_ZLIB = False
+		GZIP_OS_CODE = AUTO_DETECT
+	EOF
+}

diff --git a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.33.ebuild b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.33.ebuild
new file mode 100644
index 0000000..9e5d7aa
--- /dev/null
+++ b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.33.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.33.ebuild,v 1.3 2011/07/30 12:11:52 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PMQS
+MODULE_VERSION=2.033
+inherit multilib perl-module
+
+DESCRIPTION="Low-Level Interface to zlib compression library"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=sys-libs/zlib-1.2.5"
+DEPEND="${RDEPEND}"
+#	test? ( dev-perl/Test-Pod )"
+
+SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+
+	cat <<-EOF > "${S}/config.in"
+		BUILD_ZLIB = False
+		INCLUDE = ${EPREFIX}/usr/include
+		LIB = ${EPREFIX}/usr/$(get_libdir)
+
+		OLD_ZLIB = False
+		GZIP_OS_CODE = AUTO_DETECT
+	EOF
+}

diff --git a/perl-core/DB_File/DB_File-1.820.ebuild b/perl-core/DB_File/DB_File-1.820.ebuild
new file mode 100644
index 0000000..5707533
--- /dev/null
+++ b/perl-core/DB_File/DB_File-1.820.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/DB_File/DB_File-1.820.ebuild,v 1.9 2010/01/05 18:47:47 nixnut Exp $
+
+MODULE_AUTHOR=PMQS
+inherit perl-module multilib eutils
+
+DESCRIPTION="A Berkeley DB Support Perl Module"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-libs/db"
+
+SRC_TEST="do"
+
+src_unpack() {
+	unpack ${A}
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i "s:^LIB.*:LIB = /usr/$(get_libdir):" "${S}"/config.in || die
+	fi
+	cd "${S}"
+	epatch "${FILESDIR}"/DB_File-MakeMaker.patch
+}

diff --git a/perl-core/DB_File/DB_File-1.821.ebuild b/perl-core/DB_File/DB_File-1.821.ebuild
new file mode 100644
index 0000000..5c037ab
--- /dev/null
+++ b/perl-core/DB_File/DB_File-1.821.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/DB_File/DB_File-1.821.ebuild,v 1.1 2011/01/13 10:41:44 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PMQS
+MODULE_VERSION=1.821
+inherit perl-module multilib eutils
+
+DESCRIPTION="A Berkeley DB Support Perl Module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/db"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"
+
+src_unpack() {
+	unpack ${A}
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i "s:^LIB.*:LIB = /usr/$(get_libdir):" "${S}"/config.in || die
+	fi
+	cd "${S}"
+	epatch "${FILESDIR}"/DB_File-MakeMaker.patch
+}

diff --git a/perl-core/DB_File/DB_File-1.822.0.ebuild b/perl-core/DB_File/DB_File-1.822.0.ebuild
new file mode 100644
index 0000000..c4193f8
--- /dev/null
+++ b/perl-core/DB_File/DB_File-1.822.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/DB_File/DB_File-1.822.0.ebuild,v 1.1 2011/03/14 07:07:13 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PMQS
+MODULE_VERSION=1.822
+inherit perl-module multilib eutils
+
+DESCRIPTION="A Berkeley DB Support Perl Module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/db"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"
+
+src_prepare() {
+	if [[ $(get_libdir) != "lib" ]] ; then
+		sed -i "s:^LIB.*:LIB = /usr/$(get_libdir):" "${S}"/config.in || die
+	fi
+	epatch "${FILESDIR}"/DB_File-MakeMaker.patch
+}

diff --git a/perl-core/DB_File/files/DB_File-MakeMaker.patch b/perl-core/DB_File/files/DB_File-MakeMaker.patch
new file mode 100644
index 0000000..0640fee
--- /dev/null
+++ b/perl-core/DB_File/files/DB_File-MakeMaker.patch
@@ -0,0 +1,11 @@
+--- Makefile.PL.old	2005-06-30 12:31:52.000000000 -0400
++++ Makefile.PL	2005-06-30 12:35:11.000000000 -0400
+@@ -54,7 +54,7 @@ WriteMakefile(
+ 	'depend'	=> { 'Makefile'          => 'config.in',
+                              'version$(OBJ_EXT)' => 'version.c'},
+ 	'clean'		=> { FILES => 'constants.h constants.xs' },
+-	'macro'		=> { INSTALLDIRS => 'perl', my_files => "@files" },
++	'macro'		=> { INSTALLDIRS => 'vendor', my_files => "@files" },
+         'dist'          => { COMPRESS => 'gzip', SUFFIX => 'gz',
+ 			     DIST_DEFAULT => 'MyDoubleCheck tardist'},    
+ 	);

diff --git a/perl-core/DB_File/files/config.in b/perl-core/DB_File/files/config.in
new file mode 100755
index 0000000..73c04c9
--- /dev/null
+++ b/perl-core/DB_File/files/config.in
@@ -0,0 +1,97 @@
+# Filename:	config.in
+#
+# written by Paul Marquess <Paul.Marquess@××××××××××.com>
+# last modified 9th Sept 1997
+# version 1.55
+
+# 1. Where is the file db.h?
+#
+#    Change the path below to point to the directory where dh.h is
+#    installed on your system.
+
+INCLUDE	= /usr/include/db3
+#INCLUDE	= /usr/local/BerkeleyDB/include
+#INCLUDE	= ./libraries/3.0.55
+
+# 2. Where is libdb?
+#
+#    Change the path below to point to the directory where libdb is
+#    installed on your system.
+
+LIB	= /usr/lib
+#LIB	= /usr/local/BerkeleyDB/lib
+#LIB	= ./libraries/3.0.55
+
+# 3. What version of Berkely DB have you got?
+#
+#    If you have version 2.0 or greater, you can skip this question.
+#
+#    If you have Berkeley DB 1.78 or greater you shouldn't have to
+#    change the definitions for PREFIX and HASH below.
+#
+#    For older versions of Berkeley DB change both PREFIX and HASH to int.
+#    Version 1.71, 1.72 and 1.73 are known to need this change.
+#
+#    If you don't know what version you have have a look in the file db.h. 
+#
+#    Search for the string "DB_VERSION_MAJOR". If it is present, you
+#    have Berkeley DB version 2 (or greater).
+#
+#    If that didn't work, find the definition of the BTREEINFO typedef.
+#    Check the return type from the prefix element. It should look like
+#    this in an older copy of db.h:
+#
+#        int      (*prefix)      __P((const DBT *, const DBT *));  
+#
+#    and like this in a more recent copy:
+#
+#        size_t  (*prefix)       /* prefix function */
+#            __P((const DBT *, const DBT *));
+#
+#    Change the definition of PREFIX, below, to reflect the return type
+#    of the prefix function in your db.h.
+#
+#    Now find the definition of the HASHINFO typedef. Check the return
+#    type of the hash element. Older versions look like this:
+#
+#        int      (*hash) __P((const void *, size_t));      
+#
+#    newer like this:
+#
+#        u_int32_t               /* hash function */
+#                (*hash) __P((const void *, size_t));
+#
+#    Change the definition of HASH, below, to reflect the return type of
+#    the hash function in your db.h.
+#
+
+PREFIX	=	size_t
+HASH	=	u_int32_t
+
+# 4. Is the library called libdb?
+#
+#    If you have copies of both 1.x and 2.x Berkeley DB installed on
+#    your system it can sometimes be tricky to make sure you are using
+#    the correct one. Renaming one (or creating a symbolic link) to
+#    include the version number of the library can help.
+#
+#    For example, if you have both Berkeley DB 2.3.12 and 1.85 on your
+#    system and you want to use the Berkeley DB version 2 library you
+#    could rename the version 2 library from libdb.a to libdb-2.3.12.a and
+#    change the DBNAME line below to look like this:
+#
+#        DBNAME = -ldb-2.3.12
+#
+#    That will ensure you are linking the correct version of the DB
+#    library.
+#
+#    Note: If you are building this module with Win32, -llibdb will be
+#    used by default.
+#
+#    If you have changed the name of the library, uncomment the line
+#    below (by removing the leading #) and edit the line to use the name
+#    you have picked.
+ 
+DBNAME = -ldb-3.2
+
+# end of file config.in

diff --git a/perl-core/Digest-MD5/Digest-MD5-2.39.ebuild b/perl-core/Digest-MD5/Digest-MD5-2.39.ebuild
new file mode 100644
index 0000000..0401cbc
--- /dev/null
+++ b/perl-core/Digest-MD5/Digest-MD5-2.39.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Digest-MD5/Digest-MD5-2.39.ebuild,v 1.11 2011/07/30 12:12:45 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=GAAS
+inherit perl-module
+
+DESCRIPTION="MD5 message digest algorithm"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="virtual/perl-digest-base"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do
+mydoc="rfc*.txt"

diff --git a/perl-core/Digest-MD5/Digest-MD5-2.510.0.ebuild b/perl-core/Digest-MD5/Digest-MD5-2.510.0.ebuild
new file mode 100644
index 0000000..63f16d5
--- /dev/null
+++ b/perl-core/Digest-MD5/Digest-MD5-2.510.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Digest-MD5/Digest-MD5-2.510.0.ebuild,v 1.10 2012/05/05 23:25:25 aballier Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=GAAS
+MODULE_VERSION=2.51
+inherit perl-module
+
+DESCRIPTION="MD5 message digest algorithm"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="virtual/perl-digest-base"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do
+mydoc="rfc*.txt"

diff --git a/perl-core/Digest-SHA/Digest-SHA-5.47.ebuild b/perl-core/Digest-SHA/Digest-SHA-5.47.ebuild
new file mode 100644
index 0000000..e494f3b
--- /dev/null
+++ b/perl-core/Digest-SHA/Digest-SHA-5.47.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Digest-SHA/Digest-SHA-5.47.ebuild,v 1.9 2009/12/16 21:47:36 abcd Exp $
+
+MODULE_AUTHOR=MSHELOR
+inherit perl-module
+
+DESCRIPTION="Perl extension for SHA-1/224/256/384/512"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+SRC_TEST="do"

diff --git a/perl-core/Digest-SHA/Digest-SHA-5.48.ebuild b/perl-core/Digest-SHA/Digest-SHA-5.48.ebuild
new file mode 100644
index 0000000..538e355
--- /dev/null
+++ b/perl-core/Digest-SHA/Digest-SHA-5.48.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Digest-SHA/Digest-SHA-5.48.ebuild,v 1.5 2010/12/07 04:27:26 mattst88 Exp $
+
+MODULE_AUTHOR=MSHELOR
+inherit perl-module
+
+DESCRIPTION="Perl extension for SHA-1/224/256/384/512"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+SRC_TEST="do"

diff --git a/perl-core/Digest-SHA/Digest-SHA-5.500.ebuild b/perl-core/Digest-SHA/Digest-SHA-5.500.ebuild
new file mode 100644
index 0000000..56b556a
--- /dev/null
+++ b/perl-core/Digest-SHA/Digest-SHA-5.500.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Digest-SHA/Digest-SHA-5.500.ebuild,v 1.1 2011/01/13 10:37:33 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=MSHELOR
+MODULE_VERSION=5.50
+inherit perl-module
+
+DESCRIPTION="Perl extension for SHA-1/224/256/384/512"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/perl-core/Digest-SHA/Digest-SHA-5.600.0.ebuild b/perl-core/Digest-SHA/Digest-SHA-5.600.0.ebuild
new file mode 100644
index 0000000..9104057
--- /dev/null
+++ b/perl-core/Digest-SHA/Digest-SHA-5.600.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Digest-SHA/Digest-SHA-5.600.0.ebuild,v 1.1 2011/03/04 07:35:36 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=MSHELOR
+MODULE_VERSION=5.60
+inherit perl-module
+
+DESCRIPTION="Perl extension for SHA-1/224/256/384/512"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/perl-core/Digest-SHA/Digest-SHA-5.610.0.ebuild b/perl-core/Digest-SHA/Digest-SHA-5.610.0.ebuild
new file mode 100644
index 0000000..e52c03b
--- /dev/null
+++ b/perl-core/Digest-SHA/Digest-SHA-5.610.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Digest-SHA/Digest-SHA-5.610.0.ebuild,v 1.1 2011/03/10 07:05:35 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=MSHELOR
+MODULE_VERSION=5.61
+inherit perl-module
+
+DESCRIPTION="Perl extension for SHA-1/224/256/384/512"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/perl-core/Encode/Encode-2.40-r1.ebuild b/perl-core/Encode/Encode-2.40-r1.ebuild
new file mode 100644
index 0000000..81d7238
--- /dev/null
+++ b/perl-core/Encode/Encode-2.40-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Encode/Encode-2.40-r1.ebuild,v 1.11 2011/12/18 21:26:04 halcy0n Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DANKOGAI
+inherit perl-module
+
+DESCRIPTION="character encodings"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="!!<dev-lang/perl-5.8.8-r8"
+
+SRC_TEST=do
+PATCHES=( "${FILESDIR}"/gentoo_enc2xs.diff )

diff --git a/perl-core/Encode/Encode-2.420.0.ebuild b/perl-core/Encode/Encode-2.420.0.ebuild
new file mode 100644
index 0000000..cfcccf9
--- /dev/null
+++ b/perl-core/Encode/Encode-2.420.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Encode/Encode-2.420.0.ebuild,v 1.5 2011/06/15 06:16:16 naota Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DANKOGAI
+MODULE_VERSION=2.42
+inherit perl-module
+
+DESCRIPTION="character encodings"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="!!<dev-lang/perl-5.8.8-r8"
+
+SRC_TEST=do
+PATCHES=( "${FILESDIR}"/gentoo_enc2xs.diff )

diff --git a/perl-core/Encode/files/gentoo_enc2xs.diff b/perl-core/Encode/files/gentoo_enc2xs.diff
new file mode 100644
index 0000000..8b46ea4
--- /dev/null
+++ b/perl-core/Encode/files/gentoo_enc2xs.diff
@@ -0,0 +1,36 @@
+From: Torsten Veller <tove@g.o>
+Subject: [PATCH] gentoo/enc2xs
+
+Tweak enc2xs to ignore missing @INC directories
+
+https://bugs.gentoo.org/show_bug.cgi?id=338802
+http://git.debian.org/?p=perl/perl-5.12.git;a=blob;h=227dc105;hb=9d9ed099
+
+---
+ cpan/Encode/bin/enc2xs |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
+index 773c0a0..b95507b 100644
+--- a/cpan/Encode/bin/enc2xs
++++ b/cpan/Encode/bin/enc2xs
+@@ -924,7 +924,7 @@ use vars qw(
+ sub find_e2x{
+     eval { require File::Find; };
+     my (@inc, %e2x_dir);
+-    for my $inc (@INC){
++    for my $inc (grep -d, @INC){
+     push @inc, $inc unless $inc eq '.'; #skip current dir
+     }
+     File::Find::find(
+@@ -1005,7 +1005,7 @@ sub make_configlocal_pm {
+ 	    $LocalMod{$enc} ||= $mod;
+ 	}
+     };
+-    File::Find::find({wanted => $wanted}, @INC);
++    File::Find::find({wanted => $wanted}, grep -d, @INC);
+     $_ModLines = "";
+     for my $enc ( sort keys %LocalMod ) {
+         $_ModLines .=
+-- 
+tg: (e5b15fe..) gentoo/enc2xs (depends on: upstream)

diff --git a/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.26.03.ebuild b/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.26.03.ebuild
new file mode 100644
index 0000000..dd15a66
--- /dev/null
+++ b/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.26.03.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.26.03.ebuild,v 1.10 2011/07/30 12:13:40 tove Exp $
+
+EAPI=2
+
+inherit versionator
+MY_P=${PN}-$(delete_version_separator 2 )
+MODULE_AUTHOR=DAGOLDEN
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Compile and link C code for Perl modules"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build"
+
+SRC_TEST="do"

diff --git a/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.27.03.ebuild b/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.27.03.ebuild
new file mode 100644
index 0000000..530ca62
--- /dev/null
+++ b/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.27.03.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.27.03.ebuild,v 1.7 2011/07/30 12:13:40 tove Exp $
+
+EAPI=2
+
+inherit versionator
+MY_P=${PN}-$(delete_version_separator 2 )
+MODULE_AUTHOR=DAGOLDEN
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Compile and link C code for Perl modules"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.56-r1.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.56-r1.ebuild
new file mode 100644
index 0000000..c0b21ff
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.56-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.56-r1.ebuild,v 1.7 2012/02/04 16:42:54 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=MSCHWERN
+inherit perl-module
+
+DESCRIPTION="Create a module Makefile"
+HOMEPAGE="http://makemaker.org ${HOMEPAGE}"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~s390 ~sh sparc x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/RUNPATH-6.54.patch
+	"${FILESDIR}"/6.56-delete_packlist_podlocal.patch )
+
+DEPEND=">=virtual/perl-ExtUtils-Manifest-1.56
+	>=virtual/perl-ExtUtils-Command-1.16
+	>=virtual/perl-ExtUtils-Install-1.52"
+RDEPEND="${DEPEND}
+	!!<dev-lang/perl-5.8.8-r7"
+
+SRC_TEST=do

diff --git a/perl-core/ExtUtils-MakeMaker/files/6.56-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/6.56-delete_packlist_podlocal.patch
new file mode 100644
index 0000000..c5763d1
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/6.56-delete_packlist_podlocal.patch
@@ -0,0 +1,79 @@
+Don't install .packlist or perllocal.pod for perl or vendor.
+Extracted from the debian patchset.
+See also bug #241834
+
+---
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |   25 +----------------------
+ 1 files changed, 1 insertions(+), 24 deletions(-)
+
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+index 239d6df..b4649ee 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -2047,8 +2047,6 @@ doc__install : doc_site_install
+ 
+ pure_perl_install :: all
+ 	$(NOECHO) $(MOD_INSTALL) \
+-		read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+-		write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+ 		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+ 		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
+ 		$(INST_BIN) $(DESTINSTALLBIN) \
+@@ -2074,8 +2072,6 @@ pure_site_install :: all
+ 
+ pure_vendor_install :: all
+ 	$(NOECHO) $(MOD_INSTALL) \
+-		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+-		write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
+ 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
+ 		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
+ 		$(INST_BIN) $(DESTINSTALLVENDORBIN) \
+@@ -2084,15 +2080,6 @@ pure_vendor_install :: all
+ 		$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
+ 
+ doc_perl_install :: all
+-	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+-	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+-	-$(NOECHO) $(DOC_INSTALL) \
+-		"Module" "$(NAME)" \
+-		"installed into" "$(INSTALLPRIVLIB)" \
+-		LINKTYPE "$(LINKTYPE)" \
+-		VERSION "$(VERSION)" \
+-		EXE_FILES "$(EXE_FILES)" \
+-		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ 
+ doc_site_install :: all
+ 	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+@@ -2106,15 +2093,6 @@ doc_site_install :: all
+ 		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ 
+ doc_vendor_install :: all
+-	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+-	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+-	-$(NOECHO) $(DOC_INSTALL) \
+-		"Module" "$(NAME)" \
+-		"installed into" "$(INSTALLVENDORLIB)" \
+-		LINKTYPE "$(LINKTYPE)" \
+-		VERSION "$(VERSION)" \
+-		EXE_FILES "$(EXE_FILES)" \
+-		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ 
+ };
+ 
+@@ -2123,13 +2101,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
+ 	$(NOECHO) $(NOOP)
+ 
+ uninstall_from_perldirs ::
+-	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
+ 
+ uninstall_from_sitedirs ::
+ 	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
+ 
+ uninstall_from_vendordirs ::
+-	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
++
+ };
+ 
+     join("",@m);
+-- 
+tg: (b9ce030..) gentoo/MakeMaker-delete_packlist (depends on: upstream)

diff --git a/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch b/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch
new file mode 100644
index 0000000..41f2609
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch
@@ -0,0 +1,16 @@
+--- a/lib/ExtUtils/MM_Any.pm
++++ b/lib/ExtUtils/MM_Any.pm
+@@ -1900,6 +1900,13 @@ CODE
+             # LD_RUN_PATH now computed by ExtUtils::Liblist
+             ($self->{EXTRALIBS},  $self->{BSLOADLIBS}, 
+              $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
++            # We do not want the build root in RPATH
++            if ( exists $ENV{PORTAGE_TMPDIR} ){
++                # If we have a PORTAGE_TMPDIR set, strip that, as just testing for
++                # /usr and /opt might not be sufficient.
++                $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
++                                       split /:/, $self->{LD_RUN_PATH};
++            }
+             last;
+         }
+     }

diff --git a/perl-core/ExtUtils-MakeMaker/files/6.58-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/6.58-delete_packlist_podlocal.patch
new file mode 100644
index 0000000..c42d1d2
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/6.58-delete_packlist_podlocal.patch
@@ -0,0 +1,76 @@
+Don't install .packlist or perllocal.pod for perl or vendor.
+Extracted from the debian patchset.
+See also bug #241834
+---
+ lib/ExtUtils/MM_Unix.pm |   25 +------------------------
+ 1 files changed, 1 insertions(+), 24 deletions(-)
+
+diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
+index 10fcdf4..642b677 100644
+--- a/lib/ExtUtils/MM_Unix.pm
++++ b/lib/ExtUtils/MM_Unix.pm
+@@ -2047,8 +2047,6 @@ doc__install : doc_site_install
+ 
+ pure_perl_install :: all
+ 	$(NOECHO) $(MOD_INSTALL) \
+-		read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+-		write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+ 		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+ 		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
+ 		$(INST_BIN) $(DESTINSTALLBIN) \
+@@ -2074,8 +2072,6 @@ pure_site_install :: all
+ 
+ pure_vendor_install :: all
+ 	$(NOECHO) $(MOD_INSTALL) \
+-		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+-		write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
+ 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
+ 		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
+ 		$(INST_BIN) $(DESTINSTALLVENDORBIN) \
+@@ -2084,15 +2080,6 @@ pure_vendor_install :: all
+ 		$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
+ 
+ doc_perl_install :: all
+-	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+-	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+-	-$(NOECHO) $(DOC_INSTALL) \
+-		"Module" "$(NAME)" \
+-		"installed into" "$(INSTALLPRIVLIB)" \
+-		LINKTYPE "$(LINKTYPE)" \
+-		VERSION "$(VERSION)" \
+-		EXE_FILES "$(EXE_FILES)" \
+-		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ 
+ doc_site_install :: all
+ 	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+@@ -2106,15 +2093,6 @@ doc_site_install :: all
+ 		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ 
+ doc_vendor_install :: all
+-	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+-	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+-	-$(NOECHO) $(DOC_INSTALL) \
+-		"Module" "$(NAME)" \
+-		"installed into" "$(INSTALLVENDORLIB)" \
+-		LINKTYPE "$(LINKTYPE)" \
+-		VERSION "$(VERSION)" \
+-		EXE_FILES "$(EXE_FILES)" \
+-		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ 
+ };
+ 
+@@ -2123,13 +2101,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
+ 	$(NOECHO) $(NOOP)
+ 
+ uninstall_from_perldirs ::
+-	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
+ 
+ uninstall_from_sitedirs ::
+ 	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
+ 
+ uninstall_from_vendordirs ::
+-	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
++
+ };
+ 
+     join("",@m);

diff --git a/perl-core/ExtUtils-MakeMaker/files/6.62-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/6.62-delete_packlist_podlocal.patch
new file mode 100644
index 0000000..9d8ee7e
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/6.62-delete_packlist_podlocal.patch
@@ -0,0 +1,76 @@
+--- a/lib/ExtUtils/MM_Unix.pm
++++ b/lib/ExtUtils/MM_Unix.pm
+@@ -2052,8 +2052,6 @@ doc__install : doc_site_install
+ 
+ pure_perl_install :: all
+ 	$(NOECHO) $(MOD_INSTALL) \
+-		read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+-		write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+ 		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+ 		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
+ 		$(INST_BIN) $(DESTINSTALLBIN) \
+@@ -2079,8 +2077,6 @@ pure_site_install :: all
+ 
+ pure_vendor_install :: all
+ 	$(NOECHO) $(MOD_INSTALL) \
+-		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+-		write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
+ 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
+ 		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
+ 		$(INST_BIN) $(DESTINSTALLVENDORBIN) \
+@@ -2089,37 +2085,19 @@ pure_vendor_install :: all
+ 		$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
+ 
+ doc_perl_install :: all
+-	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+-	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+-	-$(NOECHO) $(DOC_INSTALL) \
+-		"Module" "$(NAME)" \
+-		"installed into" "$(INSTALLPRIVLIB)" \
+-		LINKTYPE "$(LINKTYPE)" \
+-		VERSION "$(VERSION)" \
+-		EXE_FILES "$(EXE_FILES)" \
+-		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ 
+ doc_site_install :: all
+-	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+-	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
++	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod
++	-$(NOECHO) $(MKPATH) $(DESTINSTALLSITEARCH)
+ 	-$(NOECHO) $(DOC_INSTALL) \
+ 		"Module" "$(NAME)" \
+ 		"installed into" "$(INSTALLSITELIB)" \
+ 		LINKTYPE "$(LINKTYPE)" \
+ 		VERSION "$(VERSION)" \
+ 		EXE_FILES "$(EXE_FILES)" \
+-		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
++		>> }.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{
+ 
+ doc_vendor_install :: all
+-	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+-	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+-	-$(NOECHO) $(DOC_INSTALL) \
+-		"Module" "$(NAME)" \
+-		"installed into" "$(INSTALLVENDORLIB)" \
+-		LINKTYPE "$(LINKTYPE)" \
+-		VERSION "$(VERSION)" \
+-		EXE_FILES "$(EXE_FILES)" \
+-		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ 
+ };
+ 
+@@ -2128,13 +2106,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
+ 	$(NOECHO) $(NOOP)
+ 
+ uninstall_from_perldirs ::
+-	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
+ 
+ uninstall_from_sitedirs ::
+ 	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
+ 
+ uninstall_from_vendordirs ::
+-	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
++
+ };
+ 
+     join("",@m);

diff --git a/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch b/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch
new file mode 100644
index 0000000..1385207
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch
@@ -0,0 +1,17 @@
+diff -Naur ExtUtils-MakeMaker-6.54/lib/ExtUtils/MM_Any.pm ExtUtils-MakeMaker-6.54.new/lib/ExtUtils/MM_Any.pm
+--- ExtUtils-MakeMaker-6.54/lib/ExtUtils/MM_Any.pm	2009-07-08 11:49:05.000000000 +1200
++++ ExtUtils-MakeMaker-6.54.new/lib/ExtUtils/MM_Any.pm	2009-08-19 21:37:31.494655658 +1200
+@@ -1799,6 +1799,13 @@
+             # LD_RUN_PATH now computed by ExtUtils::Liblist
+             ($self->{EXTRALIBS},  $self->{BSLOADLIBS}, 
+              $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
++            # We do not want the build root in RPATH
++            if (exists $ENV{PORTAGE_TMPDIR}) {
++                # If we have PORTAGE_TMPDIR set, strip that, as just testing for
++                # /usr and /opt might not be sufficient
++                $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
++                                       split /:/, $self->{LD_RUN_PATH};
++            }
+             last;
+         }
+     }

diff --git a/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.580.0.ebuild b/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.580.0.ebuild
new file mode 100644
index 0000000..980c43d
--- /dev/null
+++ b/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.580.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.580.0.ebuild,v 1.3 2012/02/04 15:27:34 armin76 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=RKOBES
+MODULE_VERSION=1.58
+inherit perl-module
+
+DESCRIPTION="Utilities to write and check a MANIFEST file"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+SRC_TEST="do"
+PREFER_BUILDPL="no"

diff --git a/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.03.ebuild b/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.03.ebuild
new file mode 100644
index 0000000..b0c7d3c
--- /dev/null
+++ b/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.03.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.03.ebuild,v 1.6 2011/07/30 12:14:38 tove Exp $
+
+EAPI=2
+
+inherit versionator
+MY_P=${PN}-$(delete_version_separator 2 )
+S=${WORKDIR}/${MY_P}
+MODULE_AUTHOR=DAGOLDEN
+inherit perl-module
+
+DESCRIPTION="Converts Perl XS code into C code"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder
+	virtual/perl-Module-Build"
+
+SRC_TEST="do"

diff --git a/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.05.ebuild b/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.05.ebuild
new file mode 100644
index 0000000..009faf6
--- /dev/null
+++ b/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.05.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.05.ebuild,v 1.7 2011/07/30 12:14:38 tove Exp $
+
+EAPI=2
+
+inherit versionator
+MY_P=${PN}-$(delete_version_separator 2 )
+S=${WORKDIR}/${MY_P}
+MODULE_AUTHOR=DAGOLDEN
+inherit perl-module
+
+DESCRIPTION="Converts Perl XS code into C code"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder"
+
+SRC_TEST="do"

diff --git a/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.06.ebuild b/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.06.ebuild
new file mode 100644
index 0000000..18a9963
--- /dev/null
+++ b/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.06.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.06.ebuild,v 1.5 2012/04/28 02:29:26 aballier Exp $
+
+EAPI=3
+
+inherit versionator
+MY_P=${PN}-$(delete_version_separator 2 )
+MODULE_VERSION=2.2206
+S=${WORKDIR}/${MY_P}
+MODULE_AUTHOR=DAGOLDEN
+inherit perl-module
+
+DESCRIPTION="Converts Perl XS code into C code"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder"
+
+SRC_TEST="do"

diff --git a/perl-core/Filter/Filter-1.37.ebuild b/perl-core/Filter/Filter-1.37.ebuild
new file mode 100644
index 0000000..c0b8b37
--- /dev/null
+++ b/perl-core/Filter/Filter-1.37.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Filter/Filter-1.37.ebuild,v 1.6 2009/12/16 21:49:38 abcd Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=PMQS
+inherit perl-module
+
+DESCRIPTION="Interface for creation of Perl Filters"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST=do

diff --git a/perl-core/IO-Compress/IO-Compress-2.024.ebuild b/perl-core/IO-Compress/IO-Compress-2.024.ebuild
new file mode 100644
index 0000000..1d32cda
--- /dev/null
+++ b/perl-core/IO-Compress/IO-Compress-2.024.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/IO-Compress/IO-Compress-2.024.ebuild,v 1.11 2011/07/30 12:18:17 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=PMQS
+inherit perl-module
+
+DESCRIPTION="allow reading and writing of compressed data"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Compress-Raw-Zlib-${PV}
+	>=virtual/perl-Compress-Raw-Bzip2-${PV}
+	!perl-core/Compress-Zlib
+	!perl-core/IO-Compress-Zlib
+	!perl-core/IO-Compress-Bzip2
+	!perl-core/IO-Compress-Base"
+DEPEND="${RDEPEND}"
+#	test? ( dev-perl/Test-Pod )"
+
+SRC_TEST=do

diff --git a/perl-core/IO-Compress/IO-Compress-2.33.ebuild b/perl-core/IO-Compress/IO-Compress-2.33.ebuild
new file mode 100644
index 0000000..9e0797f
--- /dev/null
+++ b/perl-core/IO-Compress/IO-Compress-2.33.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/IO-Compress/IO-Compress-2.33.ebuild,v 1.3 2011/07/30 12:18:17 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PMQS
+MODULE_VERSION=2.033
+inherit perl-module
+
+DESCRIPTION="allow reading and writing of compressed data"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Compress-Raw-Zlib-${PV}
+	>=virtual/perl-Compress-Raw-Bzip2-${PV}
+	!perl-core/Compress-Zlib
+	!perl-core/IO-Compress-Zlib
+	!perl-core/IO-Compress-Bzip2
+	!perl-core/IO-Compress-Base"
+DEPEND="${RDEPEND}"
+#	test? ( dev-perl/Test-Pod )"
+
+SRC_TEST=do

diff --git a/perl-core/IPC-Cmd/IPC-Cmd-0.680.ebuild b/perl-core/IPC-Cmd/IPC-Cmd-0.680.ebuild
new file mode 100644
index 0000000..afe96f0
--- /dev/null
+++ b/perl-core/IPC-Cmd/IPC-Cmd-0.680.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/IPC-Cmd/IPC-Cmd-0.680.ebuild,v 1.3 2011/01/29 18:14:39 armin76 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=0.68
+inherit perl-module
+
+DESCRIPTION="Finding and running system commands made easy"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/perl-Locale-Maketext-Simple
+	virtual/perl-Module-Load-Conditional
+	>=virtual/perl-Params-Check-0.26"
+RDEPEND="${DEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/IPC-Cmd/IPC-Cmd-0.700.0.ebuild b/perl-core/IPC-Cmd/IPC-Cmd-0.700.0.ebuild
new file mode 100644
index 0000000..9a03cc8
--- /dev/null
+++ b/perl-core/IPC-Cmd/IPC-Cmd-0.700.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/IPC-Cmd/IPC-Cmd-0.700.0.ebuild,v 1.3 2011/07/07 23:17:04 aballier Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=0.70
+inherit perl-module
+
+DESCRIPTION="Finding and running system commands made easy"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="virtual/perl-Locale-Maketext-Simple
+	virtual/perl-Module-Load-Conditional
+	>=virtual/perl-Params-Check-0.26"
+RDEPEND="${DEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/JSON-PP/JSON-PP-2.271.40.ebuild b/perl-core/JSON-PP/JSON-PP-2.271.40.ebuild
new file mode 100644
index 0000000..7f6dcd1
--- /dev/null
+++ b/perl-core/JSON-PP/JSON-PP-2.271.40.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/JSON-PP/JSON-PP-2.271.40.ebuild,v 1.5 2011/03/19 12:35:08 armin76 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=MAKAMAKA
+MODULE_VERSION=2.27104
+inherit perl-module
+
+DESCRIPTION="JSON::XS compatible pure-Perl module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!!<dev-perl/JSON-2.50"
+
+SRC_TEST="do"

diff --git a/perl-core/JSON-PP/JSON-PP-2.271.50.ebuild b/perl-core/JSON-PP/JSON-PP-2.271.50.ebuild
new file mode 100644
index 0000000..a3203f2
--- /dev/null
+++ b/perl-core/JSON-PP/JSON-PP-2.271.50.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/JSON-PP/JSON-PP-2.271.50.ebuild,v 1.5 2011/05/02 19:39:02 grobian Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=MAKAMAKA
+MODULE_VERSION=2.27105
+inherit perl-module
+
+DESCRIPTION="JSON::XS compatible pure-Perl module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!!<dev-perl/JSON-2.50"
+
+SRC_TEST="do"

diff --git a/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.19.ebuild b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.19.ebuild
new file mode 100644
index 0000000..2bc96c8
--- /dev/null
+++ b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.19.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.19.ebuild,v 1.5 2010/01/05 19:04:24 nixnut Exp $
+
+MODULE_AUTHOR="TELS"
+MODULE_SECTION="math"
+inherit perl-module
+
+DESCRIPTION="Math::BigInt::Calc with some XS for more speed"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="amd64 hppa ppc x86"
+RDEPEND=">=virtual/perl-Math-BigInt-1.87"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.24.ebuild b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.24.ebuild
new file mode 100644
index 0000000..64aff5b
--- /dev/null
+++ b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.24.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.24.ebuild,v 1.5 2010/12/07 05:04:52 mattst88 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=FLORA
+inherit perl-module
+
+DESCRIPTION="Math::BigInt::Calc with some XS for more speed"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/perl-Math-BigInt-1.97
+	virtual/perl-XSLoader"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.251.ebuild b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.251.ebuild
new file mode 100644
index 0000000..e05c12b
--- /dev/null
+++ b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.251.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.251.ebuild,v 1.1 2011/02/08 07:47:13 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PJACKLAM
+MODULE_VERSION=0.251
+inherit perl-module
+
+DESCRIPTION="Math::BigInt::Calc with some XS for more speed"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/perl-Math-BigInt-1.991
+	virtual/perl-XSLoader"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.260.ebuild b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.260.ebuild
new file mode 100644
index 0000000..dc1f618
--- /dev/null
+++ b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.260.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.260.ebuild,v 1.1 2011/02/08 19:16:04 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PJACKLAM
+MODULE_VERSION=0.26
+inherit perl-module
+
+DESCRIPTION="Math::BigInt::Calc with some XS for more speed"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/perl-Math-BigInt-1.991
+	virtual/perl-XSLoader"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.270.0.ebuild b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.270.0.ebuild
new file mode 100644
index 0000000..f5a3461
--- /dev/null
+++ b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.270.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.270.0.ebuild,v 1.2 2011/06/24 14:43:28 grobian Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PJACKLAM
+MODULE_VERSION=0.27
+inherit perl-module
+
+DESCRIPTION="Math::BigInt::Calc with some XS for more speed"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=virtual/perl-Math-BigInt-1.993
+	virtual/perl-XSLoader"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.280.0.ebuild b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.280.0.ebuild
new file mode 100644
index 0000000..e69ae75
--- /dev/null
+++ b/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.280.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt-FastCalc/Math-BigInt-FastCalc-0.280.0.ebuild,v 1.3 2011/06/24 14:43:28 grobian Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PJACKLAM
+MODULE_VERSION=0.28
+inherit perl-module
+
+DESCRIPTION="Math::BigInt::Calc with some XS for more speed"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/perl-Math-BigInt-1.993
+	virtual/perl-XSLoader"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Math-BigInt/Math-BigInt-1.89.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.89.ebuild
new file mode 100644
index 0000000..7a35457
--- /dev/null
+++ b/perl-core/Math-BigInt/Math-BigInt-1.89.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt/Math-BigInt-1.89.ebuild,v 1.7 2010/01/05 19:03:39 nixnut Exp $
+
+MODULE_AUTHOR=TELS
+MODULE_SECTION=math
+inherit perl-module eutils
+
+DESCRIPTION="Arbitrary size floating point math package"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		>=virtual/perl-Scalar-List-Utils-1.14"
+
+PDEPEND=">=perl-core/bignum-0.22
+		>=perl-core/Math-BigRat-0.22"
+
+SRC_TEST="do"
+PREFER_BUILDPL="no"

diff --git a/perl-core/Math-BigInt/Math-BigInt-1.99.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.99.ebuild
new file mode 100644
index 0000000..62c357e
--- /dev/null
+++ b/perl-core/Math-BigInt/Math-BigInt-1.99.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt/Math-BigInt-1.99.ebuild,v 1.5 2010/12/07 05:01:12 mattst88 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=FLORA
+inherit perl-module eutils
+
+DESCRIPTION="Arbitrary size floating point math package"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/perl-Scalar-List-Utils-1.14"
+DEPEND="${RDEPEND}"
+
+PDEPEND=">=virtual/perl-Math-BigInt-FastCalc-0.24
+	>=perl-core/bignum-0.22
+	>=perl-core/Math-BigRat-0.22"
+
+SRC_TEST="do"

diff --git a/perl-core/Math-BigInt/Math-BigInt-1.991.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.991.ebuild
new file mode 100644
index 0000000..031b273
--- /dev/null
+++ b/perl-core/Math-BigInt/Math-BigInt-1.991.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt/Math-BigInt-1.991.ebuild,v 1.1 2011/02/08 07:46:09 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PJACKLAM
+MODULE_VERSION=1.991
+inherit perl-module eutils
+
+DESCRIPTION="Arbitrary size floating point math package"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/perl-Scalar-List-Utils-1.14"
+DEPEND="${RDEPEND}"
+
+PDEPEND=">=virtual/perl-Math-BigInt-FastCalc-0.24
+	>=perl-core/bignum-0.22
+	>=perl-core/Math-BigRat-0.22"
+
+SRC_TEST="do"

diff --git a/perl-core/Math-BigInt/Math-BigInt-1.992.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.992.ebuild
new file mode 100644
index 0000000..a1097ed
--- /dev/null
+++ b/perl-core/Math-BigInt/Math-BigInt-1.992.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt/Math-BigInt-1.992.ebuild,v 1.1 2011/02/19 08:30:58 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PJACKLAM
+MODULE_VERSION=1.992
+inherit perl-module eutils
+
+DESCRIPTION="Arbitrary size floating point math package"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/perl-Scalar-List-Utils-1.14"
+DEPEND="${RDEPEND}"
+
+PDEPEND=">=virtual/perl-Math-BigInt-FastCalc-0.25
+	>=perl-core/bignum-0.22
+	>=perl-core/Math-BigRat-0.260.200"
+
+SRC_TEST="do"

diff --git a/perl-core/Math-BigInt/Math-BigInt-1.993.0.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.993.0.ebuild
new file mode 100644
index 0000000..2d6e72e
--- /dev/null
+++ b/perl-core/Math-BigInt/Math-BigInt-1.993.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt/Math-BigInt-1.993.0.ebuild,v 1.3 2011/06/24 14:31:54 grobian Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=PJACKLAM
+MODULE_VERSION=1.993
+inherit perl-module eutils
+
+DESCRIPTION="Arbitrary size floating point math package"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/perl-Scalar-List-Utils-1.14"
+DEPEND="${RDEPEND}"
+
+PDEPEND=">=virtual/perl-Math-BigInt-FastCalc-0.25
+	>=perl-core/bignum-0.22
+	>=perl-core/Math-BigRat-0.260.200"
+
+SRC_TEST="do"

diff --git a/perl-core/Memoize/Memoize-1.01.ebuild b/perl-core/Memoize/Memoize-1.01.ebuild
new file mode 100644
index 0000000..3f8bbf2
--- /dev/null
+++ b/perl-core/Memoize/Memoize-1.01.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Memoize/Memoize-1.01.ebuild,v 1.4 2009/12/16 21:52:59 abcd Exp $
+
+inherit perl-module
+
+MY_P=Memoize-${PV}
+DESCRIPTION="Generic Perl function result caching system"
+HOMEPAGE="http://perl.plover.com/Memoize/"
+SRC_URI="mirror://cpan/authors/id/M/MJ/MJD/${P}.tar.gz"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-lang/perl"

diff --git a/perl-core/Memoize/Memoize-1.20.0.ebuild b/perl-core/Memoize/Memoize-1.20.0.ebuild
new file mode 100644
index 0000000..df0276d
--- /dev/null
+++ b/perl-core/Memoize/Memoize-1.20.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Memoize/Memoize-1.20.0.ebuild,v 1.6 2012/02/02 19:36:24 ranger Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=FLORA
+MODULE_VERSION=1.02
+inherit perl-module
+
+DESCRIPTION="Generic Perl function result caching system"
+
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+SRC_TEST=do

diff --git a/perl-core/Module-Build/Module-Build-0.34.0201.ebuild b/perl-core/Module-Build/Module-Build-0.34.0201.ebuild
new file mode 100644
index 0000000..72ab62b
--- /dev/null
+++ b/perl-core/Module-Build/Module-Build-0.34.0201.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Build/Module-Build-0.34.0201.ebuild,v 1.10 2011/07/30 12:20:40 tove Exp $
+
+inherit versionator
+MODULE_AUTHOR=DAGOLDEN
+MY_P=${PN}-$(delete_version_separator 2)
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Build and install Perl modules"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Removing these as hard deps. They are listed as recommended in the Build.PL,
+# but end up causing a dep loop since they require module-build to be built.
+# ~mcummings 06.16.06
+PDEPEND=">=virtual/perl-ExtUtils-CBuilder-0.15
+	>=virtual/perl-ExtUtils-ParseXS-1.02"
+
+DEPEND="dev-lang/perl
+	dev-perl/yaml
+	>=virtual/perl-Archive-Tar-1.09
+	>=virtual/perl-Test-Harness-3.16"
+
+SRC_TEST="do"

diff --git a/perl-core/Module-Build/Module-Build-0.36.07.ebuild b/perl-core/Module-Build/Module-Build-0.36.07.ebuild
new file mode 100644
index 0000000..f624376
--- /dev/null
+++ b/perl-core/Module-Build/Module-Build-0.36.07.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Build/Module-Build-0.36.07.ebuild,v 1.8 2011/07/30 12:20:40 tove Exp $
+
+EAPI=2
+
+inherit versionator
+MODULE_AUTHOR=DAGOLDEN
+MY_P=${PN}-$(delete_version_separator 2)
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Build and install Perl modules"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-perl/YAML-Tiny
+	>=virtual/perl-ExtUtils-CBuilder-0.27
+	>=virtual/perl-ExtUtils-ParseXS-2.22.05
+	>=virtual/perl-Archive-Tar-1.09
+	>=virtual/perl-Test-Harness-3.16"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Module-Build/Module-Build-0.362.400.ebuild b/perl-core/Module-Build/Module-Build-0.362.400.ebuild
new file mode 100644
index 0000000..d7e969f
--- /dev/null
+++ b/perl-core/Module-Build/Module-Build-0.362.400.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Build/Module-Build-0.362.400.ebuild,v 1.5 2011/02/27 12:09:12 grobian Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=0.3624
+inherit perl-module
+
+DESCRIPTION="Build and install Perl modules"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	>=virtual/perl-CPAN-Meta-YAML-0.2
+	>=virtual/perl-Module-Metadata-1.0.2
+	>=virtual/perl-Perl-OSType-1
+	>=virtual/perl-ExtUtils-CBuilder-0.27
+	>=virtual/perl-ExtUtils-ParseXS-2.22.05
+	>=virtual/perl-Archive-Tar-1.09
+	>=virtual/perl-Test-Harness-3.16
+	>=virtual/perl-version-0.87
+"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Module-Build/Module-Build-0.380.0.ebuild b/perl-core/Module-Build/Module-Build-0.380.0.ebuild
new file mode 100644
index 0000000..e2f7034
--- /dev/null
+++ b/perl-core/Module-Build/Module-Build-0.380.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Build/Module-Build-0.380.0.ebuild,v 1.13 2012/05/15 19:26:31 halcy0n Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=0.3800
+inherit perl-module
+
+DESCRIPTION="Build and install Perl modules"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	>=virtual/perl-CPAN-Meta-2.110.420
+	>=virtual/perl-Parse-CPAN-Meta-1.440.100
+	>=virtual/perl-Module-Metadata-1.0.2
+	>=virtual/perl-Perl-OSType-1
+	>=virtual/perl-ExtUtils-CBuilder-0.27
+	>=virtual/perl-ExtUtils-ParseXS-2.22.05
+	>=virtual/perl-Archive-Tar-1.09
+	>=virtual/perl-Test-Harness-3.16
+	>=virtual/perl-version-0.87
+"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Module-CoreList/Module-CoreList-2.38.ebuild b/perl-core/Module-CoreList/Module-CoreList-2.38.ebuild
new file mode 100644
index 0000000..0ff818d
--- /dev/null
+++ b/perl-core/Module-CoreList/Module-CoreList-2.38.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-CoreList/Module-CoreList-2.38.ebuild,v 1.3 2010/11/05 12:07:17 fauli Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+inherit perl-module
+
+DESCRIPTION="what modules shipped with versions of perl"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+#RDEPEND=""
+#DEPEND="test? ( dev-perl/Test-Pod )"
+
+SRC_TEST=do

diff --git a/perl-core/Module-CoreList/Module-CoreList-2.41.ebuild b/perl-core/Module-CoreList/Module-CoreList-2.41.ebuild
new file mode 100644
index 0000000..d0bf99d
--- /dev/null
+++ b/perl-core/Module-CoreList/Module-CoreList-2.41.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-CoreList/Module-CoreList-2.41.ebuild,v 1.1 2010/11/22 15:11:05 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+inherit perl-module
+
+DESCRIPTION="what modules shipped with versions of perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+#RDEPEND=""
+#DEPEND="test? ( dev-perl/Test-Pod )"
+
+SRC_TEST=do

diff --git a/perl-core/Module-CoreList/Module-CoreList-2.430.ebuild b/perl-core/Module-CoreList/Module-CoreList-2.430.ebuild
new file mode 100644
index 0000000..32f6c04
--- /dev/null
+++ b/perl-core/Module-CoreList/Module-CoreList-2.430.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-CoreList/Module-CoreList-2.430.ebuild,v 1.2 2011/09/03 19:45:42 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=2.43
+inherit perl-module
+
+DESCRIPTION="what modules shipped with versions of perl"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+#RDEPEND=""
+#DEPEND="test? ( dev-perl/Test-Pod )"
+
+SRC_TEST=do

diff --git a/perl-core/Module-CoreList/Module-CoreList-2.440.ebuild b/perl-core/Module-CoreList/Module-CoreList-2.440.ebuild
new file mode 100644
index 0000000..847c7e1
--- /dev/null
+++ b/perl-core/Module-CoreList/Module-CoreList-2.440.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-CoreList/Module-CoreList-2.440.ebuild,v 1.3 2011/01/29 18:06:49 armin76 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=2.44
+inherit perl-module
+
+DESCRIPTION="what modules shipped with versions of perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+#RDEPEND=""
+#DEPEND="test? ( dev-perl/Test-Pod )"
+
+SRC_TEST=do

diff --git a/perl-core/Module-CoreList/Module-CoreList-2.450.ebuild b/perl-core/Module-CoreList/Module-CoreList-2.450.ebuild
new file mode 100644
index 0000000..1c66d6c
--- /dev/null
+++ b/perl-core/Module-CoreList/Module-CoreList-2.450.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-CoreList/Module-CoreList-2.450.ebuild,v 1.3 2011/02/27 10:48:20 grobian Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=2.45
+inherit perl-module
+
+DESCRIPTION="what modules shipped with versions of perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+#RDEPEND=""
+#DEPEND="test? ( dev-perl/Test-Pod )"
+
+SRC_TEST=do

diff --git a/perl-core/Module-CoreList/Module-CoreList-2.460.0.ebuild b/perl-core/Module-CoreList/Module-CoreList-2.460.0.ebuild
new file mode 100644
index 0000000..1c5c6ad
--- /dev/null
+++ b/perl-core/Module-CoreList/Module-CoreList-2.460.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-CoreList/Module-CoreList-2.460.0.ebuild,v 1.2 2011/05/02 19:53:27 grobian Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=2.46
+inherit perl-module
+
+DESCRIPTION="what modules shipped with versions of perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+#RDEPEND=""
+#DEPEND="test? ( dev-perl/Test-Pod )"
+
+SRC_TEST=do

diff --git a/perl-core/Module-CoreList/Module-CoreList-2.490.0.ebuild b/perl-core/Module-CoreList/Module-CoreList-2.490.0.ebuild
new file mode 100644
index 0000000..4bcb76d
--- /dev/null
+++ b/perl-core/Module-CoreList/Module-CoreList-2.490.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-CoreList/Module-CoreList-2.490.0.ebuild,v 1.2 2011/06/13 01:03:30 mattst88 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=2.49
+inherit perl-module
+
+DESCRIPTION="what modules shipped with versions of perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+#RDEPEND=""
+#DEPEND="test? ( dev-perl/Test-Pod )"
+
+SRC_TEST=do

diff --git a/perl-core/Module-Load-Conditional/Module-Load-Conditional-0.400.ebuild b/perl-core/Module-Load-Conditional/Module-Load-Conditional-0.400.ebuild
new file mode 100644
index 0000000..7c79de6
--- /dev/null
+++ b/perl-core/Module-Load-Conditional/Module-Load-Conditional-0.400.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Load-Conditional/Module-Load-Conditional-0.400.ebuild,v 1.3 2011/01/29 18:10:22 armin76 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=0.40
+inherit perl-module
+
+DESCRIPTION="Looking up module information / loading at runtime"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/perl-Module-Load-0.12
+	>=virtual/perl-Module-CoreList-0.22
+	virtual/perl-Locale-Maketext-Simple
+	virtual/perl-Params-Check
+	virtual/perl-version"
+RDEPEND="${DEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/Module-Load-Conditional/Module-Load-Conditional-0.440.0.ebuild b/perl-core/Module-Load-Conditional/Module-Load-Conditional-0.440.0.ebuild
new file mode 100644
index 0000000..8ad34cc
--- /dev/null
+++ b/perl-core/Module-Load-Conditional/Module-Load-Conditional-0.440.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Load-Conditional/Module-Load-Conditional-0.440.0.ebuild,v 1.3 2011/07/07 23:16:03 aballier Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=0.44
+inherit perl-module
+
+DESCRIPTION="Looking up module information / loading at runtime"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/perl-Module-Load-0.12
+	>=virtual/perl-Module-CoreList-0.22
+	virtual/perl-Locale-Maketext-Simple
+	virtual/perl-Params-Check
+	virtual/perl-version"
+RDEPEND="${DEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/Module-Load/Module-Load-0.180.0.ebuild b/perl-core/Module-Load/Module-Load-0.180.0.ebuild
new file mode 100644
index 0000000..5c86d50
--- /dev/null
+++ b/perl-core/Module-Load/Module-Load-0.180.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Load/Module-Load-0.180.0.ebuild,v 1.3 2011/07/07 23:11:00 aballier Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=0.18
+inherit perl-module
+
+DESCRIPTION="runtime require of both modules and files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST=do

diff --git a/perl-core/Module-Loaded/Module-Loaded-0.60.0.ebuild b/perl-core/Module-Loaded/Module-Loaded-0.60.0.ebuild
new file mode 100644
index 0000000..afb0a0b
--- /dev/null
+++ b/perl-core/Module-Loaded/Module-Loaded-0.60.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Loaded/Module-Loaded-0.60.0.ebuild,v 1.1 2011/05/20 14:09:10 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="Mark modules as loaded or unloaded"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+SRC_TEST=do

diff --git a/perl-core/Module-Metadata/Module-Metadata-1.0.3.ebuild b/perl-core/Module-Metadata/Module-Metadata-1.0.3.ebuild
new file mode 100644
index 0000000..fc927d3
--- /dev/null
+++ b/perl-core/Module-Metadata/Module-Metadata-1.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Metadata/Module-Metadata-1.0.3.ebuild,v 1.4 2011/01/30 18:03:59 armin76 Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=1.000003
+inherit perl-module
+
+DESCRIPTION="Gather package and POD information from perl module files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/perl-version-0.870"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Module-Metadata/Module-Metadata-1.0.4.ebuild b/perl-core/Module-Metadata/Module-Metadata-1.0.4.ebuild
new file mode 100644
index 0000000..d1b96ab
--- /dev/null
+++ b/perl-core/Module-Metadata/Module-Metadata-1.0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Metadata/Module-Metadata-1.0.4.ebuild,v 1.6 2011/07/06 03:47:16 aballier Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=1.000004
+inherit perl-module
+
+DESCRIPTION="Gather package and POD information from perl module files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/perl-version-0.870"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Module-Pluggable/Module-Pluggable-3.900.0.ebuild b/perl-core/Module-Pluggable/Module-Pluggable-3.900.0.ebuild
new file mode 100644
index 0000000..89f1eb0
--- /dev/null
+++ b/perl-core/Module-Pluggable/Module-Pluggable-3.900.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Pluggable/Module-Pluggable-3.900.0.ebuild,v 1.2 2012/05/06 17:30:21 armin76 Exp $
+
+EAPI=2
+
+MODULE_VERSION=3.9
+MODULE_AUTHOR=SIMONW
+inherit perl-module
+
+DESCRIPTION="automatically give your module the ability to have plugins"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="virtual/perl-File-Spec"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Params-Check/Params-Check-0.26.ebuild b/perl-core/Params-Check/Params-Check-0.26.ebuild
new file mode 100644
index 0000000..5293f20
--- /dev/null
+++ b/perl-core/Params-Check/Params-Check-0.26.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Params-Check/Params-Check-0.26.ebuild,v 1.2 2009/10/27 17:31:35 volkmar Exp $
+
+MODULE_AUTHOR="KANE"
+
+inherit perl-module
+
+DESCRIPTION="A generic input parsing/checking mechanism"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/perl-Locale-Maketext-Simple"

diff --git a/perl-core/Params-Check/Params-Check-0.280.0.ebuild b/perl-core/Params-Check/Params-Check-0.280.0.ebuild
new file mode 100644
index 0000000..a3f09be
--- /dev/null
+++ b/perl-core/Params-Check/Params-Check-0.280.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Params-Check/Params-Check-0.280.0.ebuild,v 1.3 2011/07/07 23:14:31 aballier Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=0.28
+inherit perl-module
+
+DESCRIPTION="A generic input parsing/checking mechanism"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="virtual/perl-Locale-Maketext-Simple"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.40.ebuild b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.40.ebuild
new file mode 100644
index 0000000..118444f
--- /dev/null
+++ b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.40.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.40.ebuild,v 1.2 2009/10/27 17:51:22 volkmar Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=SMUELLER
+inherit perl-module
+
+DESCRIPTION="Parse META.yml and other similar CPAN metadata files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+SRC_TEST=do

diff --git a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.420.ebuild b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.420.ebuild
new file mode 100644
index 0000000..9a1825b
--- /dev/null
+++ b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.420.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.420.ebuild,v 1.2 2011/02/20 23:58:27 josejx Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=1.4200
+inherit perl-module
+
+DESCRIPTION="Parse META.yml and other similar CPAN metadata files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/perl-CPAN-Meta-YAML-0.2
+	>=virtual/perl-JSON-PP-2.271.30
+	>=virtual/perl-Module-Load-Conditional-0.260
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.100.ebuild b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.100.ebuild
new file mode 100644
index 0000000..fe56d85
--- /dev/null
+++ b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.100.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.100.ebuild,v 1.16 2012/05/15 19:16:18 halcy0n Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=1.4401
+inherit perl-module
+
+DESCRIPTION="Parse META.yml and other similar CPAN metadata files"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=virtual/perl-CPAN-Meta-YAML-0.2
+	>=virtual/perl-JSON-PP-2.271.30
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.ebuild b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.ebuild
new file mode 100644
index 0000000..9bcb635
--- /dev/null
+++ b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.ebuild,v 1.3 2011/05/02 19:41:01 grobian Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=1.4400
+inherit perl-module
+
+DESCRIPTION="Parse META.yml and other similar CPAN metadata files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x64-freebsd"
+IUSE=""
+
+RDEPEND="
+	>=virtual/perl-CPAN-Meta-YAML-0.2
+	>=virtual/perl-JSON-PP-2.271.30
+	>=virtual/perl-Module-Load-Conditional-0.260
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/Pod-Simple/Pod-Simple-3.14.ebuild b/perl-core/Pod-Simple/Pod-Simple-3.14.ebuild
new file mode 100644
index 0000000..03bb7e9
--- /dev/null
+++ b/perl-core/Pod-Simple/Pod-Simple-3.14.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Pod-Simple/Pod-Simple-3.14.ebuild,v 1.9 2011/07/30 12:23:01 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DWHEELER
+inherit perl-module
+
+DESCRIPTION="Framework for parsing Pod"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/perl-Pod-Escapes-1.04"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Pod-Simple/Pod-Simple-3.15.ebuild b/perl-core/Pod-Simple/Pod-Simple-3.15.ebuild
new file mode 100644
index 0000000..b7c71e9
--- /dev/null
+++ b/perl-core/Pod-Simple/Pod-Simple-3.15.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Pod-Simple/Pod-Simple-3.15.ebuild,v 1.3 2011/07/30 12:23:01 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DWHEELER
+inherit perl-module
+
+DESCRIPTION="Framework for parsing Pod"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/perl-Pod-Escapes-1.04"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/Pod-Simple/Pod-Simple-3.160.0.ebuild b/perl-core/Pod-Simple/Pod-Simple-3.160.0.ebuild
new file mode 100644
index 0000000..32608aa
--- /dev/null
+++ b/perl-core/Pod-Simple/Pod-Simple-3.160.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Pod-Simple/Pod-Simple-3.160.0.ebuild,v 1.9 2012/03/07 21:58:44 ranger Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=DWHEELER
+MODULE_VERSION=3.16
+inherit perl-module
+
+DESCRIPTION="Framework for parsing Pod"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/perl-Pod-Escapes-1.04"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/PodParser/PodParser-1.380.0.ebuild b/perl-core/PodParser/PodParser-1.380.0.ebuild
new file mode 100644
index 0000000..9bbd23f
--- /dev/null
+++ b/perl-core/PodParser/PodParser-1.380.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/PodParser/PodParser-1.380.0.ebuild,v 1.3 2012/04/28 01:46:55 aballier Exp $
+
+MODULE_AUTHOR=MAREKR
+MODULE_VERSION=1.38
+MY_PN=Pod-Parser
+inherit perl-module
+
+DESCRIPTION="Base class for creating POD filters and translators"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+S=${WORKDIR}/${MY_P}
+
+SRC_TEST="do"

diff --git a/perl-core/Safe/Safe-2.27.ebuild b/perl-core/Safe/Safe-2.27.ebuild
new file mode 100644
index 0000000..9beac3b
--- /dev/null
+++ b/perl-core/Safe/Safe-2.27.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Safe/Safe-2.27.ebuild,v 1.5 2010/07/19 01:18:02 josejx Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=RGARCIA
+inherit perl-module
+
+DESCRIPTION="Compile and execute code in restricted compartments"
+
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86"
+IUSE=""
+
+SRC_TEST=do

diff --git a/perl-core/Safe/Safe-2.290.0.ebuild b/perl-core/Safe/Safe-2.290.0.ebuild
new file mode 100644
index 0000000..80618af
--- /dev/null
+++ b/perl-core/Safe/Safe-2.290.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Safe/Safe-2.290.0.ebuild,v 1.1 2011/05/20 13:30:27 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=RGARCIA
+MODULE_VERSION=2.29
+inherit perl-module
+
+DESCRIPTION="Compile and execute code in restricted compartments"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+SRC_TEST=do

diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.230.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.230.0.ebuild
new file mode 100644
index 0000000..121594f
--- /dev/null
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.230.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.230.0.ebuild,v 1.2 2012/05/31 15:19:37 jer Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=GBARR
+MODULE_VERSION=1.23
+inherit perl-module
+
+DESCRIPTION="Scalar-List-Utils module for perl"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST=do

diff --git a/perl-core/Storable/Storable-2.20.ebuild b/perl-core/Storable/Storable-2.20.ebuild
new file mode 100644
index 0000000..87eb873
--- /dev/null
+++ b/perl-core/Storable/Storable-2.20.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Storable/Storable-2.20.ebuild,v 1.10 2011/07/30 12:24:34 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=AMS
+inherit perl-module
+
+DESCRIPTION="The Perl Storable Module"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/perl-core/Storable/Storable-2.250.ebuild b/perl-core/Storable/Storable-2.250.ebuild
new file mode 100644
index 0000000..453f6f9
--- /dev/null
+++ b/perl-core/Storable/Storable-2.250.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Storable/Storable-2.250.ebuild,v 1.4 2011/07/30 12:24:34 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=AMS
+MODULE_VERSION=2.25
+inherit perl-module
+
+DESCRIPTION="The Perl Storable Module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/perl-core/Sys-Syslog/Sys-Syslog-0.270.0.ebuild b/perl-core/Sys-Syslog/Sys-Syslog-0.270.0.ebuild
new file mode 100644
index 0000000..81c1f37
--- /dev/null
+++ b/perl-core/Sys-Syslog/Sys-Syslog-0.270.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Sys-Syslog/Sys-Syslog-0.270.0.ebuild,v 1.2 2011/07/30 12:25:21 tove Exp $
+
+MODULE_VERSION=0.27
+MODULE_AUTHOR=SAPER
+inherit perl-module
+
+DESCRIPTION="Provides same functionality as BSD syslog"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+# Tests disabled - they attempt to verify on the live system
+#SRC_TEST="do"

diff --git a/perl-core/Term-ANSIColor/Term-ANSIColor-3.0.0.ebuild b/perl-core/Term-ANSIColor/Term-ANSIColor-3.0.0.ebuild
new file mode 100644
index 0000000..764778c
--- /dev/null
+++ b/perl-core/Term-ANSIColor/Term-ANSIColor-3.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Term-ANSIColor/Term-ANSIColor-3.0.0.ebuild,v 1.1 2011/05/19 19:04:45 tove Exp $
+
+EAPI=3
+
+MY_PN="ANSIColor"
+MODULE_AUTHOR=RRA
+MODULE_VERSION=3.00
+inherit perl-module
+
+DESCRIPTION="Color screen output using ANSI escape sequences."
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Test-Pod )"
+
+SRC_TEST="do"

diff --git a/perl-core/Test-Harness/Test-Harness-3.17.ebuild b/perl-core/Test-Harness/Test-Harness-3.17.ebuild
new file mode 100644
index 0000000..40e7dbc
--- /dev/null
+++ b/perl-core/Test-Harness/Test-Harness-3.17.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Harness/Test-Harness-3.17.ebuild,v 1.11 2011/07/30 12:26:09 tove Exp $
+
+MODULE_AUTHOR=ANDYA
+inherit perl-module
+
+DESCRIPTION="Runs perl standard test scripts with statistics"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+PREFER_BUILDPL=no
+SRC_TEST="do"
+mydoc="rfc*.txt"
+PATCHES=( "${FILESDIR}"/3.17-taint.patch )

diff --git a/perl-core/Test-Harness/Test-Harness-3.22.ebuild b/perl-core/Test-Harness/Test-Harness-3.22.ebuild
new file mode 100644
index 0000000..82c003c
--- /dev/null
+++ b/perl-core/Test-Harness/Test-Harness-3.22.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Harness/Test-Harness-3.22.ebuild,v 1.2 2011/07/30 12:26:09 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=ANDYA
+inherit perl-module
+
+DESCRIPTION="Runs perl standard test scripts with statistics"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+PREFER_BUILDPL=no
+SRC_TEST="do"
+mydoc="rfc*.txt"

diff --git a/perl-core/Test-Harness/Test-Harness-3.230.0.ebuild b/perl-core/Test-Harness/Test-Harness-3.230.0.ebuild
new file mode 100644
index 0000000..6df9389
--- /dev/null
+++ b/perl-core/Test-Harness/Test-Harness-3.230.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Harness/Test-Harness-3.230.0.ebuild,v 1.10 2012/04/28 02:07:53 aballier Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=ANDYA
+MODULE_VERSION=3.23
+inherit perl-module
+
+DESCRIPTION="Runs perl standard test scripts with statistics"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+PREFER_BUILDPL=no
+SRC_TEST="do"
+mydoc="rfc*.txt"

diff --git a/perl-core/Test-Harness/files/3.17-taint.patch b/perl-core/Test-Harness/files/3.17-taint.patch
new file mode 100644
index 0000000..ede8150
--- /dev/null
+++ b/perl-core/Test-Harness/files/3.17-taint.patch
@@ -0,0 +1,19 @@
+--- Test-Harness/t/sample-tests/taint
++++ Test-Harness/t/sample-tests/taint
+@@ -3,5 +3,5 @@
+ use lib qw(t/lib);
+ use Test::More tests => 1;
+ 
+-eval { kill 0, $^X };
++eval { `$^X -e1` };
+ like( $@, '/^Insecure dependency/', '-T honored' );
+--- Test-Harness/t/sample-tests/taint_warn
++++ Test-Harness/t/sample-tests/taint_warn
+@@ -6,6 +6,6 @@ use Test::More tests => 1;
+ my $warnings = '';
+ {
+     local $SIG{__WARN__} = sub { $warnings .= join '', @_ };
+-    kill 0, $^X;
++    `$^X -e1`;
+ }
+ like( $warnings, '/^Insecure dependency/', '-t honored' );

diff --git a/perl-core/Test/Test-1.25.ebuild b/perl-core/Test/Test-1.25.ebuild
new file mode 100644
index 0000000..2524300
--- /dev/null
+++ b/perl-core/Test/Test-1.25.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test/Test-1.25.ebuild,v 1.10 2010/01/21 09:33:03 tove Exp $
+
+MODULE_AUTHOR=SBURKE
+inherit perl-module
+
+DESCRIPTION="Utilities for writing test scripts"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+SRC_TEST="do"

diff --git a/perl-core/Time-HiRes/Time-HiRes-1.97.19.ebuild b/perl-core/Time-HiRes/Time-HiRes-1.97.19.ebuild
new file mode 100644
index 0000000..64da0d0
--- /dev/null
+++ b/perl-core/Time-HiRes/Time-HiRes-1.97.19.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-HiRes/Time-HiRes-1.97.19.ebuild,v 1.10 2010/01/05 19:25:22 nixnut Exp $
+
+inherit versionator
+MODULE_AUTHOR=JHI
+MY_P="${PN}-$(delete_version_separator 2)"
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Perl Time::HiRes. High resolution alarm, sleep, gettimeofday, interval timers"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+mydoc="TODO"
+
+SRC_TEST="do"

diff --git a/perl-core/Time-HiRes/Time-HiRes-1.97.21.ebuild b/perl-core/Time-HiRes/Time-HiRes-1.97.21.ebuild
new file mode 100644
index 0000000..ceb2a8b
--- /dev/null
+++ b/perl-core/Time-HiRes/Time-HiRes-1.97.21.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-HiRes/Time-HiRes-1.97.21.ebuild,v 1.1 2010/03/18 08:05:53 tove Exp $
+
+EAPI=2
+
+inherit versionator
+MODULE_AUTHOR=JHI
+MY_P="${PN}-$(delete_version_separator 2)"
+S=${WORKDIR}/${MY_P}
+inherit perl-module
+
+DESCRIPTION="Perl Time::HiRes. High resolution alarm, sleep, gettimeofday, interval timers"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/perl-core/Version-Requirements/Version-Requirements-0.101.20.ebuild b/perl-core/Version-Requirements/Version-Requirements-0.101.20.ebuild
new file mode 100644
index 0000000..883ec9f
--- /dev/null
+++ b/perl-core/Version-Requirements/Version-Requirements-0.101.20.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Version-Requirements/Version-Requirements-0.101.20.ebuild,v 1.16 2012/05/15 19:13:39 halcy0n Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=RJBS
+MODULE_VERSION=0.101020
+inherit perl-module
+
+DESCRIPTION="A set of version requirements for a CPAN dist"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-version-0.77
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/XSLoader/XSLoader-0.10.ebuild b/perl-core/XSLoader/XSLoader-0.10.ebuild
new file mode 100644
index 0000000..51d4db0
--- /dev/null
+++ b/perl-core/XSLoader/XSLoader-0.10.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/XSLoader/XSLoader-0.10.ebuild,v 1.6 2010/12/07 04:58:30 mattst88 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=SAPER
+inherit perl-module
+
+DESCRIPTION="Dynamically load C libraries into Perl code"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/91152fc1_rt54132_version081.patch )
+SRC_TEST=do

diff --git a/perl-core/XSLoader/files/91152fc1_rt54132_version081.patch b/perl-core/XSLoader/files/91152fc1_rt54132_version081.patch
new file mode 100644
index 0000000..be052eb
--- /dev/null
+++ b/perl-core/XSLoader/files/91152fc1_rt54132_version081.patch
@@ -0,0 +1,27 @@
+diff --git a/dist/XSLoader/t/XSLoader.t b/dist/XSLoader/t/XSLoader.t
+index 038986e..211c4d8 100644
+--- a/dist/XSLoader/t/XSLoader.t
++++ b/dist/XSLoader/t/XSLoader.t
+@@ -30,7 +30,7 @@ my %modules = (
+     'Time::HiRes'=> q| ::can_ok( 'Time::HiRes' => 'usleep'  ) |,  # 5.7.3
+ );
+ 
+-plan tests => keys(%modules) * 4 + 5;
++plan tests => keys(%modules) * 3 + 5;
+ 
+ # Try to load the module
+ use_ok( 'XSLoader' );
+@@ -65,11 +65,9 @@ for my $module (sort keys %modules) {
+     SKIP: {
+         skip "$module not available", 4 if $extensions !~ /\b$module\b/;
+ 
+-        eval qq{ package $module; XSLoader::load('$module', "qunckkk"); };
+-        like( $@, "/^$module object version \\S+ does not match bootstrap parameter (?:qunckkk|0)/",  
++        eval qq{ package $module; XSLoader::load('$module', "12345678"); };
++        like( $@, "/^$module object version \\S+ does not match bootstrap parameter (?:12345678|0)/",
+                 "calling XSLoader::load() with a XS module and an incorrect version" );
+-        like( $warnings, "/^\$|^Version string 'qunckkk' contains invalid data; ignoring: 'qunckkk'/", 
+-                "in Perl 5.10, DynaLoader warns about the incorrect version string" );
+ 
+         eval qq{ package $module; XSLoader::load('$module'); };
+         is( $@, '',  "XSLoader::load($module)");

diff --git a/perl-core/bignum/bignum-0.23.ebuild b/perl-core/bignum/bignum-0.23.ebuild
new file mode 100644
index 0000000..919d14e
--- /dev/null
+++ b/perl-core/bignum/bignum-0.23.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/bignum/bignum-0.23.ebuild,v 1.7 2010/01/05 19:03:03 nixnut Exp $
+
+MODULE_AUTHOR=TELS
+MODULE_SECTION=math
+inherit perl-module
+
+DESCRIPTION="Transparent BigNumber/BigRational support for Perl"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86"
+IUSE="test"
+
+SRC_TEST="do"
+PREFER_BUILDPL="no"
+
+RDEPEND=">=perl-core/Math-BigInt-1.88
+	>=perl-core/Math-BigRat-0.21
+	dev-lang/perl"
+DEPEND="${RDEPEND}
+	test? ( >=dev-perl/Test-Pod-Coverage-1.08 )"

diff --git a/perl-core/bignum/bignum-0.24.ebuild b/perl-core/bignum/bignum-0.24.ebuild
new file mode 100644
index 0000000..d19ca5c
--- /dev/null
+++ b/perl-core/bignum/bignum-0.24.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/bignum/bignum-0.24.ebuild,v 1.1 2010/09/05 08:34:11 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=FLORA
+inherit perl-module
+
+DESCRIPTION="Transparent BigNumber/BigRational support for Perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=">=perl-core/Math-BigInt-1.88
+	>=perl-core/Math-BigRat-0.21"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Test-Pod
+		>=dev-perl/Test-Pod-Coverage-1.08 )"
+
+SRC_TEST="do"

diff --git a/perl-core/bignum/bignum-0.25.ebuild b/perl-core/bignum/bignum-0.25.ebuild
new file mode 100644
index 0000000..40e42b4
--- /dev/null
+++ b/perl-core/bignum/bignum-0.25.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/bignum/bignum-0.25.ebuild,v 1.3 2011/06/24 14:37:57 grobian Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=FLORA
+inherit perl-module
+
+DESCRIPTION="Transparent BigNumber/BigRational support for Perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=perl-core/Math-BigInt-1.88
+	>=perl-core/Math-BigRat-0.21"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Test-Pod
+		>=dev-perl/Test-Pod-Coverage-1.08 )"
+
+SRC_TEST="do"

diff --git a/perl-core/digest-base/digest-base-1.160.0.ebuild b/perl-core/digest-base/digest-base-1.160.0.ebuild
new file mode 100644
index 0000000..cbfca15
--- /dev/null
+++ b/perl-core/digest-base/digest-base-1.160.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/digest-base/digest-base-1.160.0.ebuild,v 1.2 2011/07/30 12:28:27 tove Exp $
+
+EAPI=2
+
+MY_PN=Digest
+MODULE_AUTHOR=GAAS
+MODULE_VERSION=1.16
+inherit perl-module
+
+DESCRIPTION="Modules that calculate message digests"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="virtual/perl-MIME-Base64"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"
+mydoc="rfc*.txt"

diff --git a/perl-core/locale-maketext/files/1.13-defined.patch b/perl-core/locale-maketext/files/1.13-defined.patch
new file mode 100644
index 0000000..6fd3d6f
--- /dev/null
+++ b/perl-core/locale-maketext/files/1.13-defined.patch
@@ -0,0 +1,11 @@
+--- Locale-Maketext-1.13/lib/Locale/Maketext.pm
++++ Locale-Maketext-1.13/lib/Locale/Maketext.pm
+@@ -401,7 +401,7 @@
+     my $module = $_[0];   # ASSUME sane module name!
+     { no strict 'refs';
+         return($tried{$module} = 1)
+-        if defined(%{$module . '::Lexicon'}) or defined(@{$module . '::ISA'});
++        if %{$module . '::Lexicon'} or @{$module . '::ISA'};
+         # weird case: we never use'd it, but there it is!
+     }
+ 

diff --git a/perl-core/locale-maketext/locale-maketext-1.13-r1.ebuild b/perl-core/locale-maketext/locale-maketext-1.13-r1.ebuild
new file mode 100644
index 0000000..f5d138a
--- /dev/null
+++ b/perl-core/locale-maketext/locale-maketext-1.13-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/locale-maketext/locale-maketext-1.13-r1.ebuild,v 1.7 2010/11/13 14:34:34 armin76 Exp $
+
+EAPI=3
+
+MY_PN=Locale-Maketext
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+MODULE_AUTHOR=FERREIRA
+
+inherit perl-module
+
+DESCRIPTION="Localization framework for Perl programs"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
+IUSE=""
+
+DEPEND=">=virtual/perl-i18n-langtags-0.30"
+
+SRC_TEST="do"
+PATCHES=( "${FILESDIR}"/1.13-defined.patch )

diff --git a/perl-core/locale-maketext/locale-maketext-1.17.ebuild b/perl-core/locale-maketext/locale-maketext-1.17.ebuild
new file mode 100644
index 0000000..e5491df
--- /dev/null
+++ b/perl-core/locale-maketext/locale-maketext-1.17.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/locale-maketext/locale-maketext-1.17.ebuild,v 1.1 2010/10/21 08:39:14 tove Exp $
+
+EAPI=3
+
+MY_PN=Locale-Maketext
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+MODULE_AUTHOR=TODDR
+
+inherit perl-module
+
+DESCRIPTION="Localization framework for Perl programs"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/perl-i18n-langtags-0.31"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/perl-core/podlators/podlators-2.2.2.ebuild b/perl-core/podlators/podlators-2.2.2.ebuild
new file mode 100644
index 0000000..552cf6c
--- /dev/null
+++ b/perl-core/podlators/podlators-2.2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/podlators/podlators-2.2.2.ebuild,v 1.2 2009/11/16 13:16:33 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=RRA
+inherit perl-module
+
+DESCRIPTION="Format POD source into various output formats"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.8-r8
+	virtual/perl-Pod-Simple"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/podlators/podlators-2.3.0.ebuild b/perl-core/podlators/podlators-2.3.0.ebuild
new file mode 100644
index 0000000..e01f894
--- /dev/null
+++ b/perl-core/podlators/podlators-2.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/podlators/podlators-2.3.0.ebuild,v 1.1 2010/01/07 20:46:51 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=RRA
+inherit perl-module
+
+DESCRIPTION="Format POD source into various output formats"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.8-r8
+	>=virtual/perl-Pod-Simple-3.06"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/podlators/podlators-2.3.1.ebuild b/perl-core/podlators/podlators-2.3.1.ebuild
new file mode 100644
index 0000000..c704edc
--- /dev/null
+++ b/perl-core/podlators/podlators-2.3.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/podlators/podlators-2.3.1.ebuild,v 1.1 2010/02/19 13:30:28 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=RRA
+inherit perl-module
+
+DESCRIPTION="Format POD source into various output formats"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.8-r8
+	>=virtual/perl-Pod-Simple-3.06"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/podlators/podlators-2.4.0.ebuild b/perl-core/podlators/podlators-2.4.0.ebuild
new file mode 100644
index 0000000..a8aaaf3
--- /dev/null
+++ b/perl-core/podlators/podlators-2.4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/podlators/podlators-2.4.0.ebuild,v 1.1 2011/01/27 02:49:00 robbat2 Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=RRA
+inherit perl-module
+
+DESCRIPTION="Format POD source into various output formats"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.8-r8
+	>=virtual/perl-Pod-Simple-3.06"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/threads-shared/threads-shared-1.32.ebuild b/perl-core/threads-shared/threads-shared-1.32.ebuild
new file mode 100644
index 0000000..3128fc6
--- /dev/null
+++ b/perl-core/threads-shared/threads-shared-1.32.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/threads-shared/threads-shared-1.32.ebuild,v 1.1 2010/02/15 19:41:27 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=JDHEDDEN
+inherit perl-module
+
+DESCRIPTION="Extension for sharing data structures between threads"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl[ithreads]
+	>=virtual/perl-threads-1.71"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/threads-shared/threads-shared-1.33.ebuild b/perl-core/threads-shared/threads-shared-1.33.ebuild
new file mode 100644
index 0000000..271c56d
--- /dev/null
+++ b/perl-core/threads-shared/threads-shared-1.33.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/threads-shared/threads-shared-1.33.ebuild,v 1.1 2010/03/14 09:58:00 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=JDHEDDEN
+inherit perl-module
+
+DESCRIPTION="Extension for sharing data structures between threads"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl[ithreads]
+	>=virtual/perl-threads-1.71"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/threads-shared/threads-shared-1.34.ebuild b/perl-core/threads-shared/threads-shared-1.34.ebuild
new file mode 100644
index 0000000..40988c2
--- /dev/null
+++ b/perl-core/threads-shared/threads-shared-1.34.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/threads-shared/threads-shared-1.34.ebuild,v 1.1 2010/10/11 07:20:16 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=JDHEDDEN
+inherit perl-module
+
+DESCRIPTION="Extension for sharing data structures between threads"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl[ithreads]
+	>=virtual/perl-threads-1.71"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/threads-shared/threads-shared-1.360.ebuild b/perl-core/threads-shared/threads-shared-1.360.ebuild
new file mode 100644
index 0000000..314a47b
--- /dev/null
+++ b/perl-core/threads-shared/threads-shared-1.360.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/threads-shared/threads-shared-1.360.ebuild,v 1.1 2011/01/13 08:11:41 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=JDHEDDEN
+MODULE_VERSION=1.36
+inherit perl-module
+
+DESCRIPTION="Extension for sharing data structures between threads"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl[ithreads]
+	>=virtual/perl-threads-1.71"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/threads/threads-1.75.ebuild b/perl-core/threads/threads-1.75.ebuild
new file mode 100644
index 0000000..9df0983
--- /dev/null
+++ b/perl-core/threads/threads-1.75.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/threads/threads-1.75.ebuild,v 1.1 2010/02/15 19:33:56 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=JDHEDDEN
+inherit perl-module
+
+DESCRIPTION="Perl interpreter-based threads"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl[ithreads]"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/threads/threads-1.76.ebuild b/perl-core/threads/threads-1.76.ebuild
new file mode 100644
index 0000000..41d9a97
--- /dev/null
+++ b/perl-core/threads/threads-1.76.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/threads/threads-1.76.ebuild,v 1.1 2010/03/14 09:55:10 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=JDHEDDEN
+inherit perl-module
+
+DESCRIPTION="Perl interpreter-based threads"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl[ithreads]"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/threads/threads-1.77.ebuild b/perl-core/threads/threads-1.77.ebuild
new file mode 100644
index 0000000..9d81af7
--- /dev/null
+++ b/perl-core/threads/threads-1.77.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/threads/threads-1.77.ebuild,v 1.1 2010/03/27 08:51:52 tove Exp $
+
+EAPI=2
+
+MODULE_AUTHOR=JDHEDDEN
+inherit perl-module
+
+DESCRIPTION="Perl interpreter-based threads"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl[ithreads]"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/threads/threads-1.79.ebuild b/perl-core/threads/threads-1.79.ebuild
new file mode 100644
index 0000000..e6c1219
--- /dev/null
+++ b/perl-core/threads/threads-1.79.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/threads/threads-1.79.ebuild,v 1.1 2010/09/26 07:29:21 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=JDHEDDEN
+inherit perl-module
+
+DESCRIPTION="Perl interpreter-based threads"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl[ithreads]"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/threads/threads-1.81.ebuild b/perl-core/threads/threads-1.81.ebuild
new file mode 100644
index 0000000..e03c264
--- /dev/null
+++ b/perl-core/threads/threads-1.81.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/threads/threads-1.81.ebuild,v 1.1 2010/09/28 12:48:50 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=JDHEDDEN
+inherit perl-module
+
+DESCRIPTION="Perl interpreter-based threads"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl[ithreads]"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/threads/threads-1.820.ebuild b/perl-core/threads/threads-1.820.ebuild
new file mode 100644
index 0000000..4cf601a
--- /dev/null
+++ b/perl-core/threads/threads-1.820.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/threads/threads-1.820.ebuild,v 1.1 2011/01/13 08:14:37 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=JDHEDDEN
+MODULE_VERSION=1.82
+inherit perl-module
+
+DESCRIPTION="Perl interpreter-based threads"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl[ithreads]"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/perl-core/version/version-0.82.ebuild b/perl-core/version/version-0.82.ebuild
new file mode 100644
index 0000000..f10d41b
--- /dev/null
+++ b/perl-core/version/version-0.82.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/version/version-0.82.ebuild,v 1.9 2011/07/30 12:30:03 tove Exp $
+
+EAPI=2
+
+#inherit versionator
+#MY_P=${PN}-$(delete_version_separator 2 )
+#S=${WORKDIR}/${MY_P}
+MODULE_AUTHOR=JPEACOCK
+inherit perl-module
+
+DESCRIPTION="Perl extension for Version Objects"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.33.05"
+
+SRC_TEST="do"

diff --git a/perl-core/version/version-0.880.0.ebuild b/perl-core/version/version-0.880.0.ebuild
new file mode 100644
index 0000000..6dcde35
--- /dev/null
+++ b/perl-core/version/version-0.880.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/version/version-0.880.0.ebuild,v 1.2 2011/07/30 12:30:03 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=JPEACOCK
+MODULE_VERSION=0.88
+inherit perl-module
+
+DESCRIPTION="Perl extension for Version Objects"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/profiles/base/package.keywords b/profiles/base/package.keywords
new file mode 100644
index 0000000..70e1b67
--- /dev/null
+++ b/profiles/base/package.keywords
@@ -0,0 +1 @@
+=sys-apps/portage-9999 amd64 x86

diff --git a/sys-auth/polkit/.#Manifest.1.91 b/sys-auth/polkit/.#Manifest.1.91
new file mode 100644
index 0000000..e2eec33
--- /dev/null
+++ b/sys-auth/polkit/.#Manifest.1.91
@@ -0,0 +1,8 @@
+DIST polkit-0.104.tar.gz 1416583 RMD160 244e825347a463ff4b9eb0a2318ab04c821bded9 SHA1 599208cf584b9e13f8c9d863238a8271af4aba62 SHA256 6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9
+DIST polkit-0.105.tar.gz 1431080 RMD160 cd1100ee69a308d620e437d34e471580bb6dcf5a SHA1 53d56484a5bffb0aaf645c8d813b3063e01e8423 SHA256 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df
+DIST polkit-0.106.tar.gz 1381428 RMD160 6fa79aaa4e67e072d16860f1a242b053cc311bc3 SHA1 665624f5d69876ec5833f7952290188ca594aac0 SHA256 4005076a67aaa182872c1e316939fcb0ba74a89298e6330d72cfdac6624c984e
+EBUILD polkit-0.104-r1.ebuild 3548 RMD160 e056d1186192d865a610ebe1250e8adf9250eed7 SHA1 1a7cec206005fdb8985fc308f16bbe6f76b45c34 SHA256 a038cdfd2381bd5ddbd6cf4feef8a3aaa126b4e80a6205979538c9ebcbf0b9a0
+EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630 SHA1 f41f0393be142066d39d52994f7f29f52c336f2c SHA256 15339d2d61f350eec88ad0fd90cec401df45106fc2ee52ee7b8b051103a5279e
+EBUILD polkit-0.106-r2.ebuild 3053 RMD160 c72671afc8f157b80374a0c34a5587b157f002e9 SHA1 0b8c5a8bd8d9a6b32d3c300be045eca08804e4eb SHA256 9c7be04b6b0528204f857219983322f3aa38e400dae46574fa512badd9589eed
+MISC ChangeLog 11429 RMD160 76e2a57cbab4a45cd81755793401fee45aa80fcc SHA1 7349a702b23cee2eea9677a9decf8cd2a8d660d8 SHA256 5526adf7f5b12cd0ab4aa6586c992e026f4603dc61dd597faefad35c37dab259
+MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba

diff --git a/sys-auth/polkit/.#Manifest.1.93 b/sys-auth/polkit/.#Manifest.1.93
new file mode 100644
index 0000000..40a638a
--- /dev/null
+++ b/sys-auth/polkit/.#Manifest.1.93
@@ -0,0 +1,9 @@
+DIST polkit-0.104.tar.gz 1416583 RMD160 244e825347a463ff4b9eb0a2318ab04c821bded9 SHA1 599208cf584b9e13f8c9d863238a8271af4aba62 SHA256 6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9
+DIST polkit-0.105.tar.gz 1431080 RMD160 cd1100ee69a308d620e437d34e471580bb6dcf5a SHA1 53d56484a5bffb0aaf645c8d813b3063e01e8423 SHA256 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df
+DIST polkit-0.106.tar.gz 1381428 RMD160 6fa79aaa4e67e072d16860f1a242b053cc311bc3 SHA1 665624f5d69876ec5833f7952290188ca594aac0 SHA256 4005076a67aaa182872c1e316939fcb0ba74a89298e6330d72cfdac6624c984e
+EBUILD polkit-0.104-r1.ebuild 3548 RMD160 e056d1186192d865a610ebe1250e8adf9250eed7 SHA1 1a7cec206005fdb8985fc308f16bbe6f76b45c34 SHA256 a038cdfd2381bd5ddbd6cf4feef8a3aaa126b4e80a6205979538c9ebcbf0b9a0
+EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630 SHA1 f41f0393be142066d39d52994f7f29f52c336f2c SHA256 15339d2d61f350eec88ad0fd90cec401df45106fc2ee52ee7b8b051103a5279e
+EBUILD polkit-0.106-r2.ebuild 2944 RMD160 692481f847aff6601a3468e938bff3334698ef8c SHA1 4fe3ae9cea9a1494d9575ede92197ee1b4301682 SHA256 f17b750e069cff665a55072c6a3ef964ddb7a37864f1d9f49e1bfc3b67aae0bb
+EBUILD polkit-0.106-r3.ebuild 3066 RMD160 18ef1dfed87b146c977ac3e8d40545ed83e9a2e3 SHA1 4641692d6a936966ba2beead438f2371f2e1b2be SHA256 97887b7820e97d15827df50b47348aa1d12aeeae8b0f7f0c74561a0f02973f9c
+MISC ChangeLog 11790 RMD160 aba3b3f69b9238d3038b05ad8bcc9bc4d9a62b23 SHA1 811278ba40af831262c80864f2b4b23f22d3876f SHA256 7e4a016b9aacc2cf594287b4cdf0dee073490e0cf2ee656de63097540d5fb3ce
+MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba

diff --git a/sys-auth/polkit/.#polkit-0.106-r2.ebuild.1.3 b/sys-auth/polkit/.#polkit-0.106-r2.ebuild.1.3
new file mode 100644
index 0000000..3bac9f4
--- /dev/null
+++ b/sys-auth/polkit/.#polkit-0.106-r2.ebuild.1.3
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r2.ebuild,v 1.3 2012/06/19 12:04:07 ssuominen Exp $
+
+EAPI=4
+inherit eutils pam systemd user
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug examples gtk +introspection kde nls pam systemd"
+
+RDEPEND=">=dev-lang/spidermonkey-1.8.5
+	>=dev-libs/glib-2.32
+	>=dev-libs/expat-2
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+		)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/intltool
+	virtual/pkgconfig"
+PDEPEND="
+	gtk? ( || (
+		>=gnome-extra/polkit-gnome-0.105
+		lxde-base/lxpolkit
+		) )
+	kde? ( sys-auth/polkit-kde-agent )
+	pam? (
+		systemd? ( sys-auth/pambase[systemd] )
+		!systemd? ( sys-auth/pambase[consolekit] )
+		)
+	!systemd? ( >=sys-auth/consolekit-0.4.5_p2012[policykit] )"
+
+DOCS="docs/TODO HACKING NEWS README"
+
+pkg_setup() {
+	enewgroup polkitd
+	enewuser polkitd -1 -1 /var/lib/polkit-1 polkitd
+	esethome polkitd /var/lib/polkit-1
+}
+
+src_prepare() {
+	sed -i -e '/unix-group/s:wheel:adm:' src/polkitbackend/*-default.rules || die #401513
+
+	has_version ">=dev-lang/spidermonkey-1.8.7" && { sed -i -e '/mozjs/s:185:187:g' configure || die; }
+}
+
+src_configure() {
+	local myconf="--with-authfw=shadow"
+	use pam && \
+		myconf="--with-authfw=pam --with-pam-module-dir=$(getpam_mod_dir) --with-pam-include=system-local-login"
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		--disable-gtk-doc \
+		$(use_enable systemd libsystemd-login) \
+		$(use_enable introspection) \
+		--disable-examples \
+		$(use_enable nls) \
+		--with-os-type=gentoo \
+		"$(systemd_with_unitdir)" \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
+
+	prune_libtool_files
+
+	diropts -m0700 -o polkitd -g polkitd
+	keepdir /var/lib/polkit-1
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/examples/{*.c,*.policy*}
+	fi
+}
+
+pkg_postinst() {
+	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
+
+	echo
+	ewarn "If home directory of unix-user \"polkitd\" is set to /dev/null, run:"
+	ewarn "# usermod -d /var/lib/polkit-1 polkitd"
+
+	echo
+	ewarn "The default administrator unix-group was changed from \"wheel\" to"
+	ewarn "\"adm\", see *-default.rules in /etc/polkit-1/rules.d"
+	ewarn "Users of unix-group \"adm\" can run, for example, \"pkexec /bin/sh\""
+	ewarn "to gain root shell without root password."
+	ewarn "For more information, see http://bugs.gentoo.org/401513"
+}

diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
new file mode 100644
index 0000000..11cf7c8
--- /dev/null
+++ b/sys-auth/polkit/Manifest
@@ -0,0 +1,8 @@
+DIST polkit-0.104.tar.gz 1416583 RMD160 244e825347a463ff4b9eb0a2318ab04c821bded9 SHA1 599208cf584b9e13f8c9d863238a8271af4aba62 SHA256 6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9
+DIST polkit-0.105.tar.gz 1431080 RMD160 cd1100ee69a308d620e437d34e471580bb6dcf5a SHA1 53d56484a5bffb0aaf645c8d813b3063e01e8423 SHA256 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df
+DIST polkit-0.106.tar.gz 1381428 RMD160 6fa79aaa4e67e072d16860f1a242b053cc311bc3 SHA1 665624f5d69876ec5833f7952290188ca594aac0 SHA256 4005076a67aaa182872c1e316939fcb0ba74a89298e6330d72cfdac6624c984e
+EBUILD polkit-0.104-r1.ebuild 3548 RMD160 e056d1186192d865a610ebe1250e8adf9250eed7 SHA1 1a7cec206005fdb8985fc308f16bbe6f76b45c34 SHA256 a038cdfd2381bd5ddbd6cf4feef8a3aaa126b4e80a6205979538c9ebcbf0b9a0
+EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630 SHA1 f41f0393be142066d39d52994f7f29f52c336f2c SHA256 15339d2d61f350eec88ad0fd90cec401df45106fc2ee52ee7b8b051103a5279e
+EBUILD polkit-0.106-r5.ebuild 3017 RMD160 aca1a2a7f62a8f2beb4a7d1edce686f5d90f4775 SHA1 63c1fe580c91ade8cff55fd704d33d82506e8df4 SHA256 b41c3e0ab952787e0a261984c75ac1f794e6280776d18ca7179f3b171c5558c2
+MISC ChangeLog 12970 RMD160 14e39e225b9973a37c6bd58f3d9b4f64b6814628 SHA1 5995158febaff4b447bd798ce980596c3a5521fc SHA256 99cc239c819a8ef2cd7ebb37a84275bab14b50012cd19017f692e427b2386741
+MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba

diff --git a/sys-auth/polkit/polkit-0.104-r1.ebuild b/sys-auth/polkit/polkit-0.104-r1.ebuild
new file mode 100644
index 0000000..bdccc3d
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.104-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.104-r1.ebuild,v 1.9 2012/05/04 18:57:21 jdhore Exp $
+
+EAPI=4
+inherit pam
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="http://hal.freedesktop.org/docs/polkit/"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="debug doc examples gtk +introspection kde nls pam systemd"
+
+RDEPEND=">=dev-libs/glib-2.30
+	dev-libs/expat
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+	pam? ( virtual/pam )
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.13 )"
+PDEPEND="!systemd? ( >=sys-auth/consolekit-0.4.5[policykit] )
+	pam? ( sys-auth/pambase[consolekit] )
+	gtk? ( || ( >=gnome-extra/polkit-gnome-${PV} lxde-base/lxpolkit ) )
+	kde? ( sys-auth/polkit-kde-agent )"
+
+DOCS=( docs/TODO HACKING NEWS README )
+
+src_prepare() {
+	cat <<-EOF > "${T}"/60-gentoo.conf
+	# This file will override 50-localauthority.conf, see:
+	# man 8 pklocalauthority
+	[Configuration]
+	AdminIdentities=unix-group:0
+	EOF
+}
+
+src_configure() {
+	local myauth="--with-authfw=shadow"
+	use pam && myauth="--with-authfw=pam --with-pam-module-dir=$(getpam_mod_dir)"
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		$(use_enable doc gtk-doc) \
+		$(use_enable systemd) \
+		$(use_enable introspection) \
+		--disable-examples \
+		$(use_enable nls) \
+		--with-os-type=gentoo \
+		${myauth}
+}
+
+src_install() {
+	default
+
+	insinto /etc/polkit-1/localauthority.conf.d
+	doins "${T}"/60-gentoo.conf
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	# We disable example compilation above, and handle it here
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/examples/{*.c,*.policy*}
+	fi
+
+	# Need to keep a few directories around...
+	diropts -m0700 -o root -g root
+	keepdir /var/lib/polkit-1
+	#keepdir /var/run/polkit-1 #387903
+}
+
+pkg_postinst() {
+	# Make sure that the user has consolekit sessions working so that the
+	# 'allow_active' directive in polkit action policies works
+	if has_version 'gnome-base/gdm' && ! has_version 'gnome-base/gdm[consolekit]'; then
+		# If user has GDM installed, but USE=-consolekit, warn them
+		ewarn "You have GDM installed, but it does not have USE=consolekit"
+		ewarn "If you login using GDM, polkit authorizations will not work"
+		ewarn "unless you enable USE=consolekit"
+		einfo
+	fi
+	if has_version 'kde-base/kdm' && ! has_version 'kde-base/kdm[consolekit]'; then
+		# If user has KDM installed, but USE=-consolekit, warn them
+		ewarn "You have KDM installed, but it does not have USE=consolekit"
+		ewarn "If you login using KDM, polkit authorizations will not work"
+		ewarn "unless you enable USE=consolekit"
+		einfo
+	fi
+	if ! has_version 'gnome-base/gdm[consolekit]' && \
+		! has_version 'kde-base/kdm[consolekit]'; then
+		# Inform user about the alternative method
+		ewarn "If you don't use GDM or KDM for logging in,"
+		ewarn "you must start your desktop environment (DE) as follows:"
+		ewarn "	ck-launch-session \$STARTGUI"
+		ewarn "Where \$STARTGUI is a DE-starting command such as 'gnome-session'."
+		ewarn "You should add this to your ~/.xinitrc if you use startx."
+	fi
+}

diff --git a/sys-auth/polkit/polkit-0.105.ebuild b/sys-auth/polkit/polkit-0.105.ebuild
new file mode 100644
index 0000000..63b4532
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.105.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.105.ebuild,v 1.2 2012/05/20 13:15:43 ssuominen Exp $
+
+EAPI=4
+inherit pam
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc examples gtk +introspection kde nls pam systemd"
+
+RDEPEND=">=dev-libs/glib-2.30
+	>=dev-libs/expat-2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+	pam? ( virtual/pam )
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.13 )"
+PDEPEND="gtk? ( || ( >=gnome-extra/polkit-gnome-${PV} lxde-base/lxpolkit ) )
+	kde? ( sys-auth/polkit-kde-agent )
+	!systemd? (
+		>=sys-auth/consolekit-0.4.5_p20120320[policykit]
+		pam? ( >=sys-auth/pambase-20101024-r2[consolekit] )
+		)"
+
+DOCS=( docs/TODO HACKING NEWS README )
+
+src_prepare() {
+	cat <<-EOF > "${T}"/60-gentoo.conf
+	# This file will override 50-localauthority.conf, see:
+	# man 8 pklocalauthority
+	[Configuration]
+	AdminIdentities=unix-group:0
+	EOF
+}
+
+src_configure() {
+	local myauth="--with-authfw=shadow"
+	use pam && myauth="--with-authfw=pam --with-pam-module-dir=$(getpam_mod_dir)"
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		$(use_enable doc gtk-doc) \
+		$(use_enable systemd) \
+		$(use_enable introspection) \
+		--disable-examples \
+		$(use_enable nls) \
+		--with-os-type=gentoo \
+		${myauth}
+}
+
+src_install() {
+	default
+
+	insinto /etc/polkit-1/localauthority.conf.d
+	doins "${T}"/60-gentoo.conf
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/examples/{*.c,*.policy*}
+	fi
+
+	diropts -m0700 -o root -g root
+	keepdir /var/lib/polkit-1
+}

diff --git a/sys-auth/polkit/polkit-0.106-r5.ebuild b/sys-auth/polkit/polkit-0.106-r5.ebuild
new file mode 100644
index 0000000..d61e480
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.106-r5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r5.ebuild,v 1.3 2012/06/27 11:56:12 ssuominen Exp $
+
+EAPI="4-slot-abi"
+inherit eutils multilib pam pax-utils systemd user
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug examples gtk +introspection kde nls pam systemd"
+
+RDEPEND=">=dev-lang/spidermonkey-1.8.5:=
+	>=dev-libs/glib-2.32
+	>=dev-libs/expat-2
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+		)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/intltool
+	virtual/pkgconfig"
+PDEPEND="
+	gtk? ( || (
+		>=gnome-extra/polkit-gnome-0.105
+		lxde-base/lxpolkit
+		) )
+	kde? ( sys-auth/polkit-kde-agent )
+	pam? (
+		systemd? ( sys-auth/pambase[systemd] )
+		!systemd? ( sys-auth/pambase[consolekit] )
+		)
+	!systemd? ( >=sys-auth/consolekit-0.4.5_p2012[policykit] )"
+
+pkg_setup() {
+	local u=polkitd
+	local g=polkitd
+	local h=/var/lib/polkit-1
+
+	enewgroup ${g}
+	enewuser ${u} -1 -1 ${h} ${g}
+	esethome ${u} ${h}
+}
+
+src_prepare() {
+	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
+	has_version "dev-lang/spidermonkey:0/187" && { sed -i -e '/mozjs/s:185:187:g' configure || die; }
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		--disable-gtk-doc \
+		$(use_enable systemd libsystemd-login) \
+		$(use_enable introspection) \
+		--disable-examples \
+		$(use_enable nls) \
+		"$(systemd_with_unitdir)" \
+		--with-authfw=$(usex pam pam shadow) \
+		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
+		--with-os-type=gentoo
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		libprivdir="${EPREFIX}"/usr/$(get_libdir)/polkit-1 \
+		install
+
+	dodoc docs/TODO HACKING NEWS README
+
+	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
+
+	diropts -m0700 -o polkitd -g polkitd
+	keepdir /var/lib/polkit-1
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/examples/{*.c,*.policy*}
+	fi
+
+	prune_libtool_files
+	rm -f "${ED}"/usr/lib*/pkgconfig/polkit-backend-1.pc #423431
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	if has_version '<dev-lang/spidermonkey-1.8.7'; then
+		pax-mark mr "${ED}"/usr/$(get_libdir)/polkit-1/polkitd
+	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
+		pax-mark m "${ED}"/usr/$(get_libdir)/polkit-1/polkitd
+	fi
+}
+
+pkg_postinst() {
+	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
+}

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
new file mode 100644
index 0000000..3bb3134
--- /dev/null
+++ b/www-client/elinks/Manifest
@@ -0,0 +1,17 @@
+AUX elinks-0.10.1-utf_8_io-default.patch 456 RMD160 69bcd2fe9a85381d53ef7d2c3da32e15d8eae36b SHA1 c9141e89ba62da5277d0df42e73f4eb258e23552 SHA256 3255c36e7107323d7415995c3c5d2458acf7b739848fb9804157b708956a7010
+AUX elinks-0.10.4.conf-syscharset.diff 2580 RMD160 3bb9037e75adc225915a4a6b41afff0ef09f1eba SHA1 fe28f5ae8f290f15f1165273f22e9417f5648e40 SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c
+AUX elinks-0.11.2-lua-5.1.patch 538 RMD160 7bd83ed15ea14cc41b909c4022eee082a47fb706 SHA1 0183f106db71725ccb0f2b83746373ca9e5f0522 SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4
+AUX elinks-0.11.2-lua-5.patch 2125 RMD160 be94e085a7b231dad1681566c533699b2a6d2745 SHA1 d1af052c0700951c703f26ac39f09d1cbbf43081 SHA256 4e0f7b622111696e52e15745d8ac35249a95def36eb5aa782487c7901125260c
+AUX elinks-0.11.3-lua-5.patch 1841 RMD160 61ef22891e59893542326df7803c63ac81117622 SHA1 17682210d407b3efb47bbab9b47463b937d6bffe SHA256 f04d11e01824fb2cf4387b87cd531d64ad280d21e9bcb57e461ace56419d1220
+AUX elinks-0.11.5-makefile.patch 1109 RMD160 7d20513b6922f895b4e4050a37550706500952c7 SHA1 4edd6e791ac08f37ee933652ded7049e04e3b6c2 SHA256 5b37be9328b80b9a995de94cf0a053ad63d43a2e0550df6e0c5a4cdc94276e1f
+AUX elinks-0.12_pre5-compilation-fix.patch 464 RMD160 afe5e31db6a7ed454052e8f0220e3a5c35aca0e1 SHA1 58a69b5b48f1699451e7a508540b14962888b4d8 SHA256 984c3e1127c18eb0925fbe1cca5bb2a7b214c6cd082db434e8fe37e082715e7e
+AUX elinks-0.12_pre5-sm185-jsval-fixes.patch 3921 RMD160 3926023d28e2442dc0451e6590b234bb07dc02e1 SHA1 b69a66f85af8f7fc5eb01839afffaab81b85230b SHA256 d59f9e97f5d495803e0ac35726bf42592a8f726c2367fbc08b8fe9de79de4a2f
+AUX elinks-0.12pre5-spidermonkey-callback.patch 513 RMD160 50dc290e366e92b3c6235571e5772fc80fdf3e60 SHA1 50bedb0a965db8f455110d75ae24cb857c55d00b SHA256 14b65ba92e8693105945d20de6e8f07ec946f17fbbf5248b4f8c431a92b88982
+DIST elinks-0.10.4.conf.bz2 5370 RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 SHA1 7f7b009b1b6cb746e90835d2b612f1aa6b5d3a1e SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209
+DIST elinks-0.11.7.tar.bz2 2467915 RMD160 2e6e863d08f9accb71892ba6f236f795c83cba9c SHA1 d13edc1477d0ab32cafe7d3c1f3a23ae1c0a5c54 SHA256 456db6f704c591b1298b0cd80105f459ff8a1fc07a0ec1156a36c4da6f898979
+DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 RMD160 14936822390e22e95bf2fc8d60fd16fa9c484629 SHA1 95658432dc826e6fa618fe23cf250a50aeff2dd9 SHA256 64f7c4a657128983d054bd0d2027e11facd42fcc86bd8dfdf5b27ffbacbd54c8
+DIST elinks-0.12pre5.tar.bz2 2783523 RMD160 4983083f21928da78f937b4dea09f8937c3a9cb9 SHA1 15fb38fa938a0eec9d5f22fdd538a6785e2854af SHA256 2d19547831098acff0c5f97f9fbc7912240f122961fd49fb8b76738417dd24d2
+EBUILD elinks-0.11.7.ebuild 4358 RMD160 afd06665d1a437205efb1452ae4a0a00c2ff5e78 SHA1 484b2b315d846c71f4f1f5f1ac4363199104c62a SHA256 2824d95dc5f12044a82a944c506dea477e1db14ed3d370062c23284b8e6a4bd4
+EBUILD elinks-0.12_pre5-r2.ebuild 5185 RMD160 0fc45dd3a89745dda07b6638d0143f9a0edd10e5 SHA1 004b280e1c2586a7cd1225285dd65c9e421eefa2 SHA256 babafe41aad903b9efc241658154761137079fcdd32cc443d89077d26451bdca
+MISC ChangeLog 27580 RMD160 690d12cea62160a8bc1116ecf4e69a6c5b4a8e06 SHA1 d7dd368e33a0db892d6b72fbe36b1d542a862c73 SHA256 562c77fb9d1ce5fb8d0dc5fcaafa61e71e3dd8bba12141d8a8c230a31dab32f4
+MISC metadata.xml 497 RMD160 3b538ecd57ee0fb1e4ca34240313abc7288e0f35 SHA1 6025d6b01f0ecbd3e4023552ae16f9f483f3e882 SHA256 46c078d1cc7e933e17fc97f3fba58c8a6de73e65dc240cf96b18a7e5f9912b31

diff --git a/www-client/elinks/elinks-0.11.7.ebuild b/www-client/elinks/elinks-0.11.7.ebuild
new file mode 100644
index 0000000..2124da5
--- /dev/null
+++ b/www-client/elinks/elinks-0.11.7.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.7.ebuild,v 1.17 2011/06/22 02:33:17 nirbheek Exp $
+
+EAPI="2"
+
+inherit eutils autotools flag-o-matic
+
+MY_P="${P/_/}"
+DESCRIPTION="Advanced and well-established text-mode web browser"
+HOMEPAGE="http://elinks.or.cz/"
+SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
+	  javascript lua nls nntp perl ruby ssl unicode X zlib"
+RESTRICT="test"
+
+DEPEND=">=dev-libs/expat-1.95.4
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	X? ( x11-libs/libX11 x11-libs/libXt )
+	lua? ( >=dev-lang/lua-5 )
+	gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
+	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
+	idn? ( net-dns/libidn )
+	perl? ( sys-devel/libperl )
+	ruby? ( dev-lang/ruby dev-ruby/rubygems )
+	javascript? ( <=dev-lang/spidermonkey-1.8 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
+	mv "${PN}-0.10.4.conf" "${PN}.conf"
+	if ! use ftp ; then
+		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf
+	fi
+	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.11.3-lua-5.patch
+
+	if use lua && has_version ">=dev-lang/lua-5.1"; then
+		epatch "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
+	fi
+
+	if use unicode ; then
+		epatch "${FILESDIR}"/elinks-0.10.1-utf_8_io-default.patch
+	fi
+
+	epatch "${FILESDIR}"/elinks-0.11.5-makefile.patch
+
+	sed -i -e 's/-Werror//' configure*
+	eautoreconf
+}
+
+src_configure() {
+	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
+	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
+	local myconf=""
+
+	if use debug ; then
+		myconf="--enable-debug"
+	else
+		myconf="--enable-fastmem"
+	fi
+
+	if use ssl ; then
+		myconf="${myconf} --with-openssl"
+	else
+		myconf="${myconf} --without-openssl --without-gnutls"
+	fi
+
+	# zlib support disabled due to bug #365585
+	econf \
+		--sysconfdir=/etc/elinks \
+		--enable-leds \
+		--enable-88-colors \
+		--enable-256-colors \
+		--enable-html-highlight \
+		--without-zlib \
+		$(use_with gpm) \
+		$(use_with bzip2 bzlib) \
+		$(use_with X x) \
+		$(use_with lua) \
+		$(use_with guile) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with idn) \
+		$(use_with javascript spidermonkey) \
+		$(use_enable bittorrent) \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
+		$(use_enable nntp) \
+		$(use_enable finger) \
+		${myconf} || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	insopts -m 644 ; insinto /etc/elinks
+	doins "${WORKDIR}"/elinks.conf
+	newins contrib/keybind-full.conf keybind-full.sample
+	newins contrib/keybind.conf keybind.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
+	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
+	insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
+	insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
+	insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
+
+	# Remove some conflicting files on OSX.  The files provided by OSX 10.4
+	# are more or less the same.  -- Fabian Groffen (2005-06-30)
+	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
+}
+
+pkg_postinst() {
+	einfo "This ebuild provides a default config for ELinks."
+	einfo "Please check /etc/elinks/elinks.conf"
+	einfo
+	einfo "You may want to convert your html.cfg and links.cfg of"
+	einfo "Links or older ELinks versions to the new ELinks elinks.conf"
+	einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
+	einfo
+	einfo "Please have a look at /etc/elinks/keybind-full.sample and"
+	einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
+	einfo
+	einfo "You will have to set your TERM variable to 'xterm-256color'"
+	einfo "to be able to use 256 colors in elinks."
+	echo
+}

diff --git a/www-client/elinks/elinks-0.12_pre5-r2.ebuild b/www-client/elinks/elinks-0.12_pre5-r2.ebuild
new file mode 100644
index 0000000..692bade
--- /dev/null
+++ b/www-client/elinks/elinks-0.12_pre5-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5-r2.ebuild,v 1.2 2012/06/28 17:05:31 axs Exp $
+
+EAPI="4-slot-abi"
+inherit eutils autotools flag-o-matic
+
+MY_P="${P/_/}"
+DESCRIPTION="Advanced and well-established text-mode web browser"
+HOMEPAGE="http://elinks.or.cz/"
+SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
+	http://dev.gentoo.org/~axs/distfiles/${P}-js185-patches.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
+	  javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib"
+RESTRICT="test"
+
+DEPEND="dev-libs/boehm-gc
+	>=dev-libs/expat-1.95.4
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	X? ( x11-libs/libX11 x11-libs/libXt )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	lua? ( >=dev-lang/lua-5 )
+	gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
+	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
+	idn? ( net-dns/libidn )
+	perl? ( sys-devel/libperl )
+	ruby? ( dev-lang/ruby dev-ruby/rubygems )
+	samba? ( net-fs/samba )
+	javascript? ( dev-lang/spidermonkey:= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
+	mv "${PN}-0.10.4.conf" "${PN}.conf"
+	if ! use ftp ; then
+		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf
+	fi
+	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf
+	cd "${S}"
+
+	if use lua && has_version ">=dev-lang/lua-5.1"; then
+		epatch "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
+	fi
+
+	epatch "${FILESDIR}"/${PN}-0.11.5-makefile.patch
+	epatch "${FILESDIR}"/${P}-compilation-fix.patch
+
+	if use javascript && has_version ">=dev-lang/spidermonkey-1.8"; then
+		if has_version ">=dev-lang/spidermonkey-1.8.5"; then
+			epatch "${WORKDIR}"/patches/${P}-js185-1-heartbeat.patch
+			epatch "${WORKDIR}"/patches/${P}-js185-2-up.patch
+			epatch "${WORKDIR}"/patches/${P}-js185-3-histback.patch
+			epatch "${FILESDIR}"/${P}-sm185-jsval-fixes.patch
+			# expand lib check to also match mozjs187
+			if has_version ">=dev-lang/spidermonkey-1.8.7"; then
+				sed -i 's:mozjs185:mozjs187 mozjs185:' configure.in
+			fi
+		else
+			epatch "${FILESDIR}"/${MY_P}-spidermonkey-callback.patch
+		fi
+	fi
+
+	sed -i -e 's/-Werror//' configure*
+	eautoreconf
+}
+
+src_configure() {
+	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
+	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
+	local myconf=""
+
+	if use debug ; then
+		myconf="--enable-debug"
+	else
+		myconf="--enable-fastmem"
+	fi
+
+	if use ssl ; then
+		myconf="${myconf} --with-openssl=${EPREFIX}/usr"
+	else
+		myconf="${myconf} --without-openssl --without-gnutls"
+	fi
+
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/elinks \
+		--enable-leds \
+		--enable-88-colors \
+		--enable-256-colors \
+		--enable-true-color \
+		--enable-html-highlight \
+		$(use_with gpm) \
+		$(use_with zlib) \
+		$(use_with bzip2 bzlib) \
+		$(use_with X x) \
+		$(use_with lua) \
+		$(use_with guile) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with idn) \
+		$(use_with javascript spidermonkey) \
+		$(use_enable bittorrent) \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
+		$(use_enable nntp) \
+		$(use_enable finger) \
+		$(use_enable samba smb) \
+		$(use_enable mouse) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insopts -m 644 ; insinto /etc/elinks
+	doins "${WORKDIR}"/elinks.conf
+	newins contrib/keybind-full.conf keybind-full.sample
+	newins contrib/keybind.conf keybind.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
+	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
+	insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
+	insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
+	insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
+
+	# Remove some conflicting files on OSX.  The files provided by OSX 10.4
+	# are more or less the same.  -- Fabian Groffen (2005-06-30)
+	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias || die
+}
+
+pkg_postinst() {
+	einfo "This ebuild provides a default config for ELinks."
+	einfo "Please check /etc/elinks/elinks.conf"
+	einfo
+	einfo "You may want to convert your html.cfg and links.cfg of"
+	einfo "Links or older ELinks versions to the new ELinks elinks.conf"
+	einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
+	einfo
+	einfo "Please have a look at /etc/elinks/keybind-full.sample and"
+	einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
+	einfo
+	einfo "You will have to set your TERM variable to 'xterm-256color'"
+	einfo "to be able to use 256 colors in elinks."
+	echo
+}

diff --git a/www-client/elinks/files/elinks-0.10.1-utf_8_io-default.patch b/www-client/elinks/files/elinks-0.10.1-utf_8_io-default.patch
new file mode 100644
index 0000000..e0f59cd
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.10.1-utf_8_io-default.patch
@@ -0,0 +1,11 @@
+--- elinks-0.10.1/src/config/options.inc.utf_8_io-default	2005-01-04 01:42:56.000000000 +0100
++++ elinks-0.10.1/src/config/options.inc	2005-01-28 17:54:42.568968720 +0100
+@@ -747,7 +747,7 @@
+ 		"terminal.")),
+ 
+ 	INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"),
+-		"utf_8_io", 0, 0,
++		"utf_8_io", 0, 1,
+ 		N_("Enable I/O in UTF8 for Unicode terminals. Note that currently,\n"
+ 		"only the subset of UTF8 according to terminal codepage is used.")),
+ 

diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
new file mode 100644
index 0000000..dc64712
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
@@ -0,0 +1,79 @@
+--- elinks-0.10.4.conf	2005-04-08 15:29:49.000000000 -0700
++++ elinks-0.10.4-syscharset.conf	2006-11-04 00:26:26.000000000 -0800
+@@ -12,8 +12,6 @@
+   # obsolete config.saving_style. You shouldn't touch it.
+   set config.saving_style_w = 1
+ 
+-    ## terminal.linux.charset <codepage>
+-    set terminal.linux.charset = "us-ascii"
+     ## terminal.linux.transparency [0|1]
+     set terminal.linux.transparency = 1
+     ## terminal.linux.colors [0|1]
+@@ -29,8 +27,6 @@
+     ## terminal.linux.type <num>
+     set terminal.linux.type = 2
+ 
+-    ## terminal.vt100.charset <codepage>
+-    set terminal.vt100.charset = "us-ascii"
+     ## terminal.vt100.transparency [0|1]
+     set terminal.vt100.transparency = 1
+     ## terminal.vt100.colors [0|1]
+@@ -46,8 +42,6 @@
+     ## terminal.vt100.type <num>
+     set terminal.vt100.type = 1
+ 
+-    ## terminal.vt110.charset <codepage>
+-    set terminal.vt110.charset = "us-ascii"
+     ## terminal.vt110.transparency [0|1]
+     set terminal.vt110.transparency = 1
+     ## terminal.vt110.colors [0|1]
+@@ -63,8 +57,6 @@
+     ## terminal.vt110.type <num>
+     set terminal.vt110.type = 1
+ 
+-    ## terminal.xterm.charset <codepage>
+-    set terminal.xterm.charset = "us-ascii"
+     ## terminal.xterm.transparency [0|1]
+     set terminal.xterm.transparency = 1
+     ## terminal.xterm.colors [0|1]
+@@ -80,8 +72,6 @@
+     ## terminal.xterm.type <num>
+     set terminal.xterm.type = 1
+ 
+-    ## terminal.xterm-color.charset <codepage>
+-    set terminal.xterm-color.charset = "us-ascii"
+     ## terminal.xterm-color.transparency [0|1]
+     set terminal.xterm-color.transparency = 1
+     ## terminal.xterm-color.colors [0|1]
+@@ -96,8 +86,7 @@
+     set terminal.xterm-color.m11_hack = 0
+     ## terminal.xterm-color.type <num>
+     set terminal.xterm-color.type = 1
+-    ## terminal.screen.charset <codepage>
+-    set terminal.screen.charset = "us-ascii"
++
+     ## terminal.screen.transparency [0|1]
+     set terminal.screen.transparency = 1
+     ## terminal.screen.colors [0|1]
+@@ -270,10 +259,6 @@
+ 
+ 
+ 
+-    ## document.codepage.assume <codepage>
+-    # Default document codepage.
+-    set document.codepage.assume = "ISO-8859-1"
+-
+     ## document.codepage.force_assumed [0|1]
+     # Ignore charset info sent by server.
+     set document.codepage.force_assumed = 0
+@@ -343,10 +328,6 @@
+ 
+ 
+ 
+-    ## document.dump.codepage <codepage>
+-    # Codepage used in dump output.
+-    set document.dump.codepage = "us-ascii"
+-
+     ## document.dump.width <num>
+     # Width of screen in characters when dumping a HTML document.
+     set document.dump.width = 80

diff --git a/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch b/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch
new file mode 100644
index 0000000..20db8a4
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch
@@ -0,0 +1,16 @@
+diff -Naurp elinks-0.11.2/src/scripting/lua/core.c elinks-0.11.2-lua/src/scripting/lua/core.c
+--- elinks-0.11.2/src/scripting/lua/core.c	2006-11-19 14:46:37.000000000 +0100
++++ elinks-0.11.2-lua/src/scripting/lua/core.c	2007-03-10 15:34:47.000000000 +0100
+@@ -646,11 +646,7 @@ init_lua(struct module *module)
+ {
+ 	L = lua_open();
+ 
+-	luaopen_base(L);
+-	luaopen_table(L);
+-	luaopen_io(L);
+-	luaopen_string(L);
+-	luaopen_math(L);
++	luaL_openlibs(L);
+ 
+ 	lua_register(L, LUA_ALERT, l_alert);
+ 	lua_register(L, "current_url", l_current_url);

diff --git a/www-client/elinks/files/elinks-0.11.2-lua-5.patch b/www-client/elinks/files/elinks-0.11.2-lua-5.patch
new file mode 100644
index 0000000..2b4bf61
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.11.2-lua-5.patch
@@ -0,0 +1,60 @@
+diff -Naur elinks-0.11.1.orig/configure.in elinks-0.11.1/configure.in
+--- elinks-0.11.1.orig/configure.in	2006-01-29 14:10:33.000000000 +0100
++++ elinks-0.11.1/configure.in	2006-03-01 17:32:58.000000000 +0100
+@@ -739,7 +739,7 @@
+ 	for luadir in "$withval" "" /usr /usr/local; do
+ 		for suffix in "" 50 51; do
+ 			if test "$cf_result" = no; then
+-				LUA_LIBS="-llua$suffix -llualib$suffix -lm"
++				LUA_LIBS="`pkg-config --libs lua`"
+ 
+ 				if test ! -z "$luadir"; then
+ 					LUA_LIBS="-L$luadir/lib $LUA_LIBS"
+@@ -754,10 +754,10 @@
+ 				AC_TRY_LINK([	#include <lua.h>
+ 						#include <lualib.h>],
+ 					    [	lua_State *L = lua_open();
+-						lua_baselibopen(L);
+-						lua_mathlibopen(L);
+-						lua_strlibopen(L);
+-						lua_tablibopen(L);
++						luaopen_base(L);
++						luaopen_math(L);
++						luaopen_string(L);
++						luaopen_table(L);
+ 						lua_pushboolean(L, 1);
+ 						lua_close(L);],
+ 					    cf_result=yes, cf_result=no)
+diff -Naur elinks-0.11.1.orig/src/scripting/lua/core.c elinks-0.11.1/src/scripting/lua/core.c
+--- elinks-0.11.1.orig/src/scripting/lua/core.c	2006-01-29 14:10:39.000000000 +0100
++++ elinks-0.11.1/src/scripting/lua/core.c	2006-03-01 17:41:43.000000000 +0100
+@@ -633,7 +633,7 @@
+ 	if (file_can_read(file)) {
+ 		int oldtop = lua_gettop(S);
+ 
+-		if (lua_dofile(S, file) != 0)
++		if (luaL_dofile(S, file) != 0)
+ 			sleep(3); /* Let some time to see error messages. */
+ 		lua_settop(S, oldtop);
+ 	}
+@@ -755,7 +755,7 @@
+ 		int oldtop = lua_gettop(L);
+ 
+ 		if (prepare_lua(ses) == 0) {
+-			lua_dostring(L, expr);
++			luaL_dostring(L, expr);
+ 			lua_settop(L, oldtop);
+ 			finish_lua();
+ 		}
+diff -Naur elinks-0.11.1.orig/src/scripting/lua/hooks.c elinks-0.11.1/src/scripting/lua/hooks.c
+--- elinks-0.11.1.orig/src/scripting/lua/hooks.c	2006-01-29 14:10:39.000000000 +0100
++++ elinks-0.11.1/src/scripting/lua/hooks.c	2006-03-01 17:41:07.000000000 +0100
+@@ -200,7 +200,7 @@
+ script_hook_quit(va_list ap, void *data)
+ {
+ 	if (!prepare_lua(NULL)) {
+-		lua_dostring(lua_state, "if quit_hook then quit_hook() end");
++		luaL_dostring(lua_state, "if quit_hook then quit_hook() end");
+ 		finish_lua();
+ 	}
+ 

diff --git a/www-client/elinks/files/elinks-0.11.3-lua-5.patch b/www-client/elinks/files/elinks-0.11.3-lua-5.patch
new file mode 100644
index 0000000..93b9599
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.11.3-lua-5.patch
@@ -0,0 +1,45 @@
+diff -Naurp elinks-0.11.3-orig/configure.in elinks-0.11.3/configure.in
+--- elinks-0.11.3-orig/configure.in	2007-05-13 11:51:34.000000000 +0200
++++ elinks-0.11.3/configure.in	2007-05-13 11:52:30.000000000 +0200
+@@ -727,7 +727,7 @@ if test -z "$disable_lua"; then
+ 	for luadir in "$withval" "" /usr /usr/local; do
+ 		for suffix in "" 50 51; do
+ 			if test "$cf_result" = no; then
+-				LUA_LIBS="-llua$suffix -llualib$suffix -lm"
++				LUA_LIBS="`pkg-config --libs lua`"
+ 
+ 				if test ! -z "$luadir"; then
+ 					LUA_LIBS="-L$luadir/lib $LUA_LIBS"
+diff -Naurp elinks-0.11.3-orig/src/scripting/lua/core.c elinks-0.11.3/src/scripting/lua/core.c
+--- elinks-0.11.3-orig/src/scripting/lua/core.c	2007-05-13 11:51:34.000000000 +0200
++++ elinks-0.11.3/src/scripting/lua/core.c	2007-05-13 11:51:49.000000000 +0200
+@@ -633,7 +633,7 @@ do_hooks_file(LS, unsigned char *prefix,
+ 	if (file_can_read(file)) {
+ 		int oldtop = lua_gettop(S);
+ 
+-		if (lua_dofile(S, file) != 0)
++		if (luaL_dofile(S, file) != 0)
+ 			sleep(3); /* Let some time to see error messages. */
+ 		lua_settop(S, oldtop);
+ 	}
+@@ -755,7 +755,7 @@ handle_ret_eval(struct session *ses)
+ 		int oldtop = lua_gettop(L);
+ 
+ 		if (prepare_lua(ses) == 0) {
+-			lua_dostring(L, expr);
++			luaL_dostring(L, expr);
+ 			lua_settop(L, oldtop);
+ 			finish_lua();
+ 		}
+diff -Naurp elinks-0.11.3-orig/src/scripting/lua/hooks.c elinks-0.11.3/src/scripting/lua/hooks.c
+--- elinks-0.11.3-orig/src/scripting/lua/hooks.c	2007-05-13 11:51:34.000000000 +0200
++++ elinks-0.11.3/src/scripting/lua/hooks.c	2007-05-13 11:51:49.000000000 +0200
+@@ -200,7 +200,7 @@ static enum evhook_status
+ script_hook_quit(va_list ap, void *data)
+ {
+ 	if (!prepare_lua(NULL)) {
+-		lua_dostring(lua_state, "if quit_hook then quit_hook() end");
++		luaL_dostring(lua_state, "if quit_hook then quit_hook() end");
+ 		finish_lua();
+ 	}
+ 

diff --git a/www-client/elinks/files/elinks-0.11.5-makefile.patch b/www-client/elinks/files/elinks-0.11.5-makefile.patch
new file mode 100644
index 0000000..beab9a9
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.11.5-makefile.patch
@@ -0,0 +1,30 @@
+diff -Naurp elinks-0.11.5-orig/Makefile.lib elinks-0.11.5/Makefile.lib
+--- elinks-0.11.5-orig/Makefile.lib	2008-11-30 13:30:08.000000000 +0100
++++ elinks-0.11.5/Makefile.lib	2008-11-30 19:50:46.000000000 +0100
+@@ -95,9 +95,14 @@ endif
+ 
+ # All files in $(OBJS) and any $(subdir)/lib.o are linked into lib.o.
+ # Sort them to filter out duplicated and get uniform order.
++SUBDIR_LIB_O_DEPS = \
++ $(foreach subdir,$(sort $(SUBDIRS)),$(subdir)/$(LIB_O_NAME))
++
+ LIB_O_DEPS = \
+- $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
+- $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
++ $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) $(SUBDIR_LIB_O_DEPS)
++
++$(SUBDIR_LIB_O_DEPS):
++	@$(call ncmd,recmake,$(subst /$(LIB_O_NAME),,$@),all) || exit 1;
+ 
+ $(LIB_O_NAME): $(LIB_O_DEPS)
+ 	$(call cmd,ld_objs)
+@@ -222,7 +227,8 @@ $(RULES_LOCAL):
+ 
+ # Default deps
+ rule_deps = $(1)-recursive $(1)-default $(1)-local
+-all:	  $(call rule_deps,all)
++all:	  all-default all-local
++	@$(MAKE) all-recursive
+ install:  $(call rule_deps,install)
+ clean:	  $(call rule_deps,clean)
+ cleanall: $(call rule_deps,cleanall)

diff --git a/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch b/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch
new file mode 100644
index 0000000..dee09a6
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch
@@ -0,0 +1,12 @@
+diff -Naurp elinks-0.12pre5-orig//src/intl/charsets.c elinks-0.12pre5/src/intl/charsets.c
+--- elinks-0.12pre5-orig//src/intl/charsets.c	2010-04-04 12:19:02.000000000 +0200
++++ elinks-0.12pre5/src/intl/charsets.c	2010-04-04 12:19:20.000000000 +0200
+@@ -821,7 +821,7 @@ free_utf_table(void)
+ 
+ 	/* Cast away const.  */
+ 	for (i = 128; i < 256; i++)
+-		mem_free((unsigned char *) utf_table[i].u.str);
++		mem_free(utf_table[i].u.str);
+ }
+ 
+ static struct conv_table *

diff --git a/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch b/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch
new file mode 100644
index 0000000..ee2e5e8
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch
@@ -0,0 +1,124 @@
+--- a/src/scripting/smjs/action_object.c	2012-06-28 11:46:58.000000000 -0400
++++ b/src/scripting/smjs/action_object.c	2012-06-28 11:52:42.000000000 -0400
+@@ -50,7 +50,7 @@
+ 	assert(smjs_ctx);
+ 	if_assert_failed return JS_FALSE;
+ 
+-	value = JS_FALSE;
++	value = JSVAL_FALSE;
+ 
+ 	if (JS_TRUE != JS_ValueToObject(ctx, argv[-2], &fn_obj)) {
+ 		JS_SET_RVAL(ctx, rval, value);
+@@ -76,7 +76,7 @@
+ 
+ 	do_action(hop->ses, hop->action_id, 1);
+ 
+-	value = JS_TRUE;
++	value = JSVAL_TRUE;
+ 	JS_SET_RVAL(ctx, rval, value);
+ 
+ 	return JS_TRUE;
+--- a/src/scripting/smjs/bookmarks.c	2012-06-28 11:57:40.000000000 -0400
++++ b/src/scripting/smjs/bookmarks.c	2012-06-28 12:08:20.000000000 -0400
+@@ -250,11 +250,20 @@
+ 
+ /* @bookmark_folder_class.getProperty */
+ static JSBool
++#if JS_VERSION >= 185
++bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
++#else
+ bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
++#endif
+ {
+ 	struct bookmark *bookmark;
+ 	struct bookmark *folder;
+ 	unsigned char *title = NULL;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	/* This can be called if @obj if not itself an instance of the
+ 	 * appropriate class but has one in its prototype chain.  Fail
+--- a/src/scripting/smjs/elinks_object.c	2012-06-28 12:11:15.000000000 -0400
++++ b/src/scripting/smjs/elinks_object.c	2012-06-28 12:14:50.000000000 -0400
+@@ -185,7 +185,7 @@
+ 	                               method, rval))
+ 		return JS_FALSE;
+ 
+-	if (JSVAL_VOID == *rval)
++	if (JSVAL_IS_VOID(*rval))
+ 		return JS_FALSE;
+ 
+ 	return JS_CallFunctionValue(smjs_ctx, smjs_elinks_object,
+--- a/src/scripting/smjs/globhist.c	2012-06-28 12:20:25.000000000 -0400
++++ b/src/scripting/smjs/globhist.c	2012-06-28 12:20:15.000000000 -0400
+@@ -201,11 +201,20 @@
+ 
+ /* @smjs_globhist_class.getProperty */
+ static JSBool
+-smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
++#if JS_VERSION >= 185
++smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
++#else
++smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
++#endif
+ {
+ 	JSObject *jsobj;
+ 	unsigned char *uri_string;
+ 	struct global_history_item *history_item;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	uri_string = JS_EncodeString(ctx, JS_ValueToString(ctx, id));
+ 	if (!uri_string) goto ret_null;
+--- a/src/scripting/smjs/keybinding.c	2012-06-28 12:21:39.000000000 -0400
++++ b/src/scripting/smjs/keybinding.c.new	2012-06-28 12:48:00.000000000 -0400
+@@ -17,11 +17,20 @@
+ 
+ /* @keymap_class.getProperty */
+ static JSBool
+-keymap_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
++#if JS_VERSION >= 185
++keymap_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
++#else
++keymap_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
++#endif
+ {
+ 	unsigned char *action_str;
+ 	const unsigned char *keystroke_str;
+ 	int *data;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	/* This can be called if @obj if not itself an instance of the
+ 	 * appropriate class but has one in its prototype chain.  Fail
+@@ -70,11 +79,20 @@
+ 
+ /* @keymap_class.setProperty */
+ static JSBool
+-keymap_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
++#if JS_VERSION >= 185
++keymap_set_property(JSContext *ctx, JSObject *obj, jsid iid, JSBool strict, jsval *vp)
++#else
++keymap_set_property(JSContext *ctx, JSObject *obj, jsval id, JSBool strict, jsval *vp)
++#endif
+ {
+ 	int *data;
+ 	unsigned char *keymap_str;
+ 	const unsigned char *keystroke_str;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	/* This can be called if @obj if not itself an instance of the
+ 	 * appropriate class but has one in its prototype chain.  Fail

diff --git a/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch b/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
new file mode 100644
index 0000000..b48ddae
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
@@ -0,0 +1,12 @@
+diff -Naurp elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c elinks-0.12pre5/src/ecmascript/spidermonkey.c
+--- elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c	2011-06-12 01:03:02.427000686 +0200
++++ elinks-0.12pre5/src/ecmascript/spidermonkey.c	2011-06-12 01:03:31.368000736 +0200
+@@ -130,7 +130,7 @@ setup_safeguard(struct ecmascript_interp
+                 JSContext *ctx)
+ {
+ 	interpreter->exec_start = time(NULL);
+-	JS_SetBranchCallback(ctx, safeguard);
++	JS_SetOperationCallback(ctx, safeguard);
+ }
+ 
+ 

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
new file mode 100644
index 0000000..d70d2cb
--- /dev/null
+++ b/x11-base/xorg-server/Manifest
@@ -0,0 +1,28 @@
+AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
+AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
+AUX xdm.confd-4 562 RMD160 3440e564c5d52ec1d30902c870daf282698f04c4 SHA1 630b8e05706050a6b7260d2a1a19d6d54cba59fa SHA256 9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8
+AUX xdm.initd-3 5662 RMD160 f59d08d172681b349496ff4274f7e9f7cad51682 SHA1 3abf99cb2e8de0afd277f4b1a0224e7c6466c66f SHA256 36a4b4e5fcb4f7ae303e1dfc20b1ec005a7ada9448ebb96e518d8c992feb5475
+AUX xdm.initd-5 5721 RMD160 785b7b3a8fc15439ed650d4ebb4f57cd28063ea2 SHA1 91905d67069cd82b4f39f6a7997ce3763fc70dae SHA256 de1a07296c7248a90fc39212f9b586816fd2f911af71624ad13ef55bf8a0fefa
+AUX xdm.initd-8 5702 RMD160 aef613766ffdd803e86914eecf101103bfcde28d SHA1 6667598ff1b0e02df286932bec934eea7e964d2c SHA256 f5f97f5ac47738f352d172185b9256c78562a91510fd3d69dbc87bb3a5d0814f
+AUX xorg-cve-2011-4028+4029.patch 671 RMD160 f9c607b5bfe20259f2adb320b6a1a0819f59f7ab SHA1 84797b66434aa05acc9f6881050d1b46487caf77 SHA256 76b9bb4a928fa7179eb52ab3b2bd2ef6d7db83e0543ba80de37cdab05efa601c
+AUX xorg-server-1.11-disable-tests-without-ddx.patch 2184 RMD160 4648fafbadebc3bc72f6a7fcac56d4e0e7fbf8ef SHA1 381c6a485505641a41337508be50cc829b17aca8 SHA256 e3b92e31843ff5046a96d3c4eb6ce67ab00e6422ffe92e7e7d13424b67dc844e
+AUX xorg-server-1.11-dix-pointerrootwin-send-focusin.patch 970 RMD160 e1384bc8e6345bb9bcfa16874e5032e1ad389af6 SHA1 2f7ab2bd9a405b77d6c1538784152b68777705cd SHA256 c65e3499f6f2974d00bfcec6f6c6826982e87327b61d9621dce6c2bf26949a7d
+AUX xorg-server-1.11-dix-send-focus-events.patch 2345 RMD160 286ed4b953c329b8bf289cb759ad986a6ab8a240 SHA1 8065f0c170df65665d992f013e2409bb3a62cb3b SHA256 77e1ce80ebf57718b5aa7cfdb1add109c62c8b8728899405c212239b2576d110
+AUX xorg-server-1.11-log-format-fix.patch 13585 RMD160 2c8328b8f2448bc206d358e95ddbb8f7f1ecfa53 SHA1 cfcc384f189237a28104f49f71e70ff613f76c84 SHA256 2a70be6fa9d77c5dbc831cc1891eb7426005a22fc3e03707810a2e07eebd58c0
+AUX xorg-server-1.12-disable-acpi.patch 275 RMD160 01244888695fc7928c81c06cc1f4fcd3625fc9de SHA1 555a4d16f38ed54ed9efa6fff9ec230d11362e30 SHA256 1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953
+AUX xorg-server-1.12-xf86edidmodes-array-bounds.patch 1219 RMD160 3b16fb00a44d493e452487c08cf4bd161e72545d SHA1 036a7b31c108dc25250a070aaa48be069d5b31c3 SHA256 d781acc0ab5c34ab52d87135346a1346b529dce663779d1e8641252e260d4de2
+AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
+AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
+AUX xorg-server-glapi_c.patch 2215 RMD160 2df0b6ef296744b0c6951f4ba76bfeeb09196d62 SHA1 5bb85cef608bd75eca7a091fb581c0243cb36598 SHA256 5f59b883d49f53d2f6f71cbbf5e4ef74bdf545238afd61fa3011e0eb311cfb3b
+AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
+DIST xorg-server-1.10.6.tar.bz2 5406712 RMD160 a920b609e462e1b6ac750e6e1466aa0f880b41a8 SHA1 398b5ba7332829f1831b8fa69e2ea071fb7d1e59 SHA256 c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
+DIST xorg-server-1.11.4.tar.bz2 4900810 RMD160 26eafdda9e7c9e21e606281dacc13e67d0144eef SHA1 adb5b0bf95a943385c08f826a647871aa1d8d6eb SHA256 3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc
+DIST xorg-server-1.12.2.tar.bz2 5431841 RMD160 47530836ebe44e8823848fb87ef979c7dd805f66 SHA1 2edb151d39571dc0fcdedc299ea0a77fe6bfc076 SHA256 ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5
+DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
+EBUILD xorg-server-1.10.6-r1.ebuild 7160 RMD160 5865b675a196f2a0f41a09266e000f21e9f9f7d9 SHA1 4f2949e06f67647594e1fdecb423d576be48f98c SHA256 39806355cf68907fd1b1d07c4218cbe440c73b63bb3d4f482e9ab6b749c817db
+EBUILD xorg-server-1.11.4-r1.ebuild 7170 RMD160 d9e6f36286f1403329f837ae82f54d9739974693 SHA1 f57ba727c7d2665151ce1054cb1b7782d9df370d SHA256 ed4b129bdfce77dab792d6bbad7913687605867e023a8b44c540ed165bf294e8
+EBUILD xorg-server-1.12.2.ebuild 6888 RMD160 9347f1620cdf6b595fbaed83c806489fcc5b6036 SHA1 6ef98c48b331c7f9a4426a8ef8485ca1664ccf43 SHA256 f0fe3864de9488daa5f46ea30230c3abd24ac3e1013dc817ef5d8319b46751a1
+EBUILD xorg-server-1.9.5-r1.ebuild 7863 RMD160 73cfb9828e9456277703076ca1e58708187035e2 SHA1 c0124e2c27bfc3d02ea40fa21558db1c836f7b92 SHA256 92cd8aba95353f41ced9c7f3122583fbfd182d9f1d7e093bb2a68a53b9d10399
+MISC ChangeLog 32035 RMD160 ee741c24e20eb255d649695c85f6dffed532f35f SHA1 90ab3382b3a33eeb373aeeac605089105e4fe7dd SHA256 30ea6c09969166459cc0a5ac57137728631c8059e961e2d5c727c5bb40a3af1a
+MISC ChangeLog-2009 109242 RMD160 49689c8b1497d684a401769d514b6878f3630361 SHA1 aba977db6bc09bec3d0cafdefc2f0e480beabc8e SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88
+MISC metadata.xml 537 RMD160 36f5ed1e9869e06c50c882193aad04d9553fbab9 SHA1 505782abd459abe3ba35969cc190675e00c65408 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f

diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 b/x11-base/xorg-server/files/xdm-setup.initd-1
new file mode 100644
index 0000000..365664e
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm-setup.initd-1
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm-setup.initd-1,v 1.1 2010/04/13 10:07:39 scarabeus Exp $
+
+depend() {
+	need localmount
+}
+
+start() {
+	if get_bootparam "nox" ; then
+		touch /etc/.noxdm
+	fi
+}

diff --git a/x11-base/xorg-server/files/xdm.confd-3 b/x11-base/xorg-server/files/xdm.confd-3
new file mode 100644
index 0000000..9c560bb
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm.confd-3
@@ -0,0 +1,16 @@
+# We always try and start X on a static VT. The various DMs normally default
+# to using VT7. If you wish to use the xdm init script, then you should ensure
+# that the VT checked is the same VT your DM wants to use. We do this check to
+# ensure that you haven't accidentally configured something to run on the VT
+# in your /etc/inittab file so that you don't get a dead keyboard.
+CHECKVT=7
+
+# What display manager do you use ?  [ xdm | gdm | kdm | kdm-4.3 | gpe | entrance ]
+# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
+#
+# KDE-specific note:
+# - If you are using kdeprefix go with "kdm-4.Y", e.g. "kdm-4.3".
+#     You can find possible versions by looking at the directories in /usr/kde/.
+# - Else, if you are using KDE 3 enter "kdm-3.5"
+# - Else, if you are using KDE 4 enter "kdm" without a version
+DISPLAYMANAGER="xdm"
\ No newline at end of file

diff --git a/x11-base/xorg-server/files/xdm.confd-4 b/x11-base/xorg-server/files/xdm.confd-4
new file mode 100644
index 0000000..c82fece
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm.confd-4
@@ -0,0 +1,10 @@
+# We always try and start X on a static VT. The various DMs normally default
+# to using VT7. If you wish to use the xdm init script, then you should ensure
+# that the VT checked is the same VT your DM wants to use. We do this check to
+# ensure that you haven't accidentally configured something to run on the VT
+# in your /etc/inittab file so that you don't get a dead keyboard.
+CHECKVT=7
+
+# What display manager do you use ?  [ xdm | gdm | kdm | gpe | entrance ]
+# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
+DISPLAYMANAGER="xdm"

diff --git a/x11-base/xorg-server/files/xdm.initd-3 b/x11-base/xorg-server/files/xdm.initd-3
new file mode 100644
index 0000000..4e4c8b2
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm.initd-3
@@ -0,0 +1,218 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-3,v 1.5 2012/06/12 11:27:07 chithanh Exp $
+
+# This is here to serve as a note to myself, and future developers.
+#
+# Any Display manager (gdm,kdm,xdm) has the following problem:  if
+# it is started before any getty, and no vt is specified, it will
+# usually run on vt2.  When the getty on vt2 then starts, and the
+# DM is already started, the getty will take control of the keyboard,
+# leaving us with a "dead" keyboard.
+#
+# Resolution: add the following line to /etc/inittab
+#
+#  x:a:once:/etc/X11/startDM.sh
+#
+# and have /etc/X11/startDM.sh start the DM in daemon mode if
+# a lock is present (with the info of what DM should be started),
+# else just fall through.
+#
+# How this basically works, is the "a" runlevel is a additional
+# runlevel that you can use to fork processes with init, but the
+# runlevel never gets changed to this runlevel.  Along with the "a"
+# runlevel, the "once" key word means that startDM.sh will only be
+# run when we specify it to run, thus eliminating respawning
+# startDM.sh when "xdm" is not added to the default runlevel, as was
+# done previously.
+#
+# This script then just calls "telinit a", and init will run
+# /etc/X11/startDM.sh after the current runlevel completes (this
+# script should only be added to the actual runlevel the user is
+# using).
+#
+# Martin Schlemmer
+# aka Azarah
+# 04 March 2002
+
+depend() {
+	need localmount xdm-setup
+
+	# this should start as early as possible
+	# we can't do 'before *' as that breaks it
+	# (#139824) Start after ypbind and autofs for network authentication
+	# (#145219 #180163) Could use lirc mouse as input device
+	# (#70689 comment #92) Start after consolefont to avoid display corruption
+	# (#291269) Start after quota, since some dm need readable home
+	after bootmisc consolefont modules netmount
+	after readahead-list ypbind autofs openvpn gpm lircmd
+	after quota
+	before alsasound
+
+	# Start before X
+	use consolekit xfs
+}
+
+setup_dm() {
+	local MY_XDM
+	
+	MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
+
+	# Load our root path from profile.env
+	# Needed for kdm
+	PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
+
+	NAME=
+	case "${MY_XDM}" in
+		kdm|kde)
+			EXE="$(which kdm)"
+			PIDFILE=/var/run/kdm.pid
+			;;
+		kdm-*)
+			EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm"
+			PIDFILE=/var/run/kdm.pid
+			;;
+		entrance*)
+			EXE=/usr/sbin/entranced
+			PIDFILE=/var/lib/entranced.pid
+			;;
+		gdm|gnome)
+			EXE=/usr/bin/gdm
+			[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
+			PIDFILE=/var/run/gdm.pid
+			;;
+		wdm)
+			EXE=/usr/bin/wdm
+			PIDFILE=
+			;;
+		gpe)
+			EXE=/usr/bin/gpe-dm
+			PIDFILE=/var/run/gpe-dm.pid
+			;;
+		lxdm)
+			EXE=/usr/sbin/lxdm-binary
+			PIDFILE=/var/run/lxdm.pid
+			START_STOP_ARGS="--background"
+			;;
+		lightdm)
+			EXE=/usr/sbin/lightdm
+			PIDFILE=/var/run/lightdm.pid
+			START_STOP_ARGS="--background"
+			;;
+		*)
+			# first find out if there is such executable
+			EXE="$(which ${MY_XDM} 2>/dev/null)"
+			PIDFILE="/var/run/${MY_XDM}.pid"
+
+			# warn user that he is doing sick things if the exe was not found
+			if [ -z "${EXE}" ]; then
+				echo "ERROR: Your XDM value is invalid."
+				echo "  No ${MY_XDM} executable could be found on your system."
+			fi
+			;;
+	esac
+
+	if ! [ -x "${EXE}" ]; then
+		EXE=/usr/bin/xdm
+		PIDFILE=/var/run/xdm.pid
+		if ! [ -x "/usr/bin/xdm" ]; then
+			echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
+			echo "	or install x11-apps/xdm package"
+			eend 255
+		fi
+	fi
+}
+
+# Check to see if something is defined on our VT
+vtstatic() {
+	if [ -e /etc/inittab ] ; then
+		grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
+	elif [ -e /etc/ttys ] ; then
+		grep -q "^ttyv$(($1 - 1))" /etc/ttys
+	else
+		return 1
+	fi
+}
+
+start() {
+	local EXE NAME PIDFILE
+	setup_dm
+
+	if [ -f /etc/.noxdm ]; then
+		einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
+		rm /etc/.noxdm
+		return 0
+	fi
+
+	ebegin "Setting up ${EXE##*/}"
+
+	# save the prefered DM
+	save_options "service" "${EXE}"
+	save_options "name"    "${NAME}"
+	save_options "pidfile" "${PIDFILE}"
+	save_options "start_stop_args" "${START_STOP_ARGS}"
+
+	if [ -n "${CHECKVT-y}" ] ; then
+		if vtstatic "${CHECKVT:-7}" ; then
+			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
+				ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
+				telinit a >/dev/null 2>&1
+				return 0
+			else
+				eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
+				return 1
+			fi
+		fi
+	fi
+
+	/etc/X11/startDM.sh
+	eend 0
+}
+
+stop() {
+	local curvt retval
+
+	retval=0
+	if [ -t 0 ]; then
+		if type fgconsole >/dev/null 2>&1; then
+			curvt=$(fgconsole 2>/dev/null)
+		else
+			curvt=$(tty)
+			case "${curvt}" in
+				/dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
+				*) curvt= ;;
+			esac
+		fi
+	fi
+	local myexe myname mypidfile myservice
+	myexe=$(get_options "service")
+	myname=$(get_options "name")
+	mypidfile=$(get_options "pidfile")
+	myservice=${myexe##*/}
+
+	[ -z "${myexe}" ] && return 0
+
+	ebegin "Stopping ${myservice}"
+
+	if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
+		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
+			${mypidfile:+--pidfile} ${mypidfile} \
+			${myname:+--name} ${myname}
+		retval=${?}
+	fi
+
+	# switch back to original vt
+	if [ -n "${curvt}" ]; then
+		if type chvt >/dev/null 2>&1; then
+			chvt "${curvt}"
+		else
+			vidcontrol -s "$((curvt + 1))"
+		fi
+	fi
+
+	eend ${retval} "Error stopping ${myservice}"
+	return ${retval}
+}
+
+# vim: set ts=4 :

diff --git a/x11-base/xorg-server/files/xdm.initd-5 b/x11-base/xorg-server/files/xdm.initd-5
new file mode 100644
index 0000000..c152e40
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm.initd-5
@@ -0,0 +1,219 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-5,v 1.1 2011/11/24 13:09:40 chithanh Exp $
+
+# This is here to serve as a note to myself, and future developers.
+#
+# Any Display manager (gdm,kdm,xdm) has the following problem:  if
+# it is started before any getty, and no vt is specified, it will
+# usually run on vt2.  When the getty on vt2 then starts, and the
+# DM is already started, the getty will take control of the keyboard,
+# leaving us with a "dead" keyboard.
+#
+# Resolution: add the following line to /etc/inittab
+#
+#  x:a:once:/etc/X11/startDM.sh
+#
+# and have /etc/X11/startDM.sh start the DM in daemon mode if
+# a lock is present (with the info of what DM should be started),
+# else just fall through.
+#
+# How this basically works, is the "a" runlevel is a additional
+# runlevel that you can use to fork processes with init, but the
+# runlevel never gets changed to this runlevel.  Along with the "a"
+# runlevel, the "once" key word means that startDM.sh will only be
+# run when we specify it to run, thus eliminating respawning
+# startDM.sh when "xdm" is not added to the default runlevel, as was
+# done previously.
+#
+# This script then just calls "telinit a", and init will run
+# /etc/X11/startDM.sh after the current runlevel completes (this
+# script should only be added to the actual runlevel the user is
+# using).
+#
+# Martin Schlemmer
+# aka Azarah
+# 04 March 2002
+
+depend() {
+	need localmount xdm-setup
+
+	# this should start as early as possible
+	# we can't do 'before *' as that breaks it
+	# (#139824) Start after ypbind and autofs for network authentication
+	# (#145219 #180163) Could use lirc mouse as input device
+	# (#70689 comment #92) Start after consolefont to avoid display corruption
+	# (#291269) Start after quota, since some dm need readable home
+	# (#390609) gdm-3 will fail when dbus is not running
+	after bootmisc consolefont modules netmount
+	after readahead-list ypbind autofs openvpn gpm lircmd
+	after quota
+	before alsasound
+
+	# Start before X
+	use consolekit dbus xfs
+}
+
+setup_dm() {
+	local MY_XDM
+	
+	MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
+
+	# Load our root path from profile.env
+	# Needed for kdm
+	PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
+
+	NAME=
+	case "${MY_XDM}" in
+		kdm|kde)
+			EXE="$(which kdm)"
+			PIDFILE=/var/run/kdm.pid
+			;;
+		kdm-*)
+			EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm"
+			PIDFILE=/var/run/kdm.pid
+			;;
+		entrance*)
+			EXE=/usr/sbin/entranced
+			PIDFILE=/var/lib/entranced.pid
+			;;
+		gdm|gnome)
+			EXE=/usr/bin/gdm
+			[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
+			PIDFILE=/var/run/gdm.pid
+			;;
+		wdm)
+			EXE=/usr/bin/wdm
+			PIDFILE=
+			;;
+		gpe)
+			EXE=/usr/bin/gpe-dm
+			PIDFILE=/var/run/gpe-dm.pid
+			;;
+		lxdm)
+			EXE=/usr/sbin/lxdm-binary
+			PIDFILE=/var/run/lxdm.pid
+			START_STOP_ARGS="--background"
+			;;
+		lightdm)
+			EXE=/usr/sbin/lightdm
+			PIDFILE=/var/run/lightdm.pid
+			START_STOP_ARGS="--background"
+			;;
+		*)
+			# first find out if there is such executable
+			EXE="$(which ${MY_XDM} 2>/dev/null)"
+			PIDFILE="/var/run/${MY_XDM}.pid"
+
+			# warn user that he is doing sick things if the exe was not found
+			if [ -z "${EXE}" ]; then
+				echo "ERROR: Your XDM value is invalid."
+				echo "  No ${MY_XDM} executable could be found on your system."
+			fi
+			;;
+	esac
+
+	if ! [ -x "${EXE}" ]; then
+		EXE=/usr/bin/xdm
+		PIDFILE=/var/run/xdm.pid
+		if ! [ -x "/usr/bin/xdm" ]; then
+			echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
+			echo "	or install x11-apps/xdm package"
+			eend 255
+		fi
+	fi
+}
+
+# Check to see if something is defined on our VT
+vtstatic() {
+	if [ -e /etc/inittab ] ; then
+		grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
+	elif [ -e /etc/ttys ] ; then
+		grep -q "^ttyv$(($1 - 1))" /etc/ttys
+	else
+		return 1
+	fi
+}
+
+start() {
+	local EXE NAME PIDFILE
+	setup_dm
+
+	if [ -f /etc/.noxdm ]; then
+		einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
+		rm /etc/.noxdm
+		return 0
+	fi
+
+	ebegin "Setting up ${EXE##*/}"
+
+	# save the prefered DM
+	save_options "service" "${EXE}"
+	save_options "name"    "${NAME}"
+	save_options "pidfile" "${PIDFILE}"
+	save_options "start_stop_args" "${START_STOP_ARGS}"
+
+	if [ -n "${CHECKVT-y}" ] ; then
+		if vtstatic "${CHECKVT:-7}" ; then
+			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
+				ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
+				telinit a >/dev/null 2>&1
+				return 0
+			else
+				eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
+				return 1
+			fi
+		fi
+	fi
+
+	/etc/X11/startDM.sh
+	eend 0
+}
+
+stop() {
+	local curvt retval
+
+	retval=0
+	if [ -t 0 ]; then
+		if type fgconsole >/dev/null 2>&1; then
+			curvt=$(fgconsole 2>/dev/null)
+		else
+			curvt=$(tty)
+			case "${curvt}" in
+				/dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
+				*) curvt= ;;
+			esac
+		fi
+	fi
+	local myexe myname mypidfile myservice
+	myexe=$(get_options "service")
+	myname=$(get_options "name")
+	mypidfile=$(get_options "pidfile")
+	myservice=${myexe##*/}
+
+	[ -z "${myexe}" ] && return 0
+
+	ebegin "Stopping ${myservice}"
+
+	if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
+		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
+			${mypidfile:+--pidfile} ${mypidfile} \
+			${myname:+--name} ${myname}
+		retval=${?}
+	fi
+
+	# switch back to original vt
+	if [ -n "${curvt}" ]; then
+		if type chvt >/dev/null 2>&1; then
+			chvt "${curvt}"
+		else
+			vidcontrol -s "$((curvt + 1))"
+		fi
+	fi
+
+	eend ${retval} "Error stopping ${myservice}"
+	return ${retval}
+}
+
+# vim: set ts=4 :

diff --git a/x11-base/xorg-server/files/xdm.initd-8 b/x11-base/xorg-server/files/xdm.initd-8
new file mode 100644
index 0000000..539cac1
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm.initd-8
@@ -0,0 +1,216 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-8,v 1.1 2012/05/01 22:08:46 chithanh Exp $
+
+# This is here to serve as a note to myself, and future developers.
+#
+# Any Display manager (gdm,kdm,xdm) has the following problem:  if
+# it is started before any getty, and no vt is specified, it will
+# usually run on vt2.  When the getty on vt2 then starts, and the
+# DM is already started, the getty will take control of the keyboard,
+# leaving us with a "dead" keyboard.
+#
+# Resolution: add the following line to /etc/inittab
+#
+#  x:a:once:/etc/X11/startDM.sh
+#
+# and have /etc/X11/startDM.sh start the DM in daemon mode if
+# a lock is present (with the info of what DM should be started),
+# else just fall through.
+#
+# How this basically works, is the "a" runlevel is a additional
+# runlevel that you can use to fork processes with init, but the
+# runlevel never gets changed to this runlevel.  Along with the "a"
+# runlevel, the "once" key word means that startDM.sh will only be
+# run when we specify it to run, thus eliminating respawning
+# startDM.sh when "xdm" is not added to the default runlevel, as was
+# done previously.
+#
+# This script then just calls "telinit a", and init will run
+# /etc/X11/startDM.sh after the current runlevel completes (this
+# script should only be added to the actual runlevel the user is
+# using).
+#
+# Martin Schlemmer
+# aka Azarah
+# 04 March 2002
+
+depend() {
+	need localmount xdm-setup
+
+	# this should start as early as possible
+	# we can't do 'before *' as that breaks it
+	# (#139824) Start after ypbind and autofs for network authentication
+	# (#145219 #180163) Could use lirc mouse as input device
+	# (#70689 comment #92) Start after consolefont to avoid display corruption
+	# (#291269) Start after quota, since some dm need readable home
+	# (#390609) gdm-3 will fail when dbus is not running
+	# (#366753) starting keymaps after X causes problems
+	after bootmisc consolefont modules netmount
+	after readahead-list ypbind autofs openvpn gpm lircmd
+	after quota keymaps
+	before alsasound
+
+	# Start before X
+	use consolekit dbus xfs
+}
+
+setup_dm() {
+	local MY_XDM
+	
+	MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
+
+	# Load our root path from profile.env
+	# Needed for kdm
+	PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
+
+	NAME=
+	case "${MY_XDM}" in
+		kdm|kde)
+			EXE=/usr/bin/kdm
+			PIDFILE=/var/run/kdm.pid
+			;;
+		entrance*)
+			EXE=/usr/sbin/entranced
+			PIDFILE=/var/lib/entranced.pid
+			;;
+		gdm|gnome)
+			EXE=/usr/bin/gdm
+			[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
+			PIDFILE=/var/run/gdm.pid
+			;;
+		wdm)
+			EXE=/usr/bin/wdm
+			PIDFILE=
+			;;
+		gpe)
+			EXE=/usr/bin/gpe-dm
+			PIDFILE=/var/run/gpe-dm.pid
+			;;
+		lxdm)
+			EXE=/usr/sbin/lxdm-binary
+			PIDFILE=/var/run/lxdm.pid
+			START_STOP_ARGS="--background"
+			;;
+		lightdm)
+			EXE=/usr/sbin/lightdm
+			PIDFILE=/var/run/lightdm.pid
+			START_STOP_ARGS="--background"
+			;;
+		*)
+			# first find out if there is such executable
+			EXE="$(command -v ${MY_XDM} 2>/dev/null)"
+			PIDFILE="/var/run/${MY_XDM}.pid"
+
+			# warn user that he is doing sick things if the exe was not found
+			if [ -z "${EXE}" ]; then
+				echo "ERROR: Your XDM value is invalid."
+				echo "  No ${MY_XDM} executable could be found on your system."
+			fi
+			;;
+	esac
+
+	if ! [ -x "${EXE}" ]; then
+		EXE=/usr/bin/xdm
+		PIDFILE=/var/run/xdm.pid
+		if ! [ -x "/usr/bin/xdm" ]; then
+			echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
+			echo "	or install x11-apps/xdm package"
+			eend 255
+		fi
+	fi
+}
+
+# Check to see if something is defined on our VT
+vtstatic() {
+	if [ -e /etc/inittab ] ; then
+		grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
+	elif [ -e /etc/ttys ] ; then
+		grep -q "^ttyv$(($1 - 1))" /etc/ttys
+	else
+		return 1
+	fi
+}
+
+start() {
+	local EXE NAME PIDFILE
+	setup_dm
+
+	if [ -f /etc/.noxdm ]; then
+		einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
+		rm /etc/.noxdm
+		return 0
+	fi
+
+	ebegin "Setting up ${EXE##*/}"
+
+	# save the prefered DM
+	save_options "service" "${EXE}"
+	save_options "name"    "${NAME}"
+	save_options "pidfile" "${PIDFILE}"
+	save_options "start_stop_args" "${START_STOP_ARGS}"
+
+	if [ -n "${CHECKVT-y}" ] ; then
+		if vtstatic "${CHECKVT:-7}" ; then
+			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
+				ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
+				telinit a >/dev/null 2>&1
+				return 0
+			else
+				eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
+				return 1
+			fi
+		fi
+	fi
+
+	/etc/X11/startDM.sh
+	eend 0
+}
+
+stop() {
+	local curvt retval
+
+	retval=0
+	if [ -t 0 ]; then
+		if type fgconsole >/dev/null 2>&1; then
+			curvt=$(fgconsole 2>/dev/null)
+		else
+			curvt=$(tty)
+			case "${curvt}" in
+				/dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
+				*) curvt= ;;
+			esac
+		fi
+	fi
+	local myexe myname mypidfile myservice
+	myexe=$(get_options "service")
+	myname=$(get_options "name")
+	mypidfile=$(get_options "pidfile")
+	myservice=${myexe##*/}
+
+	[ -z "${myexe}" ] && return 0
+
+	ebegin "Stopping ${myservice}"
+
+	if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
+		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
+			${mypidfile:+--pidfile} ${mypidfile} \
+			${myname:+--name} ${myname}
+		retval=${?}
+	fi
+
+	# switch back to original vt
+	if [ -n "${curvt}" ]; then
+		if type chvt >/dev/null 2>&1; then
+			chvt "${curvt}"
+		else
+			vidcontrol -s "$((curvt + 1))"
+		fi
+	fi
+
+	eend ${retval} "Error stopping ${myservice}"
+	return ${retval}
+}
+
+# vim: set ts=4 :

diff --git a/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch b/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
new file mode 100644
index 0000000..66e77f6
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
@@ -0,0 +1,22 @@
+diff --git a/os/utils.c b/os/utils.c
+index e8ecb71..18ff1ca 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -297,7 +297,7 @@ LockServer(void)
+     FatalError("Could not create lock file in %s\n", tmp);
+   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
+   (void) write(lfd, pid_str, 11);
+-  (void) chmod(tmp, 0444);
++  (void) fchmod(lfd, 0444);
+   (void) close(lfd);
+
+   /*
+@@ -318,7 +318,7 @@ LockServer(void)
+       /*
+        * Read the pid from the existing file
+        */
+-      lfd = open(LockFile, O_RDONLY);
++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
+       if (lfd < 0) {
+         unlink(tmp);
+         FatalError("Can't read lock file %s\n", LockFile);

diff --git a/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch b/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch
new file mode 100644
index 0000000..facb972
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch
@@ -0,0 +1,64 @@
+diff -ur a/test/Makefile.am b/test/Makefile.am
+--- a/test/Makefile.am	2011-07-15 15:26:40.000000000 +0200
++++ b/test/Makefile.am	2012-01-02 01:03:15.232740535 +0100
+@@ -1,21 +1,32 @@
+ if ENABLE_UNIT_TESTS
+ if HAVE_LD_WRAP
+-SUBDIRS= . xi2
+-noinst_PROGRAMS = xkb input xtest list misc fixes
++SUBDIRS= .
++noinst_PROGRAMS = list
++if XORG
++# Tests that require at least some DDX functions in order to fully link
++# For now, requires xf86 ddx, could be adjusted to use another
++SUBDIRS += xi2
++noinst_PROGRAMS += xkb input xtest misc fixes
++endif
+ check_LTLIBRARIES = libxservertest.la
+ 
+ TESTS=$(noinst_PROGRAMS)
+ 
+ AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
+-INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser \
+-	-I$(top_srcdir)/miext/cw -I$(top_srcdir)/hw/xfree86/ddc \
++INCLUDES = $(XORG_INCS) -I$(top_srcdir)/miext/cw
++if XORG
++INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \
++	-I$(top_srcdir)/hw/xfree86/ddc \
+ 	-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
+ 	-I$(top_srcdir)/hw/xfree86/ramdac
++endif
+ TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
+ 
++if XORG
+ if SPECIAL_DTRACE_OBJECTS
+ TEST_LDADD += $(OS_LIB) $(DIX_LIB)
+ endif
++endif
+ 
+ xkb_LDADD=$(TEST_LDADD)
+ input_LDADD=$(TEST_LDADD)
+@@ -24,9 +35,10 @@
+ misc_LDADD=$(TEST_LDADD)
+ fixes_LDADD=$(TEST_LDADD)
+ 
++libxservertest_la_LIBADD = $(XSERVER_LIBS)
++if XORG
+ nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
+-libxservertest_la_LIBADD = \
+-            $(XSERVER_LIBS) \
++libxservertest_la_LIBADD += \
+             $(top_builddir)/hw/xfree86/loader/libloader.la \
+             $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
+             $(top_builddir)/hw/xfree86/common/libcommon.la \
+@@ -36,7 +48,9 @@
+             $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
+             $(top_builddir)/hw/xfree86/ddc/libddc.la \
+             $(top_builddir)/hw/xfree86/i2c/libi2c.la \
+-            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
++            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la
++endif
++libxservertest_la_LIBADD += \
+             $(top_builddir)/mi/libmi.la \
+             $(top_builddir)/os/libos.la \
+             @XORG_LIBS@

diff --git a/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch b/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch
new file mode 100644
index 0000000..d548c89
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch
@@ -0,0 +1,27 @@
+From 3ce102c362cadcd7087bdcf48440d9498eaf77d0 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@×××××.net>
+Date: Thu, 05 Jan 2012 12:08:01 +0000
+Subject: dix: on PointerRootWin send a FocusIn to the sprite window too
+
+XTS XSetDeviceFocus-7
+
+Signed-off-by: Peter Hutterer <peter.hutterer@×××××.net>
+Reviewed-by: Chase Douglas <chase.douglas@×××××××××.com>
+---
+diff --git a/dix/enterleave.c b/dix/enterleave.c
+index 2b8c7c5..89a82ab 100644
+--- a/dix/enterleave.c
++++ b/dix/enterleave.c
+@@ -1299,7 +1299,10 @@ DeviceFocusEvents(DeviceIntPtr dev,
+         for (i = 0; i < nscreens; i++)
+             DeviceFocusEvent(dev, XI_FocusIn, mode, in, screenInfo.screens[i]->root);
+         if (to == PointerRootWin)
++        {
+             DeviceFocusInEvents(dev, GetCurrentRootWindow(dev), sprite->win, mode, NotifyPointer);
++            DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyPointer, sprite->win);
++        }
+     }
+     else
+     {
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch b/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch
new file mode 100644
index 0000000..e9ba0a7
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch
@@ -0,0 +1,48 @@
+From a125aabda3a5cf27aa98cb61f16e49280b66f451 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@×××××.net>
+Date: Thu, 05 Jan 2012 12:02:51 +0000
+Subject: dix: send focus events to the immediate parent (#44079)
+
+For a transition from windows A to B, A->parent did not receive an event.
+DeviceFocusOutEvents sends to windows ]from, to[, so start with the actual
+window, not it's parent.
+
+X.Org Bug 44079 <http://bugs.freedesktop.org/show_bug.cgi?id=44079>
+
+Signed-off-by: Peter Hutterer <peter.hutterer@×××××.net>
+Reviewed-by: Chase Douglas <chase.douglas@×××××××××.com>
+Reviewed-by: Keith Packard <keithp@××××××.com>
+---
+diff --git a/dix/enterleave.c b/dix/enterleave.c
+index a39e640..2b8c7c5 100644
+--- a/dix/enterleave.c
++++ b/dix/enterleave.c
+@@ -1292,7 +1292,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
+                         NotifyPointer);
+             DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from);
+             /* next call catches the root too, if the screen changed */
+-            DeviceFocusOutEvents(dev, from->parent, NullWindow, mode,
++            DeviceFocusOutEvents(dev, from, NullWindow, mode,
+                     NotifyNonlinearVirtual);
+         }
+         /* Notify all the roots */
+@@ -1321,7 +1321,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
+             if (IsParent(to, from))
+             {
+                 DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyAncestor, from);
+-                DeviceFocusOutEvents(dev, from->parent, to, mode,
++                DeviceFocusOutEvents(dev, from, to, mode,
+                         NotifyVirtual);
+                 DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyInferior, to);
+                 if ((IsParent(to, sprite->win)) &&
+@@ -1353,7 +1353,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
+                                 NotifyPointer);
+                     DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from);
+                     if (from->parent != NullWindow)
+-                        DeviceFocusOutEvents(dev, from->parent, common, mode,
++                        DeviceFocusOutEvents(dev, from, common, mode,
+                                 NotifyNonlinearVirtual);
+                     if (to->parent != NullWindow)
+                         DeviceFocusInEvents(dev, common, to, mode, NotifyNonlinearVirtual);
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch b/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch
new file mode 100644
index 0000000..61e7eae
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch
@@ -0,0 +1,441 @@
+Description: extreme backport of upstream log format fixes (CVE-2012-2118).
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/996250
+Origin: http://patchwork.freedesktop.org/patch/10001/
+
+Index: xorg-server-1.11.4/os/log.c
+===================================================================
+--- xorg-server-1.11.4.orig/os/log.c	2012-05-06 11:03:17.621808123 -0700
++++ xorg-server-1.11.4/os/log.c	2012-05-06 11:03:18.057814189 -0700
+@@ -167,6 +167,12 @@
+ #ifndef X_NOT_IMPLEMENTED_STRING
+ #define X_NOT_IMPLEMENTED_STRING	"(NI)"
+ #endif
++#ifndef X_DEBUG_STRING
++#define X_DEBUG_STRING          "(DB)"
++#endif
++#ifndef X_NONE_STRING
++#define X_NONE_STRING           ""
++#endif
+ 
+ /*
+  * LogInit is called to start logging to a file.  It is also called (with
+@@ -223,7 +229,7 @@
+      * needed.
+      */
+     if (saveBuffer && bufferSize > 0) {
+-	free(saveBuffer);	/* Must be free(), not free() */
++	free(saveBuffer);
+ 	saveBuffer = NULL;
+ 	bufferSize = 0;
+     }
+@@ -265,36 +271,19 @@
+ }
+ 
+ /* This function does the actual log message writes. */
+-
+-void
+-LogVWrite(int verb, const char *f, va_list args)
++static void
++LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
+ {
+-    static char tmpBuffer[1024];
+-    int len = 0;
+     static Bool newline = TRUE;
+ 
+-    if (newline) {
+-	sprintf(tmpBuffer, "[%10.3f] ", GetTimeInMillis() / 1000.0);
+-	len = strlen(tmpBuffer);
+-	if (logFile)
+-	    fwrite(tmpBuffer, len, 1, logFile);
+-    }
+-
+-    /*
+-     * Since a va_list can only be processed once, write the string to a
+-     * buffer, and then write the buffer out to the appropriate output
+-     * stream(s).
+-     */
+-    if (verb < 0 || logFileVerbosity >= verb || logVerbosity >= verb) {
+-	vsnprintf(tmpBuffer, sizeof(tmpBuffer), f, args);
+-	len = strlen(tmpBuffer);
+-    }
+-    newline = (tmpBuffer[len-1] == '\n');
+-    if ((verb < 0 || logVerbosity >= verb) && len > 0)
+-	fwrite(tmpBuffer, len, 1, stderr);
+-    if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {
++    if (verb < 0 || logVerbosity >= verb)
++        fwrite(buf, len, 1, stderr);
++    if (verb < 0 || logFileVerbosity >= verb) {
+ 	if (logFile) {
+-	    fwrite(tmpBuffer, len, 1, logFile);
++            if (newline)
++                fprintf(logFile, "[%10.3f] ", GetTimeInMillis() / 1000.0);
++            newline = end_line;
++            fwrite(buf, len, 1, logFile);
+ 	    if (logFlush) {
+ 		fflush(logFile);
+ #ifndef WIN32
+@@ -311,13 +300,19 @@
+ 		    FatalError("realloc() failed while saving log messages\n");
+ 	    }
+ 	    bufferUnused -= len;
+-	    memcpy(saveBuffer + bufferPos, tmpBuffer, len);
++            memcpy(saveBuffer + bufferPos, buf, len);
+ 	    bufferPos += len;
+ 	}
+     }
+ }
+ 
+ void
++LogVWrite(int verb, const char *f, va_list args)
++{
++    return LogVMessageVerb(X_NONE, verb, f, args);
++}
++
++void
+ LogWrite(int verb, const char *f, ...)
+ {
+     va_list args;
+@@ -327,60 +322,75 @@
+     va_end(args);
+ }
+ 
+-void
+-LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
++/* Returns the Message Type string to prepend to a logging message, or NULL
++ * if the message will be dropped due to insufficient verbosity. */
++static const char *
++LogMessageTypeVerbString(MessageType type, int verb)
+ {
+-    const char *s  = X_UNKNOWN_STRING;
+-    char tmpBuf[1024];
++    if (type == X_ERROR)
++        verb = 0;
+ 
+-    /* Ignore verbosity for X_ERROR */
+-    if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) {
+-	switch (type) {
+-	case X_PROBED:
+-	    s = X_PROBE_STRING;
+-	    break;
+-	case X_CONFIG:
+-	    s = X_CONFIG_STRING;
+-	    break;
+-	case X_DEFAULT:
+-	    s = X_DEFAULT_STRING;
+-	    break;
+-	case X_CMDLINE:
+-	    s = X_CMDLINE_STRING;
+-	    break;
+-	case X_NOTICE:
+-	    s = X_NOTICE_STRING;
+-	    break;
+-	case X_ERROR:
+-	    s = X_ERROR_STRING;
+-	    if (verb > 0)
+-		verb = 0;
+-	    break;
+-	case X_WARNING:
+-	    s = X_WARNING_STRING;
+-	    break;
+-	case X_INFO:
+-	    s = X_INFO_STRING;
+-	    break;
+-	case X_NOT_IMPLEMENTED:
+-	    s = X_NOT_IMPLEMENTED_STRING;
+-	    break;
+-	case X_UNKNOWN:
+-	    s = X_UNKNOWN_STRING;
+-	    break;
+-	case X_NONE:
+-	    s = NULL;
+-	    break;
+-	}
++    if (logVerbosity < verb && logFileVerbosity < verb)
++        return NULL;
+ 
+-        /* if s is not NULL we need a space before format */
+-        snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "",
+-                                                   s ? " " : "",
+-                                                   format);
+-        LogVWrite(verb, tmpBuf, args);
++    switch (type) {
++    case X_PROBED:
++        return X_PROBE_STRING;
++    case X_CONFIG:
++        return X_CONFIG_STRING;
++    case X_DEFAULT:
++        return X_DEFAULT_STRING;
++    case X_CMDLINE:
++        return X_CMDLINE_STRING;
++    case X_NOTICE:
++        return X_NOTICE_STRING;
++    case X_ERROR:
++        return X_ERROR_STRING;
++    case X_WARNING:
++        return X_WARNING_STRING;
++    case X_INFO:
++        return X_INFO_STRING;
++    case X_NOT_IMPLEMENTED:
++        return X_NOT_IMPLEMENTED_STRING;
++    case X_UNKNOWN:
++        return X_UNKNOWN_STRING;
++    case X_NONE:
++        return X_NONE_STRING;
++    case X_DEBUG:
++        return X_DEBUG_STRING;
++    default:
++        return X_UNKNOWN_STRING;
+     }
+ }
+ 
++void
++LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
++{
++    const char *type_str;
++    char buf[1024];
++    const size_t size = sizeof(buf);
++    Bool newline;
++    size_t len = 0;
++
++    type_str = LogMessageTypeVerbString(type, verb);
++    if (!type_str)
++        return;
++
++    /* if type_str is not "", prepend it and ' ', to message */
++    if (type_str[0] != '\0')
++        len += Xscnprintf(&buf[len], size - len, "%s ", type_str);
++
++    if (size - len > 1)
++        len += Xvscnprintf(&buf[len], size - len, format, args);
++
++    /* Force '\n' at end of truncated line */
++    if (size - len == 1)
++        buf[len - 1] = '\n';
++
++    newline = (buf[len - 1] == '\n');
++    LogSWrite(verb, buf, len, newline);
++}
++
+ /* Log message with verbosity level specified. */
+ void
+ LogMessageVerb(MessageType type, int verb, const char *format, ...)
+@@ -404,6 +414,49 @@
+ }
+ 
+ void
++LogVHdrMessageVerb(MessageType type, int verb, const char *msg_format,
++                   va_list msg_args, const char *hdr_format, va_list hdr_args)
++{
++    const char *type_str;
++    char buf[1024];
++    const size_t size = sizeof(buf);
++    Bool newline;
++    size_t len = 0;
++
++    type_str = LogMessageTypeVerbString(type, verb);
++    if (!type_str)
++        return;
++
++    /* if type_str is not "", prepend it and ' ', to message */
++    if (type_str[0] != '\0')
++        len += Xscnprintf(&buf[len], size - len, "%s ", type_str);
++
++    if (hdr_format && size - len > 1)
++        len += Xvscnprintf(&buf[len], size - len, hdr_format, hdr_args);
++
++    if (msg_format && size - len > 1)
++        len += Xvscnprintf(&buf[len], size - len, msg_format, msg_args);
++
++    /* Force '\n' at end of truncated line */
++    if (size - len == 1)
++        buf[len - 1] = '\n';
++
++    newline = (buf[len - 1] == '\n');
++    LogSWrite(verb, buf, len, newline);
++}
++
++void
++LogHdrMessageVerb(MessageType type, int verb, const char *msg_format,
++                  va_list msg_args, const char *hdr_format, ...)
++{
++    va_list hdr_args;
++
++    va_start(hdr_args, hdr_format);
++    LogVHdrMessageVerb(type, verb, msg_format, msg_args, hdr_format, hdr_args);
++    va_end(hdr_args);
++}
++
++void
+ AbortServer(void) _X_NORETURN;
+ void
+ SigAbortServer(int signo) _X_NORETURN;
+Index: xorg-server-1.11.4/include/Xprintf.h
+===================================================================
+--- xorg-server-1.11.4.orig/include/Xprintf.h	2012-05-06 10:32:42.436348011 -0700
++++ xorg-server-1.11.4/include/Xprintf.h	2012-05-06 11:03:18.057814189 -0700
+@@ -66,4 +66,16 @@
+ # define vasprintf Xvasprintf
+ #endif
+ 
++/*
++ * These functions provide a portable implementation of the linux kernel
++ * scnprintf & vscnprintf routines that return the number of bytes actually
++ * copied during a snprintf, (excluding the final '\0').
++ */
++extern _X_EXPORT int
++Xscnprintf(char *s, int n, const char * _X_RESTRICT_KYWD fmt, ...)
++_X_ATTRIBUTE_PRINTF(3,4);
++extern _X_EXPORT int
++Xvscnprintf(char *s, int n, const char * _X_RESTRICT_KYWD fmt, va_list va)
++_X_ATTRIBUTE_PRINTF(3,0);
++
+ #endif /* XPRINTF_H */
+Index: xorg-server-1.11.4/os/xprintf.c
+===================================================================
+--- xorg-server-1.11.4.orig/os/xprintf.c	2012-05-06 10:32:42.472348510 -0700
++++ xorg-server-1.11.4/os/xprintf.c	2012-05-06 11:03:18.057814189 -0700
+@@ -182,6 +182,50 @@
+     return size;
+ }
+ 
++/**
++ * Varargs snprintf that returns the actual number of bytes (excluding final
++ * '\0') that were copied into the buffer.
++ * This is opposed to the normal sprintf() usually returns the number of bytes
++ * that would have been written.
++ *
++ * @param s       buffer to copy into
++ * @param n       size of buffer s
++ * @param format  printf style format string
++ * @param va      variable argument list
++ * @return        number of bytes actually copied, excluding final '\0'
++ */
++int
++Xvscnprintf(char *s, int n, const char *format, va_list args)
++{
++    int x;
++    if (n == 0)
++        return 0;
++    x = vsnprintf(s, n , format, args);
++    return (x >= n) ? (n - 1) : x;
++}
++
++/**
++ * snprintf that returns the actual number of bytes (excluding final '\0') that
++ * were copied into the buffer.
++ * This is opposed to the normal sprintf() usually returns the number of bytes
++ * that would have been written.
++ *
++ * @param s       buffer to copy into
++ * @param n       size of buffer s
++ * @param format  printf style format string
++ * @param ...     arguments for specified format
++ * @return        number of bytes actually copied, excluding final '\0'
++ */
++int Xscnprintf(char *s, int n, const char *format, ...)
++{
++    int x;
++    va_list ap;
++    va_start(ap, format);
++    x = Xvscnprintf(s, n, format, ap);
++    va_end(ap);
++    return x;
++}
++
+ /* Old api, now deprecated, may be removed in the future */
+ char *
+ Xvprintf(const char *format, va_list va)
+Index: xorg-server-1.11.4/hw/xfree86/common/xf86Helper.c
+===================================================================
+--- xorg-server-1.11.4.orig/hw/xfree86/common/xf86Helper.c	2012-05-06 10:32:42.488348731 -0700
++++ xorg-server-1.11.4/hw/xfree86/common/xf86Helper.c	2012-05-06 11:03:18.057814189 -0700
+@@ -1036,25 +1036,13 @@
+ xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,
+ 		va_list args)
+ {
+-    char *tmpFormat;
+-
+     /* Prefix the scrnIndex name to the format string. */
+     if (scrnIndex >= 0 && scrnIndex < xf86NumScreens &&
+-	xf86Screens[scrnIndex]->name) {
+-	tmpFormat = malloc(strlen(format) +
+-			   strlen(xf86Screens[scrnIndex]->name) +
+-			   PREFIX_SIZE + 1);
+-	if (!tmpFormat)
+-	    return;
+-
+-	snprintf(tmpFormat, PREFIX_SIZE + 1, "%s(%d): ",
+-		 xf86Screens[scrnIndex]->name, scrnIndex);
+-
+-	strcat(tmpFormat, format);
+-	LogVMessageVerb(type, verb, tmpFormat, args);
+-	free(tmpFormat);
+-    } else
+-	LogVMessageVerb(type, verb, format, args);
++        xf86Screens[scrnIndex]->name)
++        LogHdrMessageVerb(type, verb, format, args, "%s(%d): ",
++                          xf86Screens[scrnIndex]->name, scrnIndex);
++    else
++        LogVMessageVerb(type, verb, format, args);
+ }
+ #undef PREFIX_SIZE
+ 
+@@ -1087,15 +1075,18 @@
+ xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *format,
+ 		 va_list args)
+ {
+-    char *msg;
++    const char *driverName = NULL;
++    const char *deviceName = NULL;
+ 
+-    if (asprintf(&msg, "%s: %s: %s", dev->drv->driverName, dev->name, format)
+-	== -1) {
+-	LogVMessageVerb(type, verb, "%s", args);
+-    } else {
+-	LogVMessageVerb(type, verb, msg, args);
+-	free(msg);
++    /* Prefix driver and device names to formatted message. */
++    if (dev) {
++        deviceName = dev->name;
++        if (dev->drv)
++            driverName = dev->drv->driverName;
+     }
++
++    LogHdrMessageVerb(type, verb, format, args, "%s: %s: ", driverName,
++                      deviceName);
+ }
+ 
+ /* Print input driver message, with verbose level specified directly */
+Index: xorg-server-1.11.4/include/os.h
+===================================================================
+--- xorg-server-1.11.4.orig/include/os.h	2012-05-06 11:03:17.621808123 -0700
++++ xorg-server-1.11.4/include/os.h	2012-05-06 11:03:29.353971366 -0700
+@@ -514,6 +514,7 @@
+     X_INFO,			/* Informational message */
+     X_NONE,			/* No prefix */
+     X_NOT_IMPLEMENTED,		/* Not implemented */
++    X_DEBUG,            /* Debug message */
+     X_UNKNOWN = -1		/* unknown -- this must always be last */
+ } MessageType;
+ 
+@@ -528,6 +529,20 @@
+ 			   ...) _X_ATTRIBUTE_PRINTF(3,4);
+ extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...)
+ 			_X_ATTRIBUTE_PRINTF(2,3);
++
++extern _X_EXPORT void
++LogVHdrMessageVerb(MessageType type, int verb,
++                   const char *msg_format, va_list msg_args,
++                   const char *hdr_format, va_list hdr_args)
++_X_ATTRIBUTE_PRINTF(3, 0)
++_X_ATTRIBUTE_PRINTF(5, 0);
++extern _X_EXPORT void
++LogHdrMessageVerb(MessageType type, int verb,
++                  const char *msg_format, va_list msg_args,
++                  const char *hdr_format, ...)
++_X_ATTRIBUTE_PRINTF(3, 0)
++_X_ATTRIBUTE_PRINTF(5, 6);
++
+ extern _X_EXPORT void FreeAuditTimer(void);
+ extern _X_EXPORT void AuditF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
+ extern _X_EXPORT void VAuditF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1,0);

diff --git a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
new file mode 100644
index 0000000..df43dbd
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
@@ -0,0 +1,11 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac	2011-10-31 19:40:02.000000000 +0100
++++ b/configure.ac	2011-10-31 19:41:02.372745481 +0100
+@@ -1624,7 +1624,6 @@
+ 		  	linux_alpha=yes
+ 			;;
+ 		  i*86|amd64*|x86_64*|ia64*)
+-			linux_acpi="yes"
+ 			;;
+ 		  *)
+ 			;;

diff --git a/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch b/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch
new file mode 100644
index 0000000..8fedc32
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch
@@ -0,0 +1,35 @@
+Patch by Torsten Kaiser <x11@×××××××××××××.org>
+taken from https://bugs.freedesktop.org/show_bug.cgi?id=45623
+
+diff -ur a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
+--- a/hw/xfree86/modes/xf86EdidModes.c	2012-05-17 19:09:03.000000000 +0200
++++ b/hw/xfree86/modes/xf86EdidModes.c	2012-05-30 01:27:06.000000000 +0200
+@@ -723,7 +723,13 @@
+     1920, 1200, 75, 0}, {
+     1920, 1200, 85, 0}, {
+     1920, 1440, 60, 0}, {
+-1920, 1440, 75, 0},};
++1920, 1440, 75, 0},
++    /* fill up last byte */
++    { 0,0,0,0 },
++    { 0,0,0,0 },
++    { 0,0,0,0 },
++    { 0,0,0,0 },
++};
+ 
+ static DisplayModePtr
+ DDCModesFromEstIII(unsigned char *est)
+@@ -732,10 +738,11 @@
+     int i, j, m;
+ 
+     for (i = 0; i < 6; i++) {
+-        for (j = 7; j > 0; j--) {
++        for (j = 7; j >= 0; j--) {
+             if (est[i] & (1 << j)) {
+                 m = (i * 8) + (7 - j);
+-                modes = xf86ModesAdd(modes,
++                if (EstIIIModes[m].w)
++                        modes = xf86ModesAdd(modes,
+                                      FindDMTMode(EstIIIModes[m].w,
+                                                  EstIIIModes[m].h,
+                                                  EstIIIModes[m].r,

diff --git a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch b/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch
new file mode 100644
index 0000000..2b05967
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch
@@ -0,0 +1,30 @@
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index 74016af..9c296f5 100644
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -1118,7 +1118,23 @@ videoPtrToDriverList(struct pci_device *dev,
+ 	    break;
+ 	case 0x102b:		    driverList[0] = "mga";	break;
+ 	case 0x10c8:		    driverList[0] = "neomagic"; break;
+-	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
++	case 0x10de: case 0x12d2:
++	    switch (dev->device_id) {
++	    /* NV1 */
++	    case 0x0008:
++	    case 0x0009:
++		driverList[0] = "vesa";
++		break;
++	    /* NV3 */
++	    case 0x0018:
++	    case 0x0019:
++		driverList[0] = "nv";
++		break;
++	    default:
++		driverList[0] = "nouveau";
++		break;
++	    }
++	    break;
+ 	case 0x1106:		    driverList[0] = "openchrome"; break;
+         case 0x1b36:		    driverList[0] = "qxl"; break;
+ 	case 0x1163:		    driverList[0] = "rendition"; break;
+-- 

diff --git a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
new file mode 100644
index 0000000..cc80e6c
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
@@ -0,0 +1,31 @@
+From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@××××××.com>
+Date: Wed, 11 Mar 2009 14:02:11 -0400
+Subject: [PATCH] Don't build the ACPI code.
+
+No good can come of this.
+---
+ configure.ac |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 72ae67e..04716f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then
+ 		case $host_cpu in
+ 		  ia64*)
+ 			linux_ia64=yes
+-			linux_acpi="yes"
+ 			;;
+ 		  alpha*)
+ 		  	linux_alpha=yes
+ 			;;
+ 		  i*86|amd64*|x86_64*)
+-			linux_acpi="yes"
+ 			;;
+ 		  *)
+ 			;;
+-- 
+1.6.1.3
+

diff --git a/x11-base/xorg-server/files/xorg-server-glapi_c.patch b/x11-base/xorg-server/files/xorg-server-glapi_c.patch
new file mode 100644
index 0000000..e65a969
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-glapi_c.patch
@@ -0,0 +1,78 @@
+From 17d9e374721d6c8ee3f7f9cdc882f80127bdb57f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@××××××.com>
+Date: Wed, 02 Mar 2011 18:21:39 +0000
+Subject: glx: Lobotomize _glapi_get_proc_address
+
+This isn't a meaningful thing in the indirect glx loader, so just warn
+if it ever happens and move on.
+
+But also, mark it PUBLIC, so if the driver does ever call it we merely
+warn instead of aborting because ld.so can't find the symbol.
+
+Reviewed-by: Dave Airlie <airlied@××××××.com>
+Signed-off-by: Adam Jackson <ajax@××××××.com>
+---
+diff --git a/glx/glapi.c b/glx/glapi.c
+index 1814493..79ff6b1 100644
+--- a/glx/glapi.c
++++ b/glx/glapi.c
+@@ -54,6 +54,7 @@
+ 
+ #include <dix-config.h>
+ #include <X11/Xfuncproto.h>
++#include <os.h>
+ #define PUBLIC _X_EXPORT
+ 
+ #else
+@@ -713,43 +714,15 @@ _glapi_add_dispatch( const char * const * function_names,
+    return offset;
+ }
+ 
+-/**
+- * Return pointer to the named function.  If the function name isn't found
+- * in the name of static functions, try generating a new API entrypoint on
+- * the fly with assembly language.
++/*
++ * glXGetProcAddress doesn't exist in the protocol, the drivers never call
++ * this themselves, and neither does the server.  warn if it happens though.
+  */
+-_glapi_proc
++PUBLIC _glapi_proc
+ _glapi_get_proc_address(const char *funcName)
+ {
+-   struct _glapi_function * entry;
+-   GLuint i;
+-
+-#ifdef MANGLE
+-   if (funcName[0] != 'm' || funcName[1] != 'g' || funcName[2] != 'l')
+-      return NULL;
+-#else
+-   if (funcName[0] != 'g' || funcName[1] != 'l')
+-      return NULL;
+-#endif
+-
+-   /* search extension functions first */
+-   for (i = 0; i < NumExtEntryPoints; i++) {
+-      if (strcmp(ExtEntryTable[i].name, funcName) == 0) {
+-         return ExtEntryTable[i].dispatch_stub;
+-      }
+-   }
+-
+-#if !defined( XFree86Server ) && !defined( XGLServer )
+-   /* search static functions */
+-   {
+-      const _glapi_proc func = get_static_proc_address(funcName);
+-      if (func)
+-         return func;
+-   }
+-#endif /* !defined( XFree86Server ) */
+-
+-   entry = add_function_name(funcName);
+-   return (entry == NULL) ? NULL : entry->dispatch_stub;
++    ErrorF("_glapi_get_proc_address called!\n");
++    return NULL;
+ }
+ 
+ /**
+--
+cgit v0.8.3-6-g21f6

diff --git a/x11-base/xorg-server/files/xorg-sets.conf b/x11-base/xorg-server/files/xorg-sets.conf
new file mode 100644
index 0000000..5cd8112
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-sets.conf
@@ -0,0 +1,6 @@
+# Rebuild all X11 modules (mostly useful after xorg-server ABI change).
+[x11-module-rebuild]
+class = portage.sets.dbapi.VariableSet
+world-candidate = false
+variable = CATEGORY
+includes = x11-drivers

diff --git a/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild b/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
new file mode 100644
index 0000000..7f3be2e
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild,v 1.8 2012/06/21 16:04:50 jer Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DOC=doc
+inherit flag-o-matic xorg-2 multilib versionator
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/1.10"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
+
+RDEPEND=">=app-admin/eselect-opengl-1.0.8
+	dev-libs/openssl
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libpciaccess-0.10.3
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/pixman-0.21.8
+	>=x11-libs/xtrans-1.2.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-1.4
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-4.0.3
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-7.8_rc[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
+	udev? ( >=sys-fs/udev-150 )
+	>=x11-apps/xinit-1.3"
+
+# dmx+doc DEPEND is a hack, a proper solution needs to be implemented in the
+# xorg-2.eclass for next release
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-4.1
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/glproto-1.4.11
+	>=x11-proto/inputproto-1.9.99.902
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.2.99.3
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.1.99
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.17
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.3
+		>=x11-libs/libdrm-2.4.20
+	)"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
+
+#UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-disable-acpi.patch
+	"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
+	"${FILESDIR}"/${PN}-1.11-log-format-fix.patch
+)
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ $(gcc-major-version) -lt 4 ]] && \
+		die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
+}
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	#	--enable-install-setuid needed because sparcs default off
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable tslib)
+		$(use_enable tslib xcalibrate)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontrootdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--disable-config-hal
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+	)
+
+	# Xorg-server requires includes from OS mesa which are not visible for
+	# users of binary drivers.
+	mkdir -p "${T}/mesa-symlinks/GL"
+	for i in gl glx glxmd glxproto glxtokens; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	for i in glext glxext; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	append-cppflags "-I${T}/mesa-symlinks"
+}
+
+src_install() {
+	xorg-2_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-5 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set xorg-x11 --use-old
+
+	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+		elog "You should consider reading upgrade guide for this release:"
+		elog "	http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
+		echo
+		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+		ewarn "because the ABI changed. If you cannot start X because"
+		ewarn "of module version mismatch errors, this is your problem."
+
+		echo
+		ewarn "You can generate a list of all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
+		ewarn "or using sets from portage-2.2:"
+		ewarn "	emerge @x11-module-rebuild"
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
+		local x=""
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
+	fi
+}

diff --git a/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild
new file mode 100644
index 0000000..5e9b866
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild,v 1.8 2012/06/09 18:54:12 armin76 Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DOC=doc
+XORG_EAUTORECONF=yes
+inherit flag-o-matic xorg-2 multilib versionator
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/1.11"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
+
+RDEPEND=">=app-admin/eselect-opengl-1.0.8
+	dev-libs/openssl
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libpciaccess-0.10.3
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/pixman-0.21.8
+	>=x11-libs/xtrans-1.2.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-7.8_rc[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=sys-fs/udev-150 )
+	>=x11-apps/xinit-1.3
+	selinux? ( sec-policy/selinux-xserver )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-5.0
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/glproto-1.4.14
+	>=x11-proto/inputproto-1.9.99.902
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.2.99.3
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.1.99
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.22
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.6
+		>=x11-libs/libdrm-2.4.20
+	)"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
+
+#UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-disable-acpi.patch
+	"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
+	"${FILESDIR}"/${PN}-1.11-disable-tests-without-ddx.patch
+	"${FILESDIR}"/${PN}-1.11-dix-pointerrootwin-send-focusin.patch
+	"${FILESDIR}"/${PN}-1.11-dix-send-focus-events.patch
+	"${FILESDIR}"/${PN}-1.11-log-format-fix.patch
+)
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+		die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
+}
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	#	--enable-install-setuid needed because sparcs default off
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable tslib)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontrootdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--disable-config-hal
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+	)
+
+	# Xorg-server requires includes from OS mesa which are not visible for
+	# users of binary drivers.
+	mkdir -p "${T}/mesa-symlinks/GL"
+	for i in gl glx glxmd glxproto glxtokens; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	for i in glext glxext; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	append-cppflags "-I${T}/mesa-symlinks"
+
+	# Make breakage less obvious, bug #402285.
+	replace-flags -O3 -O2
+}
+
+src_install() {
+	xorg-2_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-5 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set xorg-x11 --use-old
+
+	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+		ewarn "because the ABI changed. If you cannot start X because"
+		ewarn "of module version mismatch errors, this is your problem."
+
+		echo
+		ewarn "You can generate a list of all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
+		ewarn "or using sets from portage-2.2:"
+		ewarn "	emerge @x11-module-rebuild"
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
+		local x=""
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
+	fi
+}

diff --git a/x11-base/xorg-server/xorg-server-1.12.2.ebuild b/x11-base/xorg-server/xorg-server-1.12.2.ebuild
new file mode 100644
index 0000000..d5469ca
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.12.2.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.4 2012/06/24 18:58:40 ago Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DOC=doc
+inherit flag-o-matic xorg-2 multilib versionator
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/1.12"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
+
+RDEPEND=">=app-admin/eselect-opengl-1.0.8
+	dev-libs/openssl
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/pixman-0.21.8
+	>=x11-libs/xtrans-1.2.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-7.8_rc[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=sys-fs/udev-150 )
+	>=x11-apps/xinit-1.3
+	selinux? ( sec-policy/selinux-xserver )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-5.0
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/glproto-1.4.14
+	>=x11-proto/inputproto-2.1.99.3
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.2.99.3
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.1.99
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.22
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.6
+		>=x11-libs/libdrm-2.4.20
+	)"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
+
+#UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
+	"${FILESDIR}"/${PN}-1.12-xf86edidmodes-array-bounds.patch
+)
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+		die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
+}
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	#	--enable-install-setuid needed because sparcs default off
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable tslib)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontrootdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--disable-config-hal
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+	)
+
+	# Xorg-server requires includes from OS mesa which are not visible for
+	# users of binary drivers.
+	mkdir -p "${T}/mesa-symlinks/GL"
+	for i in gl glx glxmd glxproto glxtokens; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	for i in glext glxext; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	append-cppflags "-I${T}/mesa-symlinks"
+}
+
+src_install() {
+	xorg-2_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-8 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set xorg-x11 --use-old
+
+	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+		ewarn "because the ABI changed. If you cannot start X because"
+		ewarn "of module version mismatch errors, this is your problem."
+
+		echo
+		ewarn "You can generate a list of all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
+		ewarn "or using sets from portage-2.2:"
+		ewarn "	emerge @x11-module-rebuild"
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
+		local x=""
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
+	fi
+}

diff --git a/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild b/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
new file mode 100644
index 0000000..cf31691
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild,v 1.7 2012/06/12 11:27:07 chithanh Exp $
+
+EAPI=3
+inherit flag-o-matic xorg-2 multilib versionator
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="X.Org X servers"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"
+RDEPEND=">=app-admin/eselect-opengl-1.0.8
+	dev-libs/openssl
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libpciaccess-0.10.3
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/pixman-0.15.20
+	>=x11-libs/xtrans-1.2.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-1.4
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.5
+		>=x11-libs/libXfixes-4.0.3
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.3
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-7.8_rc[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
+	udev? ( >=sys-fs/udev-150 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-4.1
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/glproto-1.4.11
+	>=x11-proto/inputproto-1.9.99.902
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.2.99.3
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.0.99.3
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.17
+	dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
+	doc? (
+		>=app-doc/doxygen-1.6.1
+		app-text/xmlto
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.3
+		>=x11-libs/libdrm-2.4.20
+	)
+	>=x11-apps/xinit-1.3"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+EPATCH_FORCE="yes"
+EPATCH_SUFFIX="patch"
+
+# These have been sent upstream
+UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+	)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-disable-acpi.patch
+	"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
+	"${FILESDIR}"/xorg-cve-2011-4028+4029.patch
+	)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	use minimal || ensure_a_server_is_building
+
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	#	--enable-install-setuid needed because sparcs default off
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable tslib)
+		$(use_enable tslib xcalibrate)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontrootdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--disable-config-hal
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+		${conf_opts}
+	)
+
+	# Xorg-server requires includes from OS mesa which are not visible for
+	# users of binary drivers.
+	# Due to the limitations of CONFIGURE_OPTIONS, we have to export this
+	mkdir -p "${T}/mesa-symlinks/GL"
+	for i in gl glx glxmd glxproto glxtokens; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	for i in glext glxext; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	append-cppflags "-I${T}/mesa-symlinks"
+
+	# (#121394) Causes window corruption
+	filter-flags -fweb
+
+	# Incompatible with GCC 3.x SSP on x86, bug #244352
+	if use x86 ; then
+		if [[ $(gcc-major-version) -lt 4 ]]; then
+			filter-flags -fstack-protector
+		fi
+	fi
+
+	# Incompatible with GCC 3.x CPP, bug #314615
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
+		ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
+	fi
+
+	# detect if we should inform user about ebuild breakage
+	if ! has_version "x11-base/xorg-server" ||
+			has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
+		INFO="yes"
+	fi
+}
+
+src_install() {
+	xorg-2_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${WORKDIR}"/${P}_build/hw/xfree86/xorg.conf.example \
+			|| die "couldn't install xorg.conf.example"
+	fi
+
+	newinitd "${FILESDIR}"/xdm.initd-3 xdm || die "initd file install failed"
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
+	newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf || die
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set --use-old xorg-x11
+
+	if [[ ${INFO} = yes ]]; then
+		elog "You should consider reading upgrade guide for this release:"
+		elog "	http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
+		echo
+		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+		ewarn "because the ABI changed. If you cannot start X because"
+		ewarn "of module version mismatch errors, this is your problem."
+
+		echo
+		ewarn "You can generate a list of all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if ! has_version x11-base/xorg-server; then
+		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+		fi
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+		local x=""
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
+	fi
+}
+
+ensure_a_server_is_building() {
+	for server in ${IUSE_SERVERS}; do
+		use ${server} && return;
+	done
+	eerror "You need to specify at least one server to build."
+	eerror "Valid servers are: ${IUSE_SERVERS}."
+	die "No servers were specified to build."
+}

diff --git a/x11-libs/cairo/cairo-1.10.2-r1.ebuild b/x11-libs/cairo/cairo-1.10.2-r1.ebuild
new file mode 100644
index 0000000..987746e
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.10.2-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.15 2012/05/05 03:52:25 jdhore Exp $
+
+EAPI=3
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+[[ ${PV} == *9999 ]] && GIT_ECLASS="git"
+
+inherit eutils flag-o-matic autotools ${GIT_ECLASS}
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sys-libs/zlib
+	>=x11-libs/pixman-0.18.4
+	directfb? ( dev-libs/DirectFB )
+	glib? ( dev-libs/glib:2 )
+	opengl? ( virtual/opengl )
+	openvg? ( media-libs/mesa[gallium] )
+	qt4? ( >=x11-libs/qt-gui-4.8:4 )
+	svg? ( dev-libs/libxml2 )
+	X? (
+		>=x11-libs/libXrender-0.6
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXft
+		drm? (
+			>=sys-fs/udev-136
+			gallium? ( media-libs/mesa[gallium] )
+		)
+	)
+	xcb? (
+		x11-libs/libxcb
+		x11-libs/xcb-util
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	doc? (
+		>=dev-util/gtk-doc-1.6
+		~app-text/docbook-xml-dtd-4.2
+	)
+	X? (
+		x11-proto/renderproto
+		drm? (
+			x11-proto/xproto
+			>=x11-proto/xextproto-7.1
+		)
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+	epatch "${FILESDIR}"/${P}-interix.patch
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	# upgraded to an eautoreconf for the above interix patch.
+	eautoreconf
+}
+
+src_configure() {
+	local myopts
+
+	# SuperH doesn't have native atomics yet
+	use sh && myopts+=" --disable-atomic"
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	# tracing fails to compile, because Solaris' libelf doesn't do large files
+	[[ ${CHOST} == *-solaris* ]] && myopts+=" --disable-trace"
+
+	# 128-bits long arithemetic functions are missing
+	[[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=*
+
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
+
+	if use X; then
+		myopts+="
+			--enable-tee=yes
+			$(use_enable drm)
+		"
+
+		if use drm; then
+			myopts+="
+				$(use_enable gallium)
+				$(use_enable xcb xcb-drm)
+			"
+		else
+			use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
+			myopts+="
+				--disable-gallium
+				--disable-xcb-drm
+			"
+		fi
+	else
+		use drm && ewarn "drm use requires X use enabled. So disabling for now."
+		myopts+="
+			--disable-drm
+			--disable-gallium
+			--disable-xcb-drm
+		"
+	fi
+
+	# --disable-xcb-lib:
+	#	do not override good xlib backed by hardforcing rendering over xcb
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable directfb) \
+		$(use_enable glib gobject) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable openvg vg) \
+		$(use_enable opengl gl) \
+		$(use_enable qt4 qt) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+src_install() {
+	# parallel make install fails
+	emake -j1 DESTDIR="${D}" install || die
+	find "${ED}" -name '*.la' -exec rm -f {} +
+	dodoc AUTHORS ChangeLog NEWS README || die
+}

diff --git a/x11-libs/cairo/cairo-1.10.2-r2.ebuild b/x11-libs/cairo/cairo-1.10.2-r2.ebuild
new file mode 100644
index 0000000..f9e0d14
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.10.2-r2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r2.ebuild,v 1.11 2012/05/29 15:45:00 ranger Exp $
+
+EAPI=3
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+[[ ${PV} == *9999 ]] && GIT_ECLASS="git"
+
+inherit eutils flag-o-matic autotools ${GIT_ECLASS}
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sys-libs/zlib
+	>=x11-libs/pixman-0.18.4
+	directfb? ( dev-libs/DirectFB )
+	glib? ( dev-libs/glib:2 )
+	opengl? ( virtual/opengl )
+	openvg? ( media-libs/mesa[gallium] )
+	qt4? ( >=x11-libs/qt-gui-4.8:4 )
+	svg? ( dev-libs/libxml2 )
+	X? (
+		>=x11-libs/libXrender-0.6
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXft
+		drm? (
+			>=sys-fs/udev-136
+			gallium? ( media-libs/mesa[gallium] )
+		)
+	)
+	xcb? (
+		x11-libs/libxcb
+		x11-libs/xcb-util
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	doc? (
+		>=dev-util/gtk-doc-1.6
+		~app-text/docbook-xml-dtd-4.2
+	)
+	X? (
+		x11-proto/renderproto
+		drm? (
+			x11-proto/xproto
+			>=x11-proto/xextproto-7.1
+		)
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+	epatch "${FILESDIR}"/${P}-interix.patch
+	epatch "${FILESDIR}"/${P}-qt-surface.patch
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	# upgraded to an eautoreconf for the above interix patch.
+	eautoreconf
+}
+
+src_configure() {
+	local myopts
+
+	# SuperH doesn't have native atomics yet
+	use sh && myopts+=" --disable-atomic"
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	# tracing fails to compile, because Solaris' libelf doesn't do large files
+	[[ ${CHOST} == *-solaris* ]] && myopts+=" --disable-trace"
+
+	# 128-bits long arithemetic functions are missing
+	[[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=*
+
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
+
+	if use X; then
+		myopts+="
+			--enable-tee=yes
+			$(use_enable drm)
+		"
+
+		if use drm; then
+			myopts+="
+				$(use_enable gallium)
+				$(use_enable xcb xcb-drm)
+			"
+		else
+			use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
+			myopts+="
+				--disable-gallium
+				--disable-xcb-drm
+			"
+		fi
+	else
+		use drm && ewarn "drm use requires X use enabled. So disabling for now."
+		myopts+="
+			--disable-drm
+			--disable-gallium
+			--disable-xcb-drm
+		"
+	fi
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+	# --disable-xcb-lib:
+	#	do not override good xlib backed by hardforcing rendering over xcb
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable directfb) \
+		$(use_enable glib gobject) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable openvg vg) \
+		$(use_enable opengl gl) \
+		$(use_enable qt4 qt) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+src_install() {
+	# parallel make install fails
+	emake -j1 DESTDIR="${D}" install || die
+	find "${ED}" -name '*.la' -exec rm -f {} +
+	dodoc AUTHORS ChangeLog NEWS README || die
+}

diff --git a/x11-libs/cairo/cairo-1.8.10.ebuild b/x11-libs/cairo/cairo-1.8.10.ebuild
new file mode 100644
index 0000000..004278b
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.8.10.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.10.ebuild,v 1.13 2012/05/05 03:52:24 jdhore Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+SRC_URI="http://cairographics.org/releases/${P}.tar.gz
+	mirror://gentoo/${PN}-1.8-lcd_filter.patch.bz2"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="aqua cleartype debug directfb doc lcdfilter opengl +svg X xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2.1.9
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0
+	>=x11-libs/pixman-0.12.0
+	directfb? ( >=dev-libs/DirectFB-0.9.24 )
+	svg? ( dev-libs/libxml2 )
+	X? ( 	>=x11-libs/libXrender-0.6
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXft )
+	xcb? (	>=x11-libs/libxcb-0.92
+		x11-libs/xcb-util )"
+#	test? (
+#	pdf test
+#	x11-libs/pango
+#	>=x11-libs/gtk+-2.0
+#	>=app-text/poppler-bindings-0.9.2[gtk]
+#	ps test
+#	app-text/ghostscript-gpl
+#	svg test
+#	>=x11-libs/gtk+-2.0
+#	>=gnome-base/librsvg-2.15.0
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	doc? (	>=dev-util/gtk-doc-1.6
+		~app-text/docbook-xml-dtd-4.2 )
+	X? ( x11-proto/renderproto )"
+
+src_prepare() {
+	if use lcdfilter; then
+		# LCD filter patch from Ubuntu, taken from:
+		# http://bazaar.launchpad.net/%7Eubuntu-branches/ubuntu/lucid/cairo/lucid/files/head%3A/debian/patches/
+		epatch "${WORKDIR}"/${PN}-1.8-lcd_filter.patch
+	elif use cleartype; then
+		# ClearType-like patches applied by ArchLinux
+		epatch "${FILESDIR}"/${PN}-1.2.4-lcd-cleartype-like.diff
+	fi
+
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	# upgraded to an eautoreconf for the above interix patch.
+	eautoreconf
+}
+
+src_configure() {
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+	# http://bugs.freedesktop.org/show_bug.cgi?id=15463
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
+
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
+
+	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
+		$(use_enable directfb) $(use_enable xcb) \
+		$(use_enable svg) --disable-glitz $(use_enable X xlib-xrender) \
+		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
+		--enable-ft --enable-ps \
+		$(use_enable aqua quartz) $(use_enable aqua quartz-image) \
+		|| die "configure failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	if use xcb; then
+		ewarn "You have enabled the Cairo XCB backend which is used only by"
+		ewarn "a select few apps. The Cairo XCB backend is presently"
+		ewarn "un-maintained and needs a lot of work to get it caught up"
+		ewarn "to the Xrender and Xlib backends, which are the backends used"
+		ewarn "by most applications. See:"
+		ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html"
+	fi
+}

diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
new file mode 100644
index 0000000..950ec36
--- /dev/null
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.19 2012/05/05 03:52:25 jdhore Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+[[ ${PV} == *9999 ]] && GIT_ECLASS="git-2"
+
+inherit eutils flag-o-matic autotools ${GIT_ECLASS}
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sys-libs/zlib
+	>=x11-libs/pixman-0.18.4
+	directfb? ( dev-libs/DirectFB )
+	glib? ( >=dev-libs/glib-2.28.6:2 )
+	opengl? ( virtual/opengl )
+	openvg? ( media-libs/mesa[openvg] )
+	qt4? ( >=x11-libs/qt-gui-4.8:4 )
+	svg? ( dev-libs/libxml2 )
+	X? (
+		>=x11-libs/libXrender-0.6
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXft
+		drm? (
+			>=sys-fs/udev-136
+			gallium? ( media-libs/mesa[gallium] )
+		)
+	)
+	xcb? (
+		x11-libs/libxcb
+		x11-libs/xcb-util
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	doc? (
+		>=dev-util/gtk-doc-1.6
+		~app-text/docbook-xml-dtd-4.2
+	)
+	X? (
+		x11-proto/renderproto
+		drm? (
+			x11-proto/xproto
+			>=x11-proto/xextproto-7.1
+		)
+	)"
+
+# drm module requires X
+# for gallium we need to enable drm
+REQUIRED_USE="
+	drm? ( X )
+	gallium? ( drm )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	# upgraded to an eautoreconf for the above interix patch.
+	eautoreconf
+}
+
+src_configure() {
+	local myopts
+
+	# SuperH doesn't have native atomics yet
+	use sh && myopts+=" --disable-atomic"
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+	# http://bugs.freedesktop.org/show_bug.cgi?id=15463
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
+
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
+
+	use X && myopts+=" --enable-tee=yes"
+
+	# --disable-xcb-lib:
+	#	do not override good xlib backed by hardforcing rendering over xcb
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable directfb) \
+		$(use_enable glib gobject) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable openvg vg) \
+		$(use_enable opengl gl) \
+		$(use_enable qt4 qt) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		$(use_enable drm) \
+		$(use_enable gallium) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+src_install() {
+	# parallel make install fails
+	emake -j1 DESTDIR="${D}" install
+	find "${ED}" -name '*.la' -exec rm -f {} +
+	dodoc AUTHORS ChangeLog NEWS README
+}

diff --git a/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch b/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch
new file mode 100644
index 0000000..a58c2f8
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch
@@ -0,0 +1,17 @@
+http://repos.archlinux.org/wsvn/packages/cairo/trunk/cairo-1.10.0-buggy_gradients.patch
+http://bugs.gentoo.org/336696
+
+--- src/cairo-xlib-display.c
++++ src/cairo-xlib-display.c
+@@ -353,11 +353,7 @@
+     /* Prior to Render 0.10, there is no protocol support for gradients and
+      * we call function stubs instead, which would silently consume the drawing.
+      */
+-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
+     display->buggy_gradients = TRUE;
+-#else
+-    display->buggy_gradients = FALSE;
+-#endif
+     display->buggy_pad_reflect = FALSE;
+     display->buggy_repeat = FALSE;
+ 

diff --git a/x11-libs/cairo/files/cairo-1.10.2-interix.patch b/x11-libs/cairo/files/cairo-1.10.2-interix.patch
new file mode 100644
index 0000000..3333e3e
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.10.2-interix.patch
@@ -0,0 +1,36 @@
+commit 95f6f7a174ca096a3d3dbe84ff220d166d1e2baa
+Author: Uli Schlachter <psychon@×××.in>
+Date:   Fri Oct 22 11:54:57 2010 +0200
+
+    Make both versions of _cairo_lround consistent again
+    
+    Commit c0008242b0f made cairo use libm's lround instead of its own _cairo_lround
+    by default. However, since commit ce58f874 from 2006, _cairo_lround does
+    arithmetic rounding instead of away-from-zero rounding (before said commit, it
+    was using baker's rounding).
+    
+    So to make the rounding of _cairo_lround be independent from
+    DISABLE_SOME_FLOATING_POINT, we have to use another function. Turns out that
+    _cairo_round already does the same thing that _cairo_lround does. Their only
+    difference is the return type.
+    
+    Signed-off-by: Uli Schlachter <psychon@×××.in>
+    Signed-off-by: Chris Wilson <chris@×××××××××××××××.uk>
+
+diff --git a/src/cairoint.h b/src/cairoint.h
+index 53c87e5..539d92e 100644
+--- a/src/cairoint.h
++++ b/src/cairoint.h
+@@ -968,7 +968,11 @@ _cairo_round (double r)
+ cairo_private int
+ _cairo_lround (double d) cairo_const;
+ #else
+-#define _cairo_lround lround
++static inline int cairo_const
++_cairo_lround (double r)
++{
++    return _cairo_round (r);
++}
+ #endif
+ 
+ cairo_private uint16_t

diff --git a/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch b/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch
new file mode 100644
index 0000000..cf0b57a
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch
@@ -0,0 +1,55 @@
+diff -ruN cairo-1.10.2-0-vanilla/src/cairo-qt-surface.cpp cairo-1.10.2/src/cairo-qt-surface.cpp
+--- cairo-1.10.2-0-vanilla/src/cairo-qt-surface.cpp	2010-12-25 15:21:34.000000000 +0100
++++ cairo-1.10.2/src/cairo-qt-surface.cpp	2011-12-20 22:59:30.000000000 +0100
+@@ -61,7 +61,9 @@
+ #include <QtGui/QX11Info>
+ #include <QtCore/QVarLengthArray>
+ 
+-#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT)
++#if (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0))
++#include <QtGui/QGlyphRun>
++#elif (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT)
+ extern void qt_draw_glyphs(QPainter *, const quint32 *glyphs, const QPointF *positions, int count);
+ #endif
+ 
+@@ -1370,7 +1372,39 @@
+ 			       cairo_clip_t *clip,
+ 			       int *remaining_glyphs)
+ {
+-#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT)
++#if (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)) && !defined(QT_NO_RAWFONT)
++    cairo_qt_surface_t *qs = (cairo_qt_surface_t *) abstract_surface;
++
++    // pick out the colour to use from the cairo source
++    cairo_solid_pattern_t *solid = (cairo_solid_pattern_t*) source;
++    // documentation says you have to freeze the cache, but I don't believe it
++    _cairo_scaled_font_freeze_cache(scaled_font);
++
++    QColor tempColour(solid->color.red * 255, solid->color.green * 255, solid->color.blue * 255);
++    QVector<QPointF> positions(num_glyphs);
++    QVector<unsigned int> glyphss(num_glyphs);
++    FT_Face face = cairo_ft_scaled_font_lock_face (scaled_font);
++    const FT_Size_Metrics& ftMetrics = face->size->metrics;
++    QFont font(face->family_name);
++    font.setStyleStrategy(QFont::NoFontMerging);
++    font.setBold(face->style_flags & FT_STYLE_FLAG_BOLD);
++    font.setItalic(face->style_flags & FT_STYLE_FLAG_ITALIC);
++    font.setKerning(face->face_flags & FT_FACE_FLAG_KERNING);
++    font.setPixelSize(ftMetrics.y_ppem);
++    cairo_ft_scaled_font_unlock_face(scaled_font);
++    qs->p->setFont(font);
++    qs->p->setPen(tempColour);
++    for (int currentGlyph = 0; currentGlyph < num_glyphs; currentGlyph++) {
++        positions.append(QPointF(glyphs[currentGlyph].x, glyphs[currentGlyph].y));
++        glyphss.append(glyphs[currentGlyph].index);
++    }
++    QGlyphRun qglyphs;
++    qglyphs.setGlyphIndexes(glyphss);
++    qglyphs.setPositions(positions);
++    qs->p->drawGlyphRun(QPointF(), qglyphs);
++    _cairo_scaled_font_thaw_cache(scaled_font);
++    return CAIRO_INT_STATUS_SUCCESS;
++#elif (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT)
+     cairo_qt_surface_t *qs = (cairo_qt_surface_t *) abstract_surface;
+ 
+     // pick out the colour to use from the cairo source

diff --git a/x11-libs/cairo/files/cairo-1.2.4-lcd-cleartype-like.diff b/x11-libs/cairo/files/cairo-1.2.4-lcd-cleartype-like.diff
new file mode 100644
index 0000000..2f908b8
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.2.4-lcd-cleartype-like.diff
@@ -0,0 +1,275 @@
+diff -rup libcairo-1.2.4.orig/src/cairo-ft-font.c libcairo-1.2.4/src/cairo-ft-font.c
+--- libcairo-1.2.4.orig/src/cairo-ft-font.c	2006-08-22 21:40:02.802247352 +0800
++++ libcairo-1.2.4/src/cairo-ft-font.c	2006-08-22 21:40:39.443677008 +0800
+@@ -53,6 +53,8 @@
+ #include FT_SYNTHESIS_H
+ #endif
+ 
++#define FIR_FILTER 1
++
+ #define DOUBLE_TO_26_6(d) ((FT_F26Dot6)((d) * 64.0))
+ #define DOUBLE_FROM_26_6(t) ((double)(t) / 64.0)
+ #define DOUBLE_TO_16_16(d) ((FT_Fixed)((d) * 65536.0))
+@@ -492,6 +494,8 @@ _cairo_ft_unscaled_font_destroy (void *a
+     }
+ }
+ 
++static const int   fir_filter[5] = { 0x1C, 0x38, 0x55, 0x38, 0x1C };
++
+ static cairo_bool_t
+ _has_unlocked_face (void *entry)
+ {
+@@ -779,7 +783,220 @@ _get_bitmap_surface (FT_Bitmap		     *bi
+ 	    }
+ 	    format = CAIRO_FORMAT_A8;
+ 	    break;
+-	case CAIRO_ANTIALIAS_SUBPIXEL: {
++	case CAIRO_ANTIALIAS_SUBPIXEL:
++#ifdef FIR_FILTER
++	{
++	    unsigned char*  line;
++	    unsigned char*  bufBitmap;
++	    int		    pitch;
++	    unsigned char   *data_rgba;
++	    unsigned int    width_rgba, stride_rgba;
++	    int		    vmul = 1;
++	    int		    hmul = 1;
++
++	    switch (font_options->subpixel_order) {
++	    case CAIRO_SUBPIXEL_ORDER_DEFAULT:
++	    case CAIRO_SUBPIXEL_ORDER_RGB:
++	    case CAIRO_SUBPIXEL_ORDER_BGR:
++	    default:
++		width /= 3;
++		hmul = 3;
++		break;
++	    case CAIRO_SUBPIXEL_ORDER_VRGB:
++	    case CAIRO_SUBPIXEL_ORDER_VBGR:
++		vmul = 3;
++		height /= 3;
++		break;
++	    }
++	    /*
++	     * Filter the glyph to soften the color fringes
++	     */
++	    width_rgba = width;
++	    stride = bitmap->pitch;
++	    stride_rgba = (width_rgba * 4 + 3) & ~3;
++	    data_rgba = calloc (1, stride_rgba * height);
++
++	    /* perform in-place FIR filtering in either the horizontal or
++	     * vertical direction. We're going to modify the RGB graymap,
++	     * but that's ok, because we either own it, or its part of
++	     * the FreeType glyph slot, which will not be used anymore.
++	     */
++	    pitch  = bitmap->pitch;
++	    line   = (unsigned char*)bitmap->buffer;
++	    if ( pitch < 0 )
++		line -= pitch*(height-1);
++
++	    bufBitmap = line;
++
++	    switch (font_options->subpixel_order) {
++	    case CAIRO_SUBPIXEL_ORDER_DEFAULT:
++	    case CAIRO_SUBPIXEL_ORDER_RGB:
++	    case CAIRO_SUBPIXEL_ORDER_BGR:
++	    {
++		int  h;
++
++		for ( h = height; h > 0; h--, line += pitch ) {
++		    int             pix[6] = { 0, 0, 0, 0, 0, 0 };
++		    unsigned char*  p      = line;
++		    unsigned char*  limit  = line + width*3;
++		    int             nn, val, val2;
++
++		    val = p[0];
++		    for (nn = 0; nn < 3; nn++)
++			pix[2 + nn] += val * fir_filter[nn];
++
++		    val = p[1];
++		    for (nn = 0; nn < 4; nn++)
++			pix[1 + nn] += val * fir_filter[nn];
++
++		    p += 2;
++
++		    for ( ; p  < limit; p++ ) {
++			val = p[0];
++			for (nn = 0; nn < 5; nn++)
++			    pix[nn] += val * fir_filter[nn];
++
++			val2  = pix[0] / 256;
++			val2 |= -(val2 >> 8);
++			p[-2]  = (unsigned char)val2;
++
++			for (nn = 0; nn < 5; nn++)
++			    pix[nn] = pix[nn + 1];
++		    }
++		    for (nn = 0; nn < 2; nn++ ) {
++			val2  = pix[nn] / 256;
++			val2 |= -(val2 >> 8);
++			p[nn - 2] = (unsigned char)val2;
++		    }
++		}
++	    }
++	    break;
++	    case CAIRO_SUBPIXEL_ORDER_VRGB:
++	    case CAIRO_SUBPIXEL_ORDER_VBGR:
++	    {
++		int  w;
++
++		for (w = 0; w < width; w++ ) {
++		    int  pix[6] = { 0, 0, 0, 0, 0, 0 };
++		    unsigned char*  p     = bufBitmap + w;
++		    unsigned char*  limit = bufBitmap + w + height*3*pitch;
++		    int             nn, val, val2;
++
++		    val = p[0];
++		    for (nn = 0; nn < 3; nn++)
++			pix[2 + nn] += val*fir_filter[nn];
++
++		    val = p[pitch];
++		    for (nn = 0; nn < 4; nn++ )
++			pix[1 + nn] += val * fir_filter[nn];
++
++		    p += 2*pitch;
++		    for ( ; p < limit; p += pitch ) {
++			val = p[0];
++			for (nn = 0; nn < 5; nn++ )
++			    pix[nn] += val * fir_filter[nn];
++
++			val2  = pix[0] / 256;
++			val2 |= -(val2 >> 8);
++			p[-2 * pitch] = (unsigned char)val2;
++
++			for (nn = 0; nn < 5; nn++)
++			    pix[nn] = pix[nn+1];
++		    }
++
++		    for (nn = 0; nn < 2; nn++) {
++			val2  = pix[nn] / 256;
++			val2 |= -(val2 >> 8);
++			p[(nn - 2) * pitch] = (unsigned char)val2;
++		    }
++		}
++	    }
++	    break;
++	    default:  /* shouldn't happen */
++		break;
++	    }
++
++	    /* now copy the resulting graymap into an ARGB32 image */
++	    {
++		unsigned char*  in_line  = bufBitmap;
++		unsigned char*  out_line = data_rgba;
++		int             h        = height;
++
++		switch (font_options->subpixel_order) {
++		case CAIRO_SUBPIXEL_ORDER_DEFAULT:
++		case CAIRO_SUBPIXEL_ORDER_RGB:
++		    for ( ; h > 0; h--, in_line += pitch, out_line += stride_rgba) {
++			unsigned char*  in  = in_line;
++			int*            out = (int*)out_line;
++			int             w;
++
++			for (w = width; w > 0; w--, in += 3, out += 1) {
++			    int  r = in[0];
++			    int  g = in[1];
++			    int  b = in[2];
++
++			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
++			}
++		    }
++		    break;
++		case CAIRO_SUBPIXEL_ORDER_BGR:
++		    for ( ; h > 0; h--, in_line += pitch, out_line += stride_rgba) {
++			unsigned char*  in  = in_line;
++			int*            out = (int*)out_line;
++			int             w;
++
++			for (w = width; w > 0; w--, in += 3, out += 1) {
++			    int  r = in[2];
++			    int  g = in[1];
++			    int  b = in[0];
++
++			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
++			}
++		    }
++		    break;
++		case CAIRO_SUBPIXEL_ORDER_VRGB:
++		    for ( ; h > 0; h--, in_line += pitch*3, out_line += stride_rgba) {
++			unsigned char*  in  = in_line;
++			int*            out = (int*)out_line;
++			int             w;
++
++			for (w = width; w > 0; w--, in += 1, out += 1) {
++			    int  r = in[0];
++			    int  g = in[pitch];
++			    int  b = in[pitch*2];
++
++			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
++			}
++		    }
++		    break;
++		case CAIRO_SUBPIXEL_ORDER_VBGR:
++		    for ( ; h > 0; h--, in_line += pitch*3, out_line += stride_rgba) {
++			unsigned char*  in  = in_line;
++			int*            out = (int*)out_line;
++			int             w;
++
++			for (w = width; w > 0; w--, in += 1, out += 1) {
++			    int  r = in[2*pitch];
++			    int  g = in[pitch];
++			    int  b = in[0];
++
++			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
++			}
++		    }
++		    break;
++		}
++	    }
++
++	    if (own_buffer)
++		free (bitmap->buffer);
++	    data = data_rgba;
++	    stride = stride_rgba;
++	    format = CAIRO_FORMAT_ARGB32;
++	    subpixel = TRUE;
++	    break;
++	}
++#else /* !FIR_FILTER */
++	{
+ 	    int		    x, y;
+ 	    unsigned char   *in_line, *out_line, *in;
+ 	    unsigned int    *out;
+@@ -871,6 +1088,7 @@ _get_bitmap_surface (FT_Bitmap		     *bi
+ 	    subpixel = TRUE;
+ 	    break;
+ 	}
++#endif /* !FIR_FILTER */
+ 	}
+ 	break;
+     case FT_PIXEL_MODE_GRAY2:
+@@ -986,12 +1204,22 @@ _render_glyph_outline (FT_Face          
+ 		matrix.xx *= 3;
+ 		hmul = 3;
+ 		subpixel = TRUE;
++#ifdef FIR_FILTER
++		cbox.xMin -= 64;
++		cbox.xMax += 64;
++		width    += 2;
++#endif
+ 		break;
+ 	    case CAIRO_SUBPIXEL_ORDER_VRGB:
+ 	    case CAIRO_SUBPIXEL_ORDER_VBGR:
+ 		matrix.yy *= 3;
+ 		vmul = 3;
+ 		subpixel = TRUE;
++#ifdef FIR_FILTER
++		cbox.yMin -= 64;
++		cbox.yMax += 64;
++		height    += 2;
++#endif
+ 		break;
+ 	    }
+ 	    FT_Outline_Transform (outline, &matrix);
+Only in libcairo-1.2.4/src: cairo-ft-font.c.orig

diff --git a/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch b/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch
new file mode 100644
index 0000000..1872367
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.8.10-libpng14.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -161,7 +161,7 @@
+   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
+   if test "x$png_REQUIRES" = x; then
+     # libpng13 is GnuWin32's libpng-1.2.8 :-(
+-    for l in libpng12 libpng13 libpng10 libpng; do
++    for l in libpng14 libpng12 libpng13 libpng10 libpng; do
+       if $PKG_CONFIG --exists $l ; then
+         png_REQUIRES=$l
+         use_png=yes

diff --git a/x11-libs/cairo/files/cairo-1.8.8-interix.patch b/x11-libs/cairo/files/cairo-1.8.8-interix.patch
new file mode 100644
index 0000000..dc20714
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.8.8-interix.patch
@@ -0,0 +1,16 @@
+diff -ru cairo-1.8.8.orig/build/configure.ac.tools cairo-1.8.8/build/configure.ac.tools
+--- cairo-1.8.8.orig/build/configure.ac.tools	2009-09-30 13:36:42 +0200
++++ cairo-1.8.8/build/configure.ac.tools	2009-09-30 13:50:50 +0200
+@@ -21,5 +21,12 @@
+ *) PKGCONFIG_REQUIRES="Requires.private"; ;;
+ esac
+ 
++dnl hmm... on interix, things go really bad with Requires.private, since libpng12
++dnl is missing on the final link commands, so gtk+'s configure checks for cairo
++dnl fail miserably with unresolved symbols to it.
++case "$host_os" in
++interix*) PKGCONFIG_REQUIRES="Requires" ;;
++esac
++
+ AC_SUBST(PKGCONFIG_REQUIRES)
+ 

diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
new file mode 100644
index 0000000..55b2644
--- /dev/null
+++ b/x11-libs/libXmu/Manifest
@@ -0,0 +1,6 @@
+DIST libXmu-1.1.0.tar.bz2 360663 RMD160 e6ca19dfb86a3532faa6e37c8a5cd6edff6a1c62 SHA1 81876a0848070bfc4476a2538fc16898eb6d96cd SHA256 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
+DIST libXmu-1.1.1.tar.bz2 383473 RMD160 9b04624ee16ebd10c07b9554771e18d16d77374f SHA1 3e280aa927d78c05f94db6c7ae606f7ad132b495 SHA256 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
+EBUILD libXmu-1.1.0.ebuild 815 RMD160 795fea1050d7495aeb489ed69988969939d96346 SHA1 8fa7e7d5516685b9d30c4ca7a5ef658f796aa1cc SHA256 d5f30c23e30bf136fab4e2f2e7586c5bee26a958de22af83c800a59c4ae04282
+EBUILD libXmu-1.1.1.ebuild 837 RMD160 a65ef75a363b19da70babae4c5a3de1d63a38e56 SHA1 cc35c618ee207f2343d1a33c050aec49eaa5515b SHA256 007c4ffbcf257572891d98a29dce4b0919293cdab242046cd4b94256c5af0a71
+MISC ChangeLog 8247 RMD160 f19a7cebe2c8681c710fd0d34cd2223c6a1ea34c SHA1 4b7b127633503d475202363484db007330e6f733 SHA256 0582a5a175992a89aa67838036437f813de91a569a8f6ae6857141a1be36d756
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-libs/libXmu/libXmu-1.1.0.ebuild b/x11-libs/libXmu/libXmu-1.1.0.ebuild
new file mode 100644
index 0000000..4ca1d74
--- /dev/null
+++ b/x11-libs/libXmu/libXmu-1.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXmu/libXmu-1.1.0.ebuild,v 1.10 2011/06/22 18:43:31 grobian Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xmu library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc ipv6"
+
+RDEPEND="x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop"
+}

diff --git a/x11-libs/libXmu/libXmu-1.1.1.ebuild b/x11-libs/libXmu/libXmu-1.1.1.ebuild
new file mode 100644
index 0000000..d31535f
--- /dev/null
+++ b/x11-libs/libXmu/libXmu-1.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXmu/libXmu-1.1.1.ebuild,v 1.4 2012/06/24 19:25:44 ago Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xmu library"
+
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+}

diff --git a/x11-libs/libxcb/files/libxcb-1.7-interix.patch b/x11-libs/libxcb/files/libxcb-1.7-interix.patch
new file mode 100644
index 0000000..4317f62
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.7-interix.patch
@@ -0,0 +1,103 @@
+reported upstream: http://lists.freedesktop.org/archives/xcb/2011-June/007095.html
+
+diff -ru libxcb-1.7.orig/configure.ac libxcb-1.7/configure.ac
+--- libxcb-1.7.orig/configure.ac	2011-06-08 09:12:30 +0200
++++ libxcb-1.7/configure.ac	2011-06-08 09:54:49 +0200
+@@ -72,6 +72,8 @@
+ AC_SEARCH_LIBS(getaddrinfo, socket)
+ AC_SEARCH_LIBS(connect, socket)
+ 
++AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE(HAVE_GETADDRINFO, 1, [getaddrinfo() function is available])], )
++
+ case $host_os in
+ linux*)
+ 	AC_DEFINE([HAVE_ABSTRACT_SOCKETS], 1, [Define if your platform supports abstract sockets])
+diff -ru libxcb-1.7.orig/src/xcb_auth.c libxcb-1.7/src/xcb_auth.c
+--- libxcb-1.7.orig/src/xcb_auth.c	2011-06-08 09:12:30 +0200
++++ libxcb-1.7/src/xcb_auth.c	2011-06-08 09:54:49 +0200
+@@ -33,6 +33,12 @@
+ #include <sys/param.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <arpa/inet.h>
++
++#ifdef __INTERIX
++/* _don't_ ask. interix has INADDR_LOOPBACK in here. */
++#include <rpc/types.h>
++#endif
+ 
+ #include "xcb.h"
+ #include "xcbint.h"
+diff -ru libxcb-1.7.orig/src/xcb_util.c libxcb-1.7/src/xcb_util.c
+--- libxcb-1.7.orig/src/xcb_util.c	2011-06-08 09:12:30 +0200
++++ libxcb-1.7/src/xcb_util.c	2011-06-08 09:56:23 +0200
+@@ -44,6 +44,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <string.h>
++#include <arpa/inet.h>
+ 
+ #include "xcb.h"
+ #include "xcbext.h"
+@@ -281,10 +282,12 @@
+ static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short port)
+ {
+     int fd = -1;
++#if HAVE_GETADDRINFO
+     struct addrinfo hints;
+     char service[6]; /* "65535" with the trailing '\0' */
+     struct addrinfo *results, *addr;
+     char *bracket;
++#endif
+ 
+     if (protocol && strcmp("tcp",protocol) && strcmp("inet",protocol)
+ #ifdef AF_INET6
+@@ -296,6 +299,7 @@
+     if (*host == '\0')
+ 	host = "localhost";
+ 
++#if HAVE_GETADDRINFO
+     memset(&hints, 0, sizeof(hints));
+ #ifdef AI_ADDRCONFIG
+     hints.ai_flags |= AI_ADDRCONFIG;
+@@ -338,6 +342,40 @@
+     }
+     freeaddrinfo(results);
+     return fd;
++#else
++    {
++        struct hostent* _h;
++        struct sockaddr_in _s;
++        struct in_addr ** _c;
++
++        if((_h = gethostbyname(host)) == NULL)
++            return -1;
++
++        _c = (struct in_addr**)_h->h_addr_list;
++        fd = -1;
++
++        while(*_c) {
++            _s.sin_family = AF_INET;
++            _s.sin_port = htons(port);
++            _s.sin_addr = *(*_c);
++
++            fd = _xcb_socket(_s.sin_family, SOCK_STREAM, 0);
++            if(fd >= 0) {
++                int on = 1;
++                setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
++                setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
++
++                if(connect(fd, (struct sockaddr*)&_s, sizeof(_s)) >= 0)
++                    break;
++                close(fd);
++                fd = -1;
++            }
++            ++_c;
++        }
++
++        return fd;
++    }
++#endif
+ }
+ 
+ static int _xcb_open_unix(char *protocol, const char *file)

diff --git a/x11-libs/libxcb/files/libxcb-1.8-waitall-hang.patch b/x11-libs/libxcb/files/libxcb-1.8-waitall-hang.patch
new file mode 100644
index 0000000..ef929cf
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.8-waitall-hang.patch
@@ -0,0 +1,54 @@
+From 2b5bc1d3299510e10a1733e5a3b326232c774b75 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@××××××.org>
+Date: Thu, 9 Feb 2012 23:54:55 +0100
+Subject: [PATCH] Stop using recv(MSG_WAITALL)
+
+In one case we don't actually want to fill up our buffer.  In the other
+one we're looping over the recv() until we have all the data.
+
+Debian bug#659104
+
+Reported-by: Christoph Egger <christoph@××××××.org>
+Signed-off-by: Julien Cristau <jcristau@××××××.org>
+---
+ src/xcb_in.c |   10 +++-------
+ 1 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/src/xcb_in.c b/src/xcb_in.c
+index 969cfc0..4d8d691 100644
+--- a/src/xcb_in.c
++++ b/src/xcb_in.c
+@@ -51,11 +51,6 @@
+ #define XCB_REPLY 1
+ #define XCB_XGE_EVENT 35
+ 
+-/* required for compiling for Win32 using MinGW */
+-#ifndef MSG_WAITALL
+-#define MSG_WAITALL 0
+-#endif
+-
+ struct event_list {
+     xcb_generic_event_t *event;
+     struct event_list *next;
+@@ -269,7 +264,7 @@ static int read_block(const int fd, void *buf, const ssize_t len)
+     int done = 0;
+     while(done < len)
+     {
+-        int ret = recv(fd, ((char *) buf) + done, len - done,MSG_WAITALL);
++        int ret = recv(fd, ((char *) buf) + done, len - done, 0);
+         if(ret > 0)
+             done += ret;
+ #ifndef _WIN32
+@@ -661,7 +656,8 @@ void _xcb_in_replies_done(xcb_connection_t *c)
+ 
+ int _xcb_in_read(xcb_connection_t *c)
+ {
+-    int n = recv(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len,MSG_WAITALL);
++    int n = recv(c->fd, c->in.queue + c->in.queue_len,
++		 sizeof(c->in.queue) - c->in.queue_len, 0);
+     if(n > 0)
+         c->in.queue_len += n;
+     while(read_packet(c))
+-- 
+1.7.2.5
+

diff --git a/x11-libs/libxcb/files/xcb-rebuilder.sh b/x11-libs/libxcb/files/xcb-rebuilder.sh
new file mode 100755
index 0000000..f5be0c1
--- /dev/null
+++ b/x11-libs/libxcb/files/xcb-rebuilder.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# To use something besides `emerge` to install packages, set
+# XCB_REBUILDER_INSTALL to that binary.
+
+. /etc/init.d/functions.sh
+
+case ${1} in
+	'') ;;
+	*)
+		einfo 'Rebuilds broken packages from the XCB library renaming'
+		einfo
+		einfo 'To use something besides `emerge`, set the INSTALL variable to their binary.'
+		exit 1
+		;;
+esac
+
+if ! type -p qfile >/dev/null; then
+	einfo "Please install app-portage/portage-utils."
+	exit 1
+fi
+
+if ! type -p scanelf >/dev/null; then
+	einfo "Please install app-misc/pax-utils."
+	exit 1
+fi
+
+einfo "Fixing broken libtool archives (.la)"
+for i in $(qlist -a | grep "\.la$"); do
+	sed -i \
+		-e "s:[^[:space:]]*xcb-xlib[^[:space:]]*::g" \
+		"${i}" 2>/dev/null
+done
+
+einfo "Scanning for libraries requiring libxcb-xlib.so..."
+for i in $(qlist -a | grep "\.so$"); do
+	scanelf -n $i \
+	| grep -q xcb-xlib \
+	&& XCB_LIBS="${XCB_LIBS} ${i}"
+done
+
+if [[ -n ${XCB_LIBS} ]]; then
+	einfo "Broken libraries:"
+	for lib in ${XCB_LIBS}; do
+		echo "  ${lib}"
+	done
+	ebegin "Scanning for packages installing broken libraries"
+	XCB_PACKAGES=$(qfile -qC ${XCB_LIBS} | sort | uniq)
+	eend 0
+else
+	einfo "No broken libraries detected"
+	exit 0
+fi
+
+
+einfo "Broken packages:"
+for pkg in ${XCB_PACKAGES}; do
+	echo "  ${pkg}"
+done
+
+echo
+ewarn "Please read the libxcb upgrade guide for further instructions"
+ewarn "http://www.gentoo.org/proj/en/desktop/x/x11/libxcb-1.4-upgrade-guide.xml"
+
+#
+#ebegin "Rebuilding broken packages"
+#${XCB_REBUILDER_INSTALL:-emerge -1} ${XCB_PACKAGES}
+#eend $?

diff --git a/x11-libs/libxcb/libxcb-1.7.ebuild b/x11-libs/libxcb/libxcb-1.7.ebuild
new file mode 100644
index 0000000..6806d56
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.7.ebuild,v 1.14 2012/02/08 23:49:11 chithanh Exp $
+
+EAPI=3
+
+XORG_EAUTORECONF=yes
+inherit python xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc selinux"
+
+RDEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	dev-libs/libpthread-stubs"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-libs/libxslt
+	=dev-lang/python-2*[xml]
+	>=x11-proto/xcb-proto-1.6"
+
+	PATCHES=( "${FILESDIR}/${P}-interix.patch" )
+
+pkg_setup() {
+	python_set_active_version 2
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc build-docs)
+		$(use_enable selinux)
+		--enable-xinput
+	)
+}

diff --git a/x11-libs/libxcb/libxcb-1.8-r1.ebuild b/x11-libs/libxcb/libxcb-1.8-r1.ebuild
new file mode 100644
index 0000000..512d304
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.8-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.8-r1.ebuild,v 1.1 2012/03/03 12:19:25 chithanh Exp $
+
+EAPI=3
+
+inherit python xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc selinux"
+
+RDEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	dev-libs/libpthread-stubs"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-libs/libxslt
+	=dev-lang/python-2*[xml]
+	>=x11-proto/xcb-proto-1.7"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8-waitall-hang.patch
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc build-docs)
+		$(use_enable selinux)
+		--enable-xinput
+	)
+}

diff --git a/x11-libs/libxcb/libxcb-1.8.ebuild b/x11-libs/libxcb/libxcb-1.8.ebuild
new file mode 100644
index 0000000..75a5a12
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.8.ebuild,v 1.3 2012/02/08 23:49:11 chithanh Exp $
+
+EAPI=3
+
+inherit python xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc selinux"
+
+RDEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	dev-libs/libpthread-stubs"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-libs/libxslt
+	=dev-lang/python-2*[xml]
+	>=x11-proto/xcb-proto-1.7"
+
+pkg_setup() {
+	python_set_active_version 2
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc build-docs)
+		$(use_enable selinux)
+		--enable-xinput
+	)
+}

diff --git a/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch b/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch
new file mode 100644
index 0000000..612d0b1
--- /dev/null
+++ b/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch
@@ -0,0 +1,14 @@
+Do not build tests unless required.
+
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=226257
+--- a/test/Makefile.am	2009-04-03 16:56:51.000000000 +0200
++++ b/test/Makefile.am	2009-07-26 12:08:44.855802976 +0200
+@@ -16,7 +16,7 @@
+ 	test-launcher-xcb			\
+ 	test-watch-xmessages-xcb
+ 
+-noinst_PROGRAMS=$(XLIB_TEST) $(XCB_TEST)
++check_PROGRAMS=$(XLIB_TEST) $(XCB_TEST)
+ 
+ test_launcher_SOURCES= test-launcher.c
+ 

diff --git a/x11-libs/xcb-util/xcb-util-0.3.6.ebuild b/x11-libs/xcb-util/xcb-util-0.3.6.ebuild
new file mode 100644
index 0000000..39f90c0
--- /dev/null
+++ b/x11-libs/xcb-util/xcb-util-0.3.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/xcb-util-0.3.6.ebuild,v 1.11 2012/05/05 03:52:23 jdhore Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.4"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	virtual/pkgconfig
+	>=x11-proto/xproto-7.0.8
+	>=x11-proto/xcb-proto-1.5
+	test? ( >=dev-libs/check-0.9.4 )"
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+
+	echo
+	ewarn "Library names have changed since earlier versions of xcb-util;"
+	ewarn "you must rebuild packages that have linked against <xcb-util-0.3.0."
+	einfo "Using 'revdep-rebuild' from app-portage/gentoolkit is highly"
+	einfo "recommended."
+	epause 5
+}