[gentoo-commits] dev/axs:master commit in: media-video/gxine/, net-analyzer/symon/files/, app-arch/rpm/, ...

[Ian Stakenvicius]

commit:     9f1885224435d8bda6a6838fa8675d302c7f7841
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 29 02:12:57 2012 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 02:12:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/axs.git;a=commit;h=9f188522

Synced with tree 2012-06-29 ~00:00UTC
initial support for xorg-server (to handle x11-drivers rebuilds)
contains slotmove updates to portage db
INSTALL sys-apps/portage-9999 BEFORE ADDING THIS OVERLAY

---
 app-arch/rpm/Manifest                              |   29 +
 app-arch/rpm/files/remaining-5.3.5.txt             |   44 ++
 app-arch/rpm/files/rpm-4.4.6-autotools.patch       |   22 +
 app-arch/rpm/files/rpm-4.4.6-buffer-overflow.patch |   95 +++
 .../rpm/files/rpm-4.4.6-fix-cflags-stripping.patch |   14 +
 app-arch/rpm/files/rpm-4.4.6-neon-0.28.patch       |   63 ++
 .../rpm/files/rpm-4.4.6-qa-fix-undefined.patch     |   21 +
 app-arch/rpm/files/rpm-4.4.6-stupidness.patch      |  164 ++++++
 app-arch/rpm/files/rpm-4.4.6-with-sqlite.patch     |   20 +
 app-arch/rpm/files/rpm-4.4.7-have-locale-h.patch   |   11 +
 .../rpm/files/rpm-4.4.7-qa-fix-undefined.patch     |   33 +
 ...rpm-4.4.7-qa-implicit-function-to-pointer.patch |   14 +
 app-arch/rpm/files/rpm-4.4.7-stupidness.patch      |  171 ++++++
 app-arch/rpm/files/rpm-4.8.1-autotools.patch       |   32 +
 app-arch/rpm/files/rpm-4.8.1-db-path.patch         |   26 +
 app-arch/rpm/files/rpm-4.9.1.2-libdir.patch        |   31 +
 app-arch/rpm/rpm-4.10.0.ebuild                     |  118 ++++
 app-arch/rpm/rpm-4.4.6-r7.ebuild                   |  114 ++++
 app-arch/rpm/rpm-4.9.1.2.ebuild                    |  113 ++++
 app-arch/rpm/rpm-4.9.1.3.ebuild                    |  118 ++++
 app-arch/rpm/rpm-5.1.6.ebuild                      |  112 ++++
 app-arch/rpm/rpm-5.3.5.ebuild                      |  211 +++++++
 app-editors/XML-XSH2/Manifest                      |   14 +
 app-editors/XML-XSH2/XML-XSH2-2.0.2.ebuild         |   21 +
 app-editors/XML-XSH2/XML-XSH2-2.1.1.ebuild         |   26 +
 app-editors/XML-XSH2/XML-XSH2-2.1.2.ebuild         |   33 +
 app-editors/XML-XSH2/XML-XSH2-2.1.3.ebuild         |   33 +
 app-editors/XML-XSH2/XML-XSH2-2.1.5.ebuild         |   33 +
 app-editors/XML-XSH2/XML-XSH2-2.1.6.ebuild         |   33 +
 app-editors/padre/Manifest                         |    8 +
 app-editors/padre/padre-0.920.0.ebuild             |  108 ++++
 app-editors/padre/padre-0.940.0.ebuild             |  107 ++++
 app-editors/padre/padre-0.960.0.ebuild             |  107 ++++
 app-misc/g15daemon/Manifest                        |   13 +
 app-misc/g15daemon/files/20g15daemon               |   15 +
 app-misc/g15daemon/files/99-g15daemon.rules        |    1 +
 app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd  |   41 ++
 app-misc/g15daemon/files/g15daemon-1.2.7.confd     |    9 +
 .../g15daemon-1.9.5.3-forgotten-open-mode.patch    |   11 +
 .../files/g15daemon-1.9.5.3-overflow-fix.patch     |   11 +
 app-misc/g15daemon/files/g15daemon-hotplug         |   15 +
 app-misc/g15daemon/files/g15daemon.conf            |   27 +
 app-misc/g15daemon/g15daemon-1.9.5.3-r3.ebuild     |  167 ++++++
 app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild     |  177 ++++++
 dev-libs/libyaml/Manifest                          |    4 +-
 dev-libs/libyaml/libyaml-0.1.4.ebuild              |   10 +-
 .../Astro-FITS-Header-3.50.0.ebuild                |   22 +
 dev-perl/Astro-FITS-Header/Manifest                |    4 +-
 .../Cache-Memcached-Fast-0.190.0.ebuild            |   19 +
 dev-perl/Cache-Memcached-Fast/Manifest             |    4 +-
 .../Cache-Memcached/Cache-Memcached-1.300.0.ebuild |   21 +
 dev-perl/Cache-Memcached/Manifest                  |    4 +-
 dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild |    4 +-
 dev-perl/Encode-Locale/Manifest                    |    4 +-
 dev-perl/File-Listing/File-Listing-6.40.0.ebuild   |    4 +-
 dev-perl/File-Listing/Manifest                     |    4 +-
 dev-perl/HTML-Tree/HTML-Tree-5.20.0.ebuild         |   28 +
 dev-perl/HTML-Tree/Manifest                        |    4 +-
 dev-perl/Moo/Manifest                              |    4 +-
 dev-perl/Moo/Moo-0.91.11.ebuild                    |   30 +
 dev-perl/Net-HTTP/Manifest                         |    4 +-
 dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild           |    4 +-
 dev-perl/Net-Twitter/Manifest                      |    4 +-
 dev-perl/Net-Twitter/Net-Twitter-3.180.30.ebuild   |   41 ++
 dev-perl/XML-DT/Manifest                           |    4 +-
 dev-perl/XML-DT/XML-DT-0.620.0.ebuild              |   30 +
 dev-perl/XML-Simple/Manifest                       |    4 +-
 dev-perl/XML-Simple/XML-Simple-2.200.0.ebuild      |   24 +
 dev-vcs/gitolite-gentoo/Manifest                   |   11 +
 .../gitolite-gentoo-2.2-gl-system-setup-exit.patch |   47 ++
 .../gitolite-gentoo/gitolite-gentoo-2.1.0.ebuild   |   71 +++
 dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild |   76 +++
 .../gitolite-gentoo/gitolite-gentoo-2.3.1.ebuild   |   77 +++
 dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.ebuild |   77 +++
 dev-vcs/gitolite/Manifest                          |   13 +
 .../files/gitolite-2.2-gl-system-setup-exit.patch  |   47 ++
 dev-vcs/gitolite/gitolite-2.1.0.ebuild             |   67 +++
 dev-vcs/gitolite/gitolite-2.2.ebuild               |   72 +++
 dev-vcs/gitolite/gitolite-2.3.1.ebuild             |   73 +++
 dev-vcs/gitolite/gitolite-2.3.ebuild               |   73 +++
 dev-vcs/gitolite/gitolite-3.03.ebuild              |   90 +++
 eclass/vdr-plugin-2.eclass.~1~                     |  614 --------------------
 mail-filter/spamassassin/Manifest                  |   10 +
 mail-filter/spamassassin/files/3.0.0-spamd.conf    |   46 ++
 mail-filter/spamassassin/files/3.3.1-spamd.init    |   46 ++
 mail-filter/spamassassin/files/secrets.cf          |   14 +
 .../files/spamassassin-3.3.2-binary_token.patch    |   13 +
 .../files/spamassassin-3.3.2-innodb.patch          |  114 ++++
 .../spamassassin-3.3.2-mysql_count_rows.patch      |   88 +++
 .../spamassassin/spamassassin-3.3.2-r1.ebuild      |  218 +++++++
 media-gfx/freewrl/Manifest                         |    4 +-
 media-gfx/freewrl/freewrl-1.22.13.ebuild           |    2 +-
 media-libs/ming/Manifest                           |   10 +
 media-libs/ming/files/ming-0.4.3-libpng-1.5.patch  |   48 ++
 media-libs/ming/files/ming-0.4.3-perl-5.14.patch   |   43 ++
 media-libs/ming/files/ming-0.4.4-vasprintf.patch   |  266 +++++++++
 media-libs/ming/ming-0.4.3-r1.ebuild               |  118 ++++
 media-libs/ming/ming-0.4.3-r2.ebuild               |  119 ++++
 media-libs/ming/ming-0.4.4.ebuild                  |  117 ++++
 media-video/gxine/{Manifest => .#Manifest.1.181}   |    0
 ...e-0.5.907.ebuild => .#gxine-0.5.907.ebuild.1.6} |    4 +-
 media-video/gxine/Manifest                         |    4 +-
 media-video/gxine/gxine-0.5.907.ebuild             |    6 +-
 metadata/layout.conf                               |    1 +
 net-analyzer/symon/Manifest                        |   10 +
 net-analyzer/symon/files/symon-init.d              |   31 +
 net-analyzer/symon/files/symon.conf                |   14 +
 net-analyzer/symon/files/symux-init.d              |   31 +
 net-analyzer/symon/files/symux.conf                |   35 ++
 net-analyzer/symon/symon-2.84.ebuild               |  108 ++++
 net-analyzer/symon/symon-2.85.ebuild               |  108 ++++
 net-irc/atheme-services/Manifest                   |   13 +
 .../atheme-services/atheme-services-6.0.10.ebuild  |  105 ++++
 .../atheme-services/atheme-services-6.0.11.ebuild  |  105 ++++
 .../atheme-services/atheme-services-7.0.1.ebuild   |  109 ++++
 .../atheme-services/atheme-services-7.0.2.ebuild   |  109 ++++
 .../atheme-services/atheme-services-9999.ebuild    |  120 ++++
 .../atheme-services-6.0.8-configure-disable.patch  |  116 ++++
 .../atheme-services/files/atheme-services.initd    |   37 ++
 net-irc/irssi/Manifest                             |    6 +
 net-irc/irssi/irssi-0.8.15-r1.ebuild               |   58 ++
 net-irc/irssi/irssi-0.8.15.ebuild                  |   58 ++
 net-irc/irssi/irssi-9999.ebuild                    |   61 ++
 net-mail/mhonarc-gentoo/Manifest                   |    5 +
 .../mhonarc-gentoo-2.6.18-archives-gentoo.patch    |  197 +++++++
 .../mhonarc-gentoo/mhonarc-gentoo-2.6.18.ebuild    |   30 +
 net-print/cups-filters/Manifest                    |    8 +
 net-print/cups-filters/cups-filters-1.0.17.ebuild  |   46 ++
 net-print/cups-filters/cups-filters-1.0.18.ebuild  |   46 ++
 net-print/cups-filters/cups-filters-9999.ebuild    |   81 +++
 .../files/cups-filters-1.0.11-makefiles.patch      |  184 ++++++
 perl-core/Module-Build/Manifest                    |    4 +-
 .../Module-Build/Module-Build-0.400.100.ebuild     |   31 +
 profiles/updates/1Q-2099                           |   15 +
 sci-biology/GBrowse/GBrowse-2.44-r1.ebuild         |   72 +++
 sci-biology/GBrowse/GBrowse-2.48.ebuild            |   72 +++
 sci-biology/GBrowse/Manifest                       |    7 +
 .../GBrowse/files/GBrowseInstall.pm-2.39.patch     |   72 +++
 sci-chemistry/openbabel-perl/Manifest              |    9 +
 .../files/openbabel-perl-2.3.0-makefile.patch      |   28 +
 .../files/openbabel-perl-2.3.0-swig.patch          |   25 +
 .../files/openbabel-perl-2.3.1-makefile.patch      |    9 +
 .../openbabel-perl/openbabel-perl-2.3.0.ebuild     |   70 +++
 .../openbabel-perl/openbabel-perl-2.3.1.ebuild     |   67 +++
 sci-libs/gdal/Manifest                             |   19 +
 sci-libs/gdal/files/1.7.2-ruby_cflags.patch        |   35 ++
 sci-libs/gdal/files/gdal-1.4.2-datadir.patch       |   11 +
 sci-libs/gdal/files/gdal-1.5.0-install_name.patch  |   45 ++
 sci-libs/gdal/files/gdal-1.5.0-soname.patch        |   13 +
 .../gdal/files/gdal-1.5.1-python-install.patch     |   14 +
 sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch      |   20 +
 sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch     |   35 ++
 sci-libs/gdal/files/gdal-1.6.3-libpng15.patch      |   40 ++
 .../gdal/files/gdal-1.8.1-zlib_header_fix.patch    |   13 +
 sci-libs/gdal/files/gdal-1.9.1-opencl.patch        |   27 +
 sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch |   43 ++
 sci-libs/gdal/gdal-1.6.3-r1.ebuild                 |  236 ++++++++
 sci-libs/gdal/gdal-1.8.1-r1.ebuild                 |  268 +++++++++
 sci-libs/gdal/gdal-1.9.1.ebuild                    |  315 ++++++++++
 sci-libs/linux-gpib/Manifest                       |    7 +
 .../linux-gpib/files/linux-gpib-3.2.15-build.patch |   44 ++
 .../linux-gpib/files/linux-gpib-3.2.16-perl.patch  |    9 +
 sci-libs/linux-gpib/linux-gpib-3.2.16-r1.ebuild    |  172 ++++++
 sys-cluster/slurm/Manifest                         |    9 +
 sys-cluster/slurm/files/logrotate                  |   20 +
 sys-cluster/slurm/files/slurm.confd                |    6 +
 sys-cluster/slurm/files/slurmctld.initd            |   69 +++
 sys-cluster/slurm/files/slurmd.initd               |   72 +++
 sys-cluster/slurm/files/slurmdbd.initd             |   67 +++
 sys-cluster/slurm/slurm-2.3.4.ebuild               |  224 +++++++
 x11-base/xorg-server/Manifest                      |    4 +-
 x11-base/xorg-server/xorg-server-1.12.2.ebuild     |    5 +-
 x11-libs/cairo/Manifest                            |    6 +-
 x11-libs/cairo/cairo-1.12.0.ebuild                 |    4 +-
 x11-libs/cairo/cairo-1.12.2.ebuild                 |    4 +-
 x11-libs/cairo/cairo-9999.ebuild                   |    6 +-
 x11-libs/libXmu/Manifest                           |    4 +-
 x11-libs/libXmu/libXmu-1.1.1.ebuild                |    4 +-
 x11-libs/libxcb/Manifest                           |    4 +-
 x11-libs/libxcb/libxcb-1.8.1.ebuild                |    4 +-
 x11-libs/xcb-util/Manifest                         |    4 +-
 x11-libs/xcb-util/xcb-util-0.3.9.ebuild            |    5 +-
 182 files changed, 9089 insertions(+), 680 deletions(-)

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
new file mode 100644
index 0000000..3ade304
--- /dev/null
+++ b/app-arch/rpm/Manifest
@@ -0,0 +1,29 @@
+AUX remaining-5.3.5.txt 2521 RMD160 849a98a5cc676e49d72a54b8005ce03ca09e9827 SHA1 abe36cfdbb357571ed263288c7deec30d6538c35 SHA256 6c3a4ac2bf1d293821246d822b973f1a3b1dee7f66d2695243c639dc27d6bff4
+AUX rpm-4.4.6-autotools.patch 660 RMD160 63155d3737ffdf9927b1763ddf068c5964e168c9 SHA1 70dd2346df0e5d95ec4a06587485381b48d52b81 SHA256 dd4828899e760358b702d0c2ca75e781619f7b65140cf2cc5600ea687a085569
+AUX rpm-4.4.6-buffer-overflow.patch 1952 RMD160 468c71731ec6893de165b4e1047f85f5b240f2f7 SHA1 dc41417f4064eb9476de9ef51e616042e55e5f73 SHA256 6ae715632dabd6cc6c24a92312ac22c1bd57235ff2f027f68943df68dcfc957b
+AUX rpm-4.4.6-fix-cflags-stripping.patch 594 RMD160 a13c8d5d98ef6820bf41e6b4cbfe6f9d06545e8a SHA1 1f88f28a7a4df450768447087189c48bfc3fdefa SHA256 d1138a2b80797da7244ff1917178c104b56926f38708b0149be57f06e99233da
+AUX rpm-4.4.6-neon-0.28.patch 2393 RMD160 7cc24ef31e46682bffa57721e18299c4a9b74637 SHA1 14dd947d44150caa89b58991ed7dbdd358152c3e SHA256 e7b9c177a4ff8027f731ae54b2d6a836ea7be3e6eca92b704dbe30b33b8166c4
+AUX rpm-4.4.6-qa-fix-undefined.patch 553 RMD160 647b19a10c86850873d65b5a65c2530d5a44ed54 SHA1 75e1bb924ed57f3b0ef7776551c3d782a9121904 SHA256 1c72bb60b4c9af6b0c366debe7276f948308e777ff6fef090bb778d9bc724a06
+AUX rpm-4.4.6-stupidness.patch 4992 RMD160 d8f0e831599a72e6224e19a568fffadd999ebc4a SHA1 317f19c9f181ca2cd40d832536c458884bb5b279 SHA256 84af6ddab50982e15df90d2c7895ecd0f0b568caa6cd0af57ce33e1af784b4a7
+AUX rpm-4.4.6-with-sqlite.patch 517 RMD160 0af724f63b528aabd05f4bcf2d4c4830ebdf98d2 SHA1 0a22207c6bd4114aef4cc9cdca840e996fcf0297 SHA256 c84020fd6402c4d9bfddb554f251b4ac13c6ca151689070a7471e66c8f7bb6ac
+AUX rpm-4.4.7-have-locale-h.patch 440 RMD160 dc9a56049a5fb37bbf8efa09d1cb389f21b0d03d SHA1 fddf3bd74e8213cc16f93fa37b19d9e632cd7e48 SHA256 0c5f4745f332688f59b867fc035d55c20d3e5a2ba4077e0bdf325a9277f33b5f
+AUX rpm-4.4.7-qa-fix-undefined.patch 776 RMD160 895ab185d15c94890ed8f2a34bf4f6b54c8bfb61 SHA1 d16d4a491625d304e96ba85fda982011c9d6d946 SHA256 87a444e00328cd6d78391acdf58ac3ab57fa161241c944df173ac14b2cb025a4
+AUX rpm-4.4.7-qa-implicit-function-to-pointer.patch 604 RMD160 f87086379c28fa878c94dbcd6855af82ee852caf SHA1 61079e3109a41c639015f312603ea43ae49a5bb7 SHA256 a8f12898b8ddba5d7dcc70c1128a2b27dd729c7fe2247450cca068bfa68f1d65
+AUX rpm-4.4.7-stupidness.patch 5268 RMD160 631f1bf3dc4553e27dec4a901fa84e17ffc7c7c9 SHA1 e957a9a549fa1ec52b449b1e8fc3ea14af7b7a09 SHA256 e563657e648e9b5ecfc0a653d7515f93db7785ec6867c81591663213965c0850
+AUX rpm-4.8.1-autotools.patch 929 RMD160 9b4b1b08e38f79522a5b1e6ab487ed89b8234add SHA1 f20c1d98d325efa64f54b046cda6a8b5d4463da4 SHA256 2280de624d171399bb48dd4ae9144063ae4ab17f87e57313ba664a234a90e512
+AUX rpm-4.8.1-db-path.patch 628 RMD160 cee347c45bbbebd724dd1346bd74b3344b6a7d06 SHA1 08c3aa65104db74c9851911970711b2f503dfcc8 SHA256 791682c72dd3a24e5e8268bfa967412035aa135c7b8d4673541bed129b89a0f3
+AUX rpm-4.9.1.2-libdir.patch 1056 RMD160 f9407d89f097a746947b7817f095dbe2ef07983e SHA1 74aea2f9b006b96a42625e0d895bc9f27ebaa0da SHA256 e4beb68b13861ccedcaa0a90c49f42c6dd7a2d7799360798b21eec7ea689437c
+DIST rpm-4.10.0.tar.bz2 3530378 RMD160 c14371d6f37abdcb007fb092a755953f886d8316 SHA1 d78f19194066c3895f91f58dc84e3aad69f0b02c SHA256 0e2e237235b64c07ee4a4152e4eb77aad4eb559737eac9b6713c5e1bcabfe4a9
+DIST rpm-4.4.6.tar.gz 17157249 RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 SHA1 33221f95189671d1a083b4f140bcf9a88ecd4374 SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595
+DIST rpm-4.9.1.2.tar.bz2 3500371 RMD160 3b3a8904f9f0d8ae03c1ab903ca7f420cb9178ee SHA1 5ec557424d90461f76d4ad30bfb6653b79920d58 SHA256 ea55e5c5b70703a3fea33e5debec27a694816ae86d1bf5ce99bc9e27db84b60a
+DIST rpm-4.9.1.3.tar.bz2 3485850 RMD160 6c9860c3d6f26c86e9512df94bf4cf8ebef5b10b SHA1 d1157a05a2368de07e06638daee01d3749107c8b SHA256 531894301e1a9891baf356fb32f732b10d1b313f5c5875a47fdcbdc0c3f67883
+DIST rpm-5.1.6.tar.gz 8305612 RMD160 88645f4a7c2e25fffaa5628d267e86eaac137b35 SHA1 3ab7d1edf333102c748c22e9144ab90d9719ab0b SHA256 82ee1a737bd77ddd90b0fe1e9a2f478c46033e451fac3881d00ab9e166951799
+DIST rpm-5.3.5.tar.gz 9526224 RMD160 15d735f8eb238b260b1adb92f05feb0709ad1f3c SHA1 2dbf1268c3b6c84993e9eba3431610566fb91b83 SHA256 4ae409cc0c4940afb692de47be07e281df0acce7f145a088499d40f4fb390895
+EBUILD rpm-4.10.0.ebuild 2657 RMD160 595fff708d248a0fb82ce62572f1c94602fb9a98 SHA1 66ec389398f92936459ca5f01bec158008e4a0ce SHA256 10bc33655ee4d442f350bb567872065ab7676a72139a8579ec1e374290035d34
+EBUILD rpm-4.4.6-r7.ebuild 3191 RMD160 5ca2a16ac107c914edbccccdf0d0b2ebeb96c4e2 SHA1 0b69289cf1bc48a453c0c7117e01dd1e4021005c SHA256 1c168326b03609d81932272281226a607db66a62f7ef3114a4baf07cca3f4676
+EBUILD rpm-4.9.1.2.ebuild 2500 RMD160 f2b69bd236d00146a45d93954beee814efa30266 SHA1 0cf153b165d6190f1882d7a3f00077849a1a25f5 SHA256 8dcfffcbbdb7576c8652bb0f21b978fb5149070776faba9b2e6b76951c7fe0a8
+EBUILD rpm-4.9.1.3.ebuild 2602 RMD160 f41bdf0a61ae2198f5e8ef0c53c7f1450460287d SHA1 897594bf19c5af8bf6dff4bffc7c61ce19404bb4 SHA256 bb72c0c18d55f3c1c74e5926ffb84ba83c383012c6e2d85acdf70b70b7a018bd
+EBUILD rpm-5.1.6.ebuild 2965 RMD160 2def9d4e44cdfd12f8b4e7744064726bd23170ba SHA1 7c0a66d7a69fd4de660215718275e45dd870c62e SHA256 e54e87adb9d2947e6ce00c0bbffd022b2be989de27c76feab55adc70e0195b4e
+EBUILD rpm-5.3.5.ebuild 4916 RMD160 6f797b7e243d515b44a6cab85188a198bac426a9 SHA1 19f3d647c23168f8072eb66592ac8b67e406e7df SHA256 1398037d80bb58f103891a0abab6fd2d3c0c9bd03aa4ea4ea31587ecf6c5875e
+MISC ChangeLog 23138 RMD160 cbc17cb9ebac35d073e9cf9e1516ba29951d0de5 SHA1 d6713778aa00e1b331616465a728d032bc5700df SHA256 b1f296e7aaa031f55c40767e153a92762f5d00a1c2583489b31912345fd58a14
+MISC metadata.xml 1113 RMD160 667dcf2ae111d9d7bce0a7a57934043b2eff245b SHA1 e4daf8f6fcbf7070a9349e1a13dcec83283bc287 SHA256 267a891ee0c4018f003d15d0a8ae59452b4a50c29fc2ae9bf63094c796892641

diff --git a/app-arch/rpm/files/remaining-5.3.5.txt b/app-arch/rpm/files/remaining-5.3.5.txt
new file mode 100644
index 0000000..2631931
--- /dev/null
+++ b/app-arch/rpm/files/remaining-5.3.5.txt
@@ -0,0 +1,44 @@
+  --with-squirrel=ARG     build with Squirrel library (no)
+                          (location path: "external:none")
+  --with-ficl=ARG         build with FICL library (no)
+                          (location path: "internal:external:none")
+  --with-aterm=ARG        build with ATerm library (no)
+                          (location path: "external:none")
+  --with-nix=ARG          build with Nix expressions library
+                          (no) (location path:
+                          "external:none")
+  --with-js=ARG           build with JavaScript library (no)
+                          (location path: "internal:external:none")
+  --with-gpsee=ARG        build with GPSEE library (no)
+                          (location path: "external:none")
+  --with-rc=ARG           build with Rc library (no)
+                          (location path: "internal:none")
+  --with-bash=ARG         build with Bash library (no)
+                          (location path: "internal:none")
+  --with-syck=ARG         build with Syck library (no)
+                          (location path: "internal:external:none")
+  --with-efence=ARG       build with Electric Fence library
+                          (no) (location path:
+                          "external:none")
+  --with-cpuinfo=ARG      build with CPUInfo library (no)
+                          (location path: "external:none")
+  --with-path-versioned   install with versioned paths
+  --with-path-database=ARG
+                          build with RPM database directory path
+  --with-path-sources=ARG build with RPM package sourcs directory path
+  --with-path-magic=ARG   build with RPM magic file path (or macro)
+  --with-path-buildroot=ARG
+                          build with RPM buildroot path (or macro)
+  --with-path-locale=ARG  build with RPM locale directory path
+  --with-path-lib=ARG     build with RPM system library directory path
+  --with-path-cfg=ARG     build with RPM global configuration directory path
+  --with-extra-path-macros=ARG
+                          build with additional colon-separated RPM macro
+                          files path not overriding defaults
+  --with-path-macros=ARG  build with colon-separated RPM macro files path
+  --with-path-rpmpopt=ARG build with colon-separated RPM POPT configuration
+                          file path
+  --with-path-rpmlua=ARG  build with colon-separated RPM Lua script file path
+  --with-vendor=VENDOR    build with a supported vendor's specific set of
+                          changes: mandriva, ark, fedora
+

diff --git a/app-arch/rpm/files/rpm-4.4.6-autotools.patch b/app-arch/rpm/files/rpm-4.4.6-autotools.patch
new file mode 100644
index 0000000..55fced3
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-autotools.patch
@@ -0,0 +1,22 @@
+fixup autotool warning:
+
+configure.ac:661: warning: AC_COMPILE_IFELSE was called before AC_GNU_SOURCE
+autoconf/specific.m4:335: AC_GNU_SOURCE is expanded from...
+aclocal.m4:8669: gl_LOCK_BODY is expanded from...
+aclocal.m4:8463: gl_LOCK is expanded from...
+aclocal.m4:609: gt_INTL_SUBDIR_CORE is expanded from...
+aclocal.m4:511: AM_INTL_SUBDIR is expanded from...
+aclocal.m4:387: AM_GNU_GETTEXT is expanded from...
+configure.ac:661: the top level
+configure.ac:661: warning: AC_RUN_IFELSE was called before AC_GNU_SOURCE
+
+--- configure.ac
++++ configure.ac
+@@ -57,6 +57,7 @@
+ AC_PROG_MAKE_SET
+ dnl AC_PROG_RANLIB
+ AC_PROG_YACC
++AC_GNU_SOURCE
+ 
+ AC_AIX
+ AC_MINIX

diff --git a/app-arch/rpm/files/rpm-4.4.6-buffer-overflow.patch b/app-arch/rpm/files/rpm-4.4.6-buffer-overflow.patch
new file mode 100644
index 0000000..d543958
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-buffer-overflow.patch
@@ -0,0 +1,95 @@
+Index: lib/query.c
+===================================================================
+RCS file: /cvs/devel/rpm/lib/query.c,v
+retrieving revision 2.173.2.15
+retrieving revision 2.173.2.16
+diff -a -u -r2.173.2.15 -r2.173.2.16
+--- lib/query.c	8 Oct 2006 21:41:45 -0000	2.173.2.15
++++ lib/query.c	30 Oct 2006 02:50:53 -0000	2.173.2.16
+@@ -124,6 +124,28 @@
+     return str;
+ }
+ 
++/**
++ */
++static void flushBuffer(char ** tp, char ** tep, int nonewline)
++	/*@ modifies *tp, *tep @*/
++{
++    char *t, *te;
++
++    t = *tp;
++    te = *tep;
++    if (te > t) {
++	if (!nonewline) {
++	    *te++ = '\n';
++	    *te = '\0';
++	}
++	rpmMessage(RPMMESS_NORMAL, "%s", t);
++	te = t;
++	*t = '\0';
++    }
++    *tp = t;
++    *tep = te;
++}
++
+ int showQueryPackage(QVA_t qva, rpmts ts, Header h)
+ {
+     int scareMem = 0;
+@@ -131,7 +153,6 @@
+     char * t, * te;
+     char * prefix = NULL;
+     int rc = 0;		/* XXX FIXME: need real return code */
+-    int nonewline = 0;
+     int i;
+ 
+     te = t = xmalloc(BUFSIZ);
+@@ -141,7 +162,6 @@
+ 
+     if (qva->qva_queryFormat != NULL) {
+ 	const char * str = queryHeader(h, qva->qva_queryFormat);
+-	nonewline = 1;
+ 	/*@-branchstate@*/
+ 	if (str) {
+ 	    size_t tb = (te - t);
+@@ -157,6 +177,7 @@
+ 	    /*@=usereleased@*/
+ /*@=boundswrite@*/
+ 	    str = _free(str);
++	    flushBuffer(&t, &te, 1);
+ 	}
+ 	/*@=branchstate@*/
+     }
+@@ -312,31 +333,13 @@
+ 			_("package has neither file owner or id lists\n"));
+ 	    }
+ 	}
+-/*@-branchstate@*/
+-	if (te > t) {
+-/*@-boundswrite@*/
+-	    *te++ = '\n';
+-	    *te = '\0';
+-	    rpmMessage(RPMMESS_NORMAL, "%s", t);
+-	    te = t;
+-	    *t = '\0';
+-/*@=boundswrite@*/
+-	}
+-/*@=branchstate@*/
++	flushBuffer(&t, &te, 0);
+     }
+ 	    
+     rc = 0;
+ 
+ exit:
+-    if (te > t) {
+-	if (!nonewline) {
+-/*@-boundswrite@*/
+-	    *te++ = '\n';
+-	    *te = '\0';
+-/*@=boundswrite@*/
+-	}
+-	rpmMessage(RPMMESS_NORMAL, "%s", t);
+-    }
++    flushBuffer(&t, &te, 0);
+     t = _free(t);
+ 
+     fi = rpmfiFree(fi);

diff --git a/app-arch/rpm/files/rpm-4.4.6-fix-cflags-stripping.patch b/app-arch/rpm/files/rpm-4.4.6-fix-cflags-stripping.patch
new file mode 100644
index 0000000..3be0c1f
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-fix-cflags-stripping.patch
@@ -0,0 +1,14 @@
+diff --git a/db3/configure b/db3/configure
+index 012b423..2856f20 100755
+--- a/db3/configure
++++ b/db3/configure
+@@ -8,7 +8,7 @@ db_dist="${base_path}../db/dist"
+ rm -f config.cache
+ 
+ # XXX edit CFLAGS= ... out of invocation args ???
+-ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
++ARGS="`echo $* | sed -e 's%--param[ =][^ ]*%%g' -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g'  -e 's%--cache-file=.*$%%'`"
+ 
+ CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
+ 	--enable-shared --enable-static --enable-rpc \
+

diff --git a/app-arch/rpm/files/rpm-4.4.6-neon-0.28.patch b/app-arch/rpm/files/rpm-4.4.6-neon-0.28.patch
new file mode 100644
index 0000000..2218205
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-neon-0.28.patch
@@ -0,0 +1,63 @@
+Update to neon 0.28 API, by Honza Machacek <Hloupy.Honza@×××××××.cz> bug #214799.
+
+diff -Naur tmp-old/rpmio/rpmdav.c tmp-new/rpmio/rpmdav.c
+--- rpmio/rpmdav.c	2008-03-28 04:40:52.000000000 +0000
++++ rpmio/rpmdav.c	2008-03-28 05:19:50.000000000 +0000
+@@ -103,7 +103,7 @@
+ }
+ 
+ static void davNotify(void * userdata,
+-		ne_conn_status connstatus, const char * info)
++		ne_session_status sessionstatus, const char * info)
+ 	/*@*/
+ {
+     urlinfo u = userdata;
+@@ -124,18 +124,20 @@
+ 
+ #ifdef	REFERENCE
+ typedef enum {
+-    ne_conn_namelookup, /* lookup up hostname (info = hostname) */
+-    ne_conn_connecting, /* connecting to host (info = hostname) */
+-    ne_conn_connected, /* connected to host (info = hostname) */
+-    ne_conn_secure /* connection now secure (info = crypto level) */
+-} ne_conn_status;
++    ne_status_lookup = 0, /* looking up hostname */
++    ne_status_connecting, /* connecting to host */
++    ne_status_connected, /* connected to host */
++    ne_status_sending, /* sending a request body */
++    ne_status_recving, /* receiving a response body */
++    ne_status_disconnected /* disconnected from host */
++} ne_session_status;
+ #endif
+ 
+-    u->connstatus = connstatus;
++    u->sessionstatus = sessionstatus;
+ 
+ /*@-boundsread@*/
+ if (_dav_debug < 0)
+-fprintf(stderr, "*** davNotify(%p,%d,%p) sess %p u %p %s\n", userdata, connstatus, info, sess, u, connstates[ (connstatus < 4 ? connstatus : 4)]);
++fprintf(stderr, "*** davNotify(%p,%d,%p) sess %p u %p %s\n", userdata, sessionstatus, info, sess, u, connstates[ (sessionstatus < 5 ? sessionstatus : 5)]);
+ /*@=boundsread@*/
+ 
+ }
+@@ -350,7 +352,7 @@
+ #endif
+ 
+ 	ne_set_progress(u->sess, davProgress, u);
+-	ne_set_status(u->sess, davNotify, u);
++	ne_set_notifier(u->sess, davNotify, u);
+ 
+ 	ne_set_persist(u->sess, 1);
+ 	ne_set_read_timeout(u->sess, httpTimeoutSecs);
+diff -Naur tmp-old/rpmio/rpmurl.h tmp-new/rpmio/rpmurl.h
+--- rpmio/rpmurl.h	2008-03-28 04:55:02.000000000 +0000
++++ rpmio/rpmurl.h	2008-03-28 04:56:09.000000000 +0000
+@@ -60,7 +60,7 @@
+     void * sess;		/*!< neon: ne_session ptr */
+     off_t current;		/*!< neon: current body offset. */
+     off_t total;		/*!< neon: total body length. */
+-    int connstatus;		/*!< neon: connection status. */
++    int sessionstatus;		/*!< neon: session status. */
+ #ifdef  REFERENCE
+ typedef enum {
+     ne_conn_namelookup,	/* lookup up hostname (info = hostname) */

diff --git a/app-arch/rpm/files/rpm-4.4.6-qa-fix-undefined.patch b/app-arch/rpm/files/rpm-4.4.6-qa-fix-undefined.patch
new file mode 100644
index 0000000..25537d1
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-qa-fix-undefined.patch
@@ -0,0 +1,21 @@
+--- rpm-4.4.6/rpmio/url.c.orig	2007-01-20 16:29:35.471962977 +0100
++++ rpm-4.4.6/rpmio/url.c	2007-01-20 16:30:34.438967191 +0100
+@@ -28,6 +28,8 @@
+ #define	IPPORT_PGPKEYSERVER	11371
+ #endif
+
++#include <neon/ne_session.h>
++
+ /**
+  */
+ /*@unchecked@*/
+
+--- rpm-4.4.6/lib/rpmfi.c.orig	2007-01-20 18:11:30.186124993 +0100
++++ rpm-4.4.6/lib/rpmfi.c	2007-01-20 18:13:26.938313715 +0100
+@@ -24,6 +24,7 @@
+
+ #include "misc.h"	/* XXX stripTrailingChar */
+ #include "rpmmacro.h"	/* XXX rpmCleanPath */
++#include "legacy.h" /* XXX dodigest */
+
+ #include "debug.h"

diff --git a/app-arch/rpm/files/rpm-4.4.6-stupidness.patch b/app-arch/rpm/files/rpm-4.4.6-stupidness.patch
new file mode 100644
index 0000000..644c12f
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-stupidness.patch
@@ -0,0 +1,164 @@
+Try and disable over-engineering in the rpm build system.
+
+--- rpm-4.4.6/build/Makefile.am
++++ rpm-4.4.6/build/Makefile.am
+@@ -24,10 +24,7 @@
+ pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h
+ noinst_HEADERS = buildio.h
+ 
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+-usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpmbuild.la
++lib_LTLIBRARIES = librpmbuild.la
+ librpmbuild_la_SOURCES = \
+ 	build.c expression.c files.c misc.c names.c pack.c \
+ 	parseBuildInstallClean.c parseChangelog.c parseDescription.c \
+--- rpm-4.4.6/configure.ac
++++ rpm-4.4.6/configure.ac
+@@ -117,7 +117,7 @@
+ dnl
+ with_selinuxval=no
+ AC_MSG_CHECKING(flag used by libtool to link rpm)
+-if test X"$GCC" = Xyes ; then
++if false ; then
+ 	case "$target" in
+ 		*-*-linux*)	LDFLAGS_STATIC="-all-static"
+ 				with_selinuxval=yes ;;
+@@ -160,14 +160,6 @@
+ dnl XXX Test for libpthread.a that is NPTL aware (static link only).
+ dnl
+ LDFLAGS_NPTL=
+-if test -f /usr/lib/nptl/libpthread.a ; then
+-    LDFLAGS_NPTL="-L/usr/lib/nptl"
+-#    INCPATH="$INCPATH -I/usr/include/nptl"
+-fi
+-if test -f /usr/lib64/nptl/libpthread.a ; then
+-    LDFLAGS_NPTL="-L/usr/lib64/nptl"
+-#    INCPATH="$INCPATH -I/usr/include/nptl"
+-fi
+ AC_SUBST(LDFLAGS_NPTL)
+ 
+ dnl
+@@ -1289,9 +1281,7 @@
+ 
+ dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
+ MARK64=
+-case "${target_cpu}" in
+-x86_64*|ppc64*|powerpc64*|sparc64*|s390x*)	MARK64=64 ;;
+-esac
++MARK64=ALL-SCREWED-UP
+ AC_SUBST(MARK64)
+ 
+ # For some systems we know that we have ld_version scripts.
+@@ -1368,13 +1358,16 @@
+ else
+     usrprefix=$prefix
+ fi
++
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++
+ LOCALEDIR="`echo ${usrprefix}/share/locale`"
+ AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR",
+ 	[Full path to rpm locale directory (usually /usr/share/locale)])
+ AC_SUBST(LOCALEDIR)
+ LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
+ AC_SUBST(LIBDIR)
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="`eval eval echo ${libdir}/rpm`"
+ AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR",
+ 	[Full path to rpm global configuration directory (usually /usr/lib/rpm)])
+ AC_SUBST(RPMCONFIGDIR)
+--- rpm-4.4.6/lib/Makefile.am
++++ rpm-4.4.6/lib/Makefile.am
+@@ -29,10 +29,7 @@
+ mylibs = librpm.la
+ LIBS =
+ 
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+-usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpm.la
++lib_LTLIBRARIES = librpm.la
+ librpm_la_SOURCES = \
+ 	cpio.c depends.c formats.c fs.c fsm.c getdate.c \
+ 	manifest.c misc.c package.c \
+--- rpm-4.4.6/python/Makefile.am
++++ rpm-4.4.6/python/Makefile.am
+@@ -4,8 +4,8 @@
+ 
+ LINT = splint
+ 
+-pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@
+-pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@
++pylibdir = $(libdir)/python@WITH_PYTHON_VERSION@
++pyincdir = $(includedir)/python@WITH_PYTHON_VERSION@
+ 
+ SUBDIRS = rpm
+ 
+--- rpm-4.4.6/python/rpm/Makefile.am
++++ rpm-4.4.6/python/rpm/Makefile.am
+@@ -4,8 +4,8 @@
+ 
+ PYVER = @WITH_PYTHON_VERSION@
+ 
+-pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@
+-pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@
++pylibdir = $(libdir)/python@WITH_PYTHON_VERSION@
++pyincdir = $(includedir)/python@WITH_PYTHON_VERSION@
+ 
+ EXTRA_DIST = \
+ 	__init__.py
+--- rpm-4.4.6/rpmdb/Makefile.am
++++ rpm-4.4.6/rpmdb/Makefile.am
+@@ -41,11 +41,7 @@
+ # XXX watchout, ../db3/libdb.la created by this Makefile may surprise
+ libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
+ 
+-# XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+-usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpmdb.la
++lib_LTLIBRARIES = librpmdb.la
+ librpmdb_la_SOURCES = \
+ 	dbconfig.c fprint.c \
+ 	hdrNVR.c header.c header_internal.c legacy.c merge.c \
+--- rpm-4.4.6/rpmio/Makefile.am
++++ rpm-4.4.6/rpmio/Makefile.am
+@@ -26,10 +26,7 @@
+ 
+ BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs)
+ 
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+-usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpmio.la
++lib_LTLIBRARIES = librpmio.la
+ librpmio_la_SOURCES = \
+ 	argv.c digest.c fts.c macro.c rmd128.c rmd160.c rpmdav.c \
+ 	rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \
+--- rpm-4.4.6/scripts/Makefile.am
++++ rpm-4.4.6/scripts/Makefile.am
+@@ -25,7 +25,7 @@
+ 
+ all:
+ 
+-configdir = ${prefix}/lib/rpm
++configdir = $(libdir)/rpm
+ config_SCRIPTS = \
+ 	brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \
+ 	brp-strip brp-strip-comment-note brp-nobuildrootpath \
+--- rpm-4.4.6/tools/Makefile.am
++++ rpm-4.4.6/tools/Makefile.am
+@@ -49,10 +49,6 @@
+ #rpmdeps_LDFLAGS =	$(staticLDFLAGS)
+ rpmdeps_LDADD =		$(top_builddir)/build/librpmbuild.la
+ 
+-rpmfile.c: $(top_srcdir)/file/src/file.c
+-	rm -f $@
+-	ln -s $< $@
+-
+ rpmfile_SOURCES =	rpmfile.c
+ rpmfile_CFLAGS =	-DMAGIC='"$(MAGIC)"' $(INCLUDES)
+ rpmfile_LDADD =		$(top_builddir)/rpmio/librpmio.la

diff --git a/app-arch/rpm/files/rpm-4.4.6-with-sqlite.patch b/app-arch/rpm/files/rpm-4.4.6-with-sqlite.patch
new file mode 100644
index 0000000..f42e17e
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-with-sqlite.patch
@@ -0,0 +1,20 @@
+--- configure.ac
++++ configure.ac
+@@ -625,6 +625,9 @@
+ WITH_SQLITE3_INCLUDE=
+ WITH_SQLITE3_LIB=
+ 
++withval=yes
++AC_ARG_WITH(sqlite,   [  --with-sqlite           use sqlite database library ])
++if test "$withval" != no; then
+ AC_CHECK_HEADER([sqlite3.h], [
+   AC_CHECK_LIB(sqlite3, sqlite3_open, [
+     AC_DEFINE(HAVE_SQLITE3_H, 1, [Define if you have the <sqlite3.h> header file])
+@@ -642,6 +645,7 @@
+     DBLIBSRCS="$DBLIBSRCS sqlite.c"
+   fi
+ ])
++fi
+ 
+ AC_SUBST(WITH_SQLITE3_SUBDIR)
+ AC_SUBST(WITH_SQLITE3_INCLUDE)

diff --git a/app-arch/rpm/files/rpm-4.4.7-have-locale-h.patch b/app-arch/rpm/files/rpm-4.4.7-have-locale-h.patch
new file mode 100644
index 0000000..7f2c51e
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.7-have-locale-h.patch
@@ -0,0 +1,11 @@
+diff -ur rpm-4.4.7.orig/configure.ac rpm-4.4.7/configure.ac
+--- rpm-4.4.7.orig/configure.ac	2010-04-06 22:43:07.000000000 +0300
++++ rpm-4.4.7/configure.ac	2010-04-07 20:53:40.000000000 +0300
+@@ -1120,6 +1120,7 @@
+   LIBS="$LIBS -lefence"
+ fi
+ 
++AC_CHECK_HEADER([locale.h], [AC_DEFINE(HAVE_LOCALE_H, 1, [locale.h isn't properly included without this])])
+ AC_CHECK_FUNCS(setlocale)
+ 
+ dnl XXX Solaris <= 2.6 only permits 8 chars in password.

diff --git a/app-arch/rpm/files/rpm-4.4.7-qa-fix-undefined.patch b/app-arch/rpm/files/rpm-4.4.7-qa-fix-undefined.patch
new file mode 100644
index 0000000..a5627eb
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.7-qa-fix-undefined.patch
@@ -0,0 +1,33 @@
+--- rpmio/url.c.orig	2007-01-20 16:29:35.471962977 +0100
++++ rpmio/url.c	2007-01-20 16:30:34.438967191 +0100
+@@ -28,6 +28,8 @@
+ #define	IPPORT_PGPKEYSERVER	11371
+ #endif
+
++#include <neon/ne_session.h>
++
+ /**
+  */
+ /*@unchecked@*/
+
+--- lib/rpmrc.c.orig	2007-01-20 16:40:21.922342919 +0100
++++ lib/rpmrc.c	2007-01-20 16:42:11.185674112 +0100
+@@ -13,7 +13,7 @@
+ #else
+ #define __power_pc() 0
+ #endif
+-
++#include <rpmio_internal.h>
+ #include <rpmcli.h>
+ #include <rpmmacro.h>
+ #include <rpmlua.h>
+
+--- lib/rpmfi.c.orig	2007-01-20 18:11:30.186124993 +0100
++++ lib/rpmfi.c	2007-01-20 18:13:26.938313715 +0100
+@@ -24,6 +24,7 @@
+
+ #include "misc.h"	/* XXX stripTrailingChar */
+ #include "rpmmacro.h"	/* XXX rpmCleanPath */
++#include "legacy.h" /* XXX dodigest */
+
+ #include "debug.h"

diff --git a/app-arch/rpm/files/rpm-4.4.7-qa-implicit-function-to-pointer.patch b/app-arch/rpm/files/rpm-4.4.7-qa-implicit-function-to-pointer.patch
new file mode 100644
index 0000000..96f7afb
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.7-qa-implicit-function-to-pointer.patch
@@ -0,0 +1,14 @@
+Fix QA Notice: Function `dbiFreeIndexSet' implicitly converted to pointer at transaction.c:2086
+that will almost certainly crash on 64bit architectures.
+Patch provided by Jeff Johnson <n3npq.jbj@×××××.com> on Rpm-devel list.
+--- rpm-4.4.7/lib/transaction.c.orig	2007-01-20 15:44:30.275657635 +0100
++++ rpm-4.4.7/lib/transaction.c	2007-01-20 15:45:09.818625107 +0100
+@@ -2083,7 +2083,7 @@
+ 		shared->isRemoved = (knownBad == ro);
+ 		shared++;
+ 	    }
+-	    matches[i] = dbiFreeIndexSet(matches[i]);
++	    (void) dbiFreeIndexSet(matches[i]);
+ 	}
+ 	numShared = shared - sharedList;
+ 	shared->otherPkg = -1;

diff --git a/app-arch/rpm/files/rpm-4.4.7-stupidness.patch b/app-arch/rpm/files/rpm-4.4.7-stupidness.patch
new file mode 100644
index 0000000..8812a7b
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.7-stupidness.patch
@@ -0,0 +1,171 @@
+Try and disable over-engineering in the rpm build system.
+
+--- rpm-4.4.7/build/Makefile.am
++++ rpm-4.4.7/build/Makefile.am
+@@ -24,10 +24,7 @@
+ pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h
+ noinst_HEADERS = buildio.h
+ 
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+-usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpmbuild.la
++lib_LTLIBRARIES = librpmbuild.la
+ librpmbuild_la_SOURCES = \
+ 	build.c expression.c files.c misc.c names.c pack.c \
+ 	parseBuildInstallClean.c parseChangelog.c parseDescription.c \
+--- rpm-4.4.7/configure.ac
++++ rpm-4.4.7/configure.ac
+@@ -117,7 +117,9 @@
+ dnl
+ with_selinuxval=no
+ AC_MSG_CHECKING(flag used by libtool to link rpm)
+-if test X"$GCC" = Xyes ; then
++# We do not want static linking
++#if test X"$GCC" = Xyes ; then
++if false ; then
+ 	case "$target" in
+ 		*-*-linux*)	LDFLAGS_STATIC="-all-static"
+ 				with_selinuxval=yes ;;
+@@ -160,14 +162,15 @@
+ dnl XXX Test for libpthread.a that is NPTL aware (static link only).
+ dnl
+ LDFLAGS_NPTL=
+-if test -f /usr/lib/nptl/libpthread.a ; then
+-    LDFLAGS_NPTL="-L/usr/lib/nptl"
++# Also do not need static linking
++#if test -f /usr/lib/nptl/libpthread.a ; then
++#    LDFLAGS_NPTL="-L/usr/lib/nptl"
+ #    INCPATH="$INCPATH -I/usr/include/nptl"
+-fi
+-if test -f /usr/lib64/nptl/libpthread.a ; then
+-    LDFLAGS_NPTL="-L/usr/lib64/nptl"
++#fi
++#if test -f /usr/lib64/nptl/libpthread.a ; then
++#    LDFLAGS_NPTL="-L/usr/lib64/nptl"
+ #    INCPATH="$INCPATH -I/usr/include/nptl"
+-fi
++#fi
+ AC_SUBST(LDFLAGS_NPTL)
+ 
+ dnl
+@@ -1306,6 +1309,8 @@
+ case "${target_cpu}" in
+ x86_64*|ppc64*|powerpc64*|sparc64*|s390x*)	MARK64=64 ;;
+ esac
++# We don't want this magic as portage handles it
++MARK64=ALL-SCREWED-UP
+ AC_SUBST(MARK64)
+ 
+ # For some systems we know that we have ld_version scripts.
+@@ -1388,13 +1384,16 @@
+ else
+     usrprefix=$prefix
+ fi
++
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++
+ LOCALEDIR="`echo ${usrprefix}/share/locale`"
+ AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR",
+ 	[Full path to rpm locale directory (usually /usr/share/locale)])
+ AC_SUBST(LOCALEDIR)
+ LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
+ AC_SUBST(LIBDIR)
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="`eval echo ${libdir}/rpm`"
+ AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR",
+ 	[Full path to rpm global configuration directory (usually /usr/lib/rpm)])
+ AC_SUBST(RPMCONFIGDIR)
+--- rpm-4.4.7/lib/Makefile.am
++++ rpm-4.4.7/lib/Makefile.am
+@@ -29,10 +29,7 @@
+ mylibs = librpm.la
+ LIBS =
+ 
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+-usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpm.la
++lib_LTLIBRARIES = librpm.la
+ librpm_la_SOURCES = \
+ 	cpio.c depends.c formats.c fs.c fsm.c getdate.c \
+ 	manifest.c misc.c package.c \
+--- rpm-4.4.7/python/Makefile.am
++++ rpm-4.4.7/python/Makefile.am
+@@ -4,8 +4,8 @@
+ 
+ LINT = splint
+ 
+-pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@
+-pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@
++pylibdir = $(libdir)/python@WITH_PYTHON_VERSION@
++pyincdir = $(includedir)/python@WITH_PYTHON_VERSION@
+ 
+ SUBDIRS = rpm
+ 
+--- rpm-4.4.7/python/rpm/Makefile.am
++++ rpm-4.4.7/python/rpm/Makefile.am
+@@ -4,8 +4,8 @@
+ 
+ PYVER = @WITH_PYTHON_VERSION@
+ 
+-pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@
+-pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@
++pylibdir = $(libdir)/python@WITH_PYTHON_VERSION@
++pyincdir = $(includedir)/python@WITH_PYTHON_VERSION@
+ 
+ EXTRA_DIST = \
+ 	__init__.py
+--- rpm-4.4.7/rpmdb/Makefile.am
++++ rpm-4.4.7/rpmdb/Makefile.am
+@@ -41,11 +41,7 @@
+ # XXX watchout, ../db3/libdb.la created by this Makefile may surprise
+ libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
+ 
+-# XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+-usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpmdb.la
++lib_LTLIBRARIES = librpmdb.la
+ librpmdb_la_SOURCES = \
+ 	dbconfig.c fprint.c \
+ 	hdrNVR.c header.c header_internal.c legacy.c merge.c \
+--- rpm-4.4.7/rpmio/Makefile.am
++++ rpm-4.4.7/rpmio/Makefile.am
+@@ -28,10 +28,7 @@
+ 
+ BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs)
+ 
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+-usrlibdir = $(libdir)@MARK64@
+-usrlib_LTLIBRARIES = librpmio.la
++lib_LTLIBRARIES = librpmio.la
+ librpmio_la_SOURCES = \
+ 	argv.c digest.c fts.c macro.c md2.c md4.c rmd128.c rmd160.c tiger.c \
+ 	rpmdav.c rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \
+--- rpm-4.4.7/scripts/Makefile.am
++++ rpm-4.4.7/scripts/Makefile.am
+@@ -24,7 +24,7 @@
+ 
+ all:
+ 
+-configdir = ${prefix}/lib/rpm
++configdir = $(libdir)/rpm
+ config_SCRIPTS = \
+ 	brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \
+ 	brp-strip brp-strip-comment-note brp-nobuildrootpath \
+--- rpm-4.4.7/tools/Makefile.am
++++ rpm-4.4.7/tools/Makefile.am
+@@ -54,10 +54,6 @@
+ #rpmdeps_LDFLAGS =	$(staticLDFLAGS)
+ rpmdeps_LDADD =		$(top_builddir)/build/librpmbuild.la
+ 
+-rpmfile.c: $(top_srcdir)/file/src/file.c
+-	rm -f $@
+-	ln -s $< $@
+-
+ rpmfile_SOURCES =	rpmfile.c
+ rpmfile_CFLAGS =	-DMAGIC='"$(MAGIC)"' $(INCLUDES)
+ rpmfile_LDADD =		$(top_builddir)/rpmio/librpmio.la

diff --git a/app-arch/rpm/files/rpm-4.8.1-autotools.patch b/app-arch/rpm/files/rpm-4.8.1-autotools.patch
new file mode 100644
index 0000000..21cf254
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.8.1-autotools.patch
@@ -0,0 +1,32 @@
+diff --git a/configure.ac b/configure.ac
+index 8c2ef50..2fc75f3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -305,14 +305,9 @@ AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes])
+ # which we use too and hopefully is slightly more unique to NSS.
+ WITH_NSS_INCLUDE=
+ WITH_NSS_LIB=
+-AC_CHECK_HEADERS([nspr.h nss.h sechash.h], [], [
+-  AC_MSG_ERROR([missing required NSPR / NSS header])
+-])
+-AC_CHECK_LIB(nss3, NSS_NoDB_Init, [
+-  WITH_NSS_LIB=-lnss3
+-], [
+-  AC_MSG_ERROR([missing required NSS library 'nss3'])
+-])
++PKG_CHECK_MODULES(NSS, [ nss >= 3.0.0 ])
++WITH_NSS_INCLUDE=$NSS_CFLAGS
++WITH_NSS_LIB=$NSS_LIBS
+ AC_SUBST(WITH_NSS_INCLUDE)
+ AC_SUBST(WITH_NSS_LIB)
+ 
+@@ -1014,9 +1009,6 @@ AC_SUBST(RPMCONFIGDIR)
+ 
+ AC_SUBST(OBJDUMP)
+ 
+-if test "$with_external_db" = no; then
+-    AC_CONFIG_SUBDIRS(db3)
+-fi
+ 
+ AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no])
+ AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no])

diff --git a/app-arch/rpm/files/rpm-4.8.1-db-path.patch b/app-arch/rpm/files/rpm-4.8.1-db-path.patch
new file mode 100644
index 0000000..634dd23
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.8.1-db-path.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile.am b/Makefile.am
+index 587cfa7..498abfb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in
+ 
+ usrsrcdir = $(prefix)/src
+ 
+-rpmvardir = $(localstatedir)/lib/rpm
++rpmvardir = $(localstatedir)/rpm
+ rpmvar_DATA =
+ 
+ install-exec-hook:
+diff --git a/macros.in b/macros.in
+index ae46fcb..213b53c 100644
+--- a/macros.in
++++ b/macros.in
+@@ -155,7 +155,7 @@
+ %_bzip2bin		%{__bzip2}
+ 
+ #	The location of the rpm database file(s).
+-%_dbpath		%{_var}/lib/rpm
++%_dbpath		%{_var}/rpm
+ 
+ #	The location of the rpm database file(s) after "rpm --rebuilddb".
+ %_dbpath_rebuild	%{_dbpath}

diff --git a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
new file mode 100644
index 0000000..2219264
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
@@ -0,0 +1,31 @@
+diff -urN rpm-4.9.1.2.old/configure.ac rpm-4.9.1.2/configure.ac
+--- rpm-4.9.1.2.old/configure.ac	2012-04-19 12:18:27.584725220 +0200
++++ rpm-4.9.1.2/configure.ac	2012-04-19 12:34:50.302722933 +0200
+@@ -846,13 +846,7 @@
+ AC_SUBST(RPMCANONGNU)
+ AC_DEFINE_UNQUOTED([RPMCANONVENDOR],["${RPMCANONVENDOR}"],[canonical vendor])
+ 
+-if test X"$prefix" = XNONE ; then
+-    usrprefix="$ac_default_prefix"
+-else
+-    usrprefix=$prefix
+-fi
+-
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
+ AC_SUBST(RPMCONFIGDIR)
+ 
+ AC_SUBST(OBJDUMP)
+diff -urN rpm-4.9.1.2.old/rpm.am rpm-4.9.1.2/rpm.am
+--- rpm-4.9.1.2.old/rpm.am	2012-04-19 12:18:27.584725220 +0200
++++ rpm-4.9.1.2/rpm.am	2012-04-19 12:24:49.035724332 +0200
+@@ -1,7 +1,5 @@
+ # Internal binaries
+-## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
+-rpmlibexecdir = $(prefix)/lib/rpm
++rpmlibexecdir = $(pkglibexecdir)
+ 
+ # Host independent config files
+-## HACK: it probably should be $(datadir)/rpm
+-rpmconfigdir = $(prefix)/lib/rpm
++rpmconfigdir = $(pkglibexecdir)

diff --git a/app-arch/rpm/rpm-4.10.0.ebuild b/app-arch/rpm/rpm-4.10.0.ebuild
new file mode 100644
index 0000000..afe31fd
--- /dev/null
+++ b/app-arch/rpm/rpm-4.10.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.0.ebuild,v 1.1 2012/06/01 14:19:27 scarabeus Exp $
+
+EAPI="4-slot-abi"
+
+PYTHON_DEPEND="2"
+
+inherit eutils autotools flag-o-matic perl-module python versionator
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org"
+SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+IUSE="nls python doc caps lua acl"
+
+RDEPEND=">=sys-libs/db-4.5
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	!<dev-lang/perl-5.8.8
+	dev-libs/nss
+	python? ( >=dev-lang/python-2.3 )
+	nls? ( virtual/libintl )
+	lua? ( >=dev-lang/lua-5.1.0[deprecated] )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.8.1-autotools.patch \
+		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
+		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-selinux \
+		--with-external-db \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable nls) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	# remove la files
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	mv "${ED}"/bin/rpm "${ED}"/usr/bin
+	rmdir "${ED}"/bin
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary}
+	done
+
+	use nls || rm -rf "${ED}"/usr/share/man/??
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README*
+	if use doc; then
+		pushd doc/hacking/html
+		dohtml -p hacking -r .
+		popd
+		pushd doc/librpm/html
+		dohtml -p librpm -r .
+		popd
+	fi
+
+	# Fix perllocal.pod file collision
+	fixlocalpod
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
+	fi
+
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
+}

diff --git a/app-arch/rpm/rpm-4.4.6-r7.ebuild b/app-arch/rpm/rpm-4.4.6-r7.ebuild
new file mode 100644
index 0000000..14fadd4
--- /dev/null
+++ b/app-arch/rpm/rpm-4.4.6-r7.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r7.ebuild,v 1.5 2011/01/08 19:21:44 arfrever Exp $
+
+EAPI="3"
+
+inherit eutils autotools perl-module flag-o-matic python
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm5.org/"
+SRC_URI="http://rpm5.org/files/rpm/rpm-4.4/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+IUSE="nls python perl doc sqlite"
+
+RDEPEND=">=sys-libs/db-4
+	>=sys-libs/zlib-1.1.3
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-libs/beecrypt-3.1.0-r1
+	python? ( >=dev-lang/python-2.2 )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	>=net-libs/neon-0.28"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-with-sqlite.patch
+	epatch "${FILESDIR}"/${P}-stupidness.patch
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
+	epatch "${FILESDIR}"/${P}-qa-fix-undefined.patch
+	epatch "${FILESDIR}"/${P}-fix-cflags-stripping.patch
+	# bug 214799
+	epatch "${FILESDIR}"/${P}-neon-0.28.patch
+
+	# rpm uses AM_GNU_GETTEXT() but fails to actually
+	# include any of the required gettext files
+	cp /usr/share/gettext/config.rpath . || die
+
+	# the following are additional libraries that might be packaged with
+	# the rpm sources. grep for "test -d" in configure.ac
+	cp file/src/{file,patchlevel}.h tools/
+	rm -rf beecrypt elfutils neon popt sqlite zlib intl file
+
+	sed -i -e "s:intl ::" Makefile.am
+	sed -i -e "s:intl/Makefile ::" configure.ac
+	AT_NO_RECURSIVE="yes" eautoreconf
+	# TODO Get rid of internal copies of lua, db and db3
+}
+
+src_configure() {
+	# Until strict aliasing is porperly fixed...
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	econf \
+		--enable-posixmutexes \
+		--without-javaglue \
+		--without-selinux \
+		$(use_with python python $(python_get_version)) \
+		$(use_with doc apidocs) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install || die "emake install failed"
+
+	mv "${D}"/bin/rpm "${D}"/usr/bin
+	rmdir "${D}"/bin
+
+	use nls || rm -rf "${D}"/usr/share/man/??
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README* RPM*
+	use doc && dohtml -r apidocs/html/*
+
+	# Fix perllocal.pod file collision
+	use perl && fixlocalpod
+
+	for magic_file in "magic.mime.mgc" "magic.mgc" "magic.mime" "magic"; do
+		dosym /usr/share/misc/${magic_file} /usr/lib/rpm/${magic_file}
+	done
+}
+
+pkg_postinst() {
+	if [[ -f ${ROOT}/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${ROOT}"/usr/bin/rpm --rebuilddb --root="${ROOT}"
+	else
+		einfo "No RPM database found... Creating database..."
+		"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
+	fi
+
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
+}

diff --git a/app-arch/rpm/rpm-4.9.1.2.ebuild b/app-arch/rpm/rpm-4.9.1.2.ebuild
new file mode 100644
index 0000000..de30557
--- /dev/null
+++ b/app-arch/rpm/rpm-4.9.1.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.2.ebuild,v 1.11 2012/05/06 16:54:41 armin76 Exp $
+
+EAPI="4-slot-abi"
+
+PYTHON_DEPEND="2"
+
+inherit eutils autotools flag-o-matic perl-module python
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org"
+SRC_URI="http://rpm.org/releases/rpm-4.9.x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+
+IUSE="nls python doc caps lua acl"
+
+RDEPEND=">=sys-libs/db-4.5
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	!<dev-lang/perl-5.8.8
+	dev-libs/nss
+	python? ( >=dev-lang/python-2.3 )
+	nls? ( virtual/libintl )
+	lua? ( >=dev-lang/lua-5.1.0[deprecated] )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.8.1-autotools.patch
+	epatch "${FILESDIR}"/${PN}-4.8.1-db-path.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_configure() {
+	econf \
+		--without-selinux \
+		--with-external-db \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable nls) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl)
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/bin/rpm "${ED}"/usr/bin
+	rmdir "${ED}"/bin
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary}
+	done
+
+	use nls || rm -rf "${ED}"/usr/share/man/??
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README*
+	if use doc; then
+		pushd doc/hacking/html
+		dohtml -p hacking -r .
+		popd
+		pushd doc/librpm/html
+		dohtml -p librpm -r .
+		popd
+	fi
+
+	# Fix perllocal.pod file collision
+	fixlocalpod
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
+	fi
+
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
+}

diff --git a/app-arch/rpm/rpm-4.9.1.3.ebuild b/app-arch/rpm/rpm-4.9.1.3.ebuild
new file mode 100644
index 0000000..5ecaf89
--- /dev/null
+++ b/app-arch/rpm/rpm-4.9.1.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.3.ebuild,v 1.8 2012/06/23 17:09:14 armin76 Exp $
+
+EAPI="4-slot-abi"
+
+PYTHON_DEPEND="2"
+
+inherit eutils autotools flag-o-matic perl-module python
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org"
+SRC_URI="http://rpm.org/releases/rpm-4.9.x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+
+IUSE="nls python doc caps lua acl"
+
+RDEPEND=">=sys-libs/db-4.5
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	!<dev-lang/perl-5.8.8
+	dev-libs/nss
+	python? ( >=dev-lang/python-2.3 )
+	nls? ( virtual/libintl )
+	lua? ( >=dev-lang/lua-5.1.0[deprecated] )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.8.1-autotools.patch \
+		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
+		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-selinux \
+		--with-external-db \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable nls) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	# remove la files
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	mv "${ED}"/bin/rpm "${ED}"/usr/bin
+	rmdir "${ED}"/bin
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary}
+	done
+
+	use nls || rm -rf "${ED}"/usr/share/man/??
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README*
+	if use doc; then
+		pushd doc/hacking/html
+		dohtml -p hacking -r .
+		popd
+		pushd doc/librpm/html
+		dohtml -p librpm -r .
+		popd
+	fi
+
+	# Fix perllocal.pod file collision
+	fixlocalpod
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
+	fi
+
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
+}

diff --git a/app-arch/rpm/rpm-5.1.6.ebuild b/app-arch/rpm/rpm-5.1.6.ebuild
new file mode 100644
index 0000000..4da047e
--- /dev/null
+++ b/app-arch/rpm/rpm-5.1.6.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-5.1.6.ebuild,v 1.10 2012/05/24 04:34:28 vapier Exp $
+
+EAPI="3"
+
+inherit eutils multilib python user
+
+MY_P=${P/_alpha/a}
+MY_P=${P/_beta/b}
+
+DESCRIPTION="RPM Package Manager"
+HOMEPAGE="http://rpm5.org/"
+SRC_URI="http://rpm5.org/files/rpm/rpm-5.1/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb bzip2 doc lua magic webdav-neon nls pcre perl python selinux sqlite"
+
+#	dmalloc? ( dev-libs/dmalloc )
+#	efence? ( dev-util/efence )
+#	keyutils? ( sys-apps/keyutils )
+#	xar? ( app-arch/xar )
+RDEPEND="dev-libs/beecrypt
+	dev-libs/popt
+	berkdb? ( sys-libs/db )
+	bzip2? ( app-arch/bzip2 )
+	lua? ( dev-lang/lua )
+	webdav-neon? ( net-libs/neon )
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite )"
+# comes bundled with modified zlib
+#	>=sys-libs/zlib-1.2.3-r1
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup () {
+	ewarn "If you are upgrading from an rpm version of 5.0.0 or lower, "
+	ewarn "your database will not be updated. Please back up your rpm "
+	ewarn "database, and run: "
+	ewarn "    rpm --initdb"
+}
+
+src_prepare() {
+	rm -rf file xar #db
+	sed -i \
+		-e '/^pkgconfigdir/s:=.*:=$(libdir)/pkgconfig:' \
+		scripts/Makefile.in || die
+}
+
+src_configure() {
+#		$(use_with dmalloc) \
+#		$(use_with efence) \
+#		$(use_with keyutils) \
+#		$(use_with xar) \
+	# --with-libelf
+	econf \
+		$(use_with berkdb db) \
+		$(use_with bzip2) \
+		$(use_with doc apidocs) \
+		$(use_with magic file) \
+		$(use_with lua) \
+		$(use_with webdav-neon neon) \
+		$(use_with nls) \
+		$(use_with pcre) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with selinux) \
+		$(use_with sqlite) \
+		$(use berkdb || use sqlite || echo --with-db) \
+		--with-path-lib="/usr/$(get_libdir)/rpm" \
+		--with-python-lib-dir="$(python_get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install || die "emake install failed"
+	dodoc CHANGES CREDITS NEWS README TODO
+}
+
+pkg_preinst() {
+	enewgroup rpm 37
+	enewuser rpm 37 /bin/sh /var/lib/rpm rpm
+}
+
+pkg_postinst() {
+	chown -R rpm:rpm "${ROOT}"/usr/$(get_libdir)/rpm
+	chown -R rpm:rpm "${ROOT}"/var/lib/rpm
+	chown rpm:rpm "${ROOT}"/usr/bin/rpm{,2cpio,build,constant}
+	if [[ ${ROOT} == "/" ]] ; then
+		if [[ -f ${ROOT}/var/lib/rpm/Packages ]] ; then
+			einfo "RPM database found... Rebuilding database (may take a while)..."
+			"${ROOT}"/usr/bin/rpm --rebuilddb --root="${ROOT}"
+		else
+			einfo "No RPM database found... Creating database..."
+			"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
+		fi
+	fi
+	chown rpm:rpm "${ROOT}"/var/lib/rpm/*
+
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
+}

diff --git a/app-arch/rpm/rpm-5.3.5.ebuild b/app-arch/rpm/rpm-5.3.5.ebuild
new file mode 100644
index 0000000..ffc1b03
--- /dev/null
+++ b/app-arch/rpm/rpm-5.3.5.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-5.3.5.ebuild,v 1.1 2012/06/02 10:21:28 scarabeus Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit eutils multilib python user versionator
+
+DESCRIPTION="RPM Package Manager"
+HOMEPAGE="http://rpm5.org/"
+SRC_URI="http://rpm5.org/files/${PN}/${PN}-$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="acl augeas berkdb +bzip2 crypt debug expat gnutls keyutils lua lzma nls nss openssl pcre perl pkcs11 readline ruby selinux sqlite ssl tcl uuid webdav-neon xar xattr +zlib"
+
+RDEPEND="
+	dev-libs/beecrypt
+	dev-libs/popt
+	sys-apps/file
+	acl? ( sys-apps/acl )
+	augeas? ( app-admin/augeas )
+	berkdb? ( sys-libs/db )
+	bzip2? ( app-arch/bzip2 )
+	crypt? ( dev-libs/libgcrypt )
+	expat? ( dev-libs/expat )
+	keyutils? ( sys-apps/keyutils )
+	lua? ( dev-lang/lua )
+	lzma? ( app-arch/xz-utils )
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl )
+	pkcs11? ( dev-libs/pakchois )
+	readline? ( sys-libs/readline:0 )
+	ruby? ( >=dev-lang/ruby-1.9 )
+	selinux? (
+		sys-libs/libselinux
+		sys-libs/libsemanage
+		sys-libs/libsepol
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		nss? ( dev-libs/nss )
+		openssl? ( dev-libs/openssl )
+		gnutls? (
+			dev-libs/libtasn1
+			net-libs/gnutls
+		)
+	)
+	tcl? ( dev-lang/tcl )
+	uuid? ( dev-libs/ossp-uuid )
+	webdav-neon? ( net-libs/neon )
+	xar? ( app-arch/xar )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	virtual/yacc
+	nls? ( sys-devel/gettext )
+"
+
+REQUIRED_USE="
+	ssl? (
+		^^ (
+			gnutls
+			nss
+			openssl
+		)
+	)
+"
+
+pkg_setup () {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() {
+	local myconf=""
+
+	# default internal/external switches
+	# crypto default is beecrypt, user can change this on runtime
+	#   and we build beecrypt every time
+	# tomcrypt is not in portage
+	# cudf is not in portage
+	# users usually do not want to use debug malloc
+	myconf+="
+		--with-usecrypto=beecrypt
+		--with-beecrypt=external
+		--with-file=external
+		--with-popt=external
+		--without-tomcrypt
+		--without-cudf
+		--without-dmalloc
+	"
+
+	# ssl handling
+	# tasn1 is handled in most portage packages with gnutls, do the same
+	if use ssl; then
+		myconf+="
+			$(use_with gnutls)
+			$(use_with gnutls libtasn1)
+			$(use_with nss)
+			$(use_with openssl)
+		"
+	else
+		myconf+="
+			--without-gnutls
+			--without-libtasn1
+			--without-nss
+			--without-openssl
+		"
+	fi
+
+	# enable db if we use berkdb or sqlite
+	if use berkdb || use sqlite; then
+		myconf+="
+			--with-dbsql=external
+		"
+	else
+		myconf+="
+			--without-dbsql
+		"
+	fi
+
+	# for berkdb enable the options if possible
+	if use berkdb; then
+		myconf+="
+			--with-db-largefile
+			--with-db-rpc
+		"
+	fi
+
+	# we need python by default anyway so always --with-python
+	econf \
+		--disable-rpath \
+		--disable-dependency-tracking \
+		--enable-build-pic \
+		--enable-build-pie \
+		--enable-largefile \
+		--with-python \
+		--without-pythonembed \
+		--with-python-lib-dir="$(python_get_libdir)" \
+		--with-python-inc-dir="$(python_get_includedir)" \
+		$(use_enable nls) \
+		$(use_enable debug build-debug) \
+		$(use_with acl) \
+		$(use_with augeas) \
+		$(use_with berkdb db) \
+		$(use_with bzip2) \
+		$(use_with crypt gcrypt) \
+		$(use_with expat) \
+		$(use_with keyutils) \
+		$(use_with lua lua external) \
+		$(use_with lzma xz external) \
+		$(use_with pcre pcre external) \
+		$(use_with perl) \
+		$(use_with pkcs11 pakchois) \
+		$(use_with readline) \
+		$(use_with selinux) \
+		$(use_with selinux semanage) \
+		$(use_with selinux sepol) \
+		$(use_with sqlite) \
+		$(use_with tcl) \
+		$(use_with uuid) \
+		$(use_with webdav-neon neon external) \
+		$(use_with xar xar external) \
+		$(use_with xattr attr) \
+		$(use_with zlib) \
+		${myconf}
+
+	# TODO: see files/remaining-5.3.5.txt
+	ewarn "This package is far from complete"
+	ewarn "If you want to test it please see \"${FILESDIR}/remaining-5.3.5.txt\""
+	ewarn "and implement missing features."
+	ewarn "Do NOT report bugs without providing patches!"
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install || die "emake install failed"
+	dodoc CHANGES CREDITS NEWS README TODO
+}
+
+pkg_preinst() {
+	enewgroup rpm 37
+	enewuser rpm 37 /bin/sh /var/lib/rpm rpm
+}
+
+pkg_postinst() {
+	chown -R rpm:rpm "${ROOT}"/usr/$(get_libdir)/rpm
+	chown -R rpm:rpm "${ROOT}"/var/lib/rpm
+	chown rpm:rpm "${ROOT}"/usr/bin/rpm{,2cpio,build,constant}
+	if [[ ${ROOT} == "/" ]] ; then
+		if [[ -f ${ROOT}/var/lib/rpm/Packages ]] ; then
+			einfo "RPM database found... Rebuilding database (may take a while)..."
+			"${ROOT}"/usr/bin/rpm --rebuilddb --root="${ROOT}"
+		else
+			einfo "No RPM database found... Creating database..."
+			"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
+		fi
+	fi
+	chown rpm:rpm "${ROOT}"/var/lib/rpm/*
+
+	python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	python_mod_cleanup rpm
+}

diff --git a/app-editors/XML-XSH2/Manifest b/app-editors/XML-XSH2/Manifest
new file mode 100644
index 0000000..b6f24ca
--- /dev/null
+++ b/app-editors/XML-XSH2/Manifest
@@ -0,0 +1,14 @@
+DIST XML-XSH2-2.0.2.tar.gz 270693 RMD160 55e6c8be90153b217cdaf2057d3d91f61fbe78f9 SHA1 bd23509ed084f1dac15fd0f81561f9ac71f5a5f9 SHA256 3e3432e884485d68fdb950f73d842576e55540094ad3bf44d89dc7ac5838ddb7
+DIST XML-XSH2-2.1.1.tar.gz 315780 RMD160 ab3a1d7c8f57ff3d5f47e728c15faa65ebabb94b SHA1 07d4f3be8dbfa954cc5417572e6e08487127cb9b SHA256 38367cc3c70d7ef1813cfa7e519f522fb694dc677414796622099f1fc576d2b4
+DIST XML-XSH2-2.1.2.tar.gz 322132 RMD160 d7a96df28ae1045ec86268fc24137b05cbea48a8 SHA1 f94946d58f962dc7f8e661cf38b35fbd856cfedc SHA256 559f88ce4f49972f91f8c8e35cfe3aa5b9e6d1d0eeaec6615650788a6f3fbe59
+DIST XML-XSH2-2.1.3.tar.gz 322219 RMD160 e293262b7f12184fa43b068fa9f35506ca6b7dba SHA1 4a92e5f37bb6a891564f04005f630ae6cf2de5ac SHA256 8cd5d52f9657a1dc4d8cfc52099b84663abff2895cdb079cba7b2c5f22a2f592
+DIST XML-XSH2-2.1.5.tar.gz 322441 RMD160 f2843a83727aeb541673887655924749e0700650 SHA1 0605c641051ab5f20bb71a995ad96113a1186473 SHA256 d3cfe8a7f609b5c971cbd93a5f96652b58741e328516f5feb950115efd72be66
+DIST XML-XSH2-2.1.6.tar.gz 322506 RMD160 c4016ee3fc9b3f72cb9a24038c31a77b09d2564a SHA1 08629c97cc62daf86e4db1051dc78c8d75c929fd SHA256 6bd3d520db9b192e9d04b2fdb43ac54ebd945148e03d1e93dc4b9f39fa5dd551
+EBUILD XML-XSH2-2.0.2.ebuild 611 RMD160 497d5b1f97cf2073d530ec2c74346ba8a6405f93 SHA1 aa3fdf39f0168c68e141f95c083467c11b190c79 SHA256 a97ffa47ee2e68ee2d730befb86b0556559cbdc39ba23a89d46f84d409ab7ce1
+EBUILD XML-XSH2-2.1.1.ebuild 682 RMD160 dc0a6286f03b7ecf1a8ac7b0b552a1b6745ef2bb SHA1 b346de6c2f9d2a595ea2b8c78e52ae9b9fdfeb10 SHA256 bd4b8821c86d79ecad126de25f9371abb2aa4c32365d282df8ddb2558d95f404
+EBUILD XML-XSH2-2.1.2.ebuild 791 RMD160 53c44f486583d8c22d1eddf3fa5f82294ff59d1d SHA1 43b9cb48ec9297a3663e284e99b5d0d02c147107 SHA256 75e55d11d790bd99e0fb3aa9c80e26a1ec3668ae86793a0c72a1ffdc75036264
+EBUILD XML-XSH2-2.1.3.ebuild 791 RMD160 22f465ddd0e46f3d219ae4534b95c51a9128fc6d SHA1 45c9a5e70d3d207aece33f8d3314c2f0ff7c2b3a SHA256 efe6b1794a30afbaa0039ec69783a5e8df2b0bb88307b239215956ca6848f144
+EBUILD XML-XSH2-2.1.5.ebuild 791 RMD160 91b3083f925b8875d4becc98c3b5aa819bfd8030 SHA1 e468cb4b7d3c2c248de88aa1253a70bbe123f4f1 SHA256 29b9c526f48f5e22655a82d3f297bb60c81c3bbb5d1cc60b81b3dfb43c3dc757
+EBUILD XML-XSH2-2.1.6.ebuild 791 RMD160 3114a7396f5fa73e5cf7928985137b286384a9c2 SHA1 37b01ec7f5a9cb49a7a85c56f771510afd296e32 SHA256 a5c2cb0ef5df6c17338080a06e1b679255f1dcfb6cb59683cbf843b68e3d9a9a
+MISC ChangeLog 1252 RMD160 8c97c26ece559048bd6fb718a048f59e5416669b SHA1 63bd9acc5df448071b535d57b0067e284e4e8322 SHA256 4780b851923688c18943a31bc1bd4da94019ce70fae734d2554f0ce427326651
+MISC metadata.xml 359 RMD160 ca33bf3baf4c4e87cf813ca11df8af3ad4e14ef7 SHA1 6c17395fc9cb7537687a567483055f0522214ef6 SHA256 8277c510257620fd41dce7b708459b1adae8829f7c013ad2bbb736600ba8b2b8

diff --git a/app-editors/XML-XSH2/XML-XSH2-2.0.2.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.0.2.ebuild
new file mode 100644
index 0000000..be3c8e1
--- /dev/null
+++ b/app-editors/XML-XSH2/XML-XSH2-2.0.2.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/app-editors/XML-XSH2/XML-XSH2-2.0.2.ebuild,v 1.5 2007/03/09 23:54:59 mcummings Exp $
+
+inherit perl-module
+
+DESCRIPTION="XML Editing Shell"
+HOMEPAGE="http://xsh.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xsh/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-perl/XML-LibXML-1.61
+	>=dev-perl/Parse-RecDescent-1.94
+	>=dev-perl/XML-LibXSLT-1.53
+	dev-perl/Term-ReadLine-Perl
+	>=dev-perl/XML-XUpdate-LibXML-0.4.0
+	!app-editors/XML-XSH"

diff --git a/app-editors/XML-XSH2/XML-XSH2-2.1.1.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.1.1.ebuild
new file mode 100644
index 0000000..fafbd56
--- /dev/null
+++ b/app-editors/XML-XSH2/XML-XSH2-2.1.1.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/app-editors/XML-XSH2/XML-XSH2-2.1.1.ebuild,v 1.2 2010/10/30 10:07:24 ssuominen Exp $
+
+MODULE_AUTHOR=PAJAS
+inherit perl-module
+
+DESCRIPTION="XML Editing Shell"
+HOMEPAGE="http://xsh.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-perl/XML-LibXML-1.61
+	>=dev-perl/Parse-RecDescent-1.94
+	>=dev-perl/XML-LibXSLT-1.53
+	dev-perl/IO-stringy
+	dev-perl/XML-SAX-Writer
+	dev-perl/Term-ReadLine-Perl
+	dev-perl/XML-Filter-DOMFilter-LibXML
+	>=dev-perl/XML-XUpdate-LibXML-0.4.0
+	!app-editors/XML-XSH"
+
+SRC_TEST=do

diff --git a/app-editors/XML-XSH2/XML-XSH2-2.1.2.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.1.2.ebuild
new file mode 100644
index 0000000..ad7b9f3
--- /dev/null
+++ b/app-editors/XML-XSH2/XML-XSH2-2.1.2.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/app-editors/XML-XSH2/XML-XSH2-2.1.2.ebuild,v 1.1 2011/06/23 08:20:15 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=PAJAS
+MODULE_VERSION=2.1.2
+inherit perl-module
+
+DESCRIPTION="XML Editing Shell"
+HOMEPAGE="http://xsh.sourceforge.net/"
+
+LICENSE="|| ( Artistic GPL-2 )" # Artistic or GPL-2
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/XML-LibXML-1.61
+	>=dev-perl/Parse-RecDescent-1.94
+	>=dev-perl/XML-LibXSLT-1.53
+	dev-perl/IO-stringy
+	dev-perl/XML-SAX-Writer
+	dev-perl/Term-ReadLine-Perl
+	dev-perl/URI
+	dev-perl/XML-Filter-DOMFilter-LibXML
+	>=dev-perl/XML-XUpdate-LibXML-0.4.0
+	!app-editors/XML-XSH
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/app-editors/XML-XSH2/XML-XSH2-2.1.3.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.1.3.ebuild
new file mode 100644
index 0000000..8b2de93
--- /dev/null
+++ b/app-editors/XML-XSH2/XML-XSH2-2.1.3.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/app-editors/XML-XSH2/XML-XSH2-2.1.3.ebuild,v 1.1 2011/07/06 12:37:32 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=PAJAS
+MODULE_VERSION=2.1.3
+inherit perl-module
+
+DESCRIPTION="XML Editing Shell"
+HOMEPAGE="http://xsh.sourceforge.net/"
+
+LICENSE="|| ( Artistic GPL-2 )" # Artistic or GPL-2
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/XML-LibXML-1.61
+	>=dev-perl/Parse-RecDescent-1.94
+	>=dev-perl/XML-LibXSLT-1.53
+	dev-perl/IO-stringy
+	dev-perl/XML-SAX-Writer
+	dev-perl/Term-ReadLine-Perl
+	dev-perl/URI
+	dev-perl/XML-Filter-DOMFilter-LibXML
+	>=dev-perl/XML-XUpdate-LibXML-0.4.0
+	!app-editors/XML-XSH
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/app-editors/XML-XSH2/XML-XSH2-2.1.5.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.1.5.ebuild
new file mode 100644
index 0000000..35aef04
--- /dev/null
+++ b/app-editors/XML-XSH2/XML-XSH2-2.1.5.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/app-editors/XML-XSH2/XML-XSH2-2.1.5.ebuild,v 1.1 2011/11/19 19:53:32 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=PAJAS
+MODULE_VERSION=2.1.5
+inherit perl-module
+
+DESCRIPTION="XML Editing Shell"
+HOMEPAGE="http://xsh.sourceforge.net/"
+
+LICENSE="|| ( Artistic GPL-2 )" # Artistic or GPL-2
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/XML-LibXML-1.61
+	>=dev-perl/Parse-RecDescent-1.94
+	>=dev-perl/XML-LibXSLT-1.53
+	dev-perl/IO-stringy
+	dev-perl/XML-SAX-Writer
+	dev-perl/Term-ReadLine-Perl
+	dev-perl/URI
+	dev-perl/XML-Filter-DOMFilter-LibXML
+	>=dev-perl/XML-XUpdate-LibXML-0.4.0
+	!app-editors/XML-XSH
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/app-editors/XML-XSH2/XML-XSH2-2.1.6.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.1.6.ebuild
new file mode 100644
index 0000000..a8d5f28
--- /dev/null
+++ b/app-editors/XML-XSH2/XML-XSH2-2.1.6.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/app-editors/XML-XSH2/XML-XSH2-2.1.6.ebuild,v 1.1 2012/02/26 08:48:08 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=PAJAS
+MODULE_VERSION=2.1.6
+inherit perl-module
+
+DESCRIPTION="XML Editing Shell"
+HOMEPAGE="http://xsh.sourceforge.net/"
+
+LICENSE="|| ( Artistic GPL-2 )" # Artistic or GPL-2
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/XML-LibXML-1.61
+	>=dev-perl/Parse-RecDescent-1.94
+	>=dev-perl/XML-LibXSLT-1.53
+	dev-perl/IO-stringy
+	dev-perl/XML-SAX-Writer
+	dev-perl/Term-ReadLine-Perl
+	dev-perl/URI
+	dev-perl/XML-Filter-DOMFilter-LibXML
+	>=dev-perl/XML-XUpdate-LibXML-0.4.0
+	!app-editors/XML-XSH
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do

diff --git a/app-editors/padre/Manifest b/app-editors/padre/Manifest
new file mode 100644
index 0000000..66a448b
--- /dev/null
+++ b/app-editors/padre/Manifest
@@ -0,0 +1,8 @@
+DIST Padre-0.92.tar.gz 1821353 RMD160 37b844ff66b47fa501572dd30bff8383d15b82ab SHA1 bd124e266bf1e790901f7c67ff6551476d648c2b SHA256 f9d0804ec940453b96edca6760d0ac18e930572766fc1db3259bd86d30e9d541
+DIST Padre-0.94.tar.gz 1871534 RMD160 2a9489c8e446663a87428bdfaf9c7f0ecaa7a5a1 SHA1 61a297e02734febf9ecce6f0d8ace5a696350fb5 SHA256 a01a9f7dc44c5eafdcc9cf872af0ee1fdd51fe27b586f0f383bed882e8bac6fd
+DIST Padre-0.96.tar.gz 1919132 RMD160 86284c27226c65084b6872a5487bb8e63a23f8d8 SHA1 ce4a5856b5e6409cbf808ce60ad9cc19bf51eb29 SHA256 ce727f17792ef25f4bffc9dc2dc8fd71357bbabad407320c77700889272b856b
+EBUILD padre-0.920.0.ebuild 2799 RMD160 172f543111dfafcf92323034ab5ce302960da4a2 SHA1 2db360d0aac0cf6a403cb71bba19fbe1afc39084 SHA256 c8d13a5d0c9a24d72972133bff1c5fc34f1ed61e2b4698d01bf689e4c128b985
+EBUILD padre-0.940.0.ebuild 2790 RMD160 675d9fe6136d8407efd7fde5b70c3eba421c98cd SHA1 624d789214d613d1999b3a634c90da85fc3b7f15 SHA256 d1e900dc6de4d8d5226966e4fade0e4c170885cf09f1de4587449fc23e928feb
+EBUILD padre-0.960.0.ebuild 2785 RMD160 5dbbcf86a59dee44f7225fe3db67a877cafd9e6b SHA1 6aeb33e5e7c48cbd636e138390ff4d98cb70587e SHA256 7c8cf50baebdf3c38febbe7389aec6a41561b8186299679f79ea3f06202f95b9
+MISC ChangeLog 6379 RMD160 e46988b46b0e690b2b3c6da8771ad04a7af3f97c SHA1 1d556cb50e616c997f7faf1f3f23cb2a0ce0312a SHA256 da30d8e928fdb650d42e44a8c4aef7f8e8d6d7ab633577bb0d150676e3e628de
+MISC metadata.xml 231 RMD160 7a591488c710e9b882dcbd363f6d027fe7647260 SHA1 6d7057b5b0443493e5108acc78f6ea989e413b92 SHA256 7787ff49989e62247aaf7e845fcfd072370202f51149ba8d442d92a3c084bdf8

diff --git a/app-editors/padre/padre-0.920.0.ebuild b/app-editors/padre/padre-0.920.0.ebuild
new file mode 100644
index 0000000..a4e2272
--- /dev/null
+++ b/app-editors/padre/padre-0.920.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/padre/padre-0.920.0.ebuild,v 1.1 2011/12/02 19:42:55 tove Exp $
+
+EAPI="4-slot-abi"
+
+MY_PN=Padre
+MODULE_AUTHOR=PLAVEN
+MODULE_VERSION=0.92
+inherit perl-module
+
+DESCRIPTION="Perl Application Development and Refactoring Environment"
+HOMEPAGE="http://padre.perlide.org/"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Test Deps
+TDEPEND="
+	>=dev-perl/Test-MockObject-1.09
+	>=dev-perl/Test-Script-1.07
+	>=dev-perl/Test-Exception-0.27
+	>=dev-perl/Test-NoWarnings-0.084
+	>=virtual/perl-Test-Simple-0.88
+"
+
+# Depend on perl-5.10.1 but it only needs
+# a modern EU::MM
+#	>=virtual/perl-Pod-Perldoc-3.15
+RDEPEND="
+	!<dev-lang/perl-5.10.1
+	>=dev-perl/Algorithm-Diff-1.190.0
+	>=dev-perl/Capture-Tiny-0.06
+	>=dev-perl/Class-Adapter-1.05
+	>=dev-perl/Class-Inspector-1.22
+	>=dev-perl/Class-XSAccessor-1.05
+	>=dev-perl/DBD-SQLite-1.27
+	>=dev-perl/DBI-1.58
+	>=dev-perl/Devel-Dumpvar-0.04
+	>=dev-perl/Debug-Client-0.11
+	>=dev-perl/Devel-Refactor-0.05
+	>=dev-perl/File-Copy-Recursive-0.37
+	>=dev-perl/File-Find-Rule-0.30
+	>=dev-perl/File-HomeDir-0.91
+	>=virtual/perl-File-Path-2.08
+	>=dev-perl/File-Remove-1.40
+	>=dev-perl/File-ShareDir-1.00
+	dev-perl/File-Slurp
+	>=virtual/perl-File-Spec-3.27.01
+	>=virtual/perl-File-Temp-0.20
+	>=dev-perl/File-Which-1.08
+	dev-perl/File-pushd
+	>=dev-perl/Format-Human-Bytes-0.06
+	virtual/perl-Getopt-Long
+	>=dev-perl/HTML-Parser-3.58
+	>=dev-perl/IO-stringy-2.110
+	virtual/perl-IO
+	>=dev-perl/IO-String-1.08
+	>=dev-perl/IPC-Run-0.83
+	>=dev-perl/JSON-XS-2.2.9
+	>=virtual/perl-Scalar-List-Utils-1.18
+	>=dev-perl/libwww-perl-5.815
+	>=dev-perl/List-MoreUtils-0.22
+	>=dev-perl/Locale-Msgfmt-0.15
+	>=dev-perl/Module-Manifest-0.07
+	>=dev-perl/ORLite-1.48
+	>=dev-perl/ORLite-Migrate-1.80.0
+	>=dev-perl/PAR-0.989
+	>=dev-perl/Params-Util-0.33
+	>=dev-perl/Parse-ErrorString-Perl-0.14
+	>=dev-perl/Parse-ExuberantCTags-1.00
+	>=dev-perl/Pod-Abstract-0.16
+	>=dev-perl/Pod-POM-0.17
+	>=virtual/perl-Pod-Simple-3.07
+	>=dev-perl/PPI-1.205
+	>=dev-perl/PPIx-EditorTools-0.130.0
+	>=dev-perl/PPIx-Regexp-0.011
+	dev-perl/Probe-Perl
+	>=dev-perl/Sort-Versions-1.500.0
+	>=virtual/perl-Storable-2.16
+	>=dev-perl/Template-Tiny-0.11
+	>=virtual/perl-Text-Balanced-0.80
+	>=dev-perl/Text-Diff-1.410.0
+	>=dev-perl/Text-FindIndent-0.10
+	>=dev-perl/Text-Patch-1.800.0
+	>=virtual/perl-threads-1.71
+	>=virtual/perl-threads-shared-1.33
+	>=virtual/perl-Time-HiRes-1.97.18
+	>=dev-perl/URI-0
+	>=dev-perl/wxperl-0.990.100
+	>=dev-perl/Wx-Perl-ProcessStream-0.28
+	>=dev-perl/Wx-Scintilla-0.340.0
+	>=dev-perl/YAML-Tiny-1.32
+	>=virtual/perl-version-0.79
+"
+DEPEND="${RDEPEND}"
+#	test? (
+#		${TDEPEND}
+#	)
+#"
+
+#SRC_TEST=do
+
+src_configure() {
+	unset DISPLAY
+	perl-module_src_configure
+}

diff --git a/app-editors/padre/padre-0.940.0.ebuild b/app-editors/padre/padre-0.940.0.ebuild
new file mode 100644
index 0000000..42710b6
--- /dev/null
+++ b/app-editors/padre/padre-0.940.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/padre/padre-0.940.0.ebuild,v 1.2 2012/01/26 11:32:10 tove Exp $
+
+EAPI="4-slot-abi"
+
+MY_PN=Padre
+MODULE_AUTHOR=PLAVEN
+MODULE_VERSION=0.94
+inherit perl-module
+
+DESCRIPTION="Perl Application Development and Refactoring Environment"
+HOMEPAGE="http://padre.perlide.org/"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Test Deps
+TDEPEND="
+	>=dev-perl/Test-MockObject-1.09
+	>=dev-perl/Test-Script-1.07
+	>=dev-perl/Test-Exception-0.27
+	>=dev-perl/Test-NoWarnings-0.084
+	>=virtual/perl-Test-Simple-0.88
+"
+
+# Depend on perl-5.10.1 but it only needs
+# a modern EU::MM
+#	>=virtual/perl-Pod-Perldoc-3.15
+RDEPEND="
+	!<dev-lang/perl-5.10.1
+	>=dev-perl/Algorithm-Diff-1.190.0
+	>=dev-perl/Capture-Tiny-0.06
+	>=dev-perl/Class-Adapter-1.05
+	>=dev-perl/Class-Inspector-1.22
+	>=dev-perl/Class-XSAccessor-1.130.0
+	>=dev-perl/DBD-SQLite-1.350.0
+	>=dev-perl/DBI-1.58
+	>=dev-perl/Devel-Dumpvar-0.04
+	>=dev-perl/Debug-Client-0.160.0
+	>=dev-perl/Devel-Refactor-0.05
+	>=dev-perl/File-Copy-Recursive-0.37
+	>=dev-perl/File-Find-Rule-0.30
+	>=dev-perl/File-HomeDir-0.91
+	>=virtual/perl-File-Path-2.08
+	>=dev-perl/File-Remove-1.40
+	>=dev-perl/File-ShareDir-1.00
+	>=virtual/perl-File-Spec-3.27.01
+	>=virtual/perl-File-Temp-0.20
+	>=dev-perl/File-Which-1.08
+	dev-perl/File-pushd
+	>=dev-perl/Format-Human-Bytes-0.06
+	virtual/perl-Getopt-Long
+	>=dev-perl/HTML-Parser-3.58
+	>=dev-perl/IO-stringy-2.110
+	virtual/perl-IO
+	>=dev-perl/IO-String-1.08
+	>=dev-perl/IPC-Run-0.83
+	>=dev-perl/JSON-XS-2.2.9
+	>=virtual/perl-Scalar-List-Utils-1.18
+	>=dev-perl/libwww-perl-5.815
+	>=dev-perl/List-MoreUtils-0.22
+	>=dev-perl/Locale-Msgfmt-0.15
+	>=dev-perl/Module-Manifest-0.07
+	>=dev-perl/ORLite-1.510.0
+	>=dev-perl/ORLite-Migrate-1.80.0
+	>=dev-perl/PAR-0.989
+	>=dev-perl/Params-Util-0.33
+	>=dev-perl/Parse-ErrorString-Perl-0.14
+	>=dev-perl/Parse-ExuberantCTags-1.00
+	>=dev-perl/Pod-Abstract-0.16
+	>=dev-perl/Pod-POM-0.17
+	>=virtual/perl-Pod-Simple-3.07
+	>=dev-perl/PPI-1.205
+	>=dev-perl/PPIx-EditorTools-0.130.0
+	>=dev-perl/PPIx-Regexp-0.011
+	dev-perl/Probe-Perl
+	>=dev-perl/Sort-Versions-1.500.0
+	>=virtual/perl-Storable-2.16
+	>=dev-perl/Template-Tiny-0.11
+	>=virtual/perl-Text-Balanced-0.80
+	>=dev-perl/Text-Diff-1.410.0
+	>=dev-perl/Text-FindIndent-0.10
+	>=dev-perl/Text-Patch-1.800.0
+	>=virtual/perl-threads-1.71
+	>=virtual/perl-threads-shared-1.33
+	>=virtual/perl-Time-HiRes-1.97.18
+	>=dev-perl/URI-0
+	>=dev-perl/wxperl-0.990.100
+	>=dev-perl/Wx-Perl-ProcessStream-0.28
+	>=dev-perl/Wx-Scintilla-0.340.0
+	>=dev-perl/YAML-Tiny-1.32
+	>=virtual/perl-version-0.79
+"
+DEPEND="${RDEPEND}"
+#	test? (
+#		${TDEPEND}
+#	)
+#"
+
+#SRC_TEST=do
+
+src_configure() {
+	unset DISPLAY
+	perl-module_src_configure
+}

diff --git a/app-editors/padre/padre-0.960.0.ebuild b/app-editors/padre/padre-0.960.0.ebuild
new file mode 100644
index 0000000..a23b880
--- /dev/null
+++ b/app-editors/padre/padre-0.960.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/padre/padre-0.960.0.ebuild,v 1.1 2012/04/25 16:01:19 tove Exp $
+
+EAPI="4-slot-abi"
+
+MY_PN=Padre
+MODULE_AUTHOR=PLAVEN
+MODULE_VERSION=0.96
+inherit perl-module
+
+DESCRIPTION="Perl Application Development and Refactoring Environment"
+HOMEPAGE="http://padre.perlide.org/"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Test Deps
+TDEPEND="
+	>=dev-perl/Test-MockObject-1.09
+	>=dev-perl/Test-Script-1.07
+	>=dev-perl/Test-Exception-0.27
+	>=dev-perl/Test-NoWarnings-0.084
+	>=virtual/perl-Test-Simple-0.88
+	>=dev-perl/Test-Warn-0.240.0
+"
+
+# Depend on perl-5.10.1 but it only needs
+# a modern EU::MM
+#	>=virtual/perl-Pod-Perldoc-3.15
+RDEPEND="
+	!<dev-lang/perl-5.10.1
+	>=dev-perl/Algorithm-Diff-1.190.0
+	>=dev-perl/Capture-Tiny-0.06
+	>=dev-perl/Class-Adapter-1.05
+	>=dev-perl/Class-Inspector-1.22
+	>=dev-perl/Class-XSAccessor-1.130.0
+	>=dev-perl/DBD-SQLite-1.350.0
+	>=dev-perl/DBI-1.58
+	>=dev-perl/Devel-Dumpvar-0.04
+	>=dev-perl/Debug-Client-0.200.0
+	>=dev-perl/Devel-Refactor-0.05
+	>=dev-perl/File-Copy-Recursive-0.37
+	>=dev-perl/File-Find-Rule-0.30
+	>=dev-perl/File-HomeDir-0.91
+	>=virtual/perl-File-Path-2.08
+	>=dev-perl/File-Remove-1.40
+	>=dev-perl/File-ShareDir-1.00
+	>=virtual/perl-File-Spec-3.27.01
+	>=virtual/perl-File-Temp-0.20
+	>=dev-perl/File-Which-1.08
+	dev-perl/File-pushd
+	virtual/perl-Getopt-Long
+	>=dev-perl/HTML-Parser-3.58
+	>=dev-perl/IO-stringy-2.110
+	virtual/perl-IO
+	>=dev-perl/IO-String-1.08
+	>=dev-perl/IPC-Run-0.83
+	>=dev-perl/JSON-XS-2.2.9
+	>=virtual/perl-Scalar-List-Utils-1.18
+	>=dev-perl/libwww-perl-5.815
+	>=dev-perl/List-MoreUtils-0.22
+	>=dev-perl/Locale-Msgfmt-0.15
+	>=dev-perl/Module-Manifest-0.07
+	>=dev-perl/ORLite-1.960.0
+	>=dev-perl/ORLite-Migrate-1.100.0
+	>=dev-perl/PAR-0.989
+	>=dev-perl/Params-Util-0.33
+	>=dev-perl/Parse-ErrorString-Perl-0.14
+	>=dev-perl/Parse-ExuberantCTags-1.00
+	>=dev-perl/Pod-Abstract-0.16
+	>=dev-perl/Pod-POM-0.17
+	>=virtual/perl-Pod-Simple-3.07
+	>=dev-perl/PPI-1.205
+	>=dev-perl/PPIx-EditorTools-0.130.0
+	>=dev-perl/PPIx-Regexp-0.011
+	dev-perl/Probe-Perl
+	>=dev-perl/Sort-Versions-1.500.0
+	>=virtual/perl-Storable-2.16
+	>=dev-perl/Template-Tiny-0.11
+	>=virtual/perl-Text-Balanced-0.80
+	>=dev-perl/Text-Diff-1.410.0
+	>=dev-perl/Text-FindIndent-0.10
+	>=dev-perl/Text-Patch-1.800.0
+	>=virtual/perl-threads-1.71
+	>=virtual/perl-threads-shared-1.33
+	>=virtual/perl-Time-HiRes-1.97.18
+	>=dev-perl/URI-0
+	>=dev-perl/wxperl-0.990.100
+	>=dev-perl/Wx-Perl-ProcessStream-0.28
+	>=dev-perl/Wx-Scintilla-0.340.0
+	>=dev-perl/YAML-Tiny-1.32
+	>=virtual/perl-version-0.79
+"
+DEPEND="${RDEPEND}"
+#	test? (
+#		${TDEPEND}
+#	)
+#"
+
+#SRC_TEST=do
+
+src_configure() {
+	unset DISPLAY
+	perl-module_src_configure
+}

diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
new file mode 100644
index 0000000..5bb791c
--- /dev/null
+++ b/app-misc/g15daemon/Manifest
@@ -0,0 +1,13 @@
+AUX 20g15daemon 173 RMD160 5e7c09483d61f787cabaf0dfd04b4042b5f61de5 SHA1 d78b994fb0e3731db3207e846e1d9e170c494eb7 SHA256 27be8c2dfa6b4b09203b783b64615947434087d405363141b62dd12bdb17bad6
+AUX 99-g15daemon.rules 90 RMD160 35df4086850c7170227e472cc82d7db0d0e2d23b SHA1 fff177b525ba9e7882cc01ae61091c483a3863c1 SHA256 dab916b3cb839bb55f4b6f599f83de2c4dbdd87005394f737dc59ab4df7d4e84
+AUX g15daemon-1.2.7-r2.initd 1107 RMD160 33a13cbbdf3701b6e81fb39dfad5f6ee3318d1bc SHA1 7832d5da216f59b42423d2f9583eb2b3356ae237 SHA256 37d29b422cdc680bd066d8b0dca874781396aded214cf080014454421c9bb26d
+AUX g15daemon-1.2.7.confd 329 RMD160 962088db694d25a6935de80299a45d94787ed251 SHA1 f452f915e6f903e4cdbbfc3db3e2e57ef702425f SHA256 a7977e03f0faaed85f659b077fddc3a589c2e2d4386df1e9afc89133c25bc613
+AUX g15daemon-1.9.5.3-forgotten-open-mode.patch 639 RMD160 04b8ae6d53ccb99a9bba32d0ae93b58d6859c71e SHA1 81c9d08dec32d87bb26836668a6984e0182e24ce SHA256 0d97a53d63052d2da325b39b6186330432fbf1a16be3e09eef4f250410f79e38
+AUX g15daemon-1.9.5.3-overflow-fix.patch 619 RMD160 5da1767b73fbc5f39d0eeedd615949a316754073 SHA1 044847b92940f18e437131814d24461f86d52188 SHA256 0c9c888c4f2e26cf51981714e917e963b371ed2b8d84c6e00b4c13df371afeda
+AUX g15daemon-hotplug 224 RMD160 a869293418f9e04e8209dc171850eb4cabb6251f SHA1 bdbe06b4ba667a151ae70733105a5bece123664a SHA256 ff7fc4857cab25ab57c9ceca9e4c1f9ca365fc140da21e8cfa9788ee9544ba38
+AUX g15daemon.conf 516 RMD160 50e8da6e93ae52960519c00d0f76ca6ba636f33a SHA1 db3b0b119c1f77dc91a7a9222c45ed3bd65f73df SHA256 94a79cea3ac0fa566cd6515e32eec22bb6a26e353c83608767dc65d1a2404037
+DIST g15daemon-1.9.5.3.tar.gz 414603 RMD160 937362cd75d578e1b992868aeacefa928390ab4d SHA1 bc10775494ff38e78ecb62074869332d96c5cb55 SHA256 40ff07a4186c1fd01ea23d1753a2cb3bef25f92cc496ddddc6abde6a574cd60a
+EBUILD g15daemon-1.9.5.3-r3.ebuild 3978 RMD160 8d8c01b53f712c36b52e381763a167e0037f3baf SHA1 5af1cd345517247407bb669f7c1bf1617647a8fa SHA256 a9fe2935b56303c08282836ce857db559c2225123d2e80230c224d06bae33337
+EBUILD g15daemon-1.9.5.3-r5.ebuild 4177 RMD160 375e647f2cd5d74dae4c1e3c9b2e56381aa849ec SHA1 41876c80c5ab5e2469c75fd0d7d83cc781012d58 SHA256 24d0297c5acdf6eb562051aa596d484b572b804bc7ef512f2a5612cbbffb8bde
+MISC ChangeLog 8264 RMD160 467d242b73c33592f56560c81ac0551017710066 SHA1 bfdf380c86b8eba8ddf0e56725de82dafc586413 SHA256 e42c74c5df44bc31a4bf5d6ebd709d74ba61b7d566a75f6c671c6439b76527e6
+MISC metadata.xml 222 RMD160 f3b76907c0789c67d2e3d9d4073a5911aa8ae42f SHA1 792ac055d4a27ee4d9120df34d5390ac3732ab94 SHA256 edd5f0f934fb8e9338e5a0ce8caaae6f6232dfb8cb4e0c0cfbac0363eb42b7c9

diff --git a/app-misc/g15daemon/files/20g15daemon b/app-misc/g15daemon/files/20g15daemon
new file mode 100644
index 0000000..ee14225
--- /dev/null
+++ b/app-misc/g15daemon/files/20g15daemon
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. "${PM_FUNCTIONS}"
+
+case "$1" in
+	hibernate|suspend)
+		/etc/init.d/g15daemon stop
+		;;
+	thaw|resume)
+		/etc/init.d/g15daemon start
+		;;
+	*)
+		exit $NA
+		;;
+esac

diff --git a/app-misc/g15daemon/files/99-g15daemon.rules b/app-misc/g15daemon/files/99-g15daemon.rules
new file mode 100644
index 0000000..d491d68
--- /dev/null
+++ b/app-misc/g15daemon/files/99-g15daemon.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTR{product}=="G15 Gaming Keyboard", RUN+="/usr/bin/g15daemon-hotplug"

diff --git a/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd b/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd
new file mode 100644
index 0000000..b8e8cd6
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd,v 1.1 2007/12/19 17:38:30 chainsaw Exp $
+
+# Init script for g15daemon
+
+depend() {
+	after hotplug
+	after usb
+	after modules
+}
+
+start() {
+	ebegin "Starting g15daemon"
+
+	# Does the input device already exist?
+	if [ -e /proc/modules -a ! -e /dev/input/uinput ]; then
+		# We can load modules, but uinput device does not exist
+		einfo "Loading uinput module"
+		/sbin/modprobe uinput > /dev/null 2> /dev/null
+	fi
+
+	local SWITCHKEY=""
+	[ "${CLIENT_SWITCH_L1}" = "yes" ] && SWITCHKEY="--switch"
+	start-stop-daemon --start --background --pidfile /var/run/g15daemon.pid \
+		--exec /usr/sbin/g15daemon -- ${SWITCHKEY}
+	eend $? "Failed to start g15daemon."
+}
+
+stop() {
+	ebegin "Stopping g15daemon"
+	local KILLOPT="-k"
+	if [ $BACKLIGHT_OFF = "yes" ]; then
+		KILLOPT="-K"
+	fi
+	/usr/sbin/g15daemon ${KILLOPT} &>/dev/null
+	sleep 1
+	start-stop-daemon -R 5 --stop --quiet --pidfile /var/run/g15daemon.pid
+	eend $?
+}

diff --git a/app-misc/g15daemon/files/g15daemon-1.2.7.confd b/app-misc/g15daemon/files/g15daemon-1.2.7.confd
new file mode 100644
index 0000000..08ea97f
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.2.7.confd
@@ -0,0 +1,9 @@
+# /etc/conf.d/g15daemon: Configuration for the g15daemon
+
+# Key to switch the client-screens. Default is the MR key,
+# Set to "yes" to use L1 key instead (black round key below the LCD, above the multimedia keys).
+CLIENT_SWITCH_L1="no"
+
+# Set to "yes" to switch off the lcd backlight when stopping g15daemon.
+BACKLIGHT_OFF="no"
+

diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
new file mode 100644
index 0000000..b475f1d
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
@@ -0,0 +1,11 @@
+--- ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c	2008-01-26 06:02:07.000000000 +0100
++++ ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c	2009-02-01 17:00:55.203009264 +0100
+@@ -356,7 +356,7 @@
+     config_items_t * item=NULL;
+     char line[1024];
+     
+-    config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC);
++    config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC,0664);
+     if(config_fd){
+     snprintf(line,1024,"# G15Daemon Configuration File\n# any items entered before a [section] header\n# will be in the Global config space\n# comments you wish to keep should start with a semicolon';'\n");
+     write(config_fd,line,strlen(line));

diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch
new file mode 100644
index 0000000..71cbf91
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch
@@ -0,0 +1,11 @@
+--- ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c	2008-01-25 05:45:05.000000000 +0100
++++ ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c	2011-02-14 22:51:55.203009264 +0100
+@@ -217,7 +217,7 @@
+     if(poll(pfd,1,100)>0){
+        if(pfd[0].revents & POLLPRI && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL)) { 
+              memset(packet,0,sizeof(packet));
+-             msgret = recv(sock, packet, 10 , MSG_OOB);
++             msgret = recv(sock, packet, sizeof(packet), MSG_OOB);
+              if (msgret < 1) {
+                   return -1;
+               }

diff --git a/app-misc/g15daemon/files/g15daemon-hotplug b/app-misc/g15daemon/files/g15daemon-hotplug
new file mode 100644
index 0000000..2ae8be0
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-hotplug
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+export IN_HOTPLUG=1
+
+case "$ACTION" in
+    "add")
+        /etc/init.d/g15daemon --quiet restart
+        ;;
+    "remove")
+        /etc/init.d/g15daemon --quiet stop
+        ;;
+    *)
+        exit 0
+        ;;
+esac

diff --git a/app-misc/g15daemon/files/g15daemon.conf b/app-misc/g15daemon/files/g15daemon.conf
new file mode 100644
index 0000000..2d2bfc3
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon.conf
@@ -0,0 +1,27 @@
+# G15Daemon Configuration File
+# any items entered before a [section] header
+# will be in the Global config space
+# comments you wish to keep should start with a semicolon';'
+
+[Global]
+Use MR as Cycle Key: Off
+
+[PLUGIN_LOAD_ORDER]
+0: g15plugin_uinput.so
+1: g15plugin_clock.so
+2: g15plugin_tcpserver.so
+TotalPlugins: 3
+
+[PLUGINS]
+Linux UINPUT Keyboard Output: Load
+Clock: Load
+LCDServer: Load
+
+[Keyboard OS Mapping (uinput)]
+device: /dev/input/uinput
+Lkeys.mapped: 0
+
+[Clock]
+24hrFormat: On
+ShowDate: Off
+Digital: On

diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r3.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r3.ebuild
new file mode 100644
index 0000000..6b18abe
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r3.ebuild,v 1.8 2011/04/16 22:56:19 arfrever Exp $
+
+EAPI=3
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils linux-info perl-module python base
+
+DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
+HOMEPAGE="http://g15daemon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="perl python"
+
+DEPEND="virtual/libusb:0
+	>=dev-libs/libg15-1.2.4
+	>=dev-libs/libg15render-1.2
+	perl? (
+		dev-lang/perl
+		dev-perl/GDGraph
+		>=dev-perl/Inline-0.4
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-forgotten-open-mode.patch" )
+uinput_check() {
+	ebegin "Checking for uinput support"
+	local rc=1
+	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
+	rc=$?
+
+	if [[ $rc -ne 0 ]] ; then
+		eerror "To use g15daemon, you need to compile your kernel with uinput support."
+		eerror "Please enable uinput support in your kernel config, found at:"
+		eerror
+		eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
+		eerror
+		eerror "Once enabled, you should have the /dev/input/uinput device."
+		eerror "g15daemon will not work without the uinput device."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	uinput_check
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	if use perl; then
+		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
+	fi
+	if use python; then
+		unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
+	fi
+}
+
+src_prepare() {
+	if use perl; then
+		perl-module_src_prepare
+		sed -i \
+			-e '1i#!/usr/bin/perl' \
+			"${S}"/contrib/testbindings.pl
+	else
+		# perl-module_src_prepare always calls base_src_prepare
+		base_src_prepare
+	fi
+}
+
+src_configure() {
+	base_src_configure
+
+	if use perl; then
+		cd "${WORKDIR}/G15Daemon-0.2"
+		perl-module_src_configure
+	fi
+}
+
+src_compile() {
+	base_src_compile
+
+	if use perl; then
+		cd "${WORKDIR}/G15Daemon-0.2"
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} install || die "make install failed"
+
+	# remove odd docs installed my make
+	rm "${D}/usr/share/doc/${PF}/"{LICENSE,README.usage}
+
+	insinto /usr/share/${PN}/contrib
+	doins contrib/xmodmaprc
+	doins contrib/xmodmap.sh
+	if use perl; then
+		doins contrib/testbindings.pl
+	fi
+
+	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-1.2.7-r2.initd" ${PN}
+	dobin "${FILESDIR}/g15daemon-hotplug"
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}/99-g15daemon.rules"
+
+	insinto /etc
+	doins "${FILESDIR}"/g15daemon.conf
+
+	if use perl; then
+		ebegin "Installing Perl Bindings (G15Daemon.pm)"
+		cd "${WORKDIR}/G15Daemon-0.2"
+		docinto perl
+		perl-module_src_install
+	fi
+
+	if use python; then
+		ebegin "Installing Python Bindings (g15daemon.py)"
+		cd "${WORKDIR}/pyg15daemon"
+
+		installation() {
+			insinto $(python_get_sitedir)
+			doins g15daemon.py
+		}
+		python_execute_function installation
+
+		docinto python
+		dodoc AUTHORS
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize g15daemon.py
+		echo ""
+	fi
+
+	elog "To use g15daemon, you need to add g15daemon to the default runlevel."
+	elog "This can be done with:"
+	elog "# /sbin/rc-update add g15daemon default"
+	elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
+	elog ""
+	elog "To have all new keys working in X11, you'll need create a "
+	elog "specific xmodmap in your home directory or edit the existent one."
+	elog ""
+	elog "Create the xmodmap:"
+	elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
+	elog ""
+	elog "Adding keycodes to an existing xmodmap:"
+	elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup g15daemon.py
+	fi
+}

diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild
new file mode 100644
index 0000000..6398c1d
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild,v 1.4 2012/03/08 15:17:35 ranger Exp $
+
+EAPI="4-slot-abi"
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils linux-info perl-module python base
+
+DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
+HOMEPAGE="http://g15daemon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="perl python static-libs"
+
+DEPEND="virtual/libusb:0
+	>=dev-libs/libg15-1.2.4
+	>=dev-libs/libg15render-1.2
+	perl? (
+		dev-lang/perl:=
+		dev-perl/GDGraph
+		>=dev-perl/Inline-0.4
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-forgotten-open-mode.patch"
+	"${FILESDIR}/${P}-overflow-fix.patch"
+)
+uinput_check() {
+	ebegin "Checking for uinput support"
+	local rc=1
+	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
+	rc=$?
+
+	if [[ $rc -ne 0 ]] ; then
+		eerror "To use g15daemon, you need to compile your kernel with uinput support."
+		eerror "Please enable uinput support in your kernel config, found at:"
+		eerror
+		eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
+		eerror
+		eerror "Once enabled, you should have the /dev/input/uinput device."
+		eerror "g15daemon will not work without the uinput device."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	uinput_check
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	if use perl; then
+		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
+	fi
+	if use python; then
+		unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
+	fi
+}
+
+src_prepare() {
+	if use perl; then
+		perl-module_src_prepare
+		sed -i \
+			-e '1i#!/usr/bin/perl' \
+			"${S}"/contrib/testbindings.pl
+	else
+		# perl-module_src_prepare always calls base_src_prepare
+		base_src_prepare
+	fi
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static)
+
+	if use perl; then
+		cd "${WORKDIR}/G15Daemon-0.2"
+		perl-module_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		cd "${WORKDIR}/G15Daemon-0.2"
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	# remove odd docs installed my make
+	rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
+
+	insinto /usr/share/${PN}/contrib
+	doins contrib/xmodmaprc
+	doins contrib/xmodmap.sh
+	if use perl; then
+		doins contrib/testbindings.pl
+	fi
+
+	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-1.2.7-r2.initd" ${PN}
+	dobin "${FILESDIR}/g15daemon-hotplug"
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}/99-g15daemon.rules"
+
+	insinto /etc
+	doins "${FILESDIR}"/g15daemon.conf
+
+	# Gentoo bug #301340, debian bug #611649
+	exeinto /usr/lib/pm-utils/sleep.d
+	doexe "${FILESDIR}"/20g15daemon
+
+	if use perl; then
+		ebegin "Installing Perl Bindings (G15Daemon.pm)"
+		cd "${WORKDIR}/G15Daemon-0.2"
+		docinto perl
+		perl-module_src_install
+	fi
+
+	if use python; then
+		ebegin "Installing Python Bindings (g15daemon.py)"
+		cd "${WORKDIR}/pyg15daemon"
+
+		installation() {
+			insinto $(python_get_sitedir)
+			doins g15daemon.py
+		}
+		python_execute_function installation
+
+		docinto python
+		dodoc AUTHORS
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize g15daemon.py
+		echo ""
+	fi
+
+	elog "To use g15daemon, you need to add g15daemon to the default runlevel."
+	elog "This can be done with:"
+	elog "# /sbin/rc-update add g15daemon default"
+	elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
+	elog ""
+	elog "To have all new keys working in X11, you'll need create a "
+	elog "specific xmodmap in your home directory or edit the existent one."
+	elog ""
+	elog "Create the xmodmap:"
+	elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
+	elog ""
+	elog "Adding keycodes to an existing xmodmap:"
+	elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup g15daemon.py
+	fi
+}

diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index d4387bf..34001c8 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -5,6 +5,6 @@ DIST yaml-0.1.4.tar.gz 471759 RMD160 5051545022ffa4c78e63fed6f3af30f90e931497 SH
 EBUILD libyaml-0.0.1.ebuild 864 RMD160 8c717ae205720d55a896d41fa0a983ac578d734f SHA1 70fdfcf968709a710556ac15e8bc16fbf6d77607 SHA256 7f1c8104dc65401ce22f562f763383a7e5aa4dcf96bc2de5e0ebc9d361eb462a
 EBUILD libyaml-0.1.2.ebuild 890 RMD160 f45c5ad7e3d15b2cbd7c003116641990196cfd33 SHA1 f742aad3ce9ea2b7886e51b816d031fd622ba070 SHA256 7914fb3ded6b7fecb4bed788e49f98b22628bade81b3742ad83f0cb2e115029d
 EBUILD libyaml-0.1.3.ebuild 979 RMD160 dd8c726f6b87a285fbd637d186748defaaf55918 SHA1 cf02d0d713ceb9770ae359f584239acb5abd5d7e SHA256 8b4488fbc1bdd0dbdd55a5f2d8ba297f846d0e3598394587519c47bdb9544126
-EBUILD libyaml-0.1.4.ebuild 1057 RMD160 868fb5385cda737da269f19bce7a4f9fd63a6f87 SHA1 9f083848cf640b506c830e2efd30b8145cd8b411 SHA256 7e0ace18f49564588fc81d7674fb0a6a271a97f6905533bc737955bd0e2d578a
-MISC ChangeLog 2640 RMD160 55da55ee0cf49d3a839a5b4483c02b9ffee5779a SHA1 3e3d465088994da4b8bd41850a9dcb0c0a6d1dcb SHA256 b1e6e1b31c747ed39f4036eccae8fd301e2951b558ee89a41360cb1ed607356e
+EBUILD libyaml-0.1.4.ebuild 1037 RMD160 72a82237abc466fdef1de237d85bfafb45a6d4c9 SHA1 d1145f26acca131456c73f197bc0a07cef133d4f SHA256 fad1a7c570c6e0407884d8e835b78c1bec5967da24cbac01cf1988b57d204d2f
+MISC ChangeLog 2751 RMD160 92d53cf278b2844786934103782ee58278d4337b SHA1 6d048feb42d617f0f2a77f2a092f91763e4870d5 SHA256 6385d637fbc690ed7679793e2bc1bcadc8f96f3058e143802f46b1dc0899c9be
 MISC metadata.xml 385 RMD160 6f5210fb839b539e3d039fd01c4f687b9ef43af9 SHA1 11c820590de744b57148be875b915631fd4a36ce SHA256 7c7be37712d301550a32df2bbde3319b2881e9ec9e55390e7efbbe0bf0219595

diff --git a/dev-libs/libyaml/libyaml-0.1.4.ebuild b/dev-libs/libyaml/libyaml-0.1.4.ebuild
index 9ea91df..bb32e34 100644
--- a/dev-libs/libyaml/libyaml-0.1.4.ebuild
+++ b/dev-libs/libyaml/libyaml-0.1.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.4.ebuild,v 1.5 2012/06/26 12:03:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.4.ebuild,v 1.6 2012/06/28 01:19:50 sbriesen Exp $
 
 EAPI="4-slot-abi"
 
-inherit eutils
+inherit eutils autotools-utils
 
 MY_P="${P/lib}"
 
@@ -28,12 +28,8 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
-	default
+	autotools-utils_src_install
 	use doc && dohtml -r doc/html/.
 	if use examples ; then
 		docompress -x /usr/share/doc/${PF}/examples

diff --git a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.50.0.ebuild b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.50.0.ebuild
new file mode 100644
index 0000000..0a32044
--- /dev/null
+++ b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.50.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/Astro-FITS-Header/Astro-FITS-Header-3.50.0.ebuild,v 1.1 2012/06/28 19:04:06 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=TJENNESS
+MODULE_VERSION=3.05
+inherit perl-module
+
+DESCRIPTION="Interface to FITS headers"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build"
+
+SRC_TEST="do"

diff --git a/dev-perl/Astro-FITS-Header/Manifest b/dev-perl/Astro-FITS-Header/Manifest
index c0f4c06..c96e763 100644
--- a/dev-perl/Astro-FITS-Header/Manifest
+++ b/dev-perl/Astro-FITS-Header/Manifest
@@ -1,4 +1,6 @@
 DIST Astro-FITS-Header-3.03.tar.gz 108592 RMD160 cfc3365d06ba8e2b44ddbbc3f3433cea13cb6b87 SHA1 656924d70878da2e10144eff5de7e37add7c67f8 SHA256 e396fb6bd984e79199f45a04cc17147a0327a886898860ba0adc4854ea490541
+DIST Astro-FITS-Header-3.05.tar.gz 105888 RMD160 3ae0612a9924255c9e77417add870c0e20a49efc SHA1 fff7bf500a30c6a1ec2b7f74572107dc7326c7cf SHA256 8a94927052931ca48af9134a419138278d03f6ee9fee8106e5439ccccd6d805b
 EBUILD Astro-FITS-Header-3.30.0.ebuild 538 RMD160 5b1913b49378d5086107f8c56c6585bfed55f32f SHA1 a465504613a894a549513641d4d014956122aaa1 SHA256 3c4c767eebe6926274ad0f91a12c494a1bee42fc48260d139771e3415b6fb7bf
-MISC ChangeLog 3394 RMD160 148d4d77e61fdda64b3bbe772d02becd957ac670 SHA1 04e610900ca88ecb893adae9bab8f7621664b68e SHA256 65ae2fa1c42c628858f46d2501bb5b669a37f5d3b60829505bd3ff4c69e454c7
+EBUILD Astro-FITS-Header-3.50.0.ebuild 545 RMD160 ff8ff1a33202a4f27c9a2507c500e246b36cc9db SHA1 756d23ebf06a2c5682428b80d17cd880f9bf9ad9 SHA256 450a893311a66a93dae78adf8710a514d518e65d665d615008c302573ecaa992
+MISC ChangeLog 3535 RMD160 6790af9c2978952572c4137eeafdc6850f03093b SHA1 01ed308094c672f2fa44f99fb8ed6aa1d92c6d0e SHA256 7e28990151e82db71232da14da6741975c0a8565d948dd2569e2e9bab408c01d
 MISC metadata.xml 745 RMD160 f5a013fc45a9ad83347252bbb540dee4f07c762b SHA1 1473b24903538d5004badaf55ac50e19ea0398da SHA256 3e022d9cf009ea28b06f65d0386491abace01735322d17674d9ba4e42e1717bd

diff --git a/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.190.0.ebuild b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.190.0.ebuild
new file mode 100644
index 0000000..4f16318
--- /dev/null
+++ b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.190.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/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.190.0.ebuild,v 1.1 2012/06/28 19:07:51 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=KROKI
+MODULE_VERSION=0.19
+inherit perl-module
+
+DESCRIPTION="Perl client for memcached, in C language"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+SRC_TEST="do"
+
+MAKEOPTS="${MAKEOPTS} -j1"

diff --git a/dev-perl/Cache-Memcached-Fast/Manifest b/dev-perl/Cache-Memcached-Fast/Manifest
index 28f669d..77619a0 100644
--- a/dev-perl/Cache-Memcached-Fast/Manifest
+++ b/dev-perl/Cache-Memcached-Fast/Manifest
@@ -1,4 +1,6 @@
 DIST Cache-Memcached-Fast-0.17.tar.gz 91917 RMD160 b084d84c13f754e760b6288c909fcee43bfcc77f SHA1 57bd3a78c7293bc34ebaa5bc435fe1c263839a54 SHA256 de951d390a481bd92a965084a0e0fce304541ee002673af87595622d7fa60a74
+DIST Cache-Memcached-Fast-0.19.tar.gz 93883 RMD160 3ab4c2b44d657eef5e3afc9c7d1ba40a919fbb03 SHA1 502630a137a6f7e6d103c6d72e849f6c327356f6 SHA256 75340f00302b39562211b37909ef2d73fd99f28ba7c90b4af205de506affd82c
 EBUILD Cache-Memcached-Fast-0.170.0.ebuild 465 RMD160 645c3221b5ba902b8e11bbd031e43112889caccf SHA1 9bcdc804d6c97834777867770d6a53be91cb8606 SHA256 506080e1126ebef6c37a2438492b29889f9736ad029888dd82d1fbb154cf7a40
-MISC ChangeLog 1553 RMD160 8169842b88a37b8ded91cc4236008df2643c17bb SHA1 75519bfcc6eec60d90055b67bed66365f092008a SHA256 199889818e250347c100ead572c508acfad774f96ae4a8a91f15000998f23d37
+EBUILD Cache-Memcached-Fast-0.190.0.ebuild 465 RMD160 020112223e4b9a7f2fc0ade3563b1b8d763ce1bb SHA1 a7714d3a263fc57f002ae1afa77503fd4c970c1e SHA256 dc239958309d72b3d240355e4e75514d7be8a8968c7e3f1f726b324a0c408d95
+MISC ChangeLog 1703 RMD160 81858282ed8df0d0bb126250d474c823ddba2244 SHA1 c7437cfcf2b61989c02f8af4fd8af722933b4764 SHA256 d9fa371f7cef5b12504931c3960c90484ad67582933b0a65c3caf035ea836fbf
 MISC metadata.xml 434 RMD160 875ee417156b6e51a790da6721a0310315fa5201 SHA1 8f3a87f5c01cb1cbc832c32eac8838ab5c4c8019 SHA256 450c0b311d4d85fcede6fc78b67ef501e8a1183216fe9e979eeca9ddd8ff696c

diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0.ebuild
new file mode 100644
index 0000000..49b9b29
--- /dev/null
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.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/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0.ebuild,v 1.1 2012/06/28 19:11:27 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=DORMANDO
+MODULE_VERSION=1.30
+inherit perl-module
+
+DESCRIPTION="Perl API for memcached"
+HOMEPAGE="http://www.danga.com/memcached/ ${HOMEPAGE}"
+
+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"

diff --git a/dev-perl/Cache-Memcached/Manifest b/dev-perl/Cache-Memcached/Manifest
index 945476e..251e7f4 100644
--- a/dev-perl/Cache-Memcached/Manifest
+++ b/dev-perl/Cache-Memcached/Manifest
@@ -3,11 +3,13 @@ DIST Cache-Memcached-1.26.tar.gz 18282 RMD160 361c1149a0cb9978ef42148353c962b144
 DIST Cache-Memcached-1.27.tar.gz 18924 RMD160 1816ca71f0346299276de70caf437122e5989e72 SHA1 bec9edf428fd6e7409a830ceda4c23fdf3b91abc SHA256 3bfc477bd483ee04615e39b8c9df97a9a3886e01394fee822044b288cad4be27
 DIST Cache-Memcached-1.28.tar.gz 19201 RMD160 b433fb946ec606d95243a40291f581b7faa76c53 SHA1 544d3d7333d92031756514530c05ed36f1275af1 SHA256 b3407db688f7ba09e7c08a44ee1c175e9d003feb41eb91bfe13cce74cc801bef
 DIST Cache-Memcached-1.29.tar.gz 19542 RMD160 26e2aab4c2bc54cd9e7319399dc6b1cc52b938dd SHA1 a3dfa0f16f9c3f4d3986721eac9c29fd9df1a7c5 SHA256 782d60a8bc28f58b0ab37f4a9ac84a5b7168f7f7b0be708a59f2ca98812f3d43
+DIST Cache-Memcached-1.30.tar.gz 20643 RMD160 cfb766f09f3e2663ad6bea6fb20723e2be0dde24 SHA1 e439c698a9ff17bba0eae06db39b6bb36fc6fa75 SHA256 31b3c51ec0eaaf03002e2cc8e3d7d5cbe61919cfdada61c008eb9853acac42a9
 EBUILD Cache-Memcached-1.24.ebuild 619 RMD160 afde615da27d633de3775837e3ff25250b7e7af2 SHA1 d116d97e1c211f978a456bd409c98abb76e400c8 SHA256 b9c95ca18fefced93ef975aa3df9aa3e9b13068ac4495cb0cc20e115258438cb
 EBUILD Cache-Memcached-1.26.ebuild 588 RMD160 eda10e1db9c04b6f91c6d4e58a9e40faba2043e8 SHA1 27f785da09045b33d11ec391891675e0b30242b8 SHA256 a5bfc56528693f431f0ac5fdbb69fe594d4c38014c6f9d7cd526f47d330168b3
 EBUILD Cache-Memcached-1.27.ebuild 572 RMD160 cd6495fc73fffdd6f40b4278ec329ded097c1915 SHA1 db10d1d8868718ace77be128d2d486959b0c94c3 SHA256 3bd21b2b03117732b75d54b94627a733e0bb8996eb742be202da38c1e069b651
 EBUILD Cache-Memcached-1.28.ebuild 631 RMD160 7fa32d2349e17a06df2060e8b2a9427cc2acdec0 SHA1 129d890d6519a4c29d843b2cdf456073975a5e4f SHA256 38015090ef425a8dad43949f92777b557ddf88ef501d4daea9acb723f5b70341
 EBUILD Cache-Memcached-1.29.ebuild 631 RMD160 26b43c007570c324bb2d2ed89cdc31d467f04466 SHA1 c1d4c2f14ceb3f859819fea5ee6969055802597c SHA256 a5b568823601f400f31713122e2663b4632c4a850154a0b82f3f6a6cd9bdfa68
 EBUILD Cache-Memcached-1.290.0.ebuild 645 RMD160 99ec08e944ff4d463a64a9bf27e544bc87810621 SHA1 e51cef8f02bf1bba8dbec7623adc413c1d60c52b SHA256 670a5f56f6e7c2f9ac074f8e095dd31e47e90c662fcaaca6be8b12ec02ea83e2
-MISC ChangeLog 11296 RMD160 3de280ae273281cb7eae4a848ff03afe3f897837 SHA1 cfd82e7e7feb44eab2dd154479d7995be14900cd SHA256 ba92d0ea95bd6ef88784fabd0b24ca8f272302c1856e65b461508667a6bd0941
+EBUILD Cache-Memcached-1.300.0.ebuild 647 RMD160 265a1b6f1303f3c75d8e13591b0d6145a7c0c0c9 SHA1 f495fa91611281dfe14013e385fe61d85044d0aa SHA256 1589c0484d04f9021ba44497e0faf8e485d4e8d01b54b8b73989ba43e0e536ff
+MISC ChangeLog 11433 RMD160 131a47dde6c8668e2872ea3ced4b2c2f13431611 SHA1 2056f69057f4bbc2860ce249a2bfb25dacc50379 SHA256 0fd361175df46f86568b1c007ac290adf049eb3e17cc0581a09d702c435de342
 MISC metadata.xml 378 RMD160 1f08d4d27344ffd4ae5a68c034308b88185c5506 SHA1 757aec4e02a046c7a0a83ccdcd397bb2b4800764 SHA256 2371b67555e5cd9d8de64360c17e416a51c75d65c1a190246a268c638d71f95e

diff --git a/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild b/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild
index 9527eb1..8272c90 100644
--- a/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild
+++ b/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild,v 1.6 2012/06/22 15:46:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild,v 1.7 2012/06/28 12:47:28 ranger Exp $
 
 EAPI="4-slot-abi"
 
@@ -11,7 +11,7 @@ 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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~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/Encode-Locale/Manifest b/dev-perl/Encode-Locale/Manifest
index e5b572c..2e2c98e 100644
--- a/dev-perl/Encode-Locale/Manifest
+++ b/dev-perl/Encode-Locale/Manifest
@@ -1,6 +1,6 @@
 DIST Encode-Locale-1.02.tar.gz 6753 RMD160 c0848157d2d78952817f3d86811cbce5bcab1020 SHA1 25f79c9fc7636887ddf00e0a759a8cd4b9cb492c SHA256 20c5ba2ab0ac00f0e6d5c5d405f2ccb3fdb0212de3519ec8d16688574d8d5340
 DIST Encode-Locale-1.03.tar.gz 6846 RMD160 9f7b4a8bb68caea7fca48c97e2d935dfee3cd9a6 SHA1 b37c3dbb98b56d31cc8af35a548096bfbf44820f SHA256 f76337e0933225914111fcc3319ff4db359b1abfd1aa56dff2df5378db0e2d55
 EBUILD Encode-Locale-1.20.0.ebuild 601 RMD160 0a4369e4dc155392706b49269ad52f9a7adc2b92 SHA1 714c6cd5aa42b76a5345509e1d259ad62b5a086a SHA256 f9a569809cdf43371cfc08ca39a52a8591020db5263d0d0ff41ebd252a342708
-EBUILD Encode-Locale-1.30.0.ebuild 630 RMD160 3a47937e6f4f690eec44ce31c38114746e8b367f SHA1 6690cc339f9d656fa0fe373807e377d20a51d254 SHA256 ecd053036351893e565afa94df3a7badf7372e2c1277261c377433eb38c09cbd
-MISC ChangeLog 3367 RMD160 098789422bd9d703aa387da38abe687fdd36c3c4 SHA1 a3b1a82fd3021fb97a6900a5c81765f6dbdde197 SHA256 eb77af60117f616cae8ee8a69c55987f395f62060519f66e3146c8dd460e7ba0
+EBUILD Encode-Locale-1.30.0.ebuild 629 RMD160 9ca015c5fbdfbb4e57e0864efc5ef3b423fcbe98 SHA1 73695fed765af3925d7804fdaae4da0a2c93e6a2 SHA256 b64fbb944d981b9e3086e262c2571b64ad6637404c0f9a22b5ecb9dcc384dbc2
+MISC ChangeLog 3496 RMD160 feebb0177e755b536e5f0f4a84f605a0b8d18605 SHA1 fc48d81983e3e14735e82de439700397211d14cd SHA256 fc35628593c86a680b04086ff7c38a17ff49733d23a836f34512f1cd5018dbc9
 MISC metadata.xml 293 RMD160 5778fed837e8554643f490123190ca64dde728af SHA1 d8d184ee4b08f7a5ab16ea87d869c9d9b89e6ce8 SHA256 6e251bf79152a0bf7d72c1f75d460fcce58f97eda7f3fa3f1e9ca1d9c09321af

diff --git a/dev-perl/File-Listing/File-Listing-6.40.0.ebuild b/dev-perl/File-Listing/File-Listing-6.40.0.ebuild
index 8412bde..3b1c977 100644
--- a/dev-perl/File-Listing/File-Listing-6.40.0.ebuild
+++ b/dev-perl/File-Listing/File-Listing-6.40.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Listing/File-Listing-6.40.0.ebuild,v 1.6 2012/06/22 15:48:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Listing/File-Listing-6.40.0.ebuild,v 1.7 2012/06/28 12:49:39 ranger Exp $
 
 EAPI="4-slot-abi"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Parse directory listings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/dev-perl/File-Listing/Manifest b/dev-perl/File-Listing/Manifest
index d79b856..0b1317f 100644
--- a/dev-perl/File-Listing/Manifest
+++ b/dev-perl/File-Listing/Manifest
@@ -1,6 +1,6 @@
 DIST File-Listing-6.03.tar.gz 51415 RMD160 d56987dd8cdcf1b749344017b2a6cbf46bd1be73 SHA1 38a2fe3f533ee1d7999a16a389c86e6af6e638ea SHA256 23e96035f2759f211d3e9027d608c5fb6c81ba1b7cdd1079c6fa597613b99094
 DIST File-Listing-6.04.tar.gz 51536 RMD160 f19e7c2f3189205c9c7b8885fbe91dcc1854904e SHA1 02a41fe1b91f3f198712965360192f31d6d8d74e SHA256 1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5
 EBUILD File-Listing-6.30.0.ebuild 691 RMD160 7cb01c0ec73475bfd2cd4ecefa0b24dc2877c222 SHA1 28e7df569dc824d99ba8422f88800bd6a1ec9092 SHA256 af572c750b9e280f9cbc6bb871ca710150d908bbb97607f97a4891cd724118b3
-EBUILD File-Listing-6.40.0.ebuild 710 RMD160 4eedec5d30984296be5048b11c7732902c7f8e24 SHA1 79da19a4a12a7852ac0ee84fb6001acf69290384 SHA256 c9d12cd7b8c81ac045d0fa6ea9ecc28c63846ca898e9cc3408e06cae74a5f33d
-MISC ChangeLog 3580 RMD160 0f2999bb9ff90118fe977ee669c330ec7d9106c8 SHA1 0389a0aa4e92e722b5c8907cc0225b49c5a4a731 SHA256 963f5711430b6dd31ca7aff9bbd82ba79d47f8ee5e72a09e8cb7f69b2edf5272
+EBUILD File-Listing-6.40.0.ebuild 709 RMD160 84cfe90c9663894a9f41573342a4b7ebeb174ff7 SHA1 a2427eae6f87aa6077724a8b93c8c144286587cb SHA256 689796bbccd90f7bbd1782accbaec2e987acc2d10b6ebbb115cc9db12635ccdb
+MISC ChangeLog 3707 RMD160 e57777d629fc466f3ae1544e0ac68f30cc49c606 SHA1 9f21875e0550140d25ca9d775070f9b9392863a4 SHA256 9a665e64dab360110f873230553affa7e3f9b75967c87979d372e33809cee0f1
 MISC metadata.xml 617 RMD160 3aa34cbec354a32427fbf3d71ef8bdef4baf801c SHA1 0d028c5b3266088cc45d5a984b1f0c36b69246f5 SHA256 8c7a13a99353ea67ada54fb43403666a55710f90a8438c4609e6cf4f65134ead

diff --git a/dev-perl/HTML-Tree/HTML-Tree-5.20.0.ebuild b/dev-perl/HTML-Tree/HTML-Tree-5.20.0.ebuild
new file mode 100644
index 0000000..eab00ec
--- /dev/null
+++ b/dev-perl/HTML-Tree/HTML-Tree-5.20.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Tree/HTML-Tree-5.20.0.ebuild,v 1.1 2012/06/28 19:16:52 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=CJM
+MODULE_VERSION=5.02
+inherit perl-module
+
+DESCRIPTION="A library to manage HTML-Tree in PERL"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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="test"
+
+RDEPEND="
+	>=dev-perl/HTML-Tagset-3.03
+	>=dev-perl/HTML-Parser-3.46
+"
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? (
+		dev-perl/Test-Fatal
+	)
+"
+
+SRC_TEST="do"

diff --git a/dev-perl/HTML-Tree/Manifest b/dev-perl/HTML-Tree/Manifest
index 0749d90..1015127 100644
--- a/dev-perl/HTML-Tree/Manifest
+++ b/dev-perl/HTML-Tree/Manifest
@@ -1,4 +1,6 @@
 DIST HTML-Tree-4.2.tar.gz 155774 RMD160 81a93be6962f5142025d5012ae604ed932fe86ca SHA1 90fc3f3a2269b32a224f2d905e6e47b5ec4bd600 SHA256 80e4e3caa5e0e025dee5ed383a8d4cc7479ae4802184c4757dafd147a8fca7c9
+DIST HTML-Tree-5.02.tar.gz 147057 RMD160 987de99678d4ab2f6842c9ef57e538242b787a12 SHA1 899bc572de36456c04d9b7a7b2f980dedf387324 SHA256 2178276e09b6f057905b89e0a6076385de6ef53fdf6f573edf3011b2d8febef7
 EBUILD HTML-Tree-4.200.0.ebuild 729 RMD160 2e46842c4b20dbe1c57c904a60051cdf5067e184 SHA1 035b277ef10a3af1d50f7d83f7b3221d8f45f5a3 SHA256 a57128678ff79ce090f057f2170b0372f3299be45da1d3537667582cbeef7870
-MISC ChangeLog 7723 RMD160 51c9eb86934a2aa25a232de0e20b951d4f7d71a7 SHA1 1280032ec5764647349cbbe773b1081cb19d0ec5 SHA256 bb9c16d160d6280cdc8d49a2e5734aa25d0c53a4e89b3c886e3b2cb5505067a1
+EBUILD HTML-Tree-5.20.0.ebuild 772 RMD160 f8b85a53f3c26c0b1cfdf18647f7f330b0f84a59 SHA1 29b0d1c7000926d0c1d2224c94c5edf8aae4bcb2 SHA256 9026c0c270a9394a1c5d1d44ff17f0f8b40e89e1b85cc387636468944247349e
+MISC ChangeLog 7846 RMD160 49576d25ea9205a4799d6679d18b38b09e55fb61 SHA1 f4a6513448228002bf1b36c9a4a78b89c02a2ae0 SHA256 d819d09b34d20189b164d697825fd2f595ee76fd7b133b01aec91718ac9bc8b9
 MISC metadata.xml 603 RMD160 013b1771ff9c84f3101e3fc84ada6d6812105a7a SHA1 af1e6bf11d6a90f0c009c72d9494017f9d76b6bc SHA256 70ce6a05b429bf7365da36547a526e83befa3eab3665ce9170f4e423bb5acc41

diff --git a/dev-perl/Moo/Manifest b/dev-perl/Moo/Manifest
index 2f316c4..0307a43 100644
--- a/dev-perl/Moo/Manifest
+++ b/dev-perl/Moo/Manifest
@@ -4,11 +4,13 @@ DIST Moo-0.091002.tar.gz 41594 RMD160 f0b2020a6adcf432ea79b75f1b7d3441de705996 S
 DIST Moo-0.091004.tar.gz 45718 RMD160 cdc43c87848d3f77661af7c75e65c7372db5bcc0 SHA1 db185250c70a1bd40608bb31433c2bb00d7a9f88 SHA256 cc6df65ab07117cda3c2b7386982890396560f28843e94d11e48bb65b83dfb0d
 DIST Moo-0.091007.tar.gz 46594 RMD160 b87a3d05c55a79e24884c14e5c4d40e392b34427 SHA1 1a2eb3b2b6f6c365aa0aa092d21defee2685c47f SHA256 5ef77c68c64bb669185fec282f1b09cb7e28fb86e33e41fc9f112660314d9a91
 DIST Moo-0.091009.tar.gz 47212 RMD160 44fd2bba990762d9f77d7da120100fe8179a2b9c SHA1 68b840c5610ba59c3beff91d93cca258c9fa2dc2 SHA256 1c26abd2ee761cbd9757a6cbad31a567496567c98091aa869f682caf3f50ded2
+DIST Moo-0.091011.tar.gz 49613 RMD160 542a5ba651d15a6ae3bce8b13a0f1824064b1312 SHA1 82d864036cb6d05d3bac707ac568957cf798ba60 SHA256 caf8312ac55b87ff8f29fa4debff08d6abbf39628b844b47d09625dbc0f02d0a
 EBUILD Moo-0.9.14.ebuild 692 RMD160 030940f8a8cc8b23a7d44d8df5c46efc58160547 SHA1 ba74b0f1bb31468bffdc1353c6cb4aada03241e1 SHA256 097d718fe9110c4931b0ea5bc2865fc01effc80608b70ba70e4936da39727ecc
 EBUILD Moo-0.91.1.ebuild 735 RMD160 19790a0f45b6e0ff8ed2573b037cd6514af99adb SHA1 99e006421975056009e9464d3b4f45cd38af6a22 SHA256 ec9d1d76441cd5b700facd2a9d159cabbba5e3a41418a5a218dcd7120e03f1ee
+EBUILD Moo-0.91.11.ebuild 693 RMD160 bf956eb2e7cabce6be19b0480ccf1bb5bc239f54 SHA1 c9a3bd7291418ecf64869f7519505d6737837403 SHA256 98100a65ab3c3fddacbdf984b1a4e01cd048303ffb861a719961e8a46f66a17c
 EBUILD Moo-0.91.2.ebuild 735 RMD160 b466d427357b54680ad2e96c6329fb3515487582 SHA1 2ba51c09f506b69d05b8dbdbb07480fff3876124 SHA256 d2359e7ad0a551f9001e917a11967520717d66f32460f3099e35c88ddfc30adb
 EBUILD Moo-0.91.4.ebuild 735 RMD160 c3b1c571a130d7e77977798dda1acac607f85243 SHA1 a7e93ff9f7744167b6f6f8dd956f92abe7dc1db5 SHA256 fa74187522aed529f65a6abe76dcd0bf081cbd42af8a8670dc3c86d74ea69c47
 EBUILD Moo-0.91.7.ebuild 692 RMD160 b77644ec0fdc6cb7345026859323cd40b8221793 SHA1 a310a21c340d37bbf4c61cab8f8ae6135baef14d SHA256 87d80eaf4a793c018e79b0629b76eae7a3a6208cd038e0dd20d3ffc41009b583
 EBUILD Moo-0.91.9.ebuild 692 RMD160 0b270fc59276a60e2075b3d158c809f338d1a3a0 SHA1 8d370cb7ab1cf3bbd6fd975aea2678bc4db7018b SHA256 0f506e9d2cc1548c92d3a04c0675c15f275b59744552f357d4e126aec92e1803
-MISC ChangeLog 2061 RMD160 0b3d244b4758da1251cc2f3354c27a7ef67dc89a SHA1 89b331e52c0dd18b8112f41d9d7b2c879a741717 SHA256 8c342fd3d77e987a3973ea843a8d294fc51f6fa60574ed6259aad5c1872ff118
+MISC ChangeLog 2174 RMD160 9dd8ed07dd924057c8347c6cefe5291cdc5b32bf SHA1 c34ce4adb67f981fd86d14e4edac7d33fc2fab16 SHA256 9fe8f87a06c3b4baa9a49cae1b93c9131ee4ccc776e46e94e722cfac3eef3d64
 MISC metadata.xml 1274 RMD160 d98fc5cb34126944341758855d0cfa8501ae0de1 SHA1 00011b88cbc515dcd96b3dbc8306063952e39ba9 SHA256 1403654786bf84105df5dee71a26159a00b78cf3112452c2b4b0bdbacb942b31

diff --git a/dev-perl/Moo/Moo-0.91.11.ebuild b/dev-perl/Moo/Moo-0.91.11.ebuild
new file mode 100644
index 0000000..81f6edb
--- /dev/null
+++ b/dev-perl/Moo/Moo-0.91.11.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.11.ebuild,v 1.1 2012/06/28 16:57:18 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=MSTROUT
+MODULE_VERSION=0.091011
+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/Net-HTTP/Manifest b/dev-perl/Net-HTTP/Manifest
index 84d5d77..dfc1679 100644
--- a/dev-perl/Net-HTTP/Manifest
+++ b/dev-perl/Net-HTTP/Manifest
@@ -1,6 +1,6 @@
 DIST Net-HTTP-6.01.tar.gz 13733 RMD160 156670bd93ce465d7a9d2fcac685820e4708f252 SHA1 ffefc52e4e171d2b578a6e50d2fd29ea71fcdbe8 SHA256 76d883f9b249b16393dc183de04b4e4fed99bb0eb776ab9149d915607c69ea46
 DIST Net-HTTP-6.03.tar.gz 14294 RMD160 20a4e7181084820b49bda56d3cf13cd167c61924 SHA1 efb374a53aee9f9f68aed98f98ef60ac18d56078 SHA256 ecb0236dc23dccdc92e4b1c2dc63b2a2e29ac3a4a1f50104a838279a72a8a0ab
 EBUILD Net-HTTP-6.10.0.ebuild 741 RMD160 3d2fda9efe075ca99367eccd88dbb610badac9e5 SHA1 fa87a50594cf9b576f1ca2ef7d3de0addc3f0efe SHA256 340da349009cb96470d203b76c714052201e1dcb436da0e34904f352b9a1f8be
-EBUILD Net-HTTP-6.30.0.ebuild 759 RMD160 85bcc27525a5cc841338b6d548efde3ccab3946c SHA1 2b919a84c2846afd40fdb07214ead119dbdf7131 SHA256 cf0684d7f606f220f547bd5784bcfd1c02d14d824b155d51f1641f63bcadfa53
-MISC ChangeLog 3314 RMD160 87aba97b9c8e3af52a216b58b22ea6a75f11d293 SHA1 a5f0d819ffa36262693d3cb41153bdbd26c6965e SHA256 7431763c9efd8abfd83e8f891299a67873bfefd9965f1af549aa8eae67c978fe
+EBUILD Net-HTTP-6.30.0.ebuild 758 RMD160 2434eeb2ac662968b11c489d486ab3548acfe8d1 SHA1 0c8b5e29b269dbcd71f73fdff09807df6b62e8d2 SHA256 e4e7efc06c619ddfa329494d1144a89f4435e65986e05d49902517d5074d41fe
+MISC ChangeLog 3433 RMD160 49ee4d5757c945cf1ab26c1f015bc804ac8023d4 SHA1 4be407ec181a66c755130559f4135fd46bfc8462 SHA256 dad6704cff029b3fa52daad08fcc1b482da29f2e6c8df90c2ed64f49a491dca4
 MISC metadata.xml 459 RMD160 832d156b220044e7f28a7b88480966bd25dfa553 SHA1 c904e6a47cfb4af933f3257495976570705a3a99 SHA256 5f698e52527e5110e96398c41780e4611f2a5b939e1a7f18aeed0c4b329c7efe

diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild
index c26a0ee..344afc9 100644
--- a/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild,v 1.6 2012/06/22 15:52:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild,v 1.7 2012/06/28 12:33:53 ranger Exp $
 
 EAPI="4-slot-abi"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Low-level HTTP connection (client)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/dev-perl/Net-Twitter/Manifest b/dev-perl/Net-Twitter/Manifest
index 0583df0..ef8f46a 100644
--- a/dev-perl/Net-Twitter/Manifest
+++ b/dev-perl/Net-Twitter/Manifest
@@ -1,6 +1,8 @@
 DIST Net-Twitter-3.18001.tar.gz 128033 RMD160 e811a71ffa762b52ed9023d96133e0bac24100df SHA1 629c098aacf46135c89a755b799f46fa20a899bd SHA256 a46c4f5156f9a13a04eda44b46b6a838e36427ec254754f1758b0ccccb0d56b3
 DIST Net-Twitter-3.18002.tar.gz 132292 RMD160 fc126147b050de26409b29f61156858b7a50d90f SHA1 37a2106d21ae2115d75d1fb64fe789c20f8f8044 SHA256 4b65f5a6bd64ff49537e973d7ca8407df0ea60bb3bfeef30ea17b210f0754d29
+DIST Net-Twitter-3.18003.tar.gz 132271 RMD160 6330b5c655fcfb0a1d0b0dafb306322a515b95f8 SHA1 06dddf2bdc6b88cd704e587b5bede426eed8c305 SHA256 f3a67a7fe65415af4280a2fcb73460e74454534708bfe088364b3d10c81a84e6
 EBUILD Net-Twitter-3.180.10.ebuild 964 RMD160 49ef1c6c78d36c9f6e6c47e26dd4bc7be2e1601d SHA1 bab0a58bb31105eb82a73f6451aaa84c646a41d5 SHA256 7206d0799530ddafecb0f76fcfbb2943fa0c94f7bca87ab4449e859dcb813c9f
 EBUILD Net-Twitter-3.180.20.ebuild 964 RMD160 890ee6b5d25627c315c0c8914320fc3df2e9d21a SHA1 a01b691c2e792dfb3d738d9caf21f6da835ec1d4 SHA256 2080b341762eff5560d7da65cb87c29727e61df6191c6be465106d73ab849ddc
-MISC ChangeLog 5744 RMD160 a9c89facba5668bee14e5c91639f5d5b0ad91d51 SHA1 19c9efa9680e30f1a452fae3c4b39d98e94cf41c SHA256 2e793dceec69c02070f27df495d5882cd3f37f6574c71d10a4cad6ebc150786e
+EBUILD Net-Twitter-3.180.30.ebuild 967 RMD160 9452217191613b8cdb31117d2262e2a74f11a376 SHA1 376244b672d56b629019eaf714284a67a2e2a9bf SHA256 8e1eba424f8687e9dc6580d7a482744ad4e6896389e126049ea55c2dbaff369f
+MISC ChangeLog 5875 RMD160 610b4baad2eeb02262506953c0df2bf99365c79c SHA1 198b3e12903928a1e948c1860becde7e9f7cb3d9 SHA256 5392d2a2d2da8dd1c0a0ed62f567b561f2767166568a43539d80dc89dec685b6
 MISC metadata.xml 1853 RMD160 4efda5d4c16956d5b41ed1c3f9e0170613513ded SHA1 b3853760a48887f59670db5827cee93609f0e596 SHA256 2bb5557f545282b4c39857c2be1a1697b5cedb3251064517a77f9a4af5a08693

diff --git a/dev-perl/Net-Twitter/Net-Twitter-3.180.30.ebuild b/dev-perl/Net-Twitter/Net-Twitter-3.180.30.ebuild
new file mode 100644
index 0000000..9228c6e
--- /dev/null
+++ b/dev-perl/Net-Twitter/Net-Twitter-3.180.30.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Twitter/Net-Twitter-3.180.30.ebuild,v 1.1 2012/06/28 16:55:08 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=MMIMS
+MODULE_VERSION=3.18003
+inherit perl-module
+
+DESCRIPTION="A perl interface to the Twitter API"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/Moose-0.94
+	dev-perl/Crypt-SSLeay
+	dev-perl/Data-Visitor
+	>=dev-perl/DateTime-0.51
+	dev-perl/DateTime-Format-Strptime
+	>=dev-perl/Devel-StackTrace-1.21
+	dev-perl/Digest-HMAC
+	virtual/perl-Digest-SHA
+	virtual/perl-File-Spec
+	dev-perl/HTML-Parser
+	dev-perl/libwww-perl
+	dev-perl/JSON
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/Try-Tiny-0.03
+	dev-perl/MooseX-Aliases
+	dev-perl/MooseX-Role-Parameterized
+	>=dev-perl/Net-OAuth-0.25
+	dev-perl/namespace-autoclean
+	>=dev-perl/URI-1.40
+"
+DEPEND="${RDEPEND}"
+
+# online test
+SRC_TEST=skip

diff --git a/dev-perl/XML-DT/Manifest b/dev-perl/XML-DT/Manifest
index 0aa4fdd..c22096b 100644
--- a/dev-perl/XML-DT/Manifest
+++ b/dev-perl/XML-DT/Manifest
@@ -1,8 +1,10 @@
 DIST XML-DT-0.56.tar.gz 29322 RMD160 de98ba7adf9dee9bdceea9d053e75b40d77d511b SHA1 0d003cb67a843dfa2211ef7f88c13725a14d2d46 SHA256 aa2060fffd4505dd87fd028b59af147cc75394a899c3c01ca077945fd327bb09
 DIST XML-DT-0.57.tar.gz 30052 RMD160 4307d0ea1eb8ee09bfb556c900b4ab3f6cab7a56 SHA1 e3e5517fee9e1a33ec269c3030c55da2cc057fcb SHA256 bd8842b1379f0cc2e8adaafc2a9f94114a7fae84c5b49a07911be3ef9abb479c
 DIST XML-DT-0.59.tar.gz 30165 RMD160 4036914fcad5eefc7e513efdd33fcb2cf11c733a SHA1 e4552fc127670176059ab49866f20f74a5ce2103 SHA256 3b2f0c437524af13440267da4a96d3027fc93680fd23e71b0404436f16f81eb0
+DIST XML-DT-0.62.tar.gz 30553 RMD160 839268f8d1f5409e0bfffaa6f436eb16e75edfa6 SHA1 671b093b378db7bbebfab2a38cf7163d6ddee9aa SHA256 609cc817ba97e4481282705a350228c6fafe70260c327858202d5eb1c37e7864
 EBUILD XML-DT-0.560.0.ebuild 615 RMD160 62bcfdebae13f33acb7e7d6569d7a84bd9f86389 SHA1 0fab10148fa726670edd1c02c5834ee7e93fabd5 SHA256 2ff0f1284a292719e50119a3c6d880433b25c671a8af309685256eb2664d7912
 EBUILD XML-DT-0.570.0.ebuild 617 RMD160 e472ce08e15f0acdce55d8b467e8d74195d10a8e SHA1 8e4005e9f5543ec09faf6b39aa22c0c921667673 SHA256 fa41eb39289fd906079a983d115729b808046bbd9e9e499298412e4dc13be38c
 EBUILD XML-DT-0.590.0.ebuild 617 RMD160 0f9c03433e275e9164c178005c3de30b5c2df54b SHA1 0726d9f70651abb41c999cc6508acb77d5bd3ba6 SHA256 ea81cf25d261a3f9549e690afe5af676c6297fb3832686c90d4010c520d877d7
-MISC ChangeLog 10230 RMD160 ba4e0ccc29f7aa5984398b5cd913dd7f6f55bd57 SHA1 b69d7ce6c8dfd91bebbf7e4c28483ba1ed9c5088 SHA256 e335f88fbff54f67b20bfa4fdda3f3b4bfc794ab0b9158e22ccaf73310e58f83
+EBUILD XML-DT-0.620.0.ebuild 621 RMD160 c6ba3cdc9e3d734a0633277f3db1ff2e163e7804 SHA1 8e1f064a4eeb4ed3736bc5d21169a36bd3a5f36b SHA256 fad53464b19212118ba0b5b53c283cf1d69c8342d7f2335749510326d434d9f5
+MISC ChangeLog 10349 RMD160 4306265426268bb59510e91400892c19d805fe3c SHA1 345d76d3d4d0ce5da444282b76f4d973b3cd0eb9 SHA256 18a9d7183fe84919593edc3deaafc649d8c43ca27248e6891851c0525085e253
 MISC metadata.xml 286 RMD160 45f695c18e8e73c65c5d15a080f9fffaea080176 SHA1 2bd31a0f7e793e4a682f39ad10037fe2d0a05f8c SHA256 d05d1a73145d923243789e2f8830cb236f5d4a3b619429560e71c2ee02e31844

diff --git a/dev-perl/XML-DT/XML-DT-0.620.0.ebuild b/dev-perl/XML-DT/XML-DT-0.620.0.ebuild
new file mode 100644
index 0000000..d099e1e
--- /dev/null
+++ b/dev-perl/XML-DT/XML-DT-0.620.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/dev-perl/XML-DT/XML-DT-0.620.0.ebuild,v 1.1 2012/06/28 16:48:39 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=AMBS
+MODULE_SECTION=XML
+MODULE_VERSION=0.62
+inherit perl-module
+
+DESCRIPTION="A perl XML down translate module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/libwww-perl
+	>=dev-perl/XML-LibXML-1.600.0
+	>=dev-perl/XML-DTDParser-2.0.0
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
+
+SRC_TEST="do"

diff --git a/dev-perl/XML-Simple/Manifest b/dev-perl/XML-Simple/Manifest
index 80c5fd2..85166a9 100644
--- a/dev-perl/XML-Simple/Manifest
+++ b/dev-perl/XML-Simple/Manifest
@@ -1,4 +1,6 @@
 DIST XML-Simple-2.18.tar.gz 71129 RMD160 815f8e2ccb7f6763f76c9014eee82aad14d6c519 SHA1 81d38dd9fd955b0322ac64099f2d116c296267d1 SHA256 a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826
+DIST XML-Simple-2.20.tar.gz 75993 RMD160 0847fae59d34a812b6bb631bfe0123626722a5fb SHA1 2ececb0960deb51296916186000c63d55cc53092 SHA256 5cff13d0802792da1eb45895ce1be461903d98ec97c9c953bc8406af7294434a
 EBUILD XML-Simple-2.180.0.ebuild 769 RMD160 ad2cbd200b6addfe2f04d3070bffc2ae36ccb909 SHA1 3597386040056d339dc598c02c4587a4182e004a SHA256 18b43ae828eb61891ad58021354306a4d31d9043cb439308ed800076cd8516ab
-MISC ChangeLog 8461 RMD160 7421d34bab60d991951690917e778d4522594bdb SHA1 d1b3707e5c2711a669c784fe0a5ed81a2eda9ebe SHA256 9879ee777a672a4044d2307bd6cbbcd4ede874de92157130bbbc7e4cba82a48d
+EBUILD XML-Simple-2.200.0.ebuild 776 RMD160 2e3cb06d3e4480b5bddba00b89826ce1272c0ea7 SHA1 b11b65ddf9e9d2b4cf3539bebea109f9ca5366ca SHA256 2e5628ef7ab14813ebf1ce21d9f3c332713c3aac52bd67de0b625b616602eab0
+MISC ChangeLog 8588 RMD160 5e98542a82b03911c985ec6df5608c33980ba92d SHA1 7b905acebd7a399433e9d6fd7548851f01022de3 SHA256 a8473e048ff5350704bd5fc6630dd1d2cef13947a61446bdefd53b5cbddfdc9b
 MISC metadata.xml 294 RMD160 b3d412813b4ac88bd8321d1b3194af42de780873 SHA1 d95c2e5f7b8aaa24eb4447b92deb69343af587e7 SHA256 0ef3c1f39667b36fa68df4846fc0d7ba7322e4d0202a8d1745b6adff1ec9d0c7

diff --git a/dev-perl/XML-Simple/XML-Simple-2.200.0.ebuild b/dev-perl/XML-Simple/XML-Simple-2.200.0.ebuild
new file mode 100644
index 0000000..2b44042
--- /dev/null
+++ b/dev-perl/XML-Simple/XML-Simple-2.200.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/XML-Simple/XML-Simple-2.200.0.ebuild,v 1.1 2012/06/28 18:56:31 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=GRANTM
+MODULE_VERSION=2.20
+inherit perl-module
+
+DESCRIPTION="XML::Simple - Easy API to read/write XML (esp config files)"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="virtual/perl-Storable
+	dev-perl/XML-SAX
+	dev-perl/XML-LibXML
+	>=dev-perl/XML-NamespaceSupport-1.04
+	>=dev-perl/XML-Parser-2.30"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
new file mode 100644
index 0000000..6a2f6e0
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -0,0 +1,11 @@
+AUX gitolite-gentoo-2.2-gl-system-setup-exit.patch 1418 RMD160 518f67265c0ec7e595036649d05c27e2931daf66 SHA1 0b1ba304d14dcad2bb4b17885f710f672a3ba18f SHA256 44242f30693f7aff22c04870651331af2985233ba57cf90c6019b6ac27c6b54b
+DIST gitolite-gentoo-2.1.0.tar.bz2 191407 RMD160 62328cd94b0a180d718abb84c467d161cd581984 SHA1 fee8c9be8d6d79911d8772af72389c9237f86410 SHA256 431521c18d5f3b1ae12f4bed6c3ce422ac8b43242ab6a1c944801795a24ad6e8
+DIST gitolite-gentoo-2.2.tar.bz2 187769 RMD160 0f87d87b50ed30469573aa244590d236ab019151 SHA1 573fb57b91e320c13bfa676e1df2e8ba2011bfb0 SHA256 2ed4be0be6454444cbabdcd650e47697c8b838ec4e688bca7554c6a7eed17538
+DIST gitolite-gentoo-2.3.1.tar.bz2 198849 RMD160 69e434f4bb8401dea64ab788844144d2c4c4a5bd SHA1 4973892155951aa54ff8e104f2348df438dd0a2a SHA256 65c4646b5609f987b3004dbc44ebf9a76d3f1791414fbe13eacea25460b966ae
+DIST gitolite-gentoo-2.3.tar.bz2 190668 RMD160 594b58c5bf1dff5e6363576b828040d39f46f56a SHA1 8450a91ab65f9673ce4a69f37ca6e6a859393b24 SHA256 ec97063a65c01d59f9e8c72fdff2ad3436fb7503c691f0d4f1f27c5c61ebc6d9
+EBUILD gitolite-gentoo-2.1.0.ebuild 1874 RMD160 8c03706c75f249b6687dbaf3d4bfa4573901e842 SHA1 c51090363c02aeefcca18a1a83ec8869087230e1 SHA256 b5fa6ae89f9880dffb1f51753ea58eee6159fb301f7fdd68887276a7ad03694c
+EBUILD gitolite-gentoo-2.2.ebuild 1994 RMD160 72c79104c125ded6659bdf4a47ab7cc24549840f SHA1 ecd6819c76fabb7971e6bd3a8a6c79e6de3e04e1 SHA256 a2b63033f03e37ef9dd5a1364844e6c462566b2b223c2dbc364e7eeaf8260820
+EBUILD gitolite-gentoo-2.3.1.ebuild 2006 RMD160 95875fc1d9e40f07c95f1c69b2d69bdc3fd2e736 SHA1 4879333a8c624d4ff67012349223303a99960a3f SHA256 88976fceb65f1c947d4de45a4bb62dd12fadb7b2d6bef78f8bf117f31f90dbf2
+EBUILD gitolite-gentoo-2.3.ebuild 2002 RMD160 ad890bfbeb864ddb837f3c2429fdbb17d7c9be3f SHA1 61ab1e1ae3f40441f800500212fbf8047c9bad25 SHA256 df9325ea991efeadd28034dd0242234da3f9fcf343f9949276362c445c407db3
+MISC ChangeLog 5639 RMD160 46e64cb228fb75cb8e14a3da1cb24d3a499bae9f SHA1 2982169ec6dd6cda59128751d74916b1422433a6 SHA256 ddbc32013dd48240e8f5074cac91077a371ba29036c6ae5389bd91dfb30aa5c0
+MISC metadata.xml 312 RMD160 11e08691ee3b8d1760e01a850c191051cea33266 SHA1 b2450cd68efba23d3e8c88eafc3c29cd41dcd3c9 SHA256 2bd97e3481039d2126c07f5f19a80d44b81b67df628a32028718b75053d9b52d

diff --git a/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-2.2-gl-system-setup-exit.patch b/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-2.2-gl-system-setup-exit.patch
new file mode 100644
index 0000000..1d3e12a
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-2.2-gl-system-setup-exit.patch
@@ -0,0 +1,47 @@
+From ab9d0d2f57ed84c01513053b88587dac82d9ed66 Mon Sep 17 00:00:00 2001
+From: Sitaram Chamarty <sitaram@×××××××.com>
+Date: Thu, 17 Nov 2011 18:49:24 +0530
+Subject: [PATCH] a couple of very minor oopsies
+
+(1) c5f342a forgot authkeys can have blank lines also
+
+(2) f0cedeb ended gl-system-install on a non-0 ret code
+
+both caught by matthewtdawson at gmail
+---
+ src/gl-system-install |    4 +++-
+ src/sshkeys-lint      |    2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/gl-system-install b/src/gl-system-install
+index 0eec005..d7df7e4 100755
+--- a/src/gl-system-install
++++ b/src/gl-system-install
+@@ -108,8 +108,10 @@ gl-setup is not in your \$PATH.
+ $path_advice"
+ 
+ which=`dirname $which`
+-[ "$which" != "$gl_bin_dir" ] && die "                ***** WARNING *****
++[ "$which" = "$gl_bin_dir" ] || die "                ***** WARNING *****
+ $which precedes $gl_bin_dir in your \$PATH,
+ and it *also* contains gl-setup.  This is almost certainly going to confuse
+ you or me later.
+ $path_advice"
++
++exit 0
+diff --git a/src/sshkeys-lint b/src/sshkeys-lint
+index bcb8f7b..96c027f 100755
+--- a/src/sshkeys-lint
++++ b/src/sshkeys-lint
+@@ -119,7 +119,7 @@ sub ak_comment {
+     $in_gl_section = 1 if /^# gitolite start/;
+     $in_gl_section = 0 if /^# gitolite end/;
+     die "gitosis?  what's that?\n" if /^#.*gitosis/;
+-    return /^\s*#/;
++    return /^\s*(#|$)/;
+ }
+ 
+ sub fprint {
+-- 
+1.7.5.4
+

diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.1.0.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.1.0.ebuild
new file mode 100644
index 0000000..e5098c8
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.1.0.ebuild
@@ -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-vcs/gitolite-gentoo/gitolite-gentoo-2.1.0.ebuild,v 1.4 2012/06/07 21:55:09 zmedico Exp $
+
+EAPI=3
+
+inherit eutils perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="dev-lang/perl
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}-gentoo" > conf/VERSION
+}
+
+src_install() {
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	./src/gl-system-install "${D}"/usr/bin \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+	ewarn
+	elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
+	elog "then please check the permissions of all repositories using the umask feature"
+	ewarn
+}

diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild
new file mode 100644
index 0000000..904d4f3
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild,v 1.4 2012/06/07 21:55:09 zmedico Exp $
+
+EAPI=3
+
+inherit eutils perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="dev-lang/perl
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}-gentoo" > conf/VERSION
+
+	epatch "${FILESDIR}/${P}-gl-system-setup-exit.patch"
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	export PATH="${D}"/usr/bin:$PATH
+	./src/gl-system-install ${gl_bin//\/\///} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+	ewarn
+	elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
+	elog "then please check the permissions of all repositories using the umask feature"
+	ewarn
+}

diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1.ebuild
new file mode 100644
index 0000000..0fd5a77
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1.ebuild,v 1.2 2012/06/07 21:55:09 zmedico Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}-gentoo" > conf/VERSION
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+	gl_bin=${gl_bin/\/\//\/}
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	export PATH="${gl_bin}:${PATH}"
+	./src/gl-system-install ${gl_bin} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+	ewarn
+	elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
+	elog "then please check the permissions of all repositories using the umask feature"
+	ewarn
+}

diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.ebuild
new file mode 100644
index 0000000..497cb8a
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.ebuild,v 1.5 2012/06/07 21:55:09 zmedico Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}-gentoo" > conf/VERSION
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+	gl_bin=${gl_bin/\/\//\/}
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	export PATH="${gl_bin}:${PATH}"
+	./src/gl-system-install ${gl_bin} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+	ewarn
+	elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
+	elog "then please check the permissions of all repositories using the umask feature"
+	ewarn
+}

diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
new file mode 100644
index 0000000..5ebc63f
--- /dev/null
+++ b/dev-vcs/gitolite/Manifest
@@ -0,0 +1,13 @@
+AUX gitolite-2.2-gl-system-setup-exit.patch 1418 RMD160 518f67265c0ec7e595036649d05c27e2931daf66 SHA1 0b1ba304d14dcad2bb4b17885f710f672a3ba18f SHA256 44242f30693f7aff22c04870651331af2985233ba57cf90c6019b6ac27c6b54b
+DIST gitolite-2.1.0.tar.bz2 189726 RMD160 1911d6c6b700756a0ca1141b8964a69fd91b7e7a SHA1 312532739538e7fe16fbb6de4088037dd8ee77c3 SHA256 c55ca02932893f3f6a76a2e31d53d847c2fd5ccb768831db123c2f80d1b8eaa3
+DIST gitolite-2.2.tar.bz2 186414 RMD160 3403fcde29a5a405d36cb88fdfe380b4bc1f42be SHA1 1c11de5264ecadbc4aed0f38607182dd68ee2cc1 SHA256 b43a735af62dbb2b05ed679029f3eafd8aa0c0e8041399f2c4dad796f87d6ccc
+DIST gitolite-2.3.1.tar.gz 255807 RMD160 f3be9fa2dde09dac5f28ac02fa13faa4742a352b SHA1 634f4e9ef11db0944111bedc112cb629912eddf0 SHA256 53303fea0154914356830202d3de23f94682bab26197ead8ca05d58818c56e82
+DIST gitolite-2.3.tar.bz2 189284 RMD160 e23bd9fc08df815ebc9a82dbde13cd9edf3c0aa0 SHA1 88066185732d67a5bc1417c8aaa9b912ac34696c SHA256 19a01127012930ae59231a898e045bf1eb15df209decc452fb31d71d86a5053d
+DIST gitolite-3.03.tar.gz 199433 RMD160 a65f75589bf8646c0bd16c9cda2fa525aa497efc SHA1 97b918721156bf1ad997b87b099ec16ef6dbba4b SHA256 b3487fd99cc46a7be32a58f8a86a520fc0943814794cc56b5f83d803591737ca
+EBUILD gitolite-2.1.0.ebuild 1621 RMD160 dfe19d41e5e34f209f64e530226f4f3a62c6ca17 SHA1 7d85a9693af498ccdc9b314dfdd583557f812c1e SHA256 f1b94856b0218c048089d259a76653bb44f7757707ab116d5b46c13974f2890b
+EBUILD gitolite-2.2.ebuild 1743 RMD160 2b14defecfdce11704d1f7f4918c4122d5e82d29 SHA1 1a049f5c80c46fc19be6dcec2206d3279585d697 SHA256 7509fc550f4fcedb6d4d89eec7e51981774350265c05655a2b2896179c7bfa5e
+EBUILD gitolite-2.3.1.ebuild 1766 RMD160 04134050a86056ee04f47a64bc62fbe94eeabdd4 SHA1 0e9707080c7f4fd17bcee1c9b5903f839e981b57 SHA256 e30f5b09ce9db3cfdc7ef95fc5cef2fdcfb83a98e45e56ec4b425885fd671e33
+EBUILD gitolite-2.3.ebuild 1749 RMD160 8c56ad02b3fced974f3fd04b16c63aebde3ffc21 SHA1 9149cebe4ba4a0c070ffe1c9b60d7760df5f9e37 SHA256 3a36dea8174b0d9d166f09c5a3ca3576648869a2c546929c6c0bd04eb98c660f
+EBUILD gitolite-3.03.ebuild 2140 RMD160 2fdcf1d2f1c1aa935cc72641e2b178c9bcd4263f SHA1 a99030af513f3b53def97def2bdc5fb4931fa1ea SHA256 11ba160145ef36e38d2ad39668b3d01781f7d8ec23fbd72725fac2f9471d2837
+MISC ChangeLog 3233 RMD160 c185c480e1a43f81af63d45f1f92bfc3e7d2cd63 SHA1 e0b6a03442f730ffb7c3d2aba71914922247e114 SHA256 4964224b486ffa1500c6d314f595e97c339302c79cac44c162ad2d610b0982ad
+MISC metadata.xml 779 RMD160 cfd0539ec6cc7e725a1967df39f676fe1138f931 SHA1 1dd339cb9ddbcb3ec4ed3f0fee41aae39b7bc7d3 SHA256 b4ffa2d440bbd0bad5a09952ae8b0240b7056ad2773cd36c617d89ac0b589e8b

diff --git a/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch b/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch
new file mode 100644
index 0000000..1d3e12a
--- /dev/null
+++ b/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch
@@ -0,0 +1,47 @@
+From ab9d0d2f57ed84c01513053b88587dac82d9ed66 Mon Sep 17 00:00:00 2001
+From: Sitaram Chamarty <sitaram@×××××××.com>
+Date: Thu, 17 Nov 2011 18:49:24 +0530
+Subject: [PATCH] a couple of very minor oopsies
+
+(1) c5f342a forgot authkeys can have blank lines also
+
+(2) f0cedeb ended gl-system-install on a non-0 ret code
+
+both caught by matthewtdawson at gmail
+---
+ src/gl-system-install |    4 +++-
+ src/sshkeys-lint      |    2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/gl-system-install b/src/gl-system-install
+index 0eec005..d7df7e4 100755
+--- a/src/gl-system-install
++++ b/src/gl-system-install
+@@ -108,8 +108,10 @@ gl-setup is not in your \$PATH.
+ $path_advice"
+ 
+ which=`dirname $which`
+-[ "$which" != "$gl_bin_dir" ] && die "                ***** WARNING *****
++[ "$which" = "$gl_bin_dir" ] || die "                ***** WARNING *****
+ $which precedes $gl_bin_dir in your \$PATH,
+ and it *also* contains gl-setup.  This is almost certainly going to confuse
+ you or me later.
+ $path_advice"
++
++exit 0
+diff --git a/src/sshkeys-lint b/src/sshkeys-lint
+index bcb8f7b..96c027f 100755
+--- a/src/sshkeys-lint
++++ b/src/sshkeys-lint
+@@ -119,7 +119,7 @@ sub ak_comment {
+     $in_gl_section = 1 if /^# gitolite start/;
+     $in_gl_section = 0 if /^# gitolite end/;
+     die "gitosis?  what's that?\n" if /^#.*gitosis/;
+-    return /^\s*#/;
++    return /^\s*(#|$)/;
+ }
+ 
+ sub fprint {
+-- 
+1.7.5.4
+

diff --git a/dev-vcs/gitolite/gitolite-2.1.0.ebuild b/dev-vcs/gitolite/gitolite-2.1.0.ebuild
new file mode 100644
index 0000000..f38480a
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-2.1.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-vcs/gitolite/gitolite-2.1.0.ebuild,v 1.4 2012/06/07 21:53:43 zmedico Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="http://github.com/sitaramc/gitolite"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}" > conf/VERSION
+}
+
+src_install() {
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	# install using upstream method
+	./src/gl-system-install "${D}"/usr/bin \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}

diff --git a/dev-vcs/gitolite/gitolite-2.2.ebuild b/dev-vcs/gitolite/gitolite-2.2.ebuild
new file mode 100644
index 0000000..9fe64e3
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-2.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-2.2.ebuild,v 1.2 2012/06/07 21:53:43 zmedico Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="http://github.com/sitaramc/gitolite"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}" > conf/VERSION
+
+	epatch "${FILESDIR}/${P}-gl-system-setup-exit.patch"
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	# install using upstream method
+	export PATH="${D}"/usr/bin:$PATH
+	./src/gl-system-install ${gl_bin//\/\///} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}

diff --git a/dev-vcs/gitolite/gitolite-2.3.1.ebuild b/dev-vcs/gitolite/gitolite-2.3.1.ebuild
new file mode 100644
index 0000000..4721bc2
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-2.3.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-2.3.1.ebuild,v 1.2 2012/06/07 21:53:43 zmedico Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="http://github.com/sitaramc/gitolite"
+SRC_URI="http://milki.github.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}" > conf/VERSION
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+	gl_bin=${gl_bin/\/\//\/}
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	# install using upstream method
+	export PATH="${gl_bin}:${PATH}"
+	./src/gl-system-install ${gl_bin} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}

diff --git a/dev-vcs/gitolite/gitolite-2.3.ebuild b/dev-vcs/gitolite/gitolite-2.3.ebuild
new file mode 100644
index 0000000..2474d6c
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-2.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-2.3.ebuild,v 1.5 2012/06/07 21:53:43 zmedico Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="http://github.com/sitaramc/gitolite"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}" > conf/VERSION
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+	gl_bin=${gl_bin/\/\//\/}
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	# install using upstream method
+	export PATH="${gl_bin}:${PATH}"
+	./src/gl-system-install ${gl_bin} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}

diff --git a/dev-vcs/gitolite/gitolite-3.03.ebuild b/dev-vcs/gitolite/gitolite-3.03.ebuild
new file mode 100644
index 0000000..d101ed6
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.03.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.03.ebuild,v 1.2 2012/06/07 21:53:43 zmedico Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="http://github.com/sitaramc/gitolite"
+SRC_URI="http://milki.github.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc tools vim-syntax"
+
+DEPEND="
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.mkd doc/CHANGELOG
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use doc; then
+		dodoc doc/*.mkd
+
+		docinto extras
+		dodoc doc/extras/*.mkd
+	fi
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if has_version "=dev-vcs/gitolite-2*"; then
+		ewarn
+		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
+		elog "Alternatively there's a local and probably older copy in /usr/share/doc/${PF}"
+		elog "in case you have the \"doc\" useflag set."
+	fi
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}

diff --git a/eclass/vdr-plugin-2.eclass.~1~ b/eclass/vdr-plugin-2.eclass.~1~
deleted file mode 100644
index 2de0d31..0000000
--- a/eclass/vdr-plugin-2.eclass.~1~
+++ /dev/null
@@ -1,614 +0,0 @@
-# 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/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
new file mode 100644
index 0000000..c38e7ca
--- /dev/null
+++ b/mail-filter/spamassassin/Manifest
@@ -0,0 +1,10 @@
+AUX 3.0.0-spamd.conf 1527 RMD160 8075268aecdf6f41f5cdacb683fe92567d860dae SHA1 01623333cecb1ef38b25a130d3b5afe016e70f1c SHA256 ea61041e8b6b1616ec096cc42245ab8442b962f72c318695f5acff1fd794ee34
+AUX 3.3.1-spamd.init 1052 RMD160 c5166155fc6b7be234aa06802e7aff05d5539ca3 SHA1 2de84b9ca084029b1206585df9c6e22aaf6663a0 SHA256 05c61f546c6dd701e53689163e282125c2f3a916b0bada4bad5686fc8ddb1a3c
+AUX secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a SHA1 a742beddf850e55bc4454a7548dc43c36f8e9760 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139
+AUX spamassassin-3.3.2-binary_token.patch 465 RMD160 1b354b899047ca5d13abb50deebee424b50fbe6c SHA1 f2c6fd3cafa53e8d8754791940416475e28ca7fa SHA256 170ffed8831f7e45d7e50fda774dccd2482f4652c733e419c664d04b3208f37f
+AUX spamassassin-3.3.2-innodb.patch 4749 RMD160 df293f19f3269875d07ddb3b6ed1cc9a609cb7e8 SHA1 f6310cbbf9bd0ef57445d4aa03b00dedd57ec462 SHA256 d40a72692f9b7161f2a332189e68cfd5486b69a4d2e9fdea9d23d6ae7bd7fd10
+AUX spamassassin-3.3.2-mysql_count_rows.patch 3319 RMD160 45eb621e2934dc19344310b39aee1f0ca198fc18 SHA1 ed5d37df3355f1992402a00f1185a7ae9a4f5095 SHA256 a97f6b9b67e721a95885b978c2def9a1065577855ab4377f80fb142fdf6cbba1
+DIST Mail-SpamAssassin-3.3.2.tar.bz2 1006577 RMD160 ae164d1b1772590ca261492c5cde37485d64ed9c SHA1 f38480352935fe3bb849a27a52615e400dee7d66 SHA256 c7239b4b4ef04ba5e2d5aedb9156850146ed3fa47c88f0a0757f08e22f93a205
+EBUILD spamassassin-3.3.2-r1.ebuild 6915 RMD160 2928d5bf8288db4a115401791ec933741946940d SHA1 622ee2f777c455ad3f1b00d43ed03cd3f0c4a3d3 SHA256 38ab4bfe15a55febf386e01e3a6cce28603d1d6e248326b6b0124fa6705d35da
+MISC ChangeLog 42343 RMD160 d7a0c132e429c620f1da85d4e1aa6ab61f9acf89 SHA1 d324f03b125db590b8ef1b510b83eb7b27bfab3a SHA256 590ddffb885d77dfd1aca62dfe89fa4ab9df0f1f0915abc265a74fb74eb8b681
+MISC metadata.xml 339 RMD160 d26879faaf735d1ca3001a1c61ab472b14789420 SHA1 8b21003a4404ada77b2a9bf2a3fa1733e46fe352 SHA256 140cb2839ea50486116c578fe574b9090de04c483c2c7bce792dfa7e21138aa5

diff --git a/mail-filter/spamassassin/files/3.0.0-spamd.conf b/mail-filter/spamassassin/files/3.0.0-spamd.conf
new file mode 100644
index 0000000..b6fca03
--- /dev/null
+++ b/mail-filter/spamassassin/files/3.0.0-spamd.conf
@@ -0,0 +1,46 @@
+# Config file for /etc/init.d/spamd
+
+
+# ***WARNING***
+# spamd was not designed to listed to an untrusted network. spamd
+# is vulnerable to DoS attacks (and eternal doom) if used to listen
+# to an untrusted network.
+#
+
+
+# Some options:
+#
+# -c          to create a per user configuration file
+# -H [dir]    to switch home dirs for helper apps, dir optional
+# -i [ip]     to listen on the specified IP,
+#             127.0.0.1 if omitted,
+#             0.0.0.0 (ie. all) if given without value;
+#             must be used in combination with -A to actually allow
+#             connections from anybody but localhost
+# -m limit    to set the number of children, default 5
+# -u user     the user to run spamd as
+# -L          if you want to run no net tests
+#
+# for more help look in man spamd
+#
+# Note: if you plan on using the -u flag to spamd you will need to
+# make sure the location of the PID file is writable by that user.
+# This can be done by making the directory /var/run/spamd and
+# changing the owner to the UID that runs spamd.  You will then
+# need to edit $pidfile in /etc/init.d/spamd. This should fix the
+# problem with stop/restart in the init scripts.
+#
+# See http://bugs.gentoo.org/show_bug.cgi?id=70124 for a full
+# explanation.
+
+SPAMD_OPTS="-m 5 -c -H"
+
+# spamd stores its pid in this file. If you use the -u option to
+# run spamd under another user, you might need to adjust it.
+
+PIDFILE="/var/run/spamd.pid"
+
+# SPAMD_NICELEVEL lets you set the 'nice'ness of the running 
+# spamd process
+
+# SPAMD_NICELEVEL=5

diff --git a/mail-filter/spamassassin/files/3.3.1-spamd.init b/mail-filter/spamassassin/files/3.3.1-spamd.init
new file mode 100644
index 0000000..e52dba6
--- /dev/null
+++ b/mail-filter/spamassassin/files/3.3.1-spamd.init
@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.3.1-spamd.init,v 1.4 2011/09/14 23:00:38 polynomial-c Exp $
+
+# NB: Config is in /etc/conf.d/spamd
+
+# Provide a default location if they haven't in /etc/conf.d/spamd
+PIDFILE=${PIDFILE:-/var/run/spamd.pid}
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+	before mta
+	use logger
+@USEPOSTGRES@  use postgresql
+@USEMYSQL@ use mysql
+}
+
+start() {
+	ebegin "Starting spamd"
+	start-stop-daemon --start --quiet \
+		--name spamd \
+		--nicelevel ${SPAMD_NICELEVEL:-0} \
+		--pidfile ${PIDFILE} \
+		--exec /usr/sbin/spamd -- -d -r ${PIDFILE} \
+		${SPAMD_OPTS}
+	retval=$?
+	if ! [ -f "${PIDFILE}" ]; then
+		sleep 1
+	fi
+	eend ${retval} "Failed to start spamd"
+}
+
+stop() {
+	ebegin "Stopping spamd"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	eend $? "Failed to stop spamd"
+}
+
+reload() {
+	ebegin "Reloading configuration"
+	kill -HUP $(< ${PIDFILE})
+	eend $?
+}

diff --git a/mail-filter/spamassassin/files/secrets.cf b/mail-filter/spamassassin/files/secrets.cf
new file mode 100644
index 0000000..efa31a6
--- /dev/null
+++ b/mail-filter/spamassassin/files/secrets.cf
@@ -0,0 +1,14 @@
+# The below sample from bug 91430 is an example of using mysql
+# for spam filter storage
+
+#(Tell Spamassissin to use MySQL for bayes data
+#bayes_store_module              Mail::SpamAssassin::BayesStore::SQL
+#bayes_sql_dsn                   DBI:mysql:sa_bayes:localhost:3306
+#bayes_sql_username              db_name
+#bayes_sql_password              another_very_secret_password
+
+#(Tell Spamassissin to use MySQL for AWL data
+#auto_whitelist_factory          Mail::SpamAssassin::SQLBasedAddrList
+#user_awl_dsn                    DBI:mysql:sa_bayes:localhost:3306
+#user_awl_sql_username           db_name
+#user_awl_sql_password           another_very_secret_password

diff --git a/mail-filter/spamassassin/files/spamassassin-3.3.2-binary_token.patch b/mail-filter/spamassassin/files/spamassassin-3.3.2-binary_token.patch
new file mode 100644
index 0000000..5ce5c0d
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin-3.3.2-binary_token.patch
@@ -0,0 +1,13 @@
+Index: sql/bayes_mysql.sql
+===================================================================
+--- sql/bayes_mysql.sql	(revision 1139005)
++++ sql/bayes_mysql.sql	(working copy)
+@@ -22,7 +22,7 @@
+ 
+ CREATE TABLE bayes_token (
+   id int(11) NOT NULL default '0',
+-  token char(5) NOT NULL default '',
++  token binary(5) NOT NULL default '',
+   spam_count int(11) NOT NULL default '0',
+   ham_count int(11) NOT NULL default '0',
+   atime int(11) NOT NULL default '0',

diff --git a/mail-filter/spamassassin/files/spamassassin-3.3.2-innodb.patch b/mail-filter/spamassassin/files/spamassassin-3.3.2-innodb.patch
new file mode 100644
index 0000000..8bf1372
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin-3.3.2-innodb.patch
@@ -0,0 +1,114 @@
+Index: sql/README.bayes
+===================================================================
+--- sql/README.bayes	(revision 1139008)
++++ sql/README.bayes	(working copy)
+@@ -17,27 +17,37 @@
+ bayes_store_module		   Mail::SpamAssassin::BayesStore::SQL
+ 
+ This directive is used by the Bayes module to determine which storage
+-module should be used.  If not set it will default to:
++module should be used. If not set it will default to:
+ Mail::SpamAssassin::BayesStore::DBM
+ 
++The storage module Mail::SpamAssassin::BayesStore::SQL is an older generic
++SQL module which can be also be used with versions of MySQL which did not
++have support for an InnoDB engine and transactions. If choosing this module
++consider replacing the InnoDB engine with MyISAM (explicitly or defaulted)
++in the schema (files bayes_mysql.sql and awl_mysql.sql). Note that old
++versions of MySQL expect syntax TYPE=MyISAM instead of ENGINE=MyISAM,
++while newer versions throw a syntax error on TYPE and only allow ENGINE.
++In short: replace ENGINE=InnoDB with TYPE=MyISAM (or just leave it out)
++in the bayes_mysql.sql and awl_mysql.sql schemas if ENGINE=InnoDB is not
++accepted.
++
++There is also a MySQL specific storage driver available to provides a
++small boost in performance.  It requires version 4.1 or above of the
++MySQL database software to work properly.  In addition, it provides
++rollback on error functionality if you create your bayes database table
++using the InnoDB storage engine. WARNING: Using this module with a version
++of MySQL < 4.1 could have unexpected results.  To use the MySQL 4.1+
++specific module set your bayes_store_module directive accordingly:
++  bayes_store_module               Mail::SpamAssassin::BayesStore::MySQL
++
+ PostgreSQL users will want to use the PostgreSQL specific storage
+ module:
+-bayes_store_module               Mail::SpamAssassin::BayesStore::PgSQL
++  bayes_store_module               Mail::SpamAssassin::BayesStore::PgSQL
+ This module provides a slightly different interface to makes better
+ use of the resources that PostgreSQL offers.  In addition, please make
+ sure that you follow the instructions below for loading the proper
+ procedural language and installing the tables and stored procedure.
+ 
+-There is also a MySQL specific storage driver available to provides a
+-small boost in performance.  It requires version 4.1 or above of the
+-MySQL database software to work properly.  In addition, it provides
+-rollback on error functionality if you create your bayes database
+-table using the InnoDB storage engine (ie s/MyISAM/InnoDB/ on the
+-bayes_mysql.sql file).  WARNING: Using this module with a version of
+-MySQL < 4.1 could have unexpected results.  To use the MySQL 4.1+
+-specific module set your bayes_store_module directive accordingly:
+-bayes_store_module               Mail::SpamAssassin::BayesStore::MySQL
+-
+ Additional configuration directives provided by BayesSQL:
+ 
+ bayes_sql_dsn			   DBI:driver:database:hostname[:port]
+Index: sql/awl_mysql.sql
+===================================================================
+--- sql/awl_mysql.sql	(revision 1139008)
++++ sql/awl_mysql.sql	(working copy)
+@@ -1,9 +1,9 @@
+ CREATE TABLE awl (
+   username varchar(100) NOT NULL default '',
+-  email varchar(255) NOT NULL default '',
++  email varbinary(255) NOT NULL default '',
+   ip varchar(40) NOT NULL default '',
+   count int(11) NOT NULL default '0',
+   totscore float NOT NULL default '0',
+   signedby varchar(255) NOT NULL default '',
+   PRIMARY KEY (username,email,signedby,ip)
+-) TYPE=MyISAM;
++) ENGINE=InnoDB;
+Index: sql/bayes_mysql.sql
+===================================================================
+--- sql/bayes_mysql.sql	(revision 1139008)
++++ sql/bayes_mysql.sql	(working copy)
+@@ -3,13 +3,13 @@
+   id int(11) NOT NULL default '0',
+   runtime int(11) NOT NULL default '0',
+   KEY bayes_expire_idx1 (id)
+-) TYPE=MyISAM;
++) ENGINE=InnoDB;
+ 
+ CREATE TABLE bayes_global_vars (
+   variable varchar(30) NOT NULL default '',
+   value varchar(200) NOT NULL default '',
+   PRIMARY KEY  (variable)
+-) TYPE=MyISAM;
++) ENGINE=InnoDB;
+ 
+ INSERT INTO bayes_global_vars VALUES ('VERSION','3');
+ 
+@@ -18,7 +18,7 @@
+   msgid varchar(200) binary NOT NULL default '',
+   flag char(1) NOT NULL default '',
+   PRIMARY KEY  (id,msgid)
+-) TYPE=MyISAM;
++) ENGINE=InnoDB;
+ 
+ CREATE TABLE bayes_token (
+   id int(11) NOT NULL default '0',
+@@ -28,7 +28,7 @@
+   atime int(11) NOT NULL default '0',
+   PRIMARY KEY  (id, token),
+   INDEX bayes_token_idx1 (id, atime)
+-) TYPE=MyISAM;
++) ENGINE=InnoDB;
+ 
+ CREATE TABLE bayes_vars (
+   id int(11) NOT NULL AUTO_INCREMENT,
+@@ -43,4 +43,4 @@
+   newest_token_age int(11) NOT NULL default '0',
+   PRIMARY KEY  (id),
+   UNIQUE bayes_vars_idx1 (username)
+-) TYPE=MyISAM;
++) ENGINE=InnoDB;

diff --git a/mail-filter/spamassassin/files/spamassassin-3.3.2-mysql_count_rows.patch b/mail-filter/spamassassin/files/spamassassin-3.3.2-mysql_count_rows.patch
new file mode 100644
index 0000000..54ee557
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin-3.3.2-mysql_count_rows.patch
@@ -0,0 +1,88 @@
+--- lib/Mail/SpamAssassin/BayesStore/MySQL.pm	(revision 1138970)
++++ lib/Mail/SpamAssassin/BayesStore/MySQL.pm	(working copy)
+@@ -840,14 +840,28 @@
+       return 0;
+     }
+ 
++    # With ON DUPLICATE KEY UPDATE, the affected-rows value per row is 1 if
++    # the row is inserted as a new row and 2 if an existing row is updated.
++    #
++    # Due to a MySQL server bug a value of 3 can be seen.
++    # See: http://bugs.mysql.com/bug.php?id=46675
++    #   When executing the INSERT ... ON DUPLICATE KEY UPDATE statement
++    #   and checking the rows return count:
++    #   mysql_client_found_rows = 0: The second INSERT returns a row count
++    #                                of 2 in all MySQL versions.
++    #   mysql_client_found_rows = 1: The second INSERT returns this row count:
++    #     Before MySQL 5.1.20: 2
++    #     MySQL 5.1.20: undef on Mac OS X, 139775481 on Linux (garbage?)
++    #     MySQL 5.1.21 and up: 3
++    #
+     my $num_rows = $rc;
+ 
+     $sth->finish();
+ 
+-    if ($num_rows == 1 || $num_rows == 2) {
++    if ($num_rows == 1 || $num_rows == 2 || $num_rows == 3) {
+       my $token_count_update = '';
+       
+-      $token_count_update = "token_count = token_count + 1," if ($num_rows == 1);
++      $token_count_update = "token_count = token_count + 1," if $num_rows == 1;
+       $sql = "UPDATE bayes_vars SET
+                      $token_count_update
+                      newest_token_age = GREATEST(newest_token_age, ?),
+@@ -872,7 +886,11 @@
+     }
+     else {
+       # $num_rows was not what we expected
+-      dbg("bayes: _put_token: Updated an unexpected number of rows.");
++      my $token_displ = $token;
++      $token_displ =~ s/(.)/sprintf('%02x',ord($1))/egs;
++      dbg("bayes: _put_token: Updated an unexpected number of rows: %s, ".
++          "id: %s, token (hex): %s",
++          $num_rows, $self->{_userid}, $token_displ);
+       $self->{_dbh}->rollback();
+       return 0;
+     }
+@@ -987,8 +1005,24 @@
+       else {
+ 	my $num_rows = $rc;
+ 
+-	$need_atime_update_p = 1 if ($num_rows == 1 || $num_rows == 2);
+-	$new_tokens++ if ($num_rows == 1);
++        # With ON DUPLICATE KEY UPDATE, the affected-rows value per row is 1 if
++        # the row is inserted as a new row and 2 if an existing row is updated.
++        # But see MySQL bug (as above): http://bugs.mysql.com/bug.php?id=46675
++
++        if ($num_rows == 1) {
++          $new_tokens++;
++          $need_atime_update_p = 1;
++        } elsif ($num_rows == 2 || $num_rows == 3) {
++          $need_atime_update_p = 1;
++        } else {
++          # $num_rows was not what we expected
++          my $token_displ = $token;
++          $token_displ =~ s/(.)/sprintf('%02x',ord($1))/egs;
++          dbg("bayes: _put_tokens: Updated an unexpected number of rows: %s, ".
++              "id: %s, token (hex): %s",
++              $num_rows, $self->{_userid}, $token_displ);
++          $error_p = 1;
++        }
+       }
+     }
+ 
+@@ -1026,10 +1060,10 @@
+       }
+     }
+     else {
+-      # $num_rows was not what we expected
+-      dbg("bayes: _put_tokens: Updated an unexpected number of rows.");
+-      $self->{_dbh}->rollback();
+-      return 0;
++      info("bayes: _put_tokens: no atime updates needed?  Num of tokens: %d",
++           scalar keys %{$tokens});
++#     $self->{_dbh}->rollback();
++#     return 0;
+     }
+   }
+ 

diff --git a/mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild
new file mode 100644
index 0000000..d1dacab
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild,v 1.9 2012/06/17 14:46:52 armin76 Exp $
+
+EAPI="4-slot-abi"
+
+inherit perl-module toolchain-funcs eutils
+
+MY_P=Mail-SpamAssassin-${PV//_/-}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam"
+HOMEPAGE="http://spamassassin.apache.org/"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+# need keyword request for Mail-SPF ppc ppc64
+IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite ipv6"
+
+DEPEND="!<dev-lang/perl-5.8.8-r8
+	virtual/perl-MIME-Base64
+	>=virtual/perl-PodParser-1.32
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+	>=dev-perl/HTML-Parser-3.43
+	>=dev-perl/Mail-DKIM-0.37
+	>=dev-perl/Net-DNS-0.53
+	dev-perl/Digest-SHA1
+	dev-perl/libwww-perl
+	>=virtual/perl-Archive-Tar-1.26
+	app-crypt/gnupg
+	>=virtual/perl-IO-Zlib-1.04
+	>=dev-util/re2c-0.12.0
+	dev-perl/Mail-SPF
+	dev-perl/NetAddr-IP
+	ssl? (
+		dev-perl/IO-Socket-SSL
+		dev-libs/openssl
+	)
+	berkdb? (
+		virtual/perl-DB_File
+	)
+	ldap? ( dev-perl/perl-ldap )
+	mysql? (
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+	)
+	postgres? (
+		dev-perl/DBI
+		dev-perl/DBD-Pg
+	)
+	sqlite? (
+		dev-perl/DBI
+		dev-perl/DBD-SQLite
+	)
+	ipv6? (
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
+
+src_prepare() {
+	# http://old.nabble.com/Migrating-bayes-to-mysql-fails-with-parsing-errors-td31889789i20.html
+
+	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6624
+	epatch "${FILESDIR}/${P}-mysql_count_rows.patch"
+
+	#https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6625
+	epatch "${FILESDIR}/${P}-binary_token.patch"
+
+	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6626
+	epatch "${FILESDIR}/${P}-innodb.patch"
+}
+
+src_configure() {
+	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+	#	(just to be sure, nobody knows how it could happen in the first place).
+	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
+
+	# If ssl is enabled, spamc can be built with ssl support
+	if use ssl; then
+		myconf+=" ENABLE_SSL=yes"
+	else
+		myconf+=" ENABLE_SSL=no"
+	fi
+
+	# Set the path to the Perl executable explictly.  This will be used to
+	# create the initial sharpbang line in the scripts and might cause
+	# a versioned app name end in there, see
+	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
+	myconf+=" PERL_BIN=/usr/bin/perl"
+
+	# Add Gentoo tag to make it easy for the upstream devs to spot
+	# possible modifications or patches.
+	#version_tag="g${PV:6}${PR}"
+	#version_str="${PV//_/-}-${version_tag}"
+
+	# Create the Gentoo config file before Makefile.PL is called so it
+	# is copied later on.
+	#echo "version_tag ${version_tag}" > rules/11_gentoo.cf
+
+	# Setting the following env var ensures that no questions are asked.
+	perl-module_src_configure
+	# Configure spamc
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
+}
+
+src_compile() {
+	export PERL_MM_USE_DEFAULT=1
+
+	# Now compile all the stuff selected.
+	perl-module_src_compile
+
+	if use qmail; then
+		emake spamc/qmail-spamc
+	fi
+
+}
+
+src_install () {
+	perl-module_src_install
+
+	# Create the stub dir used by sa-update and friends
+	dodir /var/lib/spamassassin
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die "move spamd failed"
+
+	if use qmail; then
+		dobin spamc/qmail-spamc
+	fi
+
+	ln -s mail/spamassassin "${D}"/etc/spamassassin || die
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' "${D}"/etc/mail/spamassassin/init.pre || die
+
+	# Add the init and config scripts.
+	newinitd "${FILESDIR}"/3.3.1-spamd.init spamd
+	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
+
+	if use postgres; then
+		sed -i -e 's:@USEPOSTGRES@::' "${D}/etc/init.d/spamd"
+
+		dodoc sql/*_pg.sql
+	else
+		sed -i -e '/@USEPOSTGRES@/d' "${D}/etc/init.d/spamd"
+	fi
+
+	if use mysql; then
+		sed -i -e 's:@USEMYSQL@::' "${D}/etc/init.d/spamd"
+
+		dodoc sql/*_mysql.sql
+	else
+		sed -i -e '/@USEMYSQL@/d' "${D}/etc/init.d/spamd"
+	fi
+
+	dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
+		sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
+		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
+		spamd-apache2/README.apache
+
+	# Rename some docu files so they don't clash with others
+	newdoc spamd/README README.spamd
+	newdoc sql/README README.sql
+	newdoc ldap/README README.ldap
+
+	if use qmail; then
+		dodoc spamc/README.qmail
+	fi
+
+	cp "${FILESDIR}"/secrets.cf "${D}"/etc/mail/spamassassin/secrets.cf.example || die
+	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
+
+	cat <<-EOF > "${T}/local.cf.example"
+		# Sensitive data, such as database connection info, should be stored in
+		# /etc/mail/spamassassin/secrets.cf with appropriate permissions
+EOF
+
+	insinto /etc/mail/spamassassin/
+	doins "${T}/local.cf.example"
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+	elog "If you plan on using the -u flag to spamd, please read the notes"
+	elog "in /etc/conf.d/spamd regarding the location of the pid file.\n"
+	elog "If you build ${PN} with optional dependancy support,"
+	elog "you can enable them in /etc/mail/spamassassin/init.pre\n"
+	elog "You need to configure your database to be able to use Bayes filter"
+	elog "with database backend, otherwise it will still use (and need) the"
+	elog "Berkeley DB support."
+	elog "Look at the sql/README.bayes file in the documentation directory"
+	elog "for how to configure it.\n"
+	elog "If you plan to use Vipul's Razor, note that versions up to and"
+	elog "including version 2.82 include a bug that will slow down the entire"
+	elog "perl interpreter.  Version 2.83 or later fixes this."
+	elog "If you do not plan to use this plugin, be sure to comment out"
+	elog "its loadplugin line in /etc/mail/spamassassin/v310.pre.\n"
+	elog "The DKIM plugin is now enabled by default for new installs,"
+	elog "if the perl module Mail::DKIM is installed."
+	elog "However, installation of SpamAssassin will not overwrite existing"
+	elog ".pre configuration files, so to use DKIM when upgrading from a"
+	elog "previous release that did not use DKIM, a directive:\n"
+	elog "loadplugin Mail::SpamAssassin::Plugin::DKIM"
+	elog "will need to be uncommented in file 'v312.pre', or added"
+	elog "to some other .pre file, such as local.pre.\n"
+	ewarn "Rules are no longer included with SpamAssassin out of the box".
+	ewarn "You will need to immediately run sa-update, or download"
+	ewarn "the additional rules .tgz package and run sa-update --install"
+	ewarn "with it, to get a ruleset.\n"
+	elog "If when you run sa-update and receive a GPG validation error."
+	elog "Then you need to import an updated sa-update key."
+	elog "sa-update --import /usr/share/spamassassin/sa-update-pubkey.txt\n"
+}

diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 35d4abf..0d54f78 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,5 +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
+EBUILD freewrl-1.22.13.ebuild 4358 RMD160 b0f58d7d5a05585d6160f3c6749c43765e017175 SHA1 a79ff75a22cab49e18f260a924ef14193e9ecc0f SHA256 68c51acb2145b92e41f646d3542270a6f8b6453c644f047224de69910260b208
+MISC ChangeLog 6741 RMD160 0448bd63518493504c5befcaa9f27eba4ac2e528 SHA1 9e8cd4fd534cea2057124143bd4a6e6901d623b2 SHA256 af98d5b4ccb9f6004b89adef11a46185f44337a9f1311a3e1bcf9f601075ba33
 MISC metadata.xml 547 RMD160 9d5b1f027da48321e26e79fafbe6f8a0695dd307 SHA1 26476c1d5f7e99b2498462a351018dbf16ddd934 SHA256 7d745ed3fa96fd3febcb5f3f9891b87c29a8c24ac7614840c6f7a378b20feb37

diff --git a/media-gfx/freewrl/freewrl-1.22.13.ebuild b/media-gfx/freewrl/freewrl-1.22.13.ebuild
index b85259f..9133627 100644
--- a/media-gfx/freewrl/freewrl-1.22.13.ebuild
+++ b/media-gfx/freewrl/freewrl-1.22.13.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/media-gfx/freewrl/freewrl-1.22.13.ebuild,v 1.3 2012/06/13 18:05:51 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13.ebuild,v 1.4 2012/06/28 19:12:02 axs Exp $
 
 EAPI="4-slot-abi"
 

diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
new file mode 100644
index 0000000..5d3b10e
--- /dev/null
+++ b/media-libs/ming/Manifest
@@ -0,0 +1,10 @@
+AUX ming-0.4.3-libpng-1.5.patch 1344 RMD160 0b846c76dce0d921cf89947297be9a121a9ecc9a SHA1 3e08aa8dba069cac7654d95cc84b225a9a02384c SHA256 8c53e49a3fe3ce4ae0e9235985b6b17764677db30ade29b3b2b258fe71c3d098
+AUX ming-0.4.3-perl-5.14.patch 1469 RMD160 e707f893b68cd52758dbad14ca8aa9c24cf5f517 SHA1 0d465332bb1c08c273b38e268978c8d59ca59509 SHA256 c0ca274aef210dc5a5eb9114b0e4967fd0cb324d95a9597930847613fe4038e2
+AUX ming-0.4.4-vasprintf.patch 6319 RMD160 88f106252808ee443c3fd4073828d97b75e3ab5a SHA1 841fa13f4a55713e6c3624b68bf88fb303cb4c3c SHA256 b87e9e1480b726ee577f7eda13dcd6d46fc1cbe9afd845a5cd0914beef619c9f
+DIST ming-0.4.3.tar.bz2 14098671 RMD160 38a495250c7f4ff3335ebd08df2984719a2f046b SHA1 e51a1c9de7efcd6b20f727a824cfbf323b6f5e6f SHA256 61480ef0bd911639ac0538bf59d4d5052a1380192d145e922720c33c40693bf0
+DIST ming-0.4.4.tar.bz2 14001112 RMD160 2070cd694b9a1ff8dd0a577df2f551d5d810e4fe SHA1 e803b3b94a00a361e3415105f26112cf6f7bac81 SHA256 40e09d781741ac961338ed8dec7ba2ed06217de9da44dd67af6b881b95d2af7e
+EBUILD ming-0.4.3-r1.ebuild 2437 RMD160 72c0c5f5974c0a9d6e39f5870a67384061d66fcf SHA1 c5f40818df9499bfce954889d0add6b1d921c6e3 SHA256 dc4abca69596e6f26a1616235a53f920571a4e29a8f27c7c30916f91d86955d0
+EBUILD ming-0.4.3-r2.ebuild 2501 RMD160 6e713b765105ec5bd7c20303de250e25127dfd8b SHA1 66d6a365364cc1f5ebac0abb3f24f39fae7f2818 SHA256 367d1ebd6b7d08d1b21c9fdaf54175a9ec797934a3fd7bceb7d3f34e1a1db59c
+EBUILD ming-0.4.4.ebuild 2512 RMD160 6301b5f88f8f56b0e2be69965b6c8b9460252e5d SHA1 592ff42da0ab728f3f453912cc9114264b771bfb SHA256 ce3bdc1b10abb817e4e078eed236e193e2507742c66243001b59483382d3960a
+MISC ChangeLog 12080 RMD160 3c9fb05f46c399a0907aa62f928b79e8d9f75ff5 SHA1 ea507715f1266ceb67becf238d6397b9f949a8ab SHA256 254e6adcbbb61b509a709aa70bd09eb11cb05413d6d65ab8ab932cff86ddebfd
+MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5

diff --git a/media-libs/ming/files/ming-0.4.3-libpng-1.5.patch b/media-libs/ming/files/ming-0.4.3-libpng-1.5.patch
new file mode 100644
index 0000000..fb2b62f
--- /dev/null
+++ b/media-libs/ming/files/ming-0.4.3-libpng-1.5.patch
@@ -0,0 +1,48 @@
+From 63a408b763e3facdc8965ef216a06621f04e16ed Mon Sep 17 00:00:00 2001
+From: OBATA Akio <obata@××××.jp>
+Date: Tue, 15 Feb 2011 09:54:34 +0100
+Subject: [PATCH] Bug 109 - libpng-1.5 support
+
+---
+ src/blocks/pngdbl.c |    4 ++--
+ util/png2dbl.c      |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/blocks/pngdbl.c b/src/blocks/pngdbl.c
+index e0b88d6..77bb323 100644
+--- a/src/blocks/pngdbl.c
++++ b/src/blocks/pngdbl.c
+@@ -61,7 +61,7 @@ static png_structp openPngFromFile(FILE *fp)
+ }
+ 
+ static int pngReadFunc(png_structp png, unsigned char *buf, int len)
+-{	SWFInput input = (SWFInput) png->io_ptr;
++{	SWFInput input = (SWFInput) png_get_io_ptr(png);
+ 	return SWFInput_read(input, buf, len);
+ }
+ 
+@@ -127,7 +127,7 @@ static int readPNG(png_structp png_ptr, dblData result)
+ 		return 0;
+ 	}
+ 
+-	if(setjmp(png_ptr->jmpbuf))
++	if(setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+     	return 0;
+diff --git a/util/png2dbl.c b/util/png2dbl.c
+index 49610a3..ce44b27 100644
+--- a/util/png2dbl.c
++++ b/util/png2dbl.c
+@@ -91,7 +91,7 @@ struct pngdata readPNG(FILE *fp)
+     error("Couldn't create end_info\n");
+   }
+ 
+-  if(setjmp(png_ptr->jmpbuf))
++  if(setjmp(png_jmpbuf(png_ptr)))
+   {
+     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+     fclose(fp);
+-- 
+1.7.4.1
+

diff --git a/media-libs/ming/files/ming-0.4.3-perl-5.14.patch b/media-libs/ming/files/ming-0.4.3-perl-5.14.patch
new file mode 100644
index 0000000..e34eb0f
--- /dev/null
+++ b/media-libs/ming/files/ming-0.4.3-perl-5.14.patch
@@ -0,0 +1,43 @@
+From a0ea1cc47330a3ab316713d720892b6272401890 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@××××××.org>
+Date: Sun, 10 Jul 2011 21:46:09 +0300
+Subject: [PATCH] GvCV() isn't an lvalue since Perl 5.13.10
+
+GvCV() can't be assigned to anymore with recent perls, so use the new
+GvCV_set() macro when available or implement it the old way if it isn't.
+---
+ perl_ext/Exports.c  |    2 +-
+ perl_ext/perl_swf.h |    4 ++++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/perl_ext/Exports.c b/perl_ext/Exports.c
+index 65f8912..5529728 100644
+--- a/perl_ext/Exports.c
++++ b/perl_ext/Exports.c
+@@ -190,7 +190,7 @@ void export_cv(SV *class, SV *caller, char *sub)
+             SvPVX(caller), sub, SvPVX(class), sub); 
+ #endif 
+     gv = gv_fetchpv(form("%s::%s",SvPVX( caller), sub), TRUE, SVt_PVCV); 
+-    GvCV(gv) = perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE); 
++    GvCV_set(gv, perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE)); 
+     GvIMPORTED_CV_on(gv); 
+     GvMULTI_on(gv);
+ } 
+diff --git a/perl_ext/perl_swf.h b/perl_ext/perl_swf.h
+index b960229..1a3656e 100644
+--- a/perl_ext/perl_swf.h
++++ b/perl_ext/perl_swf.h
+@@ -58,6 +58,10 @@ typedef SWFFontCollection  SWF__FontCollection;
+ #define aTHXo_
+ #endif
+ 
++#ifndef GvCV_set
++# define GvCV_set(G, C) (GvCV(G) = (C))
++#endif
++
+ #ifndef S_DEBUG
+ #define swf_debug 0   /* Should we get this from, say, $SWF::debug? */
+ #define S_DEBUG(level,code)  if (swf_debug >= level) { code; }
+-- 
+1.7.5.4
+

diff --git a/media-libs/ming/files/ming-0.4.4-vasprintf.patch b/media-libs/ming/files/ming-0.4.4-vasprintf.patch
new file mode 100644
index 0000000..1c0da42
--- /dev/null
+++ b/media-libs/ming/files/ming-0.4.4-vasprintf.patch
@@ -0,0 +1,266 @@
+From 815f18295602dfabfad53b754fbcaad91e2198bc Mon Sep 17 00:00:00 2001
+Message-Id: <815f18295602dfabfad53b754fbcaad91e2198bc.1338912967.git.jlec@g.o>
+From: Sandro Santilli <strk@××××××.net>
+Date: Sat, 29 Oct 2011 08:41:17 +0200
+Subject: [PATCH] Put vasprintf own implementation in its own file
+
+---
+ test/actionscript/ActionScriptTest.c |    1 +
+ test/actionscript/Makefile.am        |    2 +-
+ util/Makefile.am                     |    6 +++-
+ util/decompile.c                     |   44 +++------------------------------
+ util/makeswf.c                       |   39 ------------------------------
+ util/makeswf_utils.c                 |    1 +
+ util/vasprintf.c                     |   43 +++++++++++++++++++++++++++++++++
+ util/vasprintf.h                     |    7 +++++
+ 8 files changed, 61 insertions(+), 82 deletions(-)
+
+diff --git a/test/actionscript/ActionScriptTest.c b/test/actionscript/ActionScriptTest.c
+index b351711..5af64c4 100644
+--- a/test/actionscript/ActionScriptTest.c
++++ b/test/actionscript/ActionScriptTest.c
+@@ -40,6 +40,7 @@
+ #include <sys/stat.h>
+ #include <limits.h>
+ #include <makeswf.h>
++#include <vasprintf.h>
+ 
+ static SWFMovie
+ compile(const char* filename, const char* ppfile, int version)
+diff --git a/test/actionscript/Makefile.am b/test/actionscript/Makefile.am
+index ae415ab..40e64e2 100644
+--- a/test/actionscript/Makefile.am
++++ b/test/actionscript/Makefile.am
+@@ -83,7 +83,7 @@ CLEANFILES = *.pp *.swf
+ check_PROGRAMS = \
+ 	ActionScriptTest
+ 
+-ActionScriptTest_SOURCES = ActionScriptTest.c ../run_test.c ../../util/makeswf_utils.c
++ActionScriptTest_SOURCES = ActionScriptTest.c ../run_test.c ../../util/makeswf_utils.c ../../util/vasprintf.c
+ ActionScriptTest_LDADD = $(top_builddir)/src/libming.la
+ ActionScriptTest_CFLAGS = -DTOP_BUILDDIR='"$(top_builddir)"' -DTOP_SOURCEDIR='"$(srcdir)"' -I$(top_srcdir)/util/ -DAS_TESTS='"$(AS_TESTS)"'
+ 
+diff --git a/util/Makefile.am b/util/Makefile.am
+index 0668f4f..3a7c9c4 100644
+--- a/util/Makefile.am
++++ b/util/Makefile.am
+@@ -45,7 +45,8 @@ libutil_la_SOURCES =	\
+ 	blocktypes.c	\
+ 	decompile.c	\
+ 	parser.c	\
+-	read.c 
++	read.c 		\
++	vasprintf.c
+ 
+ libutil_la_LIBADD = $(MATHLIB) $(ZLIB)
+ 
+@@ -60,7 +61,8 @@ noinst_HEADERS = \
+ 	parser.h	\
+ 	read.h		\
+ 	swfoutput.h	\
+-	swftypes.h
++	swftypes.h	\
++	vasprintf.c
+ 
+ listswf_SOURCES = outputtxt.c main.c	
+ listswf_LDADD = libutil.la $(top_builddir)/src/libming.la
+diff --git a/util/decompile.c b/util/decompile.c
+index 1af7a9f..c844fa4 100644
+--- a/util/decompile.c
++++ b/util/decompile.c
+@@ -18,7 +18,7 @@
+  *
+  ****************************************************************************/
+ 
+-#define _GNU_SOURCE
++#define _GNU_SOURCE 1
+ 
+ #define DEBUGSTACK
+ #define DECOMP_SWITCH
+@@ -42,45 +42,8 @@
+ #include "action.h"
+ #include "swftypes.h"
+ #include "../src/blocks/error.h"
++#include "vasprintf.h"
+ 
+-#ifndef HAVE_VASPRINTF
+-/* Workaround for the lack of vasprintf()
+- * As found on: http://unixpapa.com/incnote/stdio.html
+- * Seems to be Public Domain
+- */
+-int
+-vasprintf(char **ret, const char *format, va_list ap)
+-{
+-	va_list ap2;
+-	int len = 100;        /* First guess at the size */
+-	if ((*ret = (char *) malloc(len)) == NULL)
+-	{
+-		return -1;
+-	}
+-	while (1)
+-	{
+-		int nchar;
+-		va_copy(ap2, ap);
+-		nchar= vsnprintf(*ret, len, format, ap2);
+-		if (nchar > -1 && nchar < len)
+-		{
+-			return nchar;
+-		}
+-		if (nchar > len)
+-		{
+-			len= nchar+1;
+-		} else
+-		{
+-			len*= 2;
+-		}
+-		if ((*ret = (char *) realloc(*ret, len)) == NULL)
+-		{
+-			free(*ret);
+-			return -1;
+-		}
+-	}
+-}
+-#endif
+ 
+ static char **pool;
+ struct SWF_ACTIONPUSHPARAM *regs[256];
+@@ -247,10 +210,11 @@ static void
+ println(const char* fmt, ...)
+ {
+ 	char *tmp;
++	int written;
+ 
+ 	va_list ap;
+ 	va_start (ap, fmt);
+-	vasprintf (&tmp, fmt, ap);
++	written = vasprintf (&tmp, fmt, ap);
+ 
+ 	dcprintf("%s%s", tmp, newlinestring);
+ 
+diff --git a/util/makeswf.c b/util/makeswf.c
+index 0b80728..4fdc826 100644
+--- a/util/makeswf.c
++++ b/util/makeswf.c
+@@ -76,45 +76,6 @@
+ #include <getopt.h>
+ #endif
+ 
+-#ifndef HAVE_VASPRINTF
+-/* Workaround for the lack of vasprintf()
+- * As found on: http://unixpapa.com/incnote/stdio.html
+- * Seems to be Public Domain
+- */
+-int
+-vasprintf(char **ret, const char *format, va_list ap)
+-{
+-	va_list ap2;
+-	int len = 100;        /* First guess at the size */
+-	if ((*ret = (char *) malloc(len)) == NULL)
+-	{
+-		return -1;
+-	}
+-	while (1)
+-	{
+-		int nchar;
+-		va_copy(ap2, ap);
+-		nchar= vsnprintf(*ret, len, format, ap2);
+-		if (nchar > -1 && nchar < len)
+-		{
+-			return nchar;
+-		}
+-		if (nchar > len)
+-		{
+-			len= nchar+1;
+-		} else
+-		{
+-			len*= 2;
+-		}
+-		if ((*ret = (char *) realloc(*ret, len)) == NULL)
+-		{
+-			free(*ret);
+-			return -1;
+-		}
+-	}
+-}
+-#endif
+-
+ #define DEFSWFVERSION 6
+ #define DEFSWFCOMPRESSION 9
+ 
+diff --git a/util/makeswf_utils.c b/util/makeswf_utils.c
+index f9f53bd..6a65d87 100644
+--- a/util/makeswf_utils.c
++++ b/util/makeswf_utils.c
+@@ -41,6 +41,7 @@
+ #ifdef HAVE_GETOPT_H
+ #include <getopt.h>
+ #endif
++#include "vasprintf.h"
+ 
+ // Cheating, but it works (not sure why the above ifdef for getopt isn't)
+ #ifdef _WIN32
+diff --git a/util/vasprintf.c b/util/vasprintf.c
+new file mode 100644
+index 0000000..1127664
+--- /dev/null
++++ b/util/vasprintf.c
+@@ -0,0 +1,43 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <stdarg.h>
++
++#ifndef HAVE_VASPRINTF
++/* Workaround for the lack of vasprintf()
++ * As found on: http://unixpapa.com/incnote/stdio.html
++ * Seems to be Public Domain
++ */
++int
++vasprintf(char **ret, const char *format, va_list ap)
++{
++	va_list ap2;
++	int len = 100;        /* First guess at the size */
++	if ((*ret = (char *) malloc(len)) == NULL)
++	{
++		return -1;
++	}
++	while (1)
++	{
++		int nchar;
++		va_copy(ap2, ap);
++		nchar= vsnprintf(*ret, len, format, ap2);
++		if (nchar > -1 && nchar < len)
++		{
++			return nchar;
++		}
++		if (nchar > len)
++		{
++			len= nchar+1;
++		} else
++		{
++			len*= 2;
++		}
++		if ((*ret = (char *) realloc(*ret, len)) == NULL)
++		{
++			free(*ret);
++			return -1;
++		}
++	}
++}
++#endif
++
+diff --git a/util/vasprintf.h b/util/vasprintf.h
+new file mode 100644
+index 0000000..9391c23
+--- /dev/null
++++ b/util/vasprintf.h
+@@ -0,0 +1,7 @@
++#include <stdio.h>
++#include "ming_config.h"
++
++#ifndef HAVE_VASPRINTF
++int vasprintf(char **ret, const char *format, va_list ap);
++#endif
++
+-- 
+1.7.8.6
+

diff --git a/media-libs/ming/ming-0.4.3-r1.ebuild b/media-libs/ming/ming-0.4.3-r1.ebuild
new file mode 100644
index 0000000..1574e77
--- /dev/null
+++ b/media-libs/ming/ming-0.4.3-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.3-r1.ebuild,v 1.6 2011/11/15 22:27:59 xmw Exp $
+
+EAPI="3"
+
+PHP_EXT_NAME=ming
+PHP_EXT_OPTIONAL_USE=php
+PYTHON_DEPEND="python? 2"
+
+inherit eutils autotools flag-o-matic multilib php-ext-source-r2 perl-module python
+
+DESCRIPTION="An Open Source library for Flash movie generation."
+HOMEPAGE="http://ming.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ming/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="+perl +python php static-libs"
+
+RDEPEND="perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	media-libs/freetype
+	media-libs/libpng
+	media-libs/giflib
+	sys-libs/zlib
+	!media-libs/libswf"
+DEPEND="${DEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+S=${WORKDIR}/${P/_/.}
+
+# Tests only work when the package is tested on a system
+# which does not presently have any version of ming installed.
+RESTRICT="test"
+
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng-1.5.patch
+
+	# Let's get rid of the TEXTRELS, link dynamic. Use gif.
+	sed -i \
+		-e 's/libming.a/libming.so/' \
+		-e 's/lungif/lgif/' \
+		perl_ext/Makefile.PL
+	sed -i \
+		-e 's/ungif/gif/' \
+		py_ext/setup.py.in
+
+	if use php; then
+		cd "${S}/php_ext"
+		php-ext-source-r2_phpize
+		cd "${S}"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# build is sensitive to -O3 (bug #297437)
+	replace-flags -O3 -O2
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable perl) \
+		$(use_enable python)
+}
+
+src_compile() {
+	emake || die
+
+	if use php; then
+		cd "${S}"/php_ext
+		myconf="--disable-rpath
+			--disable-static
+			--with-ming"
+		php-ext-source-r2_src_compile
+	fi
+}
+
+src_test() {
+	emake check || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS="vendor" install || die
+
+	rm -f "${ED}"usr/lib*/lib${PN}.la
+
+	fixlocalpod
+
+	# Get rid of the precompiled stuff, we generate it later.
+	find "${ED}" -name "*.pyc" -print0 | xargs -0 rm -f
+
+	if use php; then
+		cd "${S}"/php_ext
+		php-ext-source-r2_src_install
+	fi
+}
+
+pkg_postinst() {
+	use perl && perl-module_pkg_postinst
+	use python && python_mod_optimize ming.py mingc.py
+}
+
+pkg_prerm() {
+	use perl && perl-module_pkg_prerm
+}
+
+pkg_postrm() {
+	use perl && perl-module_pkg_postrm
+	use python && python_mod_cleanup ming.py mingc.py
+}

diff --git a/media-libs/ming/ming-0.4.3-r2.ebuild b/media-libs/ming/ming-0.4.3-r2.ebuild
new file mode 100644
index 0000000..4aa240f
--- /dev/null
+++ b/media-libs/ming/ming-0.4.3-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.3-r2.ebuild,v 1.7 2012/06/14 06:20:10 jdhore Exp $
+
+EAPI="3"
+
+PHP_EXT_NAME=ming
+PHP_EXT_OPTIONAL_USE=php
+PYTHON_DEPEND="python? 2"
+
+inherit eutils autotools flag-o-matic multilib php-ext-source-r2 perl-module python
+
+DESCRIPTION="An Open Source library for Flash movie generation."
+HOMEPAGE="http://ming.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ming/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+perl +python php static-libs"
+
+RDEPEND="perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	media-libs/freetype
+	media-libs/libpng
+	media-libs/giflib
+	sys-libs/zlib
+	!media-libs/libswf"
+DEPEND="${DEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+S=${WORKDIR}/${P/_/.}
+
+# Tests only work when the package is tested on a system
+# which does not presently have any version of ming installed.
+RESTRICT="test"
+
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng-1.5.patch
+	epatch "${FILESDIR}"/${P}-perl-5.14.patch
+
+	# Let's get rid of the TEXTRELS, link dynamic. Use gif.
+	sed -i \
+		-e 's/libming.a/libming.so/' \
+		-e 's/lungif/lgif/' \
+		perl_ext/Makefile.PL
+	sed -i \
+		-e 's/ungif/gif/' \
+		py_ext/setup.py.in
+
+	if use php; then
+		cd "${S}/php_ext"
+		php-ext-source-r2_phpize
+		cd "${S}"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# build is sensitive to -O3 (bug #297437)
+	replace-flags -O3 -O2
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable perl) \
+		$(use_enable python)
+}
+
+src_compile() {
+	emake || die
+
+	if use php; then
+		cd "${S}"/php_ext
+		myconf="--disable-rpath
+			--disable-static
+			--with-ming"
+		php-ext-source-r2_src_compile
+	fi
+}
+
+src_test() {
+	emake check || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS="vendor" install || die
+
+	rm -f "${ED}"usr/lib*/lib${PN}.la
+
+	fixlocalpod
+
+	# Get rid of the precompiled stuff, we generate it later.
+	find "${ED}" -name "*.pyc" -print0 | xargs -0 rm -f
+
+	if use php; then
+		cd "${S}"/php_ext
+		php-ext-source-r2_src_install
+	fi
+}
+
+pkg_postinst() {
+	use perl && perl-module_pkg_postinst
+	use python && python_mod_optimize ming.py mingc.py
+}
+
+pkg_prerm() {
+	use perl && perl-module_pkg_prerm
+}
+
+pkg_postrm() {
+	use perl && perl-module_pkg_postrm
+	use python && python_mod_cleanup ming.py mingc.py
+}

diff --git a/media-libs/ming/ming-0.4.4.ebuild b/media-libs/ming/ming-0.4.4.ebuild
new file mode 100644
index 0000000..f1736e8
--- /dev/null
+++ b/media-libs/ming/ming-0.4.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.4.ebuild,v 1.2 2012/06/11 09:18:03 ago Exp $
+
+EAPI="4-slot-abi"
+
+PHP_EXT_NAME=ming
+PHP_EXT_OPTIONAL_USE=php
+PYTHON_DEPEND="python? 2"
+AUTOTOOLS_AUTORECONF=yes
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools-utils flag-o-matic multilib php-ext-source-r2 perl-module python
+
+DESCRIPTION="An Open Source library for Flash movie generation."
+HOMEPAGE="http://ming.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ming/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+perl +python php static-libs"
+
+RDEPEND="perl? ( dev-lang/perl:= )
+	python? ( dev-lang/python )
+	media-libs/freetype
+	media-libs/libpng
+	media-libs/giflib
+	sys-libs/zlib
+	!media-libs/libswf"
+DEPEND="${DEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+S=${WORKDIR}/${P/_/.}
+
+# Tests only work when the package is tested on a system
+# which does not presently have any version of ming installed.
+RESTRICT="test"
+
+pkg_setup() {
+	use python && python_set_active_version 2 && python_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-vasprintf.patch
+	"${FILESDIR}"/${PN}-0.4.3-perl-5.14.patch )
+
+src_prepare() {
+	# Let's get rid of the TEXTRELS, link dynamic. Use gif.
+	sed -i \
+		-e 's/libming.a/libming.so/' \
+		-e 's/lungif/lgif/' \
+		perl_ext/Makefile.PL
+	sed -i \
+		-e 's/ungif/gif/' \
+		py_ext/setup.py.in
+
+	if use php; then
+		cd "${S}/php_ext"
+		php-ext-source-r2_phpize
+		cd "${S}"
+	fi
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# build is sensitive to -O3 (bug #297437)
+	replace-flags -O3 -O2
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable perl)
+		$(use_enable python)
+		)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use php; then
+		cd "${S}"/php_ext
+		myconf="--disable-rpath
+			--disable-static
+			--with-ming"
+		php-ext-source-r2_src_compile
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install INSTALLDIRS="vendor"
+
+	fixlocalpod
+
+	use python && python_clean_installation_image
+
+	if use php; then
+		cd "${S}"/php_ext
+		php-ext-source-r2_src_install
+	fi
+}
+
+pkg_postinst() {
+	use perl && perl-module_pkg_postinst
+	use python && python_mod_optimize ming.py mingc.py
+}
+
+pkg_prerm() {
+	use perl && perl-module_pkg_prerm
+}
+
+pkg_postrm() {
+	use perl && perl-module_pkg_postrm
+	use python && python_mod_cleanup ming.py mingc.py
+}

diff --git a/media-video/gxine/Manifest b/media-video/gxine/.#Manifest.1.181
similarity index 100%
copy from media-video/gxine/Manifest
copy to media-video/gxine/.#Manifest.1.181

diff --git a/media-video/gxine/gxine-0.5.907.ebuild b/media-video/gxine/.#gxine-0.5.907.ebuild.1.6
similarity index 98%
copy from media-video/gxine/gxine-0.5.907.ebuild
copy to media-video/gxine/.#gxine-0.5.907.ebuild.1.6
index 9e01fb6..7f9ee81 100644
--- a/media-video/gxine/gxine-0.5.907.ebuild
+++ b/media-video/gxine/.#gxine-0.5.907.ebuild.1.6
@@ -2,7 +2,7 @@
 # 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"
+EAPI=4
 inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
 
 DESCRIPTION="GTK+ Front-End for libxine"
@@ -17,7 +17,7 @@ IUSE="gnome-screensaver linguas_cs linguas_de lirc nls nsplugin udev +xcb xinera
 COMMON_DEPEND=">=media-libs/xine-lib-1.1.20
 	x11-libs/gtk+:2
 	>=dev-libs/glib-2
-	>=dev-lang/spidermonkey-1.8.2.15:=
+	>=dev-lang/spidermonkey-1.8.2.15
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender

diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 0a91523..64bd933 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -4,6 +4,6 @@ AUX gxine-0.5.906-endif.patch 349 RMD160 0683bb409616d8ef878e4144e747bd0032fc236
 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
+EBUILD gxine-0.5.907.ebuild 2861 RMD160 cc621b97e13d0cf3fc4261c8846ec06defa1fa26 SHA1 81e1eb61ce42e237420b9478f1872cce7aea240a SHA256 805aaeba061448056aa0afdae22d4643d9f4a853ffd950fd99bcd08f2a145fa2
+MISC ChangeLog 17987 RMD160 9e70ca9deaba5a8dacd9a169c4da173888c6692c SHA1 8fa9d2df13fa9ab9d6083ca0c503a41965981451 SHA256 9231405d37427175b53955b28c0d7aec3c116ac377a2549244b591e7b719b8ea
 MISC metadata.xml 373 RMD160 879bbceb1af5297cc90a6191f9a40375a4732c81 SHA1 9e40c5d9bb710cc676c38c9a097af598db072e60 SHA256 202b197a4f7feb227636e8de2bc00c6af351fd80f72a7916df100aeadd056bd9

diff --git a/media-video/gxine/gxine-0.5.907.ebuild b/media-video/gxine/gxine-0.5.907.ebuild
index 9e01fb6..028f102 100644
--- a/media-video/gxine/gxine-0.5.907.ebuild
+++ b/media-video/gxine/gxine-0.5.907.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/media-video/gxine/gxine-0.5.907.ebuild,v 1.6 2012/05/17 20:32:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.907.ebuild,v 1.7 2012/06/28 20:42:24 ssuominen Exp $
 
 EAPI="4-slot-abi"
 inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
@@ -40,6 +40,10 @@ src_prepare() {
 	# ld: cannot find -ljs
 	sed -i -e '/JS_LIBS="`spidermonkey_locate_lib/s:js:mozjs:' m4/_js.m4 || die
 
+	if has_version '>=dev-lang/spidermonkey-1.8.7'; then
+		sed -i -e 's:mozjs185:mozjs187:' m4/_js.m4 || die #422983
+	fi
+
 	epatch \
 		"${FILESDIR}"/${PN}-0.5.905-desktop.patch \
 		"${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \

diff --git a/metadata/layout.conf b/metadata/layout.conf
new file mode 100644
index 0000000..6b50717
--- /dev/null
+++ b/metadata/layout.conf
@@ -0,0 +1 @@
+masters = gentoo axs

diff --git a/net-analyzer/symon/Manifest b/net-analyzer/symon/Manifest
new file mode 100644
index 0000000..efe2052
--- /dev/null
+++ b/net-analyzer/symon/Manifest
@@ -0,0 +1,10 @@
+AUX symon-init.d 680 RMD160 b944a18cefedc75a17f4cba0a7d9f824cf2ab8ab SHA1 dfb1407601ca74be7e1f5e2b5ce6fd7bf05c5c95 SHA256 5c6f83290aec327de26cce51de1121528e217ba37e8f4f93447925ff4b8dc19c
+AUX symon.conf 313 RMD160 2a892b80bbf6d1f78c06875782a080d28661fd84 SHA1 15d93dd00106a8bd9444a79ffab9a1fd0c22af76 SHA256 3f4914f65fa4456de5ee70da3c6f40f416d6452fac8a439648cc565c791cec73
+AUX symux-init.d 674 RMD160 1de1e203dd711df1cfdc95beef65c02ade32976b SHA1 2c0da16555cb9a965f89ed3dd904638e560389ee SHA256 a985bfb53ea2bfcc47a57d5b10ec8411853795a11a6892caaa974ddfecce75dd
+AUX symux.conf 952 RMD160 7e88432728d7b9884695b9a55a5d1b11246b0b9f SHA1 81c077f320f1aa98b20336eee2cf1f25cf59e206 SHA256 20f915f55f084c1f9b55410c097c8165e2d621924e3496c9e3add7c1de655126
+DIST symon-2.84.tar.gz 105849 RMD160 0211185b3e19593e3a6807fe58ecfdd72520a6bc SHA1 1a4a79c01b43ae3efc7e9179266d3f7375eb94f3 SHA256 4b67beae478f4314c81428d44578670914fbc8e761e9c7ae0d9701c267f7a371
+DIST symon-2.85.tar.gz 106011 RMD160 c355c188d23284de175756e044c43e8c9f6cc6e2 SHA1 96e4d0e6dbd763249fcc09c5e25e1ae233781fea SHA256 547329a1efbc2408298256d31a005db23869117ccf6249c052ef662b3ee12d35
+EBUILD symon-2.84.ebuild 2663 RMD160 3c024ce3a45926a51c7587878432fdf9bffa3fcc SHA1 5f56ba7309dd0689682b5f66441cf53f7ba2210c SHA256 5e03d563719a37fb4d46ad0184470de37059d6b4f99ba4900b962a4f62ad4dd2
+EBUILD symon-2.85.ebuild 2663 RMD160 2c56768eb7820d0efa4d5d61e5e1525138662b9e SHA1 11ba235dd2a623ede96c58ee10e40d6b70a3e5c9 SHA256 3f30c92eb9e5b3f2e25b37e8b4b77a16b914816b20e76022d6a026fb8bb219cb
+MISC ChangeLog 2491 RMD160 3ad3b6c8aca0173560fd3f3fe3395169023f1409 SHA1 a1aac27b5a89d422791650b2526ac5ad8c2c8ad4 SHA256 e99e04dd27432fd4c01a2446e70c588b278c7523d1ec7aa3d1d9ff0252424af8
+MISC metadata.xml 512 RMD160 6b444d2d140460d6ba170a4492710c092854b9f5 SHA1 ea9074b4229bc8ea0c90d59d1885c6536803fd6e SHA256 c95f7e3719ea159f70b49b972150f6fb2f366f2373636a0a6167a6efe36b4631

diff --git a/net-analyzer/symon/files/symon-init.d b/net-analyzer/symon/files/symon-init.d
new file mode 100644
index 0000000..d4f4b3d
--- /dev/null
+++ b/net-analyzer/symon/files/symon-init.d
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/files/symon-init.d,v 1.2 2008/11/17 00:00:46 tcunha Exp $
+
+opts="${opts} reload"
+
+depend() {
+	after bootmisc
+	need localmount net
+	use logger
+}
+
+reload() {
+	ebegin "Reloading symon"
+	start-stop-daemon --stop --pidfile /var/run/symon.pid \
+		--exec /usr/sbin/symon --oknodo --signal HUP
+	eend $?
+}
+
+start() {
+	ebegin "Starting symon"
+	start-stop-daemon --start --exec /usr/sbin/symon -- -u
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping symon"
+	start-stop-daemon --stop --pidfile /var/run/symon.pid
+	eend $?
+}

diff --git a/net-analyzer/symon/files/symon.conf b/net-analyzer/symon/files/symon.conf
new file mode 100644
index 0000000..9206621
--- /dev/null
+++ b/net-analyzer/symon/files/symon.conf
@@ -0,0 +1,14 @@
+#
+# Demo configuration for symon. See symon(8) for BNF.
+#
+
+monitor { cpu(0),  mem,
+	  if(lo),
+#	  cpuiow(0),
+#         sensor(fan0), sensor(in0), sensor(temp0),
+#         if(eth0), if(eth1), if(eth2),
+#         df(sda),
+#	  smart(sda),
+#	  io(hda), io(hdb), io(hdc), io(hdd)
+	  io(sda)
+} stream to 127.0.0.1 2100

diff --git a/net-analyzer/symon/files/symux-init.d b/net-analyzer/symon/files/symux-init.d
new file mode 100644
index 0000000..b7c10e4
--- /dev/null
+++ b/net-analyzer/symon/files/symux-init.d
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/files/symux-init.d,v 1.2 2008/11/17 00:00:46 tcunha Exp $
+
+opts="${opts} reload"
+
+depend() {
+	after bootmisc
+	need localmount net
+	use logger
+}
+
+reload() {
+	ebegin "Reloading symux"
+	start-stop-daemon --stop --pidfile /var/run/symux.pid \
+		--exec /usr/sbin/symux --oknodo --signal HUP
+	eend $?
+}
+
+start() {
+	ebegin "Starting symux"
+	start-stop-daemon --start --exec /usr/sbin/symux
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping symux"
+	start-stop-daemon --stop --pidfile /var/run/symux.pid
+	eend $?
+}

diff --git a/net-analyzer/symon/files/symux.conf b/net-analyzer/symon/files/symux.conf
new file mode 100644
index 0000000..fa0ed50
--- /dev/null
+++ b/net-analyzer/symon/files/symux.conf
@@ -0,0 +1,35 @@
+#
+# Demo symux configuration. See symux(8) for BNF.
+#
+
+mux 127.0.0.1 2100
+
+source 127.0.0.1 {
+	accept { cpu(0),  mem,
+	  	 if(lo),
+#		 cpuiow(0),
+#         	 sensor(fan0), sensor(in0), sensor(temp0),
+#         	 if(eth0), if(eth1), if(eth2),
+#         	 df(sda),
+#         	 smart(sda),
+#	  	 io(hda), io(hdb), io(hdc), io(hdd)
+	  	 io(sda)
+	}
+	datadir "/var/lib/symon/rrds/localhost"
+}
+
+# an example showing the write directive
+#
+# source 10.0.0.2 {
+#	accept { cpu(0), mem, if(eth0), if(eth1),
+#		 if(lo), if(eth2), io(sda)
+#	}
+#
+#	write cpu(0)   in "/var/lib/symon/rrds/<host>/cpu0.rrd"
+#	write mem      in "/var/lib/symon/rrds/<host>/mem.rrd"
+#	write if(eth0) in "/var/lib/symon/rrds/<host>/if_eth0.rrd"
+#	write if(eth1) in "/var/lib/symon/rrds/<host>/if_eth1.rrd"
+#	write if(lo)   in "/var/lib/symon/rrds/<host>/if_lo.rrd"
+#	write if(eth2) in "/var/lib/symon/rrds/<host>/if_eth2.rrd"
+#	write io(sda)  in "/var/lib/symon/rrds/<host>/io_sda.rrd"
+# }

diff --git a/net-analyzer/symon/symon-2.84.ebuild b/net-analyzer/symon/symon-2.84.ebuild
new file mode 100644
index 0000000..38a306b
--- /dev/null
+++ b/net-analyzer/symon/symon-2.84.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/net-analyzer/symon/symon-2.84.ebuild,v 1.1 2012/02/15 15:49:30 jer Exp $
+
+EAPI="4-slot-abi"
+GENTOO_DEPEND_ON_PERL=no
+inherit perl-module toolchain-funcs
+
+DESCRIPTION="Performance and information monitoring tool"
+HOMEPAGE="http://www.xs4all.nl/~wpd/symon/"
+SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="perl +symon symux"
+
+RDEPEND="perl? ( dev-lang/perl:= )
+	symux? ( net-analyzer/rrdtool )"
+DEPEND="${RDEPEND}
+	virtual/pmake"
+
+S=${WORKDIR}/${PN}
+
+# Deletes the directory passed as an argument from the internal pmake
+# variable SUBDIR.
+zap_subdir() {
+	sed -i "/^SUBDIR/s/$1//" Makefile || die
+}
+
+pkg_setup() {
+	use symon && USE_SYMON=1 && return
+
+	if ! use perl && ! use symon && ! use symux; then
+		ewarn "You have all available USE flags disabled. Therefore, only the"
+		ewarn "system monitor will be emerged. Please, enable at least one USE"
+		ewarn "flag to avoid this message."
+		USE_SYMON=1
+	fi
+}
+
+src_prepare() {
+	# Respect LDFLAGS.
+	sed -i "/^[ \t]*\${CC}.*\${LIBS}/s/\${CC}/& \${LDFLAGS}/" sym*/Makefile \
+		|| die "sed ldflags failed"
+
+	# Do some sed magic in accordance with the USE flags.
+	use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib
+	! use perl && zap_subdir client
+	! use symux && zap_subdir symux
+	[[ -z ${USE_SYMON} ]] && zap_subdir symon
+}
+
+src_compile() {
+	pmake CC="$(tc-getCC)" CFLAGS+="${CFLAGS}" STRIP=true || die "pmake failed"
+}
+
+src_install() {
+	if [[ -n ${USE_SYMON} ]]; then
+		insinto /etc
+		doins "${FILESDIR}"/symon.conf
+
+		newinitd "${FILESDIR}"/symon-init.d symon
+
+		dodoc CHANGELOG HACKERS TODO
+
+		doman symon/symon.8
+		dosbin symon/symon
+	fi
+
+	if use perl; then
+		dobin client/getsymonitem.pl
+
+		perlinfo
+		insinto ${VENDOR_LIB}
+		doins client/SymuxClient.pm
+	fi
+
+	if use symux; then
+		insinto /etc
+		doins "${FILESDIR}"/symux.conf
+
+		newinitd "${FILESDIR}"/symux-init.d symux
+
+		doman symux/symux.8
+		dosbin symux/symux
+
+		dodir /usr/share/symon
+		insinto /usr/share/symon
+		doins symux/c_smrrds.sh
+		fperms a+x /usr/share/symon/c_smrrds.sh
+
+		dodir /var/lib/symon/rrds/localhost
+	fi
+}
+
+pkg_postinst() {
+	use perl && perl-module_pkg_postinst
+
+	if use symux; then
+		elog "The RRDs files can be obtained by running"
+		elog "/usr/share/symon/c_smrrds.sh all."
+		elog "For information about migrating RRDs from a previous"
+		elog "symux version read the LEGACY FORMATS section of symux(8)."
+		elog "To view the rrdtool pictures of the stored data, emerge"
+		elog "net-analyzer/syweb."
+	fi
+}

diff --git a/net-analyzer/symon/symon-2.85.ebuild b/net-analyzer/symon/symon-2.85.ebuild
new file mode 100644
index 0000000..897a6b0
--- /dev/null
+++ b/net-analyzer/symon/symon-2.85.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/net-analyzer/symon/symon-2.85.ebuild,v 1.1 2012/04/17 16:39:50 jer Exp $
+
+EAPI="4-slot-abi"
+GENTOO_DEPEND_ON_PERL=no
+inherit perl-module toolchain-funcs
+
+DESCRIPTION="Performance and information monitoring tool"
+HOMEPAGE="http://www.xs4all.nl/~wpd/symon/"
+SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="perl +symon symux"
+
+RDEPEND="perl? ( dev-lang/perl:= )
+	symux? ( net-analyzer/rrdtool )"
+DEPEND="${RDEPEND}
+	virtual/pmake"
+
+S=${WORKDIR}/${PN}
+
+# Deletes the directory passed as an argument from the internal pmake
+# variable SUBDIR.
+zap_subdir() {
+	sed -i "/^SUBDIR/s/$1//" Makefile || die
+}
+
+pkg_setup() {
+	use symon && USE_SYMON=1 && return
+
+	if ! use perl && ! use symon && ! use symux; then
+		ewarn "You have all available USE flags disabled. Therefore, only the"
+		ewarn "system monitor will be emerged. Please, enable at least one USE"
+		ewarn "flag to avoid this message."
+		USE_SYMON=1
+	fi
+}
+
+src_prepare() {
+	# Respect LDFLAGS.
+	sed -i "/^[ \t]*\${CC}.*\${LIBS}/s/\${CC}/& \${LDFLAGS}/" sym*/Makefile \
+		|| die "sed ldflags failed"
+
+	# Do some sed magic in accordance with the USE flags.
+	use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib
+	! use perl && zap_subdir client
+	! use symux && zap_subdir symux
+	[[ -z ${USE_SYMON} ]] && zap_subdir symon
+}
+
+src_compile() {
+	pmake CC="$(tc-getCC)" CFLAGS+="${CFLAGS}" STRIP=true || die "pmake failed"
+}
+
+src_install() {
+	if [[ -n ${USE_SYMON} ]]; then
+		insinto /etc
+		doins "${FILESDIR}"/symon.conf
+
+		newinitd "${FILESDIR}"/symon-init.d symon
+
+		dodoc CHANGELOG HACKERS TODO
+
+		doman symon/symon.8
+		dosbin symon/symon
+	fi
+
+	if use perl; then
+		dobin client/getsymonitem.pl
+
+		perlinfo
+		insinto ${VENDOR_LIB}
+		doins client/SymuxClient.pm
+	fi
+
+	if use symux; then
+		insinto /etc
+		doins "${FILESDIR}"/symux.conf
+
+		newinitd "${FILESDIR}"/symux-init.d symux
+
+		doman symux/symux.8
+		dosbin symux/symux
+
+		dodir /usr/share/symon
+		insinto /usr/share/symon
+		doins symux/c_smrrds.sh
+		fperms a+x /usr/share/symon/c_smrrds.sh
+
+		dodir /var/lib/symon/rrds/localhost
+	fi
+}
+
+pkg_postinst() {
+	use perl && perl-module_pkg_postinst
+
+	if use symux; then
+		elog "The RRDs files can be obtained by running"
+		elog "/usr/share/symon/c_smrrds.sh all."
+		elog "For information about migrating RRDs from a previous"
+		elog "symux version read the LEGACY FORMATS section of symux(8)."
+		elog "To view the rrdtool pictures of the stored data, emerge"
+		elog "net-analyzer/syweb."
+	fi
+}

diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
new file mode 100644
index 0000000..6684f92
--- /dev/null
+++ b/net-irc/atheme-services/Manifest
@@ -0,0 +1,13 @@
+AUX atheme-services-6.0.8-configure-disable.patch 4067 RMD160 83b845addd7af78d10a4b8447e9ec3c88f7efa17 SHA1 a893c2fab189495b31525332a8c4c9ffdcbd3aaf SHA256 861b9b458e6e2122aca923425dec407a5d2a13fecde613544c5aafb2cb161595
+AUX atheme-services.initd 975 RMD160 83486b35d148bab6f4b611d62fb18da63846a966 SHA1 bedd35acca25fad59ecd067709cfe85c0ba9798d SHA256 0cdcfb95d2399e132364127429618b44ce1830a61af0a5dc5bce1179b3810f75
+DIST atheme-services-6.0.10.tar.bz2 897748 RMD160 e7e1e606cb29c426568d462f6afab4709a1c2124 SHA1 7b38b5f99cf0f2dab6c19557514cc5a6a8ca0d35 SHA256 9a2b3954316d29ae0cd546edc9c2b6169bae448f982dbd76ca3efd84c271d0c8
+DIST atheme-services-6.0.11.tar.bz2 859123 RMD160 c01d835e6401e97f67d7647959b59b38297e9b1f SHA1 e6cb8156583c9daa4619cfee5e5e1cd8a38b7b2d SHA256 762bc717d4710d135f8654025c34c4fc431a6a8cf7345e994fbe800fa78a9f74
+DIST atheme-services-7.0.1.tar.bz2 1052229 RMD160 e2cc66e92456daf54bdcc5288efcedebd0c3dd5f SHA1 9616a6651a06f18d2b2c85e64c85be524643a917 SHA256 bc42b736e3a90c9e07ca1b0085e1dcadf7139d74453664f55aa8d963a3f79064
+DIST atheme-services-7.0.2.tar.bz2 1050575 RMD160 28ba758ef0dd60b31fe6261eb18b9c7a2eea46f7 SHA1 4cf363a067f8d9b0b01c999127748fa3995ad037 SHA256 a5eeb853b7d6206e4a01dd52a35f14e4a255cae95aa75d66c1e0ffe70625a2e0
+EBUILD atheme-services-6.0.10.ebuild 2800 RMD160 a5bcbc7a548d69e8e543d48c2ad73c2fd0a68c56 SHA1 8d562185861272abba757edc0e893bed3758cef6 SHA256 6884a8992743b5f10926eb46144b5ab6313ae5390e70dd319eb29cf9f7b3bef3
+EBUILD atheme-services-6.0.11.ebuild 2802 RMD160 8fb42029b8cf5dfa2ec584b2d7e3ffcfecda8283 SHA1 42aff36eebd4719e4e281380b14450449d9c5084 SHA256 1af195488af73451ee21646aecdca0e295ba86357ae2ae9bed605ff876ada4b4
+EBUILD atheme-services-7.0.1.ebuild 2942 RMD160 4da667a63feb6bd0618a5b63dc5974c14e1c53ae SHA1 7f61109ab91f5a59bc496c2ef28beddbf3e56a0a SHA256 e989f815855f39a879b6557f76bd0a37564b305fa537318c8552535027c67ed7
+EBUILD atheme-services-7.0.2.ebuild 2942 RMD160 4cf343d0345f552fb49f0eb517530b372cbddb79 SHA1 7705154b213cb0eee21b13d867165e78aec7fa30 SHA256 2c2f095476ec0fec2e9ccffc7e570f1dcfcce013bcc4eeff0b62aff16843b8c3
+EBUILD atheme-services-9999.ebuild 3092 RMD160 f7c57e919ab3a987a7aa5206b12177bf9d25cc92 SHA1 568445eb637f1772f0262f61eec5d16911909af1 SHA256 9bc9c2a9e4fd46067988cfdc517b20562ca3a7d5e7813722d0d1f70bd4f283b6
+MISC ChangeLog 9602 RMD160 67e38b2d5df63cd13f35c27f474e694ffc9f8b99 SHA1 515a35614e3d86bf34c9a9d35e30947cce137bc2 SHA256 0fc3a8ce971081afee5a8dc1d04824c8f5430ea2b0b67acba59a3dee1ba62ebe
+MISC metadata.xml 771 RMD160 6681a3e8f489ae5a5b0ae882a11d423b932f0081 SHA1 07abec75deb6154fc71a3ff5cf9057d3ce713adb SHA256 a837c036193dc300db84f5539f463723abaa14e1fb15ca6314b7e850fdfac460

diff --git a/net-irc/atheme-services/atheme-services-6.0.10.ebuild b/net-irc/atheme-services/atheme-services-6.0.10.ebuild
new file mode 100644
index 0000000..ade0087
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-6.0.10.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-6.0.10.ebuild,v 1.3 2012/05/03 06:27:14 jdhore Exp $
+
+EAPI="4-slot-abi"
+
+inherit autotools eutils flag-o-matic perl-module prefix
+
+DESCRIPTION="A portable and secure set of open-source and modular IRC services"
+HOMEPAGE="http://atheme.net/"
+SRC_URI="http://atheme.net/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux"
+IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
+
+RDEPEND="dev-libs/libmowgli:0
+	cracklib? ( sys-libs/cracklib )
+	ldap? ( net-nds/openldap )
+	nls? ( sys-devel/gettext )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# the dependency calculation puts all of the .c files together and
+	# overwhelms cc1 with this flag :-(
+	filter-flags -combine
+
+	if use profile; then
+		# bug #371119
+		ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag."
+		ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid."
+		append-flags -nopie
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.0.8-configure-disable.patch
+	eautoconf
+
+	# fix docdir
+	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
+
+	# basic logging config directive fix
+	sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die
+
+	# QA against bundled libs
+	rm -rf libmowgli || die
+
+	# Get useful information into build.log
+	sed -i -e '/^\.SILENT:$/d' buildsys.mk.in || die
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-fhs-paths \
+		--enable-contrib \
+		$(use_enable largenet large-net) \
+		$(use_with cracklib) \
+		$(use_with ldap) \
+		$(use_with nls) \
+		$(use_enable profile) \
+		$(use_with pcre) \
+		$(use_enable ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/${PN}
+	for conf in dist/*.example; do
+		# The .cron file isn't meant to live in /etc/${PN}, so only
+		# install a .example version.
+		[[ ${conf} == *cron* ]] && continue
+
+		newins ${conf} $(basename ${conf} .example)
+	done
+
+	fowners -R 0:${PN} /etc/${PN}
+	keepdir /var/{lib,log}/atheme
+	fowners ${PN}:${PN} /var/{lib,log,run}/atheme
+	fperms -R go-w,o-rx /etc/${PN}
+	fperms 750 /etc/${PN} /var/{lib,log,run}/atheme
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	# contributed scripts and such:
+	insinto /usr/share/doc/${PF}/contrib
+	doins contrib/*.{c,pl,php,py,rb}
+
+	if use perl; then
+		perlinfo
+		insinto "${VENDOR_LIB#${EPREFIX}}"
+		doins -r contrib/Atheme{,.pm}
+	fi
+}

diff --git a/net-irc/atheme-services/atheme-services-6.0.11.ebuild b/net-irc/atheme-services/atheme-services-6.0.11.ebuild
new file mode 100644
index 0000000..ef1dd12
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-6.0.11.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-6.0.11.ebuild,v 1.1 2012/05/15 08:31:15 jdhore Exp $
+
+EAPI="4-slot-abi"
+
+inherit autotools eutils flag-o-matic perl-module prefix
+
+DESCRIPTION="A portable and secure set of open-source and modular IRC services"
+HOMEPAGE="http://atheme.net/"
+SRC_URI="http://atheme.net/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
+
+RDEPEND="dev-libs/libmowgli:0
+	cracklib? ( sys-libs/cracklib )
+	ldap? ( net-nds/openldap )
+	nls? ( sys-devel/gettext )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# the dependency calculation puts all of the .c files together and
+	# overwhelms cc1 with this flag :-(
+	filter-flags -combine
+
+	if use profile; then
+		# bug #371119
+		ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag."
+		ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid."
+		append-flags -nopie
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.0.8-configure-disable.patch
+	eautoconf
+
+	# fix docdir
+	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
+
+	# basic logging config directive fix
+	sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die
+
+	# QA against bundled libs
+	rm -rf libmowgli || die
+
+	# Get useful information into build.log
+	sed -i -e '/^\.SILENT:$/d' buildsys.mk.in || die
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-fhs-paths \
+		--enable-contrib \
+		$(use_enable largenet large-net) \
+		$(use_with cracklib) \
+		$(use_with ldap) \
+		$(use_with nls) \
+		$(use_enable profile) \
+		$(use_with pcre) \
+		$(use_enable ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/${PN}
+	for conf in dist/*.example; do
+		# The .cron file isn't meant to live in /etc/${PN}, so only
+		# install a .example version.
+		[[ ${conf} == *cron* ]] && continue
+
+		newins ${conf} $(basename ${conf} .example)
+	done
+
+	fowners -R 0:${PN} /etc/${PN}
+	keepdir /var/{lib,log}/atheme
+	fowners ${PN}:${PN} /var/{lib,log,run}/atheme
+	fperms -R go-w,o-rx /etc/${PN}
+	fperms 750 /etc/${PN} /var/{lib,log,run}/atheme
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	# contributed scripts and such:
+	insinto /usr/share/doc/${PF}/contrib
+	doins contrib/*.{c,pl,php,py,rb}
+
+	if use perl; then
+		perlinfo
+		insinto "${VENDOR_LIB#${EPREFIX}}"
+		doins -r contrib/Atheme{,.pm}
+	fi
+}

diff --git a/net-irc/atheme-services/atheme-services-7.0.1.ebuild b/net-irc/atheme-services/atheme-services-7.0.1.ebuild
new file mode 100644
index 0000000..140f22a
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-7.0.1.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/net-irc/atheme-services/atheme-services-7.0.1.ebuild,v 1.2 2012/05/03 06:27:14 jdhore Exp $
+
+EAPI="4-slot-abi"
+GENTOO_DEPEND_ON_PERL=no
+inherit eutils flag-o-matic perl-module
+
+DESCRIPTION="A portable and secure set of open-source and modular IRC services"
+HOMEPAGE="http://atheme.net/"
+SRC_URI="http://atheme.net/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
+
+RDEPEND=">=dev-libs/libmowgli-2.0.0:2
+	cracklib? ( sys-libs/cracklib )
+	ldap? ( net-nds/openldap )
+	nls? ( sys-devel/gettext )
+	perl? ( dev-lang/perl:= )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# the dependency calculation puts all of the .c files together and
+	# overwhelms cc1 with this flag :-(
+	filter-flags -combine
+
+	if use profile; then
+		# bug #371119
+		ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag."
+		ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid."
+		append-flags -nopie
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
+}
+
+src_prepare() {
+	# fix docdir
+	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
+
+	# basic logging config directive fix
+	sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die
+
+	# QA against bundled libs
+	rm -rf libmowgli-2 || die
+}
+
+src_configure() {
+	# perl scriping module support is also broken in 7.0.0. Yay for QA failures.
+	econf \
+		atheme_cv_c_gcc_w_error_implicit_function_declaration=no \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-fhs-paths \
+		--disable-warnings \
+		--enable-contrib \
+		$(use_enable largenet large-net) \
+		$(use_with cracklib) \
+		$(use_with ldap) \
+		$(use_with nls) \
+		$(use_enable profile) \
+		$(use_with pcre) \
+		$(use_with perl) \
+		$(use_enable ssl)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/${PN}
+	for conf in dist/*.example; do
+		# The .cron file isn't meant to live in /etc/${PN}, so only
+		# install a .example version.
+		[[ ${conf} == *cron* ]] && continue
+
+		newins ${conf} $(basename ${conf} .example)
+	done
+
+	fowners -R 0:${PN} /etc/${PN}
+	keepdir /var/{lib,log}/atheme
+	fowners ${PN}:${PN} /var/{lib,log,run}/atheme
+	fperms -R go-w,o-rx /etc/${PN}
+	fperms 750 /etc/${PN} /var/{lib,log,run}/atheme
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	mv "${ED}"/usr/bin/{,atheme-}dbverify || die
+
+	# contributed scripts and such:
+	insinto /usr/share/doc/${PF}/contrib
+	doins contrib/*.{c,pl,php,py,rb}
+
+	if use perl; then
+		perlinfo
+		insinto "${VENDOR_LIB#${EPREFIX}}"
+		doins -r contrib/Atheme{,.pm}
+	fi
+}

diff --git a/net-irc/atheme-services/atheme-services-7.0.2.ebuild b/net-irc/atheme-services/atheme-services-7.0.2.ebuild
new file mode 100644
index 0000000..b5a1bdc
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-7.0.2.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/net-irc/atheme-services/atheme-services-7.0.2.ebuild,v 1.1 2012/05/15 08:31:15 jdhore Exp $
+
+EAPI="4-slot-abi"
+GENTOO_DEPEND_ON_PERL=no
+inherit eutils flag-o-matic perl-module
+
+DESCRIPTION="A portable and secure set of open-source and modular IRC services"
+HOMEPAGE="http://atheme.net/"
+SRC_URI="http://atheme.net/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
+
+RDEPEND=">=dev-libs/libmowgli-2.0.0:2
+	cracklib? ( sys-libs/cracklib )
+	ldap? ( net-nds/openldap )
+	nls? ( sys-devel/gettext )
+	perl? ( dev-lang/perl:= )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# the dependency calculation puts all of the .c files together and
+	# overwhelms cc1 with this flag :-(
+	filter-flags -combine
+
+	if use profile; then
+		# bug #371119
+		ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag."
+		ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid."
+		append-flags -nopie
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
+}
+
+src_prepare() {
+	# fix docdir
+	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
+
+	# basic logging config directive fix
+	sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die
+
+	# QA against bundled libs
+	rm -rf libmowgli-2 || die
+}
+
+src_configure() {
+	# perl scriping module support is also broken in 7.0.0. Yay for QA failures.
+	econf \
+		atheme_cv_c_gcc_w_error_implicit_function_declaration=no \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-fhs-paths \
+		--disable-warnings \
+		--enable-contrib \
+		$(use_enable largenet large-net) \
+		$(use_with cracklib) \
+		$(use_with ldap) \
+		$(use_with nls) \
+		$(use_enable profile) \
+		$(use_with pcre) \
+		$(use_with perl) \
+		$(use_enable ssl)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/${PN}
+	for conf in dist/*.example; do
+		# The .cron file isn't meant to live in /etc/${PN}, so only
+		# install a .example version.
+		[[ ${conf} == *cron* ]] && continue
+
+		newins ${conf} $(basename ${conf} .example)
+	done
+
+	fowners -R 0:${PN} /etc/${PN}
+	keepdir /var/{lib,log}/atheme
+	fowners ${PN}:${PN} /var/{lib,log,run}/atheme
+	fperms -R go-w,o-rx /etc/${PN}
+	fperms 750 /etc/${PN} /var/{lib,log,run}/atheme
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	mv "${ED}"/usr/bin/{,atheme-}dbverify || die
+
+	# contributed scripts and such:
+	insinto /usr/share/doc/${PF}/contrib
+	doins contrib/*.{c,pl,php,py,rb}
+
+	if use perl; then
+		perlinfo
+		insinto "${VENDOR_LIB#${EPREFIX}}"
+		doins -r contrib/Atheme{,.pm}
+	fi
+}

diff --git a/net-irc/atheme-services/atheme-services-9999.ebuild b/net-irc/atheme-services/atheme-services-9999.ebuild
new file mode 100644
index 0000000..36a478a
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-9999.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-9999.ebuild,v 1.5 2012/05/17 00:48:10 jdhore Exp $
+
+EAPI="4-slot-abi"
+GENTOO_DEPEND_ON_PERL=no
+inherit git-2 user eutils flag-o-matic perl-module
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A portable and secure set of open-source and modular IRC services"
+HOMEPAGE="http://atheme.net/"
+EGIT_REPO_URI="git://github.com/atheme/atheme.git"
+EGIT_HAS_SUBMODULES="true"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
+
+RDEPEND="=dev-libs/libmowgli-9999:2
+	cracklib? ( sys-libs/cracklib )
+	ldap? ( net-nds/openldap )
+	nls? ( sys-devel/gettext )
+	perl? ( dev-lang/perl:= )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# the dependency calculation puts all of the .c files together and
+	# overwhelms cc1 with this flag :-(
+	filter-flags -combine
+
+	if use profile; then
+		# bug #371119
+		ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag."
+		ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid."
+		append-flags -nopie
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
+}
+
+# To stop perl-module overriding this function
+src_unpack() {
+	git-2_src_unpack
+}
+
+src_prepare() {
+	# fix docdir
+	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
+
+	# basic logging config directive fix
+	sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die
+
+	# QA against bundled libs.
+	# But comment it out in the live ebuild
+	# because it only contains a git submodule
+	# and removing it MAY break everything.
+	#rm -rf libmowgli-2 || die
+}
+
+src_configure() {
+	econf \
+		atheme_cv_c_gcc_w_error_implicit_function_declaration=no \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-fhs-paths \
+		--disable-warnings \
+		--enable-contrib \
+		$(use_enable largenet large-net) \
+		$(use_with cracklib) \
+		$(use_with ldap) \
+		$(use_with nls) \
+		$(use_enable profile) \
+		$(use_with perl) \
+		$(use_with pcre) \
+		$(use_enable ssl)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/${PN}
+	for conf in dist/*.example; do
+		# The .cron file isn't meant to live in /etc/${PN}, so only
+		# install a .example version.
+		[[ ${conf} == *cron* ]] && continue
+
+		newins ${conf} $(basename ${conf} .example)
+	done
+
+	fowners -R 0:${PN} /etc/${PN}
+	keepdir /var/{lib,log}/atheme
+	fowners ${PN}:${PN} /var/{lib,log,run}/atheme
+	fperms -R go-w,o-rx /etc/${PN}
+	fperms 750 /etc/${PN} /var/{lib,log,run}/atheme
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	mv "${ED}"/usr/bin/{,atheme-}dbverify || die
+
+	# contributed scripts and such:
+	insinto /usr/share/doc/${PF}/contrib
+	doins contrib/*.{c,pl,php,py,rb}
+
+	if use perl; then
+		perlinfo
+		insinto "${VENDOR_LIB#${EPREFIX}}"
+		doins -r contrib/Atheme{,.pm}
+	fi
+}

diff --git a/net-irc/atheme-services/files/atheme-services-6.0.8-configure-disable.patch b/net-irc/atheme-services/files/atheme-services-6.0.8-configure-disable.patch
new file mode 100644
index 0000000..ac67195
--- /dev/null
+++ b/net-irc/atheme-services/files/atheme-services-6.0.8-configure-disable.patch
@@ -0,0 +1,116 @@
+From be144253c54b41d9b2f3929f12025457f66ce288 Mon Sep 17 00:00:00 2001
+From: Nathan Phillip Brink <ohnobinki@××××××××××××××.net>
+Date: Mon, 13 Jun 2011 22:25:47 -0400
+Subject: [PATCH] Fix remaining AC_ARG_ENABLEs so that --disable-<feature> does not produce the same effect as --enable-<feature>.
+
+Fixes --disable-warnings, --disable-propolice, and --disable-profile. (Problems with --disable-profile resulted in https://bugs.gentoo.org/371119).
+---
+ configure    |   21 +++++++++++++++++----
+ configure.ac |   18 ++++++++++++------
+ 2 files changed, 29 insertions(+), 10 deletions(-)
+
+diff --git a/configure b/configure
+index a3337e0..9bd0428 100755
+--- a/configure
++++ b/configure
+@@ -8360,7 +8360,11 @@ $as_echo "no" >&6; }
+ 
+ # Check whether --enable-warnings was given.
+ if test "${enable_warnings+set}" = set; then :
+-  enableval=$enable_warnings;
++  enableval=$enable_warnings; enable_warnings=no
++fi
++
++if test "x$enable_warnings" = "xyes"; then :
++
+ 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCC flag(s) -Wall" >&5
+ $as_echo_n "checking GCC flag(s) -Wall... " >&6; }
+@@ -9335,10 +9339,15 @@ $as_echo "no" >&6; }
+ 
+ fi
+ 
+-
+ # Check whether --enable-propolice was given.
+ if test "${enable_propolice+set}" = set; then :
+   enableval=$enable_propolice;
++else
++  enable_propolice=no
++fi
++
++if test "x$enable_propolice" = "xyes"; then :
++
+ 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCC flag(s) -fno-stack-protector-all" >&5
+ $as_echo_n "checking GCC flag(s) -fno-stack-protector-all... " >&6; }
+@@ -9546,10 +9555,15 @@ $as_echo "no" >&6; }
+ 
+ fi
+ 
+-
+ # Check whether --enable-profile was given.
+ if test "${enable_profile+set}" = set; then :
+   enableval=$enable_profile;
++else
++  enable_profile=no
++fi
++
++if test "x$enable_profile" = "xyes"; then :
++
+ 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCC flag(s) -pg" >&5
+ $as_echo_n "checking GCC flag(s) -pg... " >&6; }
+@@ -9606,7 +9620,6 @@ LDFLAGS=${ac_save_LDFLAGS}
+ 
+ fi
+ 
+-
+ ac_save_CPPFLAGS="${CFLAGS} ${orig_CFLAGS} ${CWARNS} -DPREFIX=\\\"\${prefix}\\\" -DLOCALEDIR=\\\"\${LOCALEDIR}\\\" -DMODDIR=\\\"\${MODDIR}\\\" -DSHAREDIR=\\\"${SHAREDIR}\\\" -DSYSCONFDIR=\\\"${sysconfdir}\\\" -DLOGDIR=\\\"${LOGDIR}\\\" -DRUNDIR=\\\"${RUNDIR}\\\" -DDATADIR=\\\"${DATADIR}\\\""
+ CPPFLAGS=${ac_save_CPPFLAGS}
+ 
+diff --git a/configure.ac b/configure.ac
+index a8baa2e..36195ce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -484,8 +484,10 @@ AC_SUBST(PICFLAGS)
+ ATHEME_C_GCC_TRY_FLAGS([-std=gnu99], atheme_cv_c_gcc_std_gnu99)
+ ATHEME_C_GCC_TRY_FLAGS([-Werror-implicit-function-declaration], atheme_cv_c_gcc_w_error_implicit_function_declaration)
+ 
+-AC_ARG_ENABLE(warnings,
+-AC_HELP_STRING([--enable-warnings],[ Enable compiler warnings]),
++AC_ARG_ENABLE([warnings],
++	[AS_HELP_STRING([--enable-warnings],[ Enable compiler warnings])],
++	[enable_warnings=no])
++AS_IF([test "x$enable_warnings" = "xyes"],
+ [
+ dnl See what warnings we can get away with
+ ATHEME_C_GCC_TRY_FLAGS([-Wall], atheme_cv_c_gcc_w_all)
+@@ -519,8 +521,10 @@ dnl ATHEME_C_GCC_TRY_FLAGS([-Wwrite-strings], atheme_cv_c_gcc_w_strings)
+ dnl ATHEME_C_GCC_TRY_FLAGS([-Werror], atheme_cv_c_gcc_w_error)
+ ])
+ 
+-AC_ARG_ENABLE(propolice,
+-AC_HELP_STRING([--disable-propolice],[ Disable propolice protections (for debugging.)]),
++AC_ARG_ENABLE([propolice],
++	[AS_HELP_STRING([--disable-propolice],[ Disable propolice protections (for debugging.)])],
++	[], [enable_propolice=no])
++AS_IF([test "x$enable_propolice" = "xyes"],
+ [
+ ATHEME_C_GCC_TRY_FLAGS([-fno-stack-protector-all], atheme_cv_nspa)
+ ATHEME_C_GCC_TRY_FLAGS([-fno-pie], atheme_cv_npie)
+@@ -528,8 +532,10 @@ ATHEME_C_GCC_TRY_FLAGS([-nonow], atheme_cv_nonow)
+ ATHEME_C_GCC_TRY_FLAGS([-norelro], atheme_cv_no_relro)
+ ])
+ 
+-AC_ARG_ENABLE(profile,
+-AC_HELP_STRING([--enable-profile],[ Enable profiling extensions]),
++AC_ARG_ENABLE([profile],
++	[AS_HELP_STRING([--enable-profile],[ Enable profiling extensions])],
++	[], [enable_profile=no])
++AS_IF([test "x$enable_profile" = "xyes"],
+ [
+ ATHEME_C_GCC_TRY_FLAGS([-pg], atheme_cv_pg)
+ ac_save_LDFLAGS="${LDFLAGS} -pg"
+-- 
+1.7.3.4
+

diff --git a/net-irc/atheme-services/files/atheme-services.initd b/net-irc/atheme-services/files/atheme-services.initd
new file mode 100644
index 0000000..af4beef
--- /dev/null
+++ b/net-irc/atheme-services/files/atheme-services.initd
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/files/atheme-services.initd,v 1.4 2011/12/17 04:12:05 binki Exp $
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+	use ircd
+	provide irc-services
+}
+
+start() {
+	ATHEME_SERVICES_RUNDIR=/var/run/atheme
+	if ! [ -d "${ATHEME_SERVICES_RUNDIR}" ]; then
+	    ebegin "Creating \`${ATHEME_SERVICES_RUNDIR}'"
+	    install -o atheme-services -d "${ATHEME_SERVICES_RUNDIR}"
+	    eend $?
+	fi
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile=/var/run/atheme/atheme.pid --user atheme-services --exec /usr/bin/atheme-services
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile /var/run/atheme/atheme.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile /var/run/atheme/atheme.pid
+	eend $?
+}

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
new file mode 100644
index 0000000..e40ec1c
--- /dev/null
+++ b/net-irc/irssi/Manifest
@@ -0,0 +1,6 @@
+DIST irssi-0.8.15.tar.bz2 948847 RMD160 0c8fba8cf3409621f6c1883127e14538a58c3359 SHA1 b79ce8c2c98a76b004f63706e7868cd363000d89 SHA256 c12d16fb605103d7c256ddce44012dc396af57f3771e086d0387c195a052a0a6
+EBUILD irssi-0.8.15-r1.ebuild 1455 RMD160 22d86c3b5db20209147224f13f3fc99175929689 SHA1 8f780b5376ab17471a1357d8af861162b247fba3 SHA256 bc5065f287e7755ae4edc5a382e94ba250d68ebe9ac9f689e13eb276b1dcf785
+EBUILD irssi-0.8.15.ebuild 1272 RMD160 2294176b501c701e4ae4e7877963514b5d859507 SHA1 0ec0e8f789002de331724146e67d5ece89faf94d SHA256 979bab61a033281489f325711a3f56d0d1d3b697b9a2a46bbd6a797cba993b5b
+EBUILD irssi-9999.ebuild 1351 RMD160 1be3deee8f654b53105684756bbdbe8fe8d4a668 SHA1 0094bc976379ad54155a050de7e3d5a981258669 SHA256 f2941e8d53ace770bb8139d320a07bd74009bda7ccb452b4a3bf732bb9d36379
+MISC ChangeLog 23204 RMD160 1242a5a04f411b379c97df197129c6d661106b6d SHA1 2e681ac7de5fed5703ef08e20c8718155314debe SHA256 13a60bddc77ccc637056256a2d98cebfe9357bfe376f3077f7ba414d0b9c6e90
+MISC metadata.xml 270 RMD160 217b6381a937b94caa61f5d1dcbcdf24fe2852f1 SHA1 1e8951324990f813bd348ce2b1c4fc75cb097250 SHA256 4962741e0eded229c8ac0cca6dc8fed203d9b63ed7d8de546c661e6661579c75

diff --git a/net-irc/irssi/irssi-0.8.15-r1.ebuild b/net-irc/irssi/irssi-0.8.15-r1.ebuild
new file mode 100644
index 0000000..979fbd3
--- /dev/null
+++ b/net-irc/irssi/irssi-0.8.15-r1.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/net-irc/irssi/irssi-0.8.15-r1.ebuild,v 1.5 2012/05/03 06:27:14 jdhore Exp $
+
+EAPI=3
+
+inherit perl-module libtool
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="http://irssi.org/"
+SRC_URI="http://irssi.org/files/${MY_P}.tar.bz2"
+
+LICENSE="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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6 +perl ssl socks5"
+
+RDEPEND="sys-libs/ncurses
+	>=dev-libs/glib-2.2.1
+	ssl? ( dev-libs/openssl )
+	perl? ( dev-lang/perl )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	perl? ( !net-im/silc-client )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epunt_cxx
+	elibtoolize  # for Darwin bundle
+}
+
+src_configure() {
+	econf \
+		--with-proxy \
+		--with-ncurses="${EPREFIX}"/usr \
+		--with-perl-lib=vendor \
+		$(use_with perl) \
+		$(use_with socks5 socks) \
+		$(use_enable ssl) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install || die "make install failed"
+
+	use perl && fixlocalpod
+
+	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
+}

diff --git a/net-irc/irssi/irssi-0.8.15.ebuild b/net-irc/irssi/irssi-0.8.15.ebuild
new file mode 100644
index 0000000..e6421ed
--- /dev/null
+++ b/net-irc/irssi/irssi-0.8.15.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/net-irc/irssi/irssi-0.8.15.ebuild,v 1.8 2012/05/03 06:27:14 jdhore Exp $
+
+EAPI="2"
+
+inherit perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="http://irssi.org/"
+SRC_URI="http://irssi.org/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="ipv6 +perl ssl socks5"
+
+RDEPEND="sys-libs/ncurses
+	>=dev-libs/glib-2.2.1
+	ssl? ( dev-libs/openssl )
+	perl? ( dev-lang/perl )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	perl? ( !net-im/silc-client )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epunt_cxx
+}
+
+src_configure() {
+	econf \
+		--with-proxy \
+		--with-ncurses \
+		--with-perl-lib=vendor \
+		$(use_with perl) \
+		$(use_with socks5 socks) \
+		$(use_enable ssl) \
+		$(use_enable ipv6) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		install || die "make install failed"
+
+	use perl && fixlocalpod
+
+	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
+}

diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
new file mode 100644
index 0000000..e42661f
--- /dev/null
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-9999.ebuild,v 1.4 2012/05/03 06:27:14 jdhore Exp $
+
+EAPI=4
+GENTOO_DEPEND_ON_PERL=no
+inherit autotools perl-module subversion
+
+ESVN_REPO_URI="http://svn.irssi.org/repos/irssi/trunk"
+ESVN_PROJECT="irssi"
+ESVN_BOOTSTRAP=""
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="http://irssi.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="ipv6 +perl ssl socks5"
+
+RDEPEND="sys-libs/ncurses
+	>=dev-libs/glib-2.2.1
+	ssl? ( dev-libs/openssl )
+	perl? ( dev-lang/perl:= )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.58
+	dev-lang/perl
+	www-client/lynx"
+RDEPEND="${RDEPEND}
+	perl? ( !net-im/silc-client )"
+
+src_prepare() {
+	TZ=UTC svn log -v "${ESVN_REPO_URI}" > "${S}"/ChangeLog || die
+	sed -i -e /^autoreconf/d autogen.sh || die
+	NOCONFIGURE=1 ./autogen.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-proxy \
+		--with-ncurses \
+		--with-perl-lib=vendor \
+		$(use_with perl) \
+		$(use_with socks5 socks) \
+		$(use_enable ssl) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		install
+
+	use perl && fixlocalpod
+
+	dodoc AUTHORS ChangeLog README TODO NEWS
+}

diff --git a/net-mail/mhonarc-gentoo/Manifest b/net-mail/mhonarc-gentoo/Manifest
new file mode 100644
index 0000000..9cac128
--- /dev/null
+++ b/net-mail/mhonarc-gentoo/Manifest
@@ -0,0 +1,5 @@
+AUX mhonarc-gentoo-2.6.18-archives-gentoo.patch 6534 RMD160 e5444027bea221b5c53461ad04ab2c74484007e0 SHA1 1b83f57530ec623046adfe984dd0229f95f3c58d SHA256 e8da521cf04bba45a7a8b22ddbf150d8c88b88924d30391a0e4ded43f46efdba
+DIST MHonArc-2.6.18.tar.bz2 1546854 RMD160 4cf0d8e67050cc573ef81f826938a6c096ff0e93 SHA1 4990889d13cc3f4a2e1c284c55db5abb64e7072e SHA256 4fd014cf69c40ae7d50a9dca519f279a09563004b200edb86b7c8c6f3e3fb534
+EBUILD mhonarc-gentoo-2.6.18.ebuild 833 RMD160 697c135bb3e1040a1a70ec76f2e52719f7059e38 SHA1 6a9cd70cff854b009326c04b54f88adb89708a27 SHA256 cb11ab864119a4a265b2d3501cccda49aaa094f3a1d9abc0417f42a95a3717b5
+MISC ChangeLog 695 RMD160 0701bf5f28c811f4329e6125a489d368cf9775f4 SHA1 be5daf2278b4b4e045f823c7e2003fbcc5fbb9d3 SHA256 db252e5747d89b9695a97d32001922d143097ce424dfd848d492592be9ff24d0
+MISC metadata.xml 240 RMD160 e9f8fad0db1adf127a591a7625a4669cd95a65ed SHA1 bc3b45335b1b6c4c31887b860ec2a2e0d94398df SHA256 bda6b267a8f104df8414a52a66d5017b89e943f3cf2496dbc693966bc0d6e5a4

diff --git a/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch
new file mode 100644
index 0000000..d67c63e
--- /dev/null
+++ b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch
@@ -0,0 +1,197 @@
+diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
+--- a/lib/mhamain.pl	2006-06-10 02:42:58.000000000 +0000
++++ b/lib/mhamain.pl	2008-01-27 14:12:48.000000000 +0000
+@@ -73,6 +73,8 @@
+     TERM TRAP USR1 USR2 VTALRM XCPU XFSZ
+ );
+ 
++use Carp;
++
+ ###############################################################################
+ ##	Public routines
+ ###############################################################################
+@@ -934,6 +936,16 @@
+     } else {
+ 	$ctype = 'text/plain';
+     }
++    
++    ##-----------------------------##
++    ## Get Custom Archives headers ##
++    ##-----------------------------##
++    if (defined($fields->{'x-archives-hash'})) {
++	$msghash = $fields->{'x-archives-hash'}[0];
++    }
++    if(!defined($msghash)) {
++	confess("No X-Archives-Hash header in $handle");
++    }
+ 
+     ## Insure uniqueness of index
+     $index .= $X . sprintf('%d',(defined($msgnum)?$msgnum:($LastMsgNum+1)));
+@@ -955,6 +967,7 @@
+     $Subject{$index} = $sub;
+     $MsgHead{$index} = htmlize_header($fields);
+     $ContentType{$index} = $ctype;
++    $MsgHash{$index} = $msghash;
+     if ($msgid) {
+ 	$MsgId{$msgid} = $index;
+ 	$NewMsgId{$msgid} = $index;	# Track new message-ids
+@@ -966,6 +979,7 @@
+     } else {
+ 	$IndexNum{$index} = getNewMsgNum();
+     }
++    #$MsgHash{$IndexNum{$index}} = $msghash;
+ 
+     $Refs{$index} = [ @refs ]  if (@refs);
+ 
+@@ -1102,7 +1116,7 @@
+ 
+     my $adding	     = ($ADD && !$force && !$SINGLE);
+     my $i_p0 	     = fmt_msgnum($msgnum);
+-    my $filename     = msgnum_filename($msgnum);
++    my $filename     = msgnum_filename($index);
+     my $filepathname = join($DIRSEP, $OUTDIR, $filename);
+     my $tmppathname;
+ 
+@@ -1160,7 +1174,9 @@
+ 		"<!--X-Message-Id: ",
+ 		    commentize($Index2MsgId{$index}), " -->\n",
+ 		"<!--X-Content-Type: ",
+-		    commentize($ContentType{$index}), " -->\n";
++		    commentize($ContentType{$index}), " -->\n",
++		"<!--X-Archives-Hash: ",
++		    commentize($MsgHash{$index}), " -->\n";
+ 
+ 	    if (defined($Refs{$index})) {
+ 		foreach (@{$Refs{$index}}) {
+@@ -1456,8 +1472,9 @@
+     #&defineIndex2MsgId();
+     my $msgnum = $IndexNum{$key};
+     return (undef, undef)  if ($msgnum eq '');
+-    my $filename = join($DIRSEP, $OUTDIR, &msgnum_filename($msgnum));
++    my $filename = join($DIRSEP, $OUTDIR, &msgnum_filename($key));
+ 
++    delete $MsgHash{$key};
+     delete $ContentType{$key};
+     delete $Date{$key};
+     delete $From{$key};
+diff -Nuar a/lib/mhdb.pl b/lib/mhdb.pl
+--- a/lib/mhdb.pl	2005-12-20 21:28:15.000000000 +0000
++++ b/lib/mhdb.pl	2008-01-27 13:25:52.000000000 +0000
+@@ -61,6 +61,7 @@
+ 
+ ## Meta-data
+ print_var($db,'ContentType', \%ContentType);
++print_var($db,'MsgHash',     \%MsgHash);
+ print_var($db,'Date',        \%Date);
+ print_var($db,'Derived',     \%Derived);
+ print_var($db,'FollowOld',   \%Follow);
+diff -Nuar a/lib/mhinit.pl b/lib/mhinit.pl
+--- a/lib/mhinit.pl	2005-07-08 06:34:03.000000000 +0000
++++ b/lib/mhinit.pl	2008-01-27 13:25:52.000000000 +0000
+@@ -247,6 +247,7 @@
+ %Follow  	= ();	# Index key to follow-ups
+ %FolCnt   	= ();	# Index key to number of follow-ups
+ %ContentType	= ();	# Index key to base content-type of message
++%MsgHash	= ();	# Custom hash from header in mail
+ %Icons    	= ();	# Index key to icon URL for content-type
+ %AddIndex 	= ();	# Flags for messages that must be written
+ 
+diff -Nuar a/lib/mhmsgfile.pl b/lib/mhmsgfile.pl
+--- a/lib/mhmsgfile.pl	2001-09-17 16:10:28.000000000 +0000
++++ b/lib/mhmsgfile.pl	2008-01-27 14:12:16.000000000 +0000
+@@ -123,6 +123,10 @@
+     if (defined($href->{'derived'})) {
+ 	$Derived{$index} = $href->{'derived'};
+     }
++    
++    if (defined($href->{'archives-hash'})) {
++	$MsgHash{$index} = $href->{'archives-hash'};
++    }
+ 
+     $IndexNum{$index} = int($msgnum);
+ 
+diff -Nuar a/lib/mhopt.pl b/lib/mhopt.pl
+--- a/lib/mhopt.pl	2005-07-08 06:34:03.000000000 +0000
++++ b/lib/mhopt.pl	2008-01-27 13:25:52.000000000 +0000
+@@ -764,6 +764,7 @@
+     delete($MsgId{''});
+     delete($FollowOld{''});
+     delete($ContentType{''});
++    delete($MsgHash{''});
+     delete($Refs{''});
+ 
+     # update DOCURL if default old value
+diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
+--- a/lib/mhrcvars.pl	2005-07-08 05:27:52.000000000 +0000
++++ b/lib/mhrcvars.pl	2008-01-27 14:11:19.000000000 +0000
+@@ -195,7 +195,7 @@
+ 	}
+     	if ($var eq 'MSG') {		## Filename of message page
+ 	    ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg);
+-	    $tmp = defined($key) ? &msgnum_filename($IndexNum{$key}) : "";
++	    $tmp = defined($key) ? &msgnum_filename($key) : "";
+ 	    last REPLACESW;
+ 	}
+ 	if ($var eq 'MSGHFIELD') {	## Message header field
+@@ -417,7 +417,7 @@
+ 	    if (!defined($key)) { $tmp = ""; last REPLACESW; }
+ 	    $tmp = qq/name="/ . &fmt_msgnum($IndexNum{$key}) .
+ 		   qq/" href="/ .
+-		   &msgnum_filename($IndexNum{$key}) .
++		   &msgnum_filename($key) .
+ 		   qq/"/;
+ 	    last REPLACESW;
+ 	}
+@@ -432,7 +432,7 @@
+ 	    $isurl = 0;
+ 	    ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg);
+ 	    if (!defined($key)) { $tmp = ""; last REPLACESW; }
+-	    $tmp = qq/href="/ . &msgnum_filename($IndexNum{$key}) . qq/"/;
++	    $tmp = qq/href="/ . &msgnum_filename($key) . qq/"/;
+ 	    last REPLACESW;
+ 	}
+     	if ($var eq 'IDXFNAME') {	## Filename of index page
+@@ -730,7 +730,7 @@
+     $ret = qq|<a name="| .
+ 	   &fmt_msgnum($IndexNum{$index}) .
+ 	   qq|" href="| .
+-	   &msgnum_filename($IndexNum{$index}) .
++	   &msgnum_filename($index) .
+ 	   qq|">$ret</a>|
+ 	if $var eq 'SUBJECT' && $arg eq "" && !$mailto;
+ 
+diff -Nuar a/lib/mhutil.pl b/lib/mhutil.pl
+--- a/lib/mhutil.pl	2005-07-08 05:27:53.000000000 +0000
++++ b/lib/mhutil.pl	2008-01-27 14:11:50.000000000 +0000
+@@ -28,6 +28,7 @@
+ package mhonarc;
+ 
+ use MHonArc::RFC822;
++use Carp;
+ 
+ ## RFC 2369 header fields to check for URLs
+ %HFieldsList = (
+@@ -304,16 +305,20 @@
+ ##	Routine to get filename of a message number.
+ ##
+ sub msgnum_filename {
+-    my($fmtstr) = "$MsgPrefix%05d.$HtmlExt";
++    my $msgnum = $_[0];
++    my($fmtstr) = "$MsgPrefix%s.$HtmlExt";
+     $fmtstr .= ".gz"  if $GzipLinks;
+-    sprintf($fmtstr, $_[0]);
++    if(!defined($MsgHash{$msgnum})) {
++	confess("Could not find X-Archives-Hash for msgnum=$msgnum");
++    }
++    sprintf($fmtstr, $MsgHash{$msgnum});
+ }
+ 
+ ##---------------------------------------------------------------------------
+ ##	Routine to get filename of an index
+ ##
+ sub get_filename_from_index {
+-    &msgnum_filename($IndexNum{$_[0]});
++    &msgnum_filename($_[0]);
+ }
+ 
+ ##---------------------------------------------------------------------------

diff --git a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18.ebuild b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18.ebuild
new file mode 100644
index 0000000..906c15a
--- /dev/null
+++ b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18.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/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18.ebuild,v 1.2 2011/05/02 22:37:34 tampakrap Exp $
+
+EAPI="4-slot-abi"
+
+inherit perl-module
+
+DESCRIPTION="Perl Mail-to-HTML Converter, Gentoo fork"
+HOMEPAGE="http://www.mhonarc.org/"
+LICENSE="GPL-2"
+SRC_URI="http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!net-mail/mhonarc"
+
+MY_P="${P/mhonarc-gentoo/MHonArc}"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-archives-gentoo.patch" )
+
+src_install() {
+	sed -e "s|-prefix |-docpath '${D}/usr/share/doc/${PF}' -prefix '${D}'|g" -i Makefile
+	sed -e "s|installsitelib|installvendorlib|g" -i install.me
+
+	perl-module_src_install
+}

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
new file mode 100644
index 0000000..8f2c9d8
--- /dev/null
+++ b/net-print/cups-filters/Manifest
@@ -0,0 +1,8 @@
+AUX cups-filters-1.0.11-makefiles.patch 7582 RMD160 9a753859a45c56d6e18b0275eafd6f69d5195334 SHA1 9773ee18d3481e1759986c20baf1adfa2d30d203 SHA256 9a25decdb0033eb1a1910c3787eaad6ac4ec69715db426edbdbdf22b759a5bdc
+DIST cups-filters-1.0.17.tar.gz 1019661 RMD160 de5c5fa4eb1391271d76ca5c049145d601ed0923 SHA1 fd80efeefb5f37755588db868c52a8cd49e620d5 SHA256 af66f4b19c6448f4b42613a66c852fbd7d4622aa9bad1ccc0e42cb7f2e617772
+DIST cups-filters-1.0.18.tar.gz 1022509 RMD160 84cba51cab4a8c78f80de268342ec281967bdf68 SHA1 00fa6d585a4b546b36d0f4a92855a43982933875 SHA256 6926980653e7cb5f94b91921517678cca7f0e6781364823a05f7b4b0ec919106
+EBUILD cups-filters-1.0.17.ebuild 1119 RMD160 65561b8d4be11439ddccc8fccc3ef4681721999e SHA1 c8a647667d83e53f543b51ad580f807bc8d0c107 SHA256 1cc5f7de3b0b68f7bd0a0c083d235db7fc152bc62b12b874a955e78559566a8a
+EBUILD cups-filters-1.0.18.ebuild 1119 RMD160 7cf53106d123bb434d3e54907ca2f4dbc902bc28 SHA1 1da23549bc08811f42c983081d0177035f10633d SHA256 9f93882bd7da4d4bf55c8254bf1868427b8892cabbbca27cc092ed65e7840ae9
+EBUILD cups-filters-9999.ebuild 1699 RMD160 8685b0b6777e048e8480fe56bf343ec85848db04 SHA1 9ae554d536991827a47ba85448bad478f3a031a3 SHA256 89bfb35500361e6d888247fa731ee80001d18c02f200f0d6c14ada8b3f9669bb
+MISC ChangeLog 2897 RMD160 8dc39a766ad5ad993463b731621edd70d8ce52c1 SHA1 5a4c83f28c7f030207524606904534d5101a9068 SHA256 c85a368475409082064c3fa324433821b3da807fbfc2090145a8cc389a809757
+MISC metadata.xml 162 RMD160 145aada347c27fc879828b9bb22ff79f4e23325c SHA1 97a164202fb2c7165cdbd9721ea05b4ac2724035 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051

diff --git a/net-print/cups-filters/cups-filters-1.0.17.ebuild b/net-print/cups-filters/cups-filters-1.0.17.ebuild
new file mode 100644
index 0000000..8dd8cc4
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.0.17.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/net-print/cups-filters/cups-filters-1.0.17.ebuild,v 1.3 2012/06/02 19:47:16 dilfridge Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Cups PDF filters"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
+SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="jpeg lcms png tiff zlib"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	app-text/poppler[jpeg?,lcms?]
+	media-libs/freetype:2
+	>net-print/cups-1.5.9999
+	jpeg? ( virtual/jpeg )
+	lcms? ( media-libs/lcms:2 )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.11-makefiles.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-php \
+		--with-optim="${CFLAGS}" \
+		$(use_enable jpeg) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable lcms cms) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_enable zlib)
+}

diff --git a/net-print/cups-filters/cups-filters-1.0.18.ebuild b/net-print/cups-filters/cups-filters-1.0.18.ebuild
new file mode 100644
index 0000000..7571ffd
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.0.18.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/net-print/cups-filters/cups-filters-1.0.18.ebuild,v 1.1 2012/06/02 19:47:17 dilfridge Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Cups PDF filters"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
+SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="jpeg lcms png tiff zlib"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	app-text/poppler[jpeg?,lcms?]
+	media-libs/freetype:2
+	>net-print/cups-1.5.9999
+	jpeg? ( virtual/jpeg )
+	lcms? ( media-libs/lcms:2 )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.11-makefiles.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-php \
+		--with-optim="${CFLAGS}" \
+		$(use_enable jpeg) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable lcms cms) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_enable zlib)
+}

diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
new file mode 100644
index 0000000..5a3cac4
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.10 2012/06/26 20:19:09 dilfridge Exp $
+
+EAPI="4-slot-abi"
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit base perl-module
+
+if [[ "${PV}"=="9999" ]] ; then
+	inherit autotools bzr
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+	KEYWORDS=""
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.gz"
+	KEYWORDS=""
+fi
+DESCRIPTION="Cups PDF filters"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="jpeg perl png static-libs tiff"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	app-text/poppler[jpeg?,lcms,tiff?]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>net-print/cups-1.5.9999
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	base_src_prepare
+	if [[ "${PV}"=="9999" ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--with-fontdir="fonts/conf.avail" \
+		--enable-imagefilters \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		--without-php
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_prep
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		fixlocalpod
+		popd > /dev/null
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}

diff --git a/net-print/cups-filters/files/cups-filters-1.0.11-makefiles.patch b/net-print/cups-filters/files/cups-filters-1.0.11-makefiles.patch
new file mode 100644
index 0000000..2c9c8bc
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.0.11-makefiles.patch
@@ -0,0 +1,184 @@
+diff -urN cups-filters-1.0.11.old/backend/Makefile cups-filters-1.0.11/backend/Makefile
+--- cups-filters-1.0.11.old/backend/Makefile	2012-04-03 17:40:50.326979137 +0200
++++ cups-filters-1.0.11/backend/Makefile	2012-04-03 17:43:59.027982425 +0200
+@@ -74,9 +74,9 @@
+ 
+ install-exec:
+ 	echo Installing backends in $(SERVERBIN)/backend...
+-	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
++	$(INSTALL_DIR) -m 755 $(DESTDIR)/$(SERVERBIN)/backend
+ 	for file in $(BACKENDS); do \
+-		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
++		$(INSTALL_BIN) $$file $(DESTDIR)/$(SERVERBIN)/backend; \
+ 	done
+ 
+ 
+diff -urN cups-filters-1.0.11.old/config-scripts/cups-compiler.m4 cups-filters-1.0.11/config-scripts/cups-compiler.m4
+--- cups-filters-1.0.11.old/config-scripts/cups-compiler.m4	2012-04-03 17:40:50.332979138 +0200
++++ cups-filters-1.0.11/config-scripts/cups-compiler.m4	2012-04-03 17:41:23.281979712 +0200
+@@ -23,13 +23,6 @@
+ AC_ARG_WITH(optim, [  --with-optim            set optimization flags ])
+ AC_ARG_ENABLE(debug, [  --enable-debug          build with debugging symbols])
+ 
+-dnl For debugging, keep symbols, otherwise strip them...
+-if test x$enable_debug = xyes; then
+-	OPTIM="-g"
+-else
+-	INSTALL_STRIP="-s"
+-fi
+-
+ dnl Read-only data/program support on Linux...
+ AC_ARG_ENABLE(relro, [  --enable-relro          build with the GCC relro option])
+ 
+diff -urN cups-filters-1.0.11.old/cupsfilters/Makefile cups-filters-1.0.11/cupsfilters/Makefile
+--- cups-filters-1.0.11.old/cupsfilters/Makefile	2012-04-03 17:40:50.330979139 +0200
++++ cups-filters-1.0.11/cupsfilters/Makefile	2012-04-03 17:57:26.362996484 +0200
+@@ -120,9 +120,9 @@
+ 
+ install-headers:
+ 	echo Installing header files into $(INCLUDEDIR)/cupsfilters...
+-	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cupsfilters
++	$(INSTALL_DIR) -m 755 $(DESTDIR)/$(INCLUDEDIR)/cupsfilters
+ 	for file in $(HEADERS); do \
+-		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cupsfilters; \
++		$(INSTALL_DATA) $$file $(DESTDIR)/$(INCLUDEDIR)/cupsfilters; \
+ 	done
+ 
+ 
+@@ -132,16 +132,16 @@
+ 
+ install-libs:
+ 	echo Installing libraries in $(LIBDIR)...
+-	$(INSTALL_DIR) -m 755 $(LIBDIR)
+-	$(INSTALL_LIB) $(LIBCUPSFILTERS) $(LIBDIR)
+-	$(INSTALL_DATA) libcupsfilters.a $(LIBDIR)
++	$(INSTALL_DIR) -m 755 $(DESTDIR)/$(LIBDIR)
++	$(INSTALL_LIB) $(LIBCUPSFILTERS) $(DESTDIR)/$(LIBDIR)
++	$(INSTALL_DATA) libcupsfilters.a $(DESTDIR)/$(LIBDIR)
+ 	if test $(LIBCUPSFILTERS) = "libcupsfilters.so.1" -o $(LIBCUPSFILTERS) = "libcupsfilters.sl.1"; then \
+-		$(RM) $(LIBDIR)/`basename $(LIBCUPSFILTERS) .1`; \
+-		$(LN) $(LIBCUPSFILTERS) $(LIBDIR)/`basename $(LIBCUPSFILTERS) .1`; \
++		$(RM) $(DESTDIR)/$(LIBDIR)/`basename $(LIBCUPSFILTERS) .1`; \
++		$(LN) $(LIBCUPSFILTERS) $(DESTDIR)/$(LIBDIR)/`basename $(LIBCUPSFILTERS) .1`; \
+ 	fi
+ 	if test $(LIBCUPSFILTERS) = "libcupsfilters.1.dylib"; then \
+-		$(RM) $(LIBDIR)/libcups.dylib; \
+-		$(LN) $(LIBCUPSFILTERS) $(LIBDIR)/libcups.dylib; \
++		$(RM) $(DESTDIR)/$(LIBDIR)/libcups.dylib; \
++		$(LN) $(LIBCUPSFILTERS) $(DESTDIR)/$(LIBDIR)/libcups.dylib; \
+ 	fi
+ 
+ 
+@@ -171,7 +171,7 @@
+ 
+ libcupsfilters.so.1:	$(LIBOBJS)
+ 	echo Linking $@...
+-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(DSOLIBS) $(LINKCUPS) -lm
++	$(DSO) $(LDFLAGS) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(DSOLIBS) $(LINKCUPS) -lm
+ 	$(RM) `basename $@ .1`
+ 	$(LN) $@ `basename $@ .1`
+ 
+diff -urN cups-filters-1.0.11.old/filter/Makefile cups-filters-1.0.11/filter/Makefile
+--- cups-filters-1.0.11.old/filter/Makefile	2012-04-03 17:40:50.324979137 +0200
++++ cups-filters-1.0.11/filter/Makefile	2012-04-03 17:53:35.708992459 +0200
+@@ -130,35 +130,35 @@
+ 
+ install-data:
+ 	echo Installing charsets to $(DATADIR)/charsets...
+-	$(INSTALL_DIR) -m 755 $(DATADIR)/charsets
++	$(INSTALL_DIR) -m 755 $(DESTDIR)/$(DATADIR)/charsets
+ 	for file in $(CHARSETS); do \
+-		$(INSTALL_DATA) $$file $(DATADIR)/charsets; \
++		$(INSTALL_DATA) $$file $(DESTDIR)/$(DATADIR)/charsets; \
+ 	done; \
+-	$(LN) pdf.utf-8.simple $(DATADIR)/charsets/pdf.utf-8
++	$(LN) pdf.utf-8.simple $(DESTDIR)/$(DATADIR)/charsets/pdf.utf-8
+ 	echo Installing data files to $(DATADIR)/data...
+-	$(INSTALL_DIR) -m 755 $(DATADIR)/data
++	$(INSTALL_DIR) -m 755 $(DESTDIR)/$(DATADIR)/data
+ 	for file in $(DATAFILES); do \
+-		$(INSTALL_DATA) $$file $(DATADIR)/data; \
++		$(INSTALL_DATA) $$file $(DESTDIR)/$(DATADIR)/data; \
+ 	done
+ 	echo Installing banners to $(DATADIR)/banners...
+-	$(INSTALL_DIR) -m 755 $(DATADIR)/banners
++	$(INSTALL_DIR) -m 755 $(DESTDIR)/$(DATADIR)/banners
+ 	for file in $(BANNERS); do \
+-		$(INSTALL_DATA) $$file $(DATADIR)/banners; \
++		$(INSTALL_DATA) $$file $(DESTDIR)/$(DATADIR)/banners; \
+ 	done
+ 	echo Installing MIME files to $(DATADIR)/mime...
+-	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
++	$(INSTALL_DIR) -m 755 $(DESTDIR)/$(DATADIR)/mime
+ 	for file in $(MIMEFILES); do \
+-		$(INSTALL_DATA) $$file $(DATADIR)/mime; \
++		$(INSTALL_DATA) $$file $(DESTDIR)/$(DATADIR)/mime; \
+ 	done
+ 	echo Installing DRV files to $(DATADIR)/drv...
+-	$(INSTALL_DIR) -m 755 $(DATADIR)/drv
++	$(INSTALL_DIR) -m 755 $(DESTDIR)/$(DATADIR)/drv
+ 	for file in $(DRVFILES); do \
+-		$(INSTALL_DATA) $$file $(DATADIR)/drv; \
++		$(INSTALL_DATA) $$file $(DESTDIR)/$(DATADIR)/drv; \
+ 	done
+-	echo Installing PPD files to $(BUILDROOT)${datadir}/ppd/cupsfilters...
+-	$(INSTALL_DIR) -m 755 $(BUILDROOT)${datadir}/ppd/cupsfilters
++	echo Installing PPD files to $(DATADIR)/ppd/cupsfilters...
++	$(INSTALL_DIR) -m 755 $(DESTDIR)$(DATADIR)/ppd/cupsfilters
+ 	for file in $(PPDFILES); do \
+-		$(INSTALL_DATA) $$file $(BUILDROOT)${datadir}/ppd/cupsfilters; \
++		$(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/ppd/cupsfilters; \
+ 	done
+ 
+ 
+@@ -168,12 +168,12 @@
+ 
+ install-exec:
+ 	echo Installing filters to $(SERVERBIN)/filter...
+-	$(INSTALL_DIR) -m 755 $(SERVERBIN)/filter
++	$(INSTALL_DIR) -m 755 $(DESTDIR)/$(SERVERBIN)/filter
+ 	for file in $(TARGETS); do \
+-		$(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
++		$(INSTALL_BIN) $$file $(DESTDIR)/$(SERVERBIN)/filter; \
+ 	done
+ 	for file in $(SCRIPTS); do \
+-		$(INSTALL_SCRIPT) $$file $(SERVERBIN)/filter; \
++		$(INSTALL_SCRIPT) $$file $(DESTDIR)/$(SERVERBIN)/filter; \
+ 	done
+ 
+ 
+diff -urN cups-filters-1.0.11.old/pdftoopvp/Makefile cups-filters-1.0.11/pdftoopvp/Makefile
+--- cups-filters-1.0.11.old/pdftoopvp/Makefile	2012-04-03 17:40:50.331979139 +0200
++++ cups-filters-1.0.11/pdftoopvp/Makefile	2012-04-03 17:54:47.771993722 +0200
+@@ -60,13 +60,13 @@
+ 
+ install-data:	all
+ 	echo Installing configuration files to $(sysconfdir)/fonts/conf.d...
+-	$(INSTALL_DIR) -m 755 $(BUILDROOT)$(sysconfdir)/fonts/conf.d
+-	$(INSTALL_DATA) -m 644 99pdftoopvp.conf $(BUILDROOT)$(sysconfdir)/fonts/conf.d
++	$(INSTALL_DIR) -m 755 $(DESTDIR)$(sysconfdir)/fonts/conf.d
++	$(INSTALL_DATA) -m 644 99pdftoopvp.conf $(DESTDIR)$(sysconfdir)/fonts/conf.d
+ 
+ install-exec:	all
+ 	echo Installing filters to $(SERVERBIN)/filter...
+-	$(INSTALL_DIR) -m 755 $(SERVERBIN)/filter
+-	$(INSTALL_BIN) pdftoopvp $(SERVERBIN)/filter
++	$(INSTALL_DIR) -m 755 $(DESTDIR)/$(SERVERBIN)/filter
++	$(INSTALL_BIN) pdftoopvp $(DESTDIR)/$(SERVERBIN)/filter
+ 
+ install-headers:
+ 
+diff -urN cups-filters-1.0.11.old/pdftopdf/Makefile cups-filters-1.0.11/pdftopdf/Makefile
+--- cups-filters-1.0.11.old/pdftopdf/Makefile	2012-04-03 17:40:50.328979140 +0200
++++ cups-filters-1.0.11/pdftopdf/Makefile	2012-04-03 17:44:39.759983134 +0200
+@@ -78,8 +78,8 @@
+ 
+ install-exec:	all
+ 	echo Installing filters in $(SERVERBIN)/filter...
+-	$(INSTALL_DIR) -m 755 $(SERVERBIN)/filter
+-	$(INSTALL_BIN) pdftopdf $(SERVERBIN)/filter
++	$(INSTALL_DIR) -m 755 $(DESTDIR)/$(SERVERBIN)/filter
++	$(INSTALL_BIN) pdftopdf $(DESTDIR)/$(SERVERBIN)/filter
+ 
+ install-headers:
+ 

diff --git a/perl-core/Module-Build/Manifest b/perl-core/Module-Build/Manifest
index 8b969a1..1c44d92 100644
--- a/perl-core/Module-Build/Manifest
+++ b/perl-core/Module-Build/Manifest
@@ -3,10 +3,12 @@ DIST Module-Build-0.3607.tar.gz 297358 RMD160 61e76b62165e7095416771af713571e635
 DIST Module-Build-0.3624.tar.gz 302003 RMD160 b75a6d0ce078f1697928fa8f0e07559a66b7d637 SHA1 d3db9cba07ddf637337a1597479cb53ce83b413a SHA256 4cad71bb5c36102cb26181668333ac972dc7ee8bcd3d7057da1f98d9ff361bb1
 DIST Module-Build-0.3800.tar.gz 305459 RMD160 c520ecd73e378600f5d9d9206d9203efc9245849 SHA1 b5da5631b3ae8afaf558caa2afec1a85da6d20dc SHA256 9bb82170deb541445a3b7e4203662668ea17b5e13f9269d4b0c021a28bed60be
 DIST Module-Build-0.40.tar.gz 306800 RMD160 20f4dda62e74eb39145b72d424fcc4c2d2e005ce SHA1 b6793d75b0a765c801113606cfc7b1033419c709 SHA256 230025eafb75ae8aa513db228af150f223d6d73bda4989b7ffcc80cebff984c0
+DIST Module-Build-0.4001.tar.gz 307187 RMD160 2af84ab8b4073bf51c9c40d6e9b9d6bc08c6458c SHA1 63b6732e14d680cb0020516a4573016c6a8982c4 SHA256 62ec33fb72ce9e34d7d3b13cf8c672a8b27210f64409ecc07066d6025a538521
 EBUILD Module-Build-0.34.0201.ebuild 1048 RMD160 78057c4a2861a7129c74614f2e64da700328f2f1 SHA1 3673031dd41b96168546084f522c2cae3e19f8b2 SHA256 93fbbb0ab92008ea57ac53ba9293b18435ec9ab0af6ddf3690e20138ec017499
 EBUILD Module-Build-0.36.07.ebuild 899 RMD160 59dce2d3dea7a0acb9fb922b925706a7181195c9 SHA1 43675e47565d3c35e28edfd143720f4cacd0534e SHA256 d200ce7bd9c39bb98217f4265187efb9247aa0d1aebc44d01fcf3f9471774059
 EBUILD Module-Build-0.362.400.ebuild 954 RMD160 899b726c91166b0dba831e94c745901a9735024f SHA1 2a159f671e08389bf6c74250ade04454dcfa743c SHA256 55882362662b762973fd9fe59e7d6c3f9c8b5b6988e09c18a41dcadb03e56e4e
 EBUILD Module-Build-0.380.0.ebuild 1008 RMD160 14b76a107ffa5ddcbaf6d48171429dfc6bf9dc45 SHA1 224934fc7ba0846dc1593b447beff6006e9a5437 SHA256 7f8487bfef81aa56c4aff8ce254d966280cdec73e8c6e557d51ee1ab22ca3c87
 EBUILD Module-Build-0.400.0.ebuild 1079 RMD160 b0710d80e8a0270971b577066be3046f01a63882 SHA1 9b2c6bd125ad7c2ecf7f8a1922ee88b059f9a241 SHA256 11afa50fb727b46d8f31924adac0c39e410efa7bbe092b22492b19a3cdd6855e
-MISC ChangeLog 17943 RMD160 1aee922f16d09292f374c735559e29321292ad8f SHA1 aa53e39a492b5ab1fdee04c7b64d71a6269d2881 SHA256 d25e3e4889d795cfef4f934e5d9a45cb015b21a2b54a5844ea3f06b8198ef83d
+EBUILD Module-Build-0.400.100.ebuild 1079 RMD160 756c4ba8c0519396dd4f0a8a26557544007a9608 SHA1 a8c6caee5ec8801db83f6e1c81938845a1fe73e7 SHA256 2cb743ebef35203a71cdd49e40f64cc5b4da976045407c7062593250b5102524
+MISC ChangeLog 18078 RMD160 4a80cb1c5f5b9047e48c3da53c6079719a63fd78 SHA1 f0f7c053cb756426f454866f3318da13479cb49d SHA256 28414cb64f83b2f404fdf9017ae829b382f010c8ed98cc8c3ec1d3cb8d23942d
 MISC metadata.xml 2255 RMD160 b6c9716c10472bb15a48668a7e92448f7a409898 SHA1 1bfec60f6f69105288f1b036cacea97b50c81d06 SHA256 5daccf00177b022c978bb39bff79d95939f82a48bbfe3075880637ab5a52aaf8

diff --git a/perl-core/Module-Build/Module-Build-0.400.100.ebuild b/perl-core/Module-Build/Module-Build-0.400.100.ebuild
new file mode 100644
index 0000000..8d400ed
--- /dev/null
+++ b/perl-core/Module-Build/Module-Build-0.400.100.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/perl-core/Module-Build/Module-Build-0.400.100.ebuild,v 1.1 2012/06/28 17:01:42 tove Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=LEONT
+MODULE_VERSION=0.4001
+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 ~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="test"
+
+RDEPEND="
+	>=virtual/perl-CPAN-Meta-2.110.420
+	>=virtual/perl-CPAN-Meta-YAML-0.3.0
+	>=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
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/profiles/updates/1Q-2099 b/profiles/updates/1Q-2099
new file mode 100644
index 0000000..418412e
--- /dev/null
+++ b/profiles/updates/1Q-2099
@@ -0,0 +1,15 @@
+dev-lang/perl-5.12.4 0 0/5.12
+dev-lang/perl-5.12.4-r1 0 0/5.12
+dev-lang/perl-5.12.4-r2 0 0/5.12
+dev-lang/perl-5.14.1 0 0/5.14
+dev-lang/perl-5.14.1-r1 0 0/5.14
+dev-lang/perl-5.14.2 0 0/5.14
+dev-lang/perl-5.16.0 0 0/5.16
+dev-lang/spidermonkey-1.8.5-r1 0 0/185
+dev-lang/spidermonkey-1.8.7 0 0/187
+dev-libs/libyaml-0.1.4 0 0/2.0
+x11-base/xorg-server-1.10.6-r1 0 0/1.10
+x11-base/xorg-server-1.11.4-r1 0 0/1.11
+x11-base/xorg-server-1.12.2 0 0/1.12
+x11-libs/xcb-util-0.3.8 0 0/0.0
+x11-libs/xcb-util-0.3.9 0 0/1.0

diff --git a/sci-biology/GBrowse/GBrowse-2.44-r1.ebuild b/sci-biology/GBrowse/GBrowse-2.44-r1.ebuild
new file mode 100644
index 0000000..4e442a7
--- /dev/null
+++ b/sci-biology/GBrowse/GBrowse-2.44-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/GBrowse/GBrowse-2.44-r1.ebuild,v 1.1 2012/01/02 21:19:46 weaver Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=LDS
+inherit perl-module webapp
+
+DESCRIPTION="Generic Model Organism Database Project - The Generic Genome Browser"
+HOMEPAGE="http://gmod.org/wiki/GBrowse"
+KEYWORDS="~amd64 ~x86"
+IUSE="-minimal mysql postgres +sqlite"
+
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+
+CDEPEND="!<sci-biology/GBrowse-2.44-r1
+	>=sci-biology/bioperl-1.6.9
+	>=dev-perl/Bio-Graphics-2.09
+	>=dev-perl/GD-2.07
+	>=dev-perl/CGI-Session-4.02
+	dev-perl/IO-String
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Statistics-Descriptive
+	!minimal? (
+		dev-perl/Bio-Das
+		>=dev-perl/Bio-SamTools-1.20
+		dev-perl/Crypt-SSLeay
+		dev-perl/DB_File-Lock
+		dev-perl/DBI
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		sqlite? ( dev-perl/DBD-SQLite )
+		dev-perl/FCGI
+		dev-perl/File-NFSLock
+		dev-perl/GD-SVG
+		dev-perl/Net-OpenID-Consumer
+		dev-perl/Net-SMTP-SSL
+	)"
+#		>=dev-perl/Bio-DB-BigFile-1.00 - requires jklib to compile
+DEPEND="virtual/perl-Module-Build
+	dev-perl/Capture-Tiny
+	${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+PATCHES=( "${FILESDIR}"/GBrowseInstall.pm-2.39.patch )
+
+src_configure() {
+	webapp_src_preinst
+
+#	myconf="--install_base=${D}/usr" or "--install_base=/opt/gbrowse"
+	myconf="--conf=/etc/gbrowse2"
+	myconf="${myconf} --htdocs=${MY_HTDOCSDIR}"
+	myconf="${myconf} --cgibin=${MY_CGIBINDIR}"
+	myconf="${myconf} --tmp=/var/tmp/gbrowse2"
+	myconf="${myconf} --persistent=/var/db/gbrowse2"
+	myconf="${myconf} --databases=/var/db/gbrowse2/databases"
+	myconf="${myconf} --installconf=no"
+	myconf="${myconf} --installetc=no"
+	perl-module_src_configure
+}
+
+src_install() {
+	dodir /var/tmp/gbrowse2
+	dodir /var/db/gbrowse2/sessions
+	dodir /var/db/gbrowse2/userdata
+	webapp_serverowned -R /var/tmp/gbrowse2 /var/db/gbrowse2
+	perl-module_src_install
+	webapp_src_install
+}

diff --git a/sci-biology/GBrowse/GBrowse-2.48.ebuild b/sci-biology/GBrowse/GBrowse-2.48.ebuild
new file mode 100644
index 0000000..2c81c8d
--- /dev/null
+++ b/sci-biology/GBrowse/GBrowse-2.48.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/GBrowse/GBrowse-2.48.ebuild,v 1.1 2012/02/27 15:55:41 weaver Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=LDS
+inherit perl-module webapp
+
+DESCRIPTION="Generic Model Organism Database Project - The Generic Genome Browser"
+HOMEPAGE="http://gmod.org/wiki/GBrowse"
+KEYWORDS="~amd64 ~x86"
+IUSE="-minimal mysql postgres +sqlite"
+
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+
+CDEPEND="!<sci-biology/GBrowse-2.44-r1
+	>=sci-biology/bioperl-1.6.9
+	>=dev-perl/Bio-Graphics-2.09
+	>=dev-perl/GD-2.07
+	>=dev-perl/CGI-Session-4.02
+	dev-perl/IO-String
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Statistics-Descriptive
+	!minimal? (
+		dev-perl/Bio-Das
+		>=dev-perl/Bio-SamTools-1.20
+		dev-perl/Crypt-SSLeay
+		dev-perl/DB_File-Lock
+		dev-perl/DBI
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		sqlite? ( dev-perl/DBD-SQLite )
+		dev-perl/FCGI
+		dev-perl/File-NFSLock
+		dev-perl/GD-SVG
+		dev-perl/Net-OpenID-Consumer
+		dev-perl/Net-SMTP-SSL
+	)"
+#		>=dev-perl/Bio-DB-BigFile-1.00 - requires jklib to compile
+DEPEND="virtual/perl-Module-Build
+	dev-perl/Capture-Tiny
+	${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+PATCHES=( "${FILESDIR}"/GBrowseInstall.pm-2.39.patch )
+
+src_configure() {
+	webapp_src_preinst
+
+#	myconf="--install_base=${D}/usr" or "--install_base=/opt/gbrowse"
+	myconf="--conf=/etc/gbrowse2"
+	myconf="${myconf} --htdocs=${MY_HTDOCSDIR}"
+	myconf="${myconf} --cgibin=${MY_CGIBINDIR}"
+	myconf="${myconf} --tmp=/var/tmp/gbrowse2"
+	myconf="${myconf} --persistent=/var/db/gbrowse2"
+	myconf="${myconf} --databases=/var/db/gbrowse2/databases"
+	myconf="${myconf} --installconf=no"
+	myconf="${myconf} --installetc=no"
+	perl-module_src_configure
+}
+
+src_install() {
+	dodir /var/tmp/gbrowse2
+	dodir /var/db/gbrowse2/sessions
+	dodir /var/db/gbrowse2/userdata
+	webapp_serverowned -R /var/tmp/gbrowse2 /var/db/gbrowse2
+	perl-module_src_install
+	webapp_src_install
+}

diff --git a/sci-biology/GBrowse/Manifest b/sci-biology/GBrowse/Manifest
new file mode 100644
index 0000000..48bea6e
--- /dev/null
+++ b/sci-biology/GBrowse/Manifest
@@ -0,0 +1,7 @@
+AUX GBrowseInstall.pm-2.39.patch 2878 RMD160 24dc53700c23521fb0e892ed1d675142eefc2c65 SHA1 961c73f9a83c101932558cd28945cfe2e5cc4b7f SHA256 80a1aefac21c55c040e89028f736c058b35695cbb816e44f4465665cdd14f9ab
+DIST GBrowse-2.44.tar.gz 12009913 RMD160 96b644a8d7f665f6403db1e76648d9eaf5374b9c SHA1 b81220e4c45ee3dae7e40de43bd351037b3170f1 SHA256 c77d8e0311eab9d581b128ee16ba0921bc651a157b68c3aed2e5e86240f8f5dc
+DIST GBrowse-2.48.tar.gz 11958127 RMD160 2d8b857d92f661dd1d0104d9041d5511aa16d073 SHA1 5c9804191237702947ee84d679c463167cfe031a SHA256 02772c5a7a31ed87733e21278efec2edd3bd6ee8a4bec9b002233e57f6dc9681
+EBUILD GBrowse-2.44-r1.ebuild 1995 RMD160 1b1fcd0a7c1a728a786ea207d193cbd8615438a5 SHA1 23cff00766d8fde92c3882847539694fc26f9126 SHA256 540ddcbad11e36ff1260a5cc2eef5e2bc1e7fb071eb5f60aa7f19fd679ac9e61
+EBUILD GBrowse-2.48.ebuild 1992 RMD160 8a664e70924d0d86fb56105e2f0e3d2d36e443cf SHA1 b93cb6cc572b140c72935a0d7969ae2be3ad2902 SHA256 1443b8cda7faec1fb449c33d2fbb8c9900c2d95d415b724dea86fcf79237daf6
+MISC ChangeLog 939 RMD160 9e33e1280cb44a96d853b6f54b7423488e6df1ad SHA1 35001ac18a33979674eac7624ca2f4c6cca68abb SHA256 929e3ba9b866ef5bed03bc87b814ca1314135c0091d82987c923c91785f4c8a3
+MISC metadata.xml 352 RMD160 c409abbd5e93c39f874f62376148fa32b7b93dd2 SHA1 9c92894b7db29b6e74ac51e0acbe457bd6e523a5 SHA256 b4ac9f3ef6106473d6685685245180ff6191165751d8c83d033f7ef0e918e82f

diff --git a/sci-biology/GBrowse/files/GBrowseInstall.pm-2.39.patch b/sci-biology/GBrowse/files/GBrowseInstall.pm-2.39.patch
new file mode 100644
index 0000000..5aa0be9
--- /dev/null
+++ b/sci-biology/GBrowse/files/GBrowseInstall.pm-2.39.patch
@@ -0,0 +1,72 @@
+diff -durr GBrowse-2.39-orig/install_util/GBrowseInstall.pm GBrowse-2.39/install_util/GBrowseInstall.pm
+--- GBrowse-2.39-orig/install_util/GBrowseInstall.pm	2011-07-19 20:14:52.434608020 +0000
++++ GBrowse-2.39/install_util/GBrowseInstall.pm	2011-07-19 21:02:13.685107753 +0000
+@@ -454,33 +454,33 @@
+     $gid =~ /^(\d+)$/;
+     $gid = $1;
+     
+-    unless (chown $uid,$gid,$tmp) {
+-	$self->ownership_warning($tmp,$user);
+-    }
++#    unless (chown $uid,$gid,$tmp) {
++#	$self->ownership_warning($tmp,$user);
++#    }
+ 
+     my $htdocs_i = File::Spec->catfile($self->install_path->{htdocs},'i');
+     my $images   = File::Spec->catfile($tmp,'images');
+     my $htdocs = $self->install_path->{htdocs};
+-    chown $uid,-1,$htdocs;
++#    chown $uid,-1,$htdocs;
+     {
+ 	local $> = $uid;
+-	symlink($images,$htdocs_i);  # so symlinkifowner match works!
++#	symlink($images,$htdocs_i);  # so symlinkifowner match works!
+     }
+-    chown $>,-1,$self->install_path->{htdocs};
++#    chown $>,-1,$self->install_path->{htdocs};
+ 
+     my $persistent = $self->install_path->{'persistent'};
+     my $sessions   = File::Spec->catfile($persistent,'sessions');
+     my $userdata   = File::Spec->catfile($persistent,'userdata');
+-    mkpath([$sessions,$userdata],0711);
++#    mkpath([$sessions,$userdata],0711);
+ 
+     my $databases = $self->install_path->{'databases'};
+     
+-    unless (chown $uid,$gid,glob(File::Spec->catfile($databases,'').'*')) {
+-	$self->ownership_warning($databases,$user);
+-    }
++#    unless (chown $uid,$gid,glob(File::Spec->catfile($databases,'').'*')) {
++#	$self->ownership_warning($databases,$user);
++#    }
+ 
+-    chmod 0755,File::Spec->catfile($self->install_path->{'etc'},'init.d','gbrowse-slave');
+-    $self->fix_selinux;
++    # chmod 0755,File::Spec->catfile($self->install_path->{'etc'},'init.d','gbrowse-slave');
++    # $self->fix_selinux;
+ 
+     my $base = basename($self->install_path->{htdocs});
+ 
+@@ -489,14 +489,14 @@
+     my $metadb_script = File::Spec->catfile("bin", "gbrowse_metadb_config.pl");
+     my $perl          = $self->perl;
+     my @inc           = map{"-I$_"} split ':',$self->added_to_INC;
+-    system $perl,@inc,$metadb_script;
+-    system 'sudo','chown','-R',"$uid.$gid",$sessions,$userdata;
++#    system $perl,@inc,$metadb_script;
++#    system 'sudo','chown','-R',"$uid.$gid",$sessions,$userdata;
+ 
+-    if (Module::Build->y_n(
+-	    "It is recommended that you restart Apache. Shall I try this for you?",'y'
+-	)) {
+-	system "sudo /etc/init.d/apache2 restart";
+-    }
++#    if (Module::Build->y_n(
++#	    "It is recommended that you restart Apache. Shall I try this for you?",'y'
++#	)) {
++#	system "sudo /etc/init.d/apache2 restart";
++#    }
+     
+     print STDERR "\n***INSTALLATION COMPLETE***\n";
+     print STDERR "Load http://localhost/$base for demo and documentation.\n";
+Only in GBrowse-2.39/install_util: GBrowseInstall.pm~

diff --git a/sci-chemistry/openbabel-perl/Manifest b/sci-chemistry/openbabel-perl/Manifest
new file mode 100644
index 0000000..98cdc9f
--- /dev/null
+++ b/sci-chemistry/openbabel-perl/Manifest
@@ -0,0 +1,9 @@
+AUX openbabel-perl-2.3.0-makefile.patch 1764 RMD160 609901472d3d38f327ad48d418f71d316eba8f4c SHA1 8ec10cdb1d74986603f5d18f72134f9238f9e2ba SHA256 cae86d9500cbbc8598719e19bad2b39d0a0c05c3bc9b105cfa3a7aeade393300
+AUX openbabel-perl-2.3.0-swig.patch 887 RMD160 5fa3e9f6ee70c4f7ec542840cdf861a7b6b8acd5 SHA1 eaf1d9b79787a82734195433bf2ef29f81e0a10c SHA256 2cb191078d1280325ab2eea473be8800e5989e33d0d11a673702436a65954a4e
+AUX openbabel-perl-2.3.1-makefile.patch 298 RMD160 963b8fd3ce7083e8b0f529b3c02424fc535a6476 SHA1 05a2394ff0cad03df0915400391f644010adac45 SHA256 8078ac0f5b4d483ade684063583e4db43fadf2f3f8391259d282fd81112e688e
+DIST openbabel-2.3.0.tar.gz 14321281 RMD160 96dafa3c2aca544f79e08b5617ab0da845c28a16 SHA1 408a4bddb7f052fd89c57ea51b4204b721856b16 SHA256 6dadcb256d83b1f2e616fa1853dd1afadb23550a20d1c118b406231a09f861fb
+DIST openbabel-2.3.1.tar.gz 20142960 RMD160 da4d240a92942dbf9dcf999187336d69d7ef8f5c SHA1 b2dd1638eaf7e6d350110b1561aeb23b03552846 SHA256 9e2e8bc9af585ee7e4a03720e3d7b82ef567aa17fdeeea48cc213a3035ced7a3
+EBUILD openbabel-perl-2.3.0.ebuild 1342 RMD160 5ccc246d0db9e229d030f951fb2cca86824dac26 SHA1 ae2baf57c3834beeea11e1f54793d00892bb13c5 SHA256 e6b9a89f2a2aba741aec14b782336711ef4ca2b29e7108aa313cf00bdf9ebc09
+EBUILD openbabel-perl-2.3.1.ebuild 1277 RMD160 f7e73a5969384765734d308cd35100cd1a374c50 SHA1 7e358879a655af6737a8613351b70f2cc9751e20 SHA256 b141c70a90ca69d39233a5559a4f69822496e4893525e66863f8ebca5c27e5a8
+MISC ChangeLog 1155 RMD160 0e6a7f87663a6b70e456e4c3efb4aa34bde2e7a8 SHA1 8258734c7b28583ae61879eb52bebaa01b1cf8bc SHA256 6197fef5e3eb03120ca45bb8aaab1e2e328292cfc64cc62b52d4b53d6a7104c4
+MISC metadata.xml 549 RMD160 d8b314ccc5c255a621484eee6b93b8366a9e0550 SHA1 33fded4ff70695d4efefb3d5ec438331526448bf SHA256 ccd692e32761fe5f0adb4f38308ef677908521578bf09966faa01cf2a743a7d2

diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-makefile.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-makefile.patch
new file mode 100644
index 0000000..597c9a7
--- /dev/null
+++ b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-makefile.patch
@@ -0,0 +1,28 @@
+ scripts/CMakeLists.txt   |    2 +-
+ scripts/perl/Makefile.PL |    1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index bf2527b..3c45111 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -223,7 +223,7 @@ if (DO_PERL_BINDINGS)
+         COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/Makefile.PL ${openbabel_BINARY_DIR}/scripts/perl
+         COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm ${openbabel_BINARY_DIR}/scripts/perl
+         COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp ${openbabel_BINARY_DIR}/scripts/perl
+-        COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc SRC_DIR=${openbabel_SOURCE_DIR} OBJ_DIR=${openbabel_BINARY_DIR} ${PERL_EXECUTABLE} ${openbabel_BINARY_DIR}/scripts/perl/Makefile.PL ${PERL_PREFIX_TEXT}
++        COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc SRC_DIR=${openbabel_SOURCE_DIR} OBJ_DIR=${openbabel_BINARY_DIR} ${PERL_EXECUTABLE} ${openbabel_BINARY_DIR}/scripts/perl/Makefile.PL INSTALLDIRS=vendor ${PERL_PREFIX_TEXT}
+         COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc make 
+             DEPENDS ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp
+             WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts/perl
+diff --git a/scripts/perl/Makefile.PL b/scripts/perl/Makefile.PL
+index a3a2116..44ad27d 100644
+--- a/scripts/perl/Makefile.PL
++++ b/scripts/perl/Makefile.PL
+@@ -32,5 +32,6 @@ WriteMakefile(
+     'CC'        => $CC,
+     'LD'        => '$(CC)',
+     'INC'       => '-I../../include -I'.$cmakesrcdir.'/include',
++    'DESTDIR'   => @ENV{"D"},
+     'OBJECT'    => 'openbabel-perl.o'
+ );

diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-swig.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-swig.patch
new file mode 100644
index 0000000..6beacf7
--- /dev/null
+++ b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-swig.patch
@@ -0,0 +1,25 @@
+ scripts/CMakeLists.txt |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index bf2527b..16feeb4 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -8,16 +8,12 @@ if (RUN_SWIG)
+   # SWIG_EXECUTABLE - the path to the swig executable
+   # SWIG_VERSION   - the version number of the swig executable
+ 
+-  find_package(SWIG)
++  find_package(SWIG 2.0.0)
+   if (NOT SWIG_FOUND)
+     message(STATUS "SWIG NOT found")
+     return()
+   endif (NOT SWIG_FOUND)
+   message(STATUS "SWIG version is ${SWIG_VERSION}")
+-  if (NOT ${SWIG_VERSION} STREQUAL "2.0.0" AND NOT ${SWIG_VERSION} STREQUAL "2.0.1")
+-    message(STATUS "SWIG version 2.0.0 exactly is required")
+-    return()
+-  endif (NOT ${SWIG_VERSION} STREQUAL "2.0.0" AND NOT ${SWIG_VERSION} STREQUAL "2.0.1")
+ endif (RUN_SWIG)
+ 
+ ###################

diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch
new file mode 100644
index 0000000..88248b4
--- /dev/null
+++ b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch
@@ -0,0 +1,9 @@
+--- scripts/perl/Makefile.PL
++++ scripts/perl/Makefile.PL
+@@ -37,5 +37,6 @@     'LDFROM'    => $ldfrom,
+     'CC'        => $CC,
+     'LD'        => '$(CC)',
+     'INC'       => '-I../../include -I'.$cmakesrcdir.'/include',
++    'DESTDIR'   => @ENV{"D"},
+     'OBJECT'    => 'openbabel-perl.o'
+ );

diff --git a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.0.ebuild b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.0.ebuild
new file mode 100644
index 0000000..87b6364
--- /dev/null
+++ b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-perl/openbabel-perl-2.3.0.ebuild,v 1.3 2011/03/29 06:00:42 jlec Exp $
+
+EAPI="3"
+
+inherit cmake-utils eutils perl-module
+
+DESCRIPTION="Perl bindings for OpenBabel"
+HOMEPAGE="http://openbabel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openbabel/openbabel-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+RDEPEND="
+	dev-lang/perl
+	~sci-chemistry/openbabel-${PV}"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-2
+	dev-util/cmake"
+
+S="${WORKDIR}/openbabel-${PV}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-makefile.patch" \
+		"${FILESDIR}"/${P}-swig.patch
+}
+
+src_configure() {
+	local mycmakeargs="-DPERL_BINDINGS=ON"
+	mycmakeargs="${mycmakeargs}
+		-DRUN_SWIG=ON"
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${WORKDIR}/${P}_build/scripts"
+	perl-module_src_prep
+	perl-module_src_compile
+}
+
+src_test() {
+	cd "${WORKDIR}/${P}_build/scripts"
+	emake test || die "make test failed"
+}
+
+src_install() {
+	cd "${WORKDIR}/${P}_build/scripts"
+	perl-module_src_install
+}
+
+pkg_preinst() {
+	perl-module_pkg_preinst
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+}
+
+pkg_prerm() {
+	perl-module_pkg_prerm
+}
+
+pkg_postrm() {
+	perl-module_pkg_postrm
+}

diff --git a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.1.ebuild b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.1.ebuild
new file mode 100644
index 0000000..77e35d4
--- /dev/null
+++ b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.1.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/sci-chemistry/openbabel-perl/openbabel-perl-2.3.1.ebuild,v 1.1 2012/03/04 10:30:40 jlec Exp $
+
+EAPI="4-slot-abi"
+
+inherit cmake-utils eutils perl-module
+
+DESCRIPTION="Perl bindings for OpenBabel"
+HOMEPAGE="http://openbabel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openbabel/openbabel-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+RDEPEND="
+	~sci-chemistry/openbabel-${PV}"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-2
+	dev-util/cmake"
+
+S="${WORKDIR}/openbabel-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_configure() {
+	local mycmakeargs="-DPERL_BINDINGS=ON"
+	mycmakeargs="${mycmakeargs}
+		-DRUN_SWIG=ON"
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${WORKDIR}/${P}_build/scripts"
+	perl-module_src_prep
+	perl-module_src_compile
+}
+
+src_test() {
+	cd "${WORKDIR}/${P}_build/scripts"
+	emake test
+}
+
+src_install() {
+	cd "${WORKDIR}/${P}_build/scripts/perl"
+	perl-module_src_install
+}
+
+pkg_preinst() {
+	perl-module_pkg_preinst
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+}
+
+pkg_prerm() {
+	perl-module_pkg_prerm
+}
+
+pkg_postrm() {
+	perl-module_pkg_postrm
+}

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
new file mode 100644
index 0000000..c49f472
--- /dev/null
+++ b/sci-libs/gdal/Manifest
@@ -0,0 +1,19 @@
+AUX 1.7.2-ruby_cflags.patch 1161 RMD160 5635b016c18a54a45e4f9410028f0a4596b52e5b SHA1 42389f01f14ba57a6337a9a1cdbe889c9fc34d61 SHA256 8a943b69b200e8b926e2ed9ad1861a152731bb829459f402a8024e1137eed754
+AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
+AUX gdal-1.5.0-install_name.patch 1731 RMD160 9e6d9d2a8a14bf01de242d889140369d083fd7c4 SHA1 4c46ebb1bb7d5f5ca2f1079e6ad1a1230ef698ef SHA256 da631282e7ee42b3f9c46a4ce76d7b4905caa4a056c8109fce0f661b9aa58abd
+AUX gdal-1.5.0-soname.patch 483 RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4 SHA1 8a98cc52bb1d74a1d45f72f8191cf322ee050682 SHA256 212f6f4cb1ef6051bdd1306cedd2236eada53a9ab650158c3b37577f7cd566e7
+AUX gdal-1.5.1-python-install.patch 493 RMD160 f925c5b902a14f4a75a8c6a7816c3e500a59c24e SHA1 7c02ab132485d1486751d45663af21aa9a04ace1 SHA256 122555483fcb811df1f305b20c9c492c64575321b4e834c75a2805ca8e62f593
+AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301ba SHA1 9b3214e7ffe6aa821d716caf3e984841f6e208fd SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1
+AUX gdal-1.6.1-ruby-make.patch 1150 RMD160 8e5b8397a86506d968cbf1a5a04616303df26fc8 SHA1 80c9844bfa4374879cc01af8ac90674c251e1034 SHA256 33d213226ad831ea43df8e7d78e56cd6704dc6089320ac63a4eb3d369b920dea
+AUX gdal-1.6.3-libpng15.patch 1392 RMD160 dfa674f506ca48c8e34d5c795829a78d13f2666a SHA1 18e56da5315590a0c0d97e8a95adab653a962a8c SHA256 dd730790ccbc72131f92d78d130b160b6db30b43688bd67e404932ecd6b57ebd
+AUX gdal-1.8.1-zlib_header_fix.patch 253 RMD160 0c2f1483ea373f596a6bbf0c86ba0f11094ef232 SHA1 04df59a10d1ad719742dd40b0d0225bad053a78d SHA256 019d7a858670aa4651b5c887db4f951d906fd3395e12f3f3a570295fcc171b89
+AUX gdal-1.9.1-opencl.patch 1267 RMD160 f01e826f356d41c079857174363a31effc318556 SHA1 c90954f3662261fe303463a767135efd4d696c74 SHA256 3a09ce25b77444b16edc60b64f44cae2e5961034b1f3f7070479652175470013
+AUX gdal-1.9.1-ruby-makefile.patch 1384 RMD160 5df27b8c9b4f18ed1a6a096598e1be2ee7eb2c9b SHA1 bd96fc10095b54554f6a052af6b2ee4cb04efc5b SHA256 0588d23d027a716b6a75364abba7222bc15e7f9b4d3546c85c0aaf2d970a8c37
+DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67
+DIST gdal-1.8.1.tar.gz 8852355 RMD160 4ac1cd59979464bd37b4d2aa588092ee0c34d45c SHA1 b2f8b12ebdd00c05bc7f1ab7b761d9ac335c470c SHA256 d5d76b85b4a7a0e28ead6c92be0eba9e2b2361a06db0a60ef0fb85db63e7a5df
+DIST gdal-1.9.1.tar.gz 9487505 RMD160 c4d77975b753fae75c634662e5e572fc2308456e SHA1 c1eae556398ff7b9332afe9d3022dcd931130808 SHA256 5b829e91c5d6c6c9af23fe6322e51bae9339e8805d52724cb0ad0b741aef7fa9
+EBUILD gdal-1.6.3-r1.ebuild 6787 RMD160 6a587d3f3f6580f037d4e24535e4482d051e8dd5 SHA1 5eca4f493b479c02e5a9f14ec03c2cf4eacaa54b SHA256 fa637b105c2d1289bf2f671128c9b57c8038463f79f6b018ad6933a63d5b2093
+EBUILD gdal-1.8.1-r1.ebuild 6841 RMD160 23773bca147cab5f63d7161b977de5e801cf4010 SHA1 8fa5e76b30f3fbdd0aba888ef9a32089e20b502a SHA256 80a9cb48c1de30a447ed7d4512f368b30eeb5e9ad64250b9863369f309d7bbba
+EBUILD gdal-1.9.1.ebuild 7882 RMD160 0104c5a924e201625a0317c6af953374998e9f57 SHA1 de14039d47de60db2103086e9e6a1279bf44bb6e SHA256 5d7a545902e37470ce63e6c46b6cb753fead0505fa8fc02d2a054ce032c5ff15
+MISC ChangeLog 23865 RMD160 5ad0de41abb560615d313b06e9ae05288f3ad577 SHA1 24f034784031891a0ffbff7d9449b4d72d4df43c SHA256 e47fc7476855022df46abda31f46be17372feab80dff99524e813c10b88cc710
+MISC metadata.xml 1572 RMD160 1088e92594a056905dc479a997415fc6f4e58a88 SHA1 cf9c406464eee430444ad20eb09e33f284177bf4 SHA256 a8fe59507f9e4082756f8fee9ecc40b1fd6d23fa7a589e5a056b71af76724814

diff --git a/sci-libs/gdal/files/1.7.2-ruby_cflags.patch b/sci-libs/gdal/files/1.7.2-ruby_cflags.patch
new file mode 100644
index 0000000..1371c05
--- /dev/null
+++ b/sci-libs/gdal/files/1.7.2-ruby_cflags.patch
@@ -0,0 +1,35 @@
+--- swig/ruby/RubyMakefile.mk.orig	2010-07-27 16:55:52.061254647 +0200
++++ swig/ruby/RubyMakefile.mk	2010-07-27 16:57:06.837255416 +0200
+@@ -25,7 +25,9 @@
+ INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
+ 
+ RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
+-LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
++LDFLAGS += -fPIC -DPIC -Xcompiler -shared -L$(RUBY_LIB_DIR)
++CFLAGS += -fPIC -DPIC
++CXXFLAGS += -fPIC -DPIC
+ RUBY_LIB := -l$(RUBY_SO_NAME)
+ 
+ build: $(RUBY_MODULES)
+@@ -40,17 +42,17 @@
+ $(INSTALL_DIR):
+ 	mkdir -p $(DESTDIR)$(INSTALL_DIR)
+ 
+-install: $(INSTALL_DIR)
+-	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
++install: $(INSTALL_DIR) $(RUBY_MODULES)
++	for f in $(RUBY_MODULES) ; do $(INSTALL) $$f $(DESTDIR)$(INSTALL_DIR) ; done
+ 
+ $(RUBY_MODULES): %.so: %_wrap.o
+ 	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
+ 
+ %.o: %.cpp
+-	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
++	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
+ 
+ %.o: %.cxx
+-	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
++	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(GDAL_INCLUDE)  $(RUBY_INCLUDE) -c $<

diff --git a/sci-libs/gdal/files/gdal-1.4.2-datadir.patch b/sci-libs/gdal/files/gdal-1.4.2-datadir.patch
new file mode 100644
index 0000000..95cd058
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.4.2-datadir.patch
@@ -0,0 +1,11 @@
+--- GDALmake.opt.in.orig	2006-05-21 14:59:21.000000000 -0700
++++ GDALmake.opt.in	2006-05-21 15:13:22.000000000 -0700
+@@ -54,7 +54,7 @@
+ exec_prefix	=	@exec_prefix@
+ INST_PREFIX	=	@exec_prefix@
+ INST_INCLUDE	=	@includedir@
+-INST_DATA 	=	@datadir@
++INST_DATA 	=	@datadir@/gdal
+ INST_LIB	=	@libdir@
+ INST_BIN	=	@bindir@
+ INST_PYMOD      =       @pymoddir@

diff --git a/sci-libs/gdal/files/gdal-1.5.0-install_name.patch b/sci-libs/gdal/files/gdal-1.5.0-install_name.patch
new file mode 100644
index 0000000..e175752
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.5.0-install_name.patch
@@ -0,0 +1,45 @@
+--- GDALmake.opt.in.orig	2008-02-02 18:25:48.000000000 -0800
++++ GDALmake.opt.in	2008-02-02 18:54:53.000000000 -0800
+@@ -97,6 +97,10 @@
+ GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
+ GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
+ 
++# for building without libtool
++GDAL_SLIB_SO_VER =	$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
++GDAL_SLIB_SONAME =	-install_name $(INST_LIB)/libgdal.$(GDAL_VERSION_MAJOR).$(SO_EXT)
++
+ # Mac OS X Framework definition
+ MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
+ 
+--- GNUmakefile.orig	2010-03-09 14:03:08 +0100
++++ GNUmakefile	2010-03-09 14:05:29 +0100
+@@ -218,7 +218,7 @@
+ 
+ ifeq ($(HAVE_LD_SHARED),yes)
+ 
+-GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))
++GDAL_SLIB_B	=	libgdal
+ 
+ install-lib:
+ 
+@@ -226,14 +226,14 @@
+ ifeq ($(MACOSX_FRAMEWORK),yes)
+ 	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/GDAL
+ else
+-	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
+-	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)
+-	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
+-	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
++	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).dylib
++	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib
++	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
++	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
+ 	(cd $(DESTDIR)$(INST_LIB) ; \
+-	 ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
++	 ln -s $(GDAL_SLIB_B).$(GDAL_VER).dylib $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib)
+ 	(cd $(DESTDIR)$(INST_LIB) ; \
+-	 ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B))
++	 ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib $(GDAL_SLIB_B).dylib)
+ endif
+ 
+ else

diff --git a/sci-libs/gdal/files/gdal-1.5.0-soname.patch b/sci-libs/gdal/files/gdal-1.5.0-soname.patch
new file mode 100644
index 0000000..f784536
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.5.0-soname.patch
@@ -0,0 +1,13 @@
+--- GDALmake.opt.in.orig	2008-02-02 18:25:48.000000000 -0800
++++ GDALmake.opt.in	2008-02-02 18:54:53.000000000 -0800
+@@ -97,6 +97,10 @@
+ GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
+ GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
+ 
++# for building without libtool
++GDAL_SLIB_SO_VER =	$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
++GDAL_SLIB_SONAME =	-Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR)
++
+ # Mac OS X Framework definition
+ MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
+ 

diff --git a/sci-libs/gdal/files/gdal-1.5.1-python-install.patch b/sci-libs/gdal/files/gdal-1.5.1-python-install.patch
new file mode 100644
index 0000000..fd1b7e4
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.5.1-python-install.patch
@@ -0,0 +1,14 @@
+--- swig/python/GNUmakefile.orig	2008-02-02 17:00:52.000000000 -0800
++++ swig/python/GNUmakefile	2008-02-02 17:02:03.000000000 -0800
+@@ -51,9 +51,9 @@
+ install:
+ 
+ ifeq ($(PY_HAVE_SETUPTOOLS),1)
+-	$(PYTHON) setup.py install 
++	$(PYTHON) setup.py install --root=$(DESTDIR) 
+ else
+-	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
++	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
+ endif
+ 
+ 	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done

diff --git a/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch b/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch
new file mode 100644
index 0000000..38c94da
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch
@@ -0,0 +1,20 @@
+--- swig/include/gdal.i.orig	2009-04-24 21:55:06.315863023 -0700
++++ swig/include/gdal.i	2009-04-24 22:10:28.806611326 -0700
+@@ -176,6 +176,17 @@
+ %include "gdal_typemaps.i"
+ #endif
+ 
++/* Default memberin typemaps required to support SWIG 1.3.39 and above */
++%typemap(memberin) char *Info %{
++/* char* Info memberin typemap */
++$1;
++%}
++
++%typemap(memberin) char *Id %{
++/* char* Info memberin typemap */
++$1;
++%}
++
+ //************************************************************************
+ //
+ // Define the exposed CPL functions.

diff --git a/sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch b/sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch
new file mode 100644
index 0000000..0216f38
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch
@@ -0,0 +1,35 @@
+--- swig/ruby/RubyMakefile.mk.orig	2009-08-01 18:54:22.260573234 -0700
++++ swig/ruby/RubyMakefile.mk	2009-08-01 18:59:11.208571244 -0700
+@@ -25,7 +25,9 @@
+ INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
+ 
+ RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
+-LDFLAGS += -shared -L$(RUBY_LIB_DIR)
++LDFLAGS += -fPIC -DPIC -Xcompiler -shared -L$(RUBY_LIB_DIR)
++CFLAGS += -fPIC -DPIC
++CXXFLAGS += -fPIC -DPIC
+ RUBY_LIB := -l$(RUBY_SO_NAME)
+ 
+ build: $(RUBY_MODULES)
+@@ -41,17 +43,17 @@
+ $(INSTALL_DIR):
+ 	mkdir -p $(DESTDIR)$(INSTALL_DIR)
+ 
+-install: $(INSTALL_DIR)
+-	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
++install: $(INSTALL_DIR) $(RUBY_MODULES)
++	for f in $(RUBY_MODULES) ; do $(INSTALL) $$f $(DESTDIR)$(INSTALL_DIR) ; done
+ 
+ $(RUBY_MODULES): %.so: %_wrap.o
+ 	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
+ 
+ %.o: %.cpp
+-	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
++	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
+ 
+ %.o: %.cxx
+-	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
++	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(GDAL_INCLUDE)  $(RUBY_INCLUDE) -c $<

diff --git a/sci-libs/gdal/files/gdal-1.6.3-libpng15.patch b/sci-libs/gdal/files/gdal-1.6.3-libpng15.patch
new file mode 100644
index 0000000..e0411a3
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.6.3-libpng15.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/386009
+
+--- frmts/png/pngdataset.cpp
++++ frmts/png/pngdataset.cpp
+@@ -1288,7 +1288,7 @@
+     * instead of an int, which is what fread() actually returns.
+     */
+    check = (png_size_t)VSIFReadL(data, (png_size_t)1, length,
+-                                 (png_FILE_p)png_ptr->io_ptr);
++                                 (png_FILE_p)png_get_io_ptr(png_ptr));
+ 
+    if (check != length)
+       png_error(png_ptr, "Read Error");
+@@ -1303,7 +1303,7 @@
+ {
+    png_uint_32 check;
+ 
+-   check = VSIFWriteL(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
++   check = VSIFWriteL(data, 1, length, (png_FILE_p)(png_get_io_ptr(png_ptr)));
+ 
+    if (check != length)
+       png_error(png_ptr, "Write Error");
+@@ -1314,7 +1314,7 @@
+ /************************************************************************/
+ static void png_vsi_flush(png_structp png_ptr)
+ {
+-    VSIFFlushL( (png_FILE_p)(png_ptr->io_ptr) );
++    VSIFFlushL( (png_FILE_p)(png_get_io_ptr(png_ptr)) );
+ }
+ 
+ /************************************************************************/
+@@ -1330,7 +1330,7 @@
+     // libpng is generally not built as C++ and so won't honour unwind
+     // semantics.  Ugg. 
+ 
+-    jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr;
++    jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr);
+     if (psSetJmpContext)
+     {
+         longjmp( *psSetJmpContext, 1 );

diff --git a/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch b/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch
new file mode 100644
index 0000000..04777c8
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch
@@ -0,0 +1,13 @@
+--- port/cpl_minizip_ioapi.h.orig	2011-09-25 13:38:22.000000000 -0700
++++ port/cpl_minizip_ioapi.h	2011-09-25 13:39:22.000000000 -0700
+@@ -41,6 +41,10 @@
+ #endif
+ #endif
+ 
++#ifndef OF
++#define OF(x) x
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif

diff --git a/sci-libs/gdal/files/gdal-1.9.1-opencl.patch b/sci-libs/gdal/files/gdal-1.9.1-opencl.patch
new file mode 100644
index 0000000..f537784
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.9.1-opencl.patch
@@ -0,0 +1,27 @@
+diff -ur gdal-1.9.0b1_orig/alg/gdalwarpkernel_opencl.c gdal-1.9.0b1/alg/gdalwarpkernel_opencl.c
+--- gdal-1.9.0b1_orig/alg/gdalwarpkernel_opencl.c	2011-12-20 02:18:27.000000000 +0100
++++ gdal-1.9.0b1/alg/gdalwarpkernel_opencl.c	2011-12-26 19:28:04.564576034 +0100
+@@ -1409,20 +1409,9 @@
+         handleErr(err);
+     } else {
+         //Make a fake image so we don't have a NULL pointer
+-        if (warper->bIsATI)
+-        {
+-            /* The code in the else clause generates a CL_INVALID_IMAGE_SIZE with ATI SDK 2.2 */
+-            /* while theoretically correct and working on other SDKs. The following is a */
+-            /* workaround */
+-            char dummyImageData[16];
+-            (*srcImag) = clCreateImage2D(warper->context, CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR, &imgFmt,
+-                                        1, 1, sz, dummyImageData, &err);
+-        }
+-        else
+-        {
+-            (*srcImag) = clCreateImage2D(warper->context, CL_MEM_READ_ONLY, &imgFmt,
+-                                         1, 1, sz, NULL, &err);
+-        }
++	char dummyImageData[16];
++	(*srcImag) = clCreateImage2D(warper->context, CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR, &imgFmt,
++				    1, 1, sz, dummyImageData, &err);
+         handleErr(err);
+     }
+ 

diff --git a/sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch b/sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch
new file mode 100644
index 0000000..b98f684
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch
@@ -0,0 +1,43 @@
+diff -urN gdal-1.9.1.old//swig/ruby/RubyMakefile.mk gdal-1.9.1/swig/ruby/RubyMakefile.mk
+--- gdal-1.9.1.old//swig/ruby/RubyMakefile.mk	2012-05-25 19:54:12.073974979 +0200
++++ gdal-1.9.1/swig/ruby/RubyMakefile.mk	2012-05-25 19:56:56.014977833 +0200
+@@ -37,13 +37,13 @@
+ 
+ ifeq ("$(shell uname -s)", "Darwin")
+ RUBY_MODULES=$(RUBY_MODULES_MAC)
+-LDFLAGS += -Xcompiler -bundle -L$(RUBY_LIB_DIR)
+-RUBY_LIB := -l$(RUBY_SO_NAME)
+ else
+ RUBY_MODULES=$(RUBY_MODULES_LIN)
+-LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
+-RUBY_LIB := -l$(RUBY_SO_NAME)
+ endif
++LDFLAGS += -fPIC -DPIC -shared -L$(RUBY_LIB_DIR)
++CFLAGS += -fPIC -DPIC
++CXXFLAGS += -fPIC -DPIC
++RUBY_LIB := -l$(RUBY_SO_NAME)
+ 
+ build: $(RUBY_MODULES)
+ 
+@@ -59,7 +59,7 @@
+ $(INSTALL_DIR):
+ 	mkdir -p $(DESTDIR)$(INSTALL_DIR)
+ 
+-install: $(INSTALL_DIR)
++install: $(INSTALL_DIR) $(RUBY_MODULES)
+ 	for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; done
+ 
+ $(RUBY_MODULES_MAC): %.bundle: %_wrap.o
+@@ -69,10 +69,10 @@
+ 	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
+ 
+ %.o: %.cpp
+-	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
++	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
+ 
+ %.o: %.cxx
+-	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
++	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(GDAL_INCLUDE)  $(RUBY_INCLUDE) -c $<

diff --git a/sci-libs/gdal/gdal-1.6.3-r1.ebuild b/sci-libs/gdal/gdal-1.6.3-r1.ebuild
new file mode 100644
index 0000000..9ca58e3
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.6.3-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.24 2012/05/19 20:01:03 ssuominen Exp $
+
+EAPI=3
+
+WANT_AUTOCONF="2.5"
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby18"
+
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils perl-module python ruby toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="curl debug doc ecwj2k fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf odbc png ogdi perl postgres python ruby sqlite threads"
+
+RDEPEND="
+	dev-libs/expat
+	media-libs/tiff:0
+	sci-libs/libgeotiff
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg )
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	perl? ( dev-lang/perl )
+	python? ( dev-python/numpy )
+	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
+	fits? ( sci-libs/cfitsio )
+	ogdi? ( sci-libs/ogdi )
+	gml? ( >=dev-libs/xerces-c-3 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4 )
+	postgres? ( dev-db/postgresql-base )
+	|| (
+		netcdf? ( sci-libs/netcdf )
+		hdf? ( sci-libs/hdf )
+	)
+	|| (
+		jpeg2k? ( media-libs/jasper )
+		ecwj2k? ( sci-libs/libecwj2 )
+	)
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	geos? ( >=sci-libs/geos-2.2.1 )
+	sqlite? ( >=dev-db/sqlite-3 )"
+
+DEPEND="${RDEPEND}
+	perl? ( >=dev-lang/swig-1.3.32 )
+	python? ( >=dev-lang/swig-1.3.32 )
+	ruby? ( >=dev-lang/swig-1.3.32 )
+	doc? ( app-doc/doxygen )"
+
+AT_M4DIR="${S}/m4"
+
+pkg_setup() {
+	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then
+		elog "User-specified configure options are ${GDAL_CONFIGURE_OPTS}."
+	else
+		elog "User-specified configure options are not set."
+		elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
+	fi
+	python_set_active_version 2
+}
+
+src_prepare() {
+	eaclocal
+	eautoconf
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.2-datadir.patch \
+		"${FILESDIR}"/${PN}-1.5.1-python-install.patch \
+		"${FILESDIR}"/${PN}-1.6.0-swig-fix.patch \
+		"${FILESDIR}"/${PN}-1.6.1-ruby-make.patch \
+		"${FILESDIR}"/${PN}-1.6.3-libpng15.patch
+
+	[[ ${CHOST} == *-darwin* ]] \
+		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
+		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
+
+	has_version '>=sys-libs/zlib-1.2.5.1-r1' && \
+		sed -i -e '1i#define OF(x) x' port/cpl_minizip_ioapi.h
+}
+
+src_configure() {
+	local pkg_conf="${GDAL_CONFIGURE_OPTS}"
+	local use_conf=""
+
+	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
+		--with-libgrass=no --without-libtool --with-expat=${EPREFIX}/usr"
+
+	if use hdf && use netcdf; then
+		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
+		ewarn "common; HDF5 is now the preferred choice for HDF data."
+		ewarn "Disabling hdf4 in favor of NetCDF..."
+		use_conf="--with-netcdf --with-hdf4=no"
+	elif use hdf && ! use netcdf; then
+		use_conf="--with-netcdf=no --with-hdf4"
+	else
+		use_conf="$(use_with netcdf)"
+	fi
+
+	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
+	 $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
+	 $(use_with postgres pg) $(use_with python) $(use_with ruby) \
+	 $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
+	 $(use_with sqlite sqlite3 ="${EPREFIX}"/usr) $(use_with geos) \
+	 $(use_with jpeg2k jasper) $(use_with odbc) $(use_enable debug)"
+
+	# It can't find this
+	if use ogdi ; then
+		use_conf="--with-ogdi=${EPREFIX}/usr ${use_conf}"
+	fi
+
+	if use mysql ; then
+		use_conf="--with-mysql=${EPREFIX}/usr/bin/mysql_config ${use_conf}"
+	fi
+
+	if use gif ; then
+		use_conf="--with-gif=internal ${use_conf}"
+	else
+		use_conf="--with-gif=no ${use_conf}"
+	fi
+
+	if use python ; then
+		use_conf="--with-pymoddir=${EPREFIX}/$(python_get_sitedir) \
+		${use_conf}"
+	fi
+
+	# Fix doc path just in case
+	sed \
+		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+		-i GDALmake.opt.in || die "sed gdalmake.opt failed"
+
+	econf ${pkg_conf} ${use_conf}
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	sed \
+	 -i -r -e '/^LDFLAGS/ s/(-(Wl|O1),|,-(Wl|O1))//g' \
+	 -i -e '/^MYSQL_LIB/ s:-Wl,-O1 -rdynamic::' \
+	 GDALmake.opt || die "sed LIBS failed"
+}
+
+src_compile() {
+	local i
+	for i in perl ruby python; do
+		if use $i; then
+			rm "${S}"/swig/$i/*_wrap.cpp
+			emake -C "${S}"/swig/$i generate || \
+				die "make generate failed for swig/$i"
+		fi
+	done
+
+	# parallel makes fail on the ogr stuff (C++, what can I say?)
+	# also failing with gcc4 in libcsf
+	emake -j1 || die "emake failed"
+
+	if use python; then
+	 sed -i -e "s#library_dirs = #library_dirs = ${EPREFIX}/usr/$(get_libdir):#g" \
+		swig/python/setup.cfg || die "sed python setup.cfg failed"
+	 sed -i -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+		swig/python/GNUmakefile || die "sed python makefile failed"
+	fi
+
+	if use perl ; then
+		cd "${S}"/swig/perl
+		perl-module_src_prep
+		perl-module_src_compile
+		cd "${S}"
+	fi
+
+	if use doc ; then
+		make docs || die "make docs failed"
+	fi
+}
+
+src_install() {
+	if use perl ; then
+		cd "${S}"/swig/perl
+		perl-module_src_install
+		sed -i -e "s:BINDINGS = python ruby perl:BINDINGS = python ruby:g" \
+		GDALmake.opt
+		cd "${S}"
+	fi
+
+	# einstall causes sandbox violations on /usr/lib/libgdal.so
+	emake DESTDIR="${D}" install \
+	 || die "make install failed"
+
+	dodoc Doxyfile HOWTO-RELEASE NEWS
+
+	if use doc ; then
+		dohtml html/* || die "install html failed"
+		docinto ogr
+		dohtml ogr/html/* || die "install ogr html failed"
+	fi
+
+	if use python; then
+	 newdoc swig/python/README.txt README-python.txt
+	 dodir /usr/share/${PN}/samples
+	 insinto /usr/share/${PN}/samples
+	 doins swig/python/samples/*
+	fi
+
+	use perl && fixlocalpod
+}
+
+pkg_postinst() {
+	echo
+	elog "If you need libgrass support, then you must rebuild gdal, after"
+	elog "installing the latest Grass, and set the following option:"
+	echo
+	elog "GDAL_CONFIGURE_OPTS=--with-grass=\$GRASS_HOME emerge gdal"
+	echo
+	elog "GDAL is most useful with full graphics support enabled via various"
+	elog "USE flags: png, jpeg, gif, jpeg2k, etc. Also python, fits, ogdi,"
+	elog "geos, and support for either netcdf or HDF4 is available, as well as"
+	elog "grass, and mysql, sqlite, or postgres (grass support requires grass 6"
+	elog "and rebuilding gdal). HDF5 support is now included."
+	echo
+	elog "Note: tiff and geotiff are now hard depends, so no USE flags."
+	elog "Also, this package will check for netcdf before hdf, so if you"
+	elog "prefer hdf, please emerge hdf with USE=szip prior to emerging"
+	elog "gdal. Detailed API docs require doxygen (man pages are free)."
+	echo
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+	echo
+}

diff --git a/sci-libs/gdal/gdal-1.8.1-r1.ebuild b/sci-libs/gdal/gdal-1.8.1-r1.ebuild
new file mode 100644
index 0000000..ba1c982
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.8.1-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/sci-libs/gdal/gdal-1.8.1-r1.ebuild,v 1.5 2012/06/05 21:08:15 ranger Exp $
+
+EAPI=3
+
+WANT_AUTOCONF="2.5"
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby18"
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit autotools eutils libtool perl-module python ruby-ng toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pdf perl png postgres python ruby sqlite threads"
+
+RDEPEND="
+	dev-libs/expat
+	media-libs/tiff
+	sci-libs/libgeotiff
+	( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) )
+	curl? ( net-misc/curl )
+	ecwj2k? ( sci-libs/libecwj2 )
+	fits? ( sci-libs/cfitsio )
+	geos?   ( >=sci-libs/geos-2.2.1 )
+	gif? ( media-libs/giflib )
+	gml? ( >=dev-libs/xerces-c-3 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf )
+	odbc?   ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	pdf? ( app-text/poppler )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng )
+	postgres? ( >=dev-db/postgresql-base-8.4 )
+	python? ( dev-python/numpy )
+	ruby? ( $(ruby_implementation_depend ruby18) )
+	sqlite? ( >=dev-db/sqlite-3 )"
+
+SWIG_DEP=">=dev-lang/swig-2.0.2"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	perl? ( ${SWIG_DEP} )
+	python? ( ${SWIG_DEP} )
+	ruby? ( ${SWIG_DEP} )"
+
+AT_M4DIR="${S}/m4"
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with the src path
+	default
+}
+
+src_prepare() {
+	# fix datadir and docdir placement
+	sed -i \
+		-e "s:@datadir@:@datadir@/gdal:" \
+		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+		GDALmake.opt.in || die
+
+	# the second sed expression should fix bug 371075
+	sed -i \
+		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
+		swig/python/GNUmakefile || die
+
+	epatch "${FILESDIR}"/1.7.2-ruby_cflags.patch
+
+	# -soname is only accepted by GNU ld/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
+		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
+
+	# Update for zlib header changes (see bug #383569)
+	epatch "${FILESDIR}"/${P}-zlib_header_fix.patch
+
+	# Fix ldflags when building with ruby
+	sed -e '/^LDFLAGS/s/-Xcompiler//' -i swig/ruby/RubyMakefile.mk || die
+
+	# autoheader fail
+	eaclocal
+	eautoconf
+	eautomake
+	elibtoolize
+}
+
+src_configure() {
+	if use ruby; then
+		RUBY_MOD_DIR="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')"
+		echo "Ruby module dir is: $RUBY_MOD_DIR"
+	fi
+
+	# pcidsk is internal, because there is no such library yet released
+	#     also that thing is developed by the gdal people
+	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+	# bsb - legal issues
+	# oracle - disabled, i dont have and can't test
+	# ingres - same story as oracle oci
+	# tiff is a hard dep
+	econf \
+		--enable-shared \
+		--disable-static \
+		--with-expat \
+		--without-grass \
+		--without-hdf4 \
+		--without-fme \
+		--without-pcraster \
+		--without-kakadu \
+		--without-mrsid \
+		--without-jp2mrsid \
+		--without-msg \
+		--without-bsb \
+		--without-dods-root \
+		--without-oci \
+		--without-ingres \
+		--without-spatialite \
+		--without-dwgdirect \
+		--without-epsilon \
+		--without-idb \
+		--without-sde \
+		--without-libtool \
+		--with-libz="${EPREFIX}/usr/" \
+		--with-ogr \
+		--with-grib \
+		--with-vfk \
+		--with-libtiff=external \
+		--with-geotiff=external \
+		$(use_enable debug) \
+		$(use_with postgres pg) \
+		$(use_with fits cfitsio) \
+		$(use_with netcdf) \
+		$(use_with png) \
+		$(use_with jpeg) \
+		$(use_with jpeg pcidsk) \
+		$(use_with gif) \
+		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
+		$(use_with hdf5) \
+		$(use_with jpeg2k jasper) \
+		$(use_with ecwj2k ecw) \
+		$(use_with gml xerces) \
+		$(use_with odbc) \
+		$(use_with curl) \
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
+		$(use_with geos) \
+		$(use_with aux_xml pam) \
+		$(use_with pdf poppler) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with python) \
+		$(use_with threads) \
+		--with-pymoddir="${EPREFIX}"/$(python_get_sitedir)
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -i \
+			-e "s: -rdynamic : :" \
+			GDALmake.opt || die "sed LIBS failed"
+	fi
+
+	# updated for newer swig (must specify the path to input files)
+	if use python; then
+		sed -i \
+			-e "s: gdal_array.i: ../include/gdal_array.i:" \
+			-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+			swig/python/GNUmakefile || die "sed python makefile failed"
+		sed -i \
+			-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
+			swig/python/setup.cfg || die "sed python setup.cfg failed"
+	fi
+}
+
+src_compile() {
+	local i
+	for i in perl ruby python; do
+		if use $i; then
+			rm "${S}"/swig/$i/*_wrap.cpp
+			emake -C "${S}"/swig/$i generate || \
+				die "make generate failed for swig/$i"
+		fi
+	done
+
+	emake || die "emake failed"
+
+	if use perl ; then
+		pushd "${S}"/swig/perl > /dev/null
+		perl-module_src_prep
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+
+	if use doc ; then
+		emake docs || die "make docs failed"
+	fi
+}
+
+src_install() {
+	if use perl ; then
+		pushd "${S}"/swig/perl > /dev/null
+		perl-module_src_install
+		popd > /dev/null
+		sed -i \
+			-e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
+			GDALmake.opt || die
+	fi
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if use ruby ; then
+		# weird reinstall collision; needs manual intervention...
+		pushd "${S}"/swig/ruby > /dev/null
+		rm -rf "${D}"${RUBY_MOD_DIR}/gdal
+		exeinto ${RUBY_MOD_DIR}/gdal
+		doexe *.so || die "doins ruby modules failed"
+		popd > /dev/null
+	fi
+
+	use perl && fixlocalpod
+
+	dodoc Doxyfile HOWTO-RELEASE NEWS || die
+
+	if use doc ; then
+		dohtml html/* || die "install html failed"
+		docinto ogr
+		dohtml ogr/html/* || die "install ogr html failed"
+	fi
+
+	if use python; then
+		newdoc swig/python/README.txt README-python.txt || die
+		insinto /usr/share/${PN}/samples
+		doins swig/python/samples/* || die
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize osgeo
+	fi
+	echo
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup osgeo
+	fi
+}

diff --git a/sci-libs/gdal/gdal-1.9.1.ebuild b/sci-libs/gdal/gdal-1.9.1.ebuild
new file mode 100644
index 0000000..98f4ef0
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.9.1.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.1.ebuild,v 1.4 2012/05/27 07:49:48 scarabeus Exp $
+
+EAPI="4-slot-abi"
+
+WANT_AUTOCONF="2.5"
+
+PYTHON_DEPEND="python? 2:2.6"
+GENTOO_DEPEND_ON_PERL=no
+inherit autotools eutils libtool perl-module python toolchain-funcs java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl ogdi pdf perl png postgres python ruby spatialite sqlite threads xls"
+
+RDEPEND="
+	dev-libs/expat
+	media-libs/tiff
+	sci-libs/libgeotiff
+	( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) )
+	armadillo? ( >=sci-libs/armadillo-3.0.2 )
+	curl? ( net-misc/curl )
+	ecwj2k? ( sci-libs/libecwj2 )
+	fits? ( sci-libs/cfitsio )
+	geos?   ( >=sci-libs/geos-2.2.1 )
+	gif? ( media-libs/giflib )
+	gml? ( >=dev-libs/xerces-c-3 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
+	java? ( >=virtual/jre-1.6 )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf )
+	odbc?   ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	pdf? (
+		app-text/podofo
+		app-text/poppler
+	)
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng )
+	postgres? ( >=dev-db/postgresql-base-8.4 )
+	python? ( dev-python/numpy )
+	ruby? ( dev-lang/ruby:1.9 )
+	sqlite? ( dev-db/sqlite:3 )
+	spatialite? (
+		dev-db/spatialite
+	)
+	xls? ( dev-libs/freexl )
+"
+
+SWIG_DEP=">=dev-lang/swig-2.0.2"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	java? ( >=virtual/jdk-1.6 )
+	perl? ( ${SWIG_DEP} )
+	python? ( ${SWIG_DEP} )
+	ruby? ( ${SWIG_DEP} )"
+
+AT_M4DIR="${S}/m4"
+MAKEOPTS+=" -j1"
+
+REQUIRED_USE="
+	spatialite? ( sqlite )
+	mdb? ( java )
+"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with the src path
+	default
+}
+
+src_prepare() {
+	# fix datadir and docdir placement
+	sed -i \
+		-e "s:@datadir@:@datadir@/gdal:" \
+		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+		"${S}"/GDALmake.opt.in || die
+
+	# the second sed expression should fix bug 371075
+	sed -i \
+		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
+		"${S}"/swig/python/GNUmakefile || die
+
+	epatch "${FILESDIR}"/${PN}-1.9.1-ruby-makefile.patch
+
+	# Opencl seems broken with nvidia without this
+	epatch "${FILESDIR}"/${PN}-1.9.1-opencl.patch
+
+	# -soname is only accepted by GNU ld/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
+		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
+
+	# Update for zlib header changes (see bug #383569)
+	epatch "${FILESDIR}"/${PN}-1.8.1-zlib_header_fix.patch
+
+	# Fix spatialite/sqlite include issue
+	sed -i \
+		-e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+		ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+
+	# Fix freexl configure check
+	sed -i \
+		-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
+		configure.in || die
+
+	# autoheader fail
+	eaclocal
+	eautoconf
+	eautomake
+	elibtoolize
+}
+
+src_configure() {
+	local myopts=""
+
+	if use ruby; then
+		RUBY_MOD_DIR="$(ruby19 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		echo "Ruby module dir is: $RUBY_MOD_DIR"
+	fi
+
+	if use python; then
+		myopts+="
+			--with-pymoddir="${EPREFIX}"/$(python_get_sitedir)
+		"
+	fi
+
+	if use java; then
+		myopts+="
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			$(use_with mdb)
+		"
+	else
+		myopts+=" --without-java --without-mdb"
+		use mdb && ewarn "mdb requires java use enabled. disabling"
+	fi
+
+	# pcidsk is internal, because there is no such library yet released
+	#     also that thing is developed by the gdal people
+	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+	# bsb - legal issues
+	# oracle - disabled, i dont have and can't test
+	# ingres - same story as oracle oci
+	# podofo - we use poppler instead they are exclusive for each other
+	# tiff is a hard dep
+	econf \
+		--enable-shared \
+		--disable-static \
+		--with-expat \
+		--without-grass \
+		--without-hdf4 \
+		--without-fme \
+		--without-pcraster \
+		--without-kakadu \
+		--without-mrsid \
+		--without-jp2mrsid \
+		--without-msg \
+		--without-bsb \
+		--without-dods-root \
+		--without-oci \
+		--without-ingres \
+		--without-dwgdirect \
+		--without-epsilon \
+		--without-idb \
+		--without-podofo \
+		--without-sde \
+		--without-libtool \
+		--with-libz="${EPREFIX}/usr/" \
+		--with-ogr \
+		--with-grib \
+		--with-vfk \
+		--with-libtiff=external \
+		--with-geotiff=external \
+		$(use_enable debug) \
+		$(use_with armadillo) \
+		$(use_with postgres pg) \
+		$(use_with fits cfitsio) \
+		$(use_with netcdf) \
+		$(use_with png) \
+		$(use_with jpeg) \
+		$(use_with jpeg pcidsk) \
+		$(use_with gif) \
+		$(use_with hdf5) \
+		$(use_with jpeg2k jasper) \
+		$(use_with ecwj2k ecw) \
+		$(use_with gml xerces) \
+		$(use_with odbc) \
+		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
+		$(use_with opencl) \
+		$(use_with curl) \
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
+		$(use_with spatialite) \
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
+		$(use_with geos) \
+		$(use_with aux_xml pam) \
+		$(use_with pdf poppler) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with python) \
+		$(use_with threads) \
+		$(use_with xls freexl) \
+		${myopts}
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -i \
+			-e "s: -rdynamic : :" \
+			GDALmake.opt || die "sed LIBS failed"
+	fi
+
+	# updated for newer swig (must specify the path to input files)
+	if use python; then
+		sed -i \
+			-e "s: gdal_array.i: ../include/gdal_array.i:" \
+			-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+			swig/python/GNUmakefile || die "sed python makefile failed"
+		sed -i \
+			-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
+			swig/python/setup.cfg || die "sed python setup.cfg failed"
+	fi
+}
+
+src_compile() {
+	local i
+	for i in perl ruby python; do
+		if use $i; then
+			rm "${S}"/swig/$i/*_wrap.cpp
+			emake -C "${S}"/swig/$i generate || \
+				die "make generate failed for swig/$i"
+		fi
+	done
+
+	emake || die "emake failed"
+
+	if use perl ; then
+		pushd "${S}"/swig/perl > /dev/null
+		perl-module_src_prep
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+
+	if use doc ; then
+		emake docs || die "make docs failed"
+	fi
+}
+
+src_install() {
+	if use perl ; then
+		pushd "${S}"/swig/perl > /dev/null
+		perl-module_src_install
+		popd > /dev/null
+		sed -i \
+			-e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
+			GDALmake.opt || die
+	fi
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if use ruby ; then
+		# weird reinstall collision; needs manual intervention...
+		pushd "${S}"/swig/ruby > /dev/null
+		rm -rf "${D}"${RUBY_MOD_DIR}/gdal
+		exeinto ${RUBY_MOD_DIR}/gdal
+		doexe *.so || die "doins ruby modules failed"
+		popd > /dev/null
+	fi
+
+	use perl && fixlocalpod
+
+	dodoc Doxyfile HOWTO-RELEASE NEWS || die
+
+	if use doc ; then
+		dohtml html/* || die "install html failed"
+		docinto ogr
+		dohtml ogr/html/* || die "install ogr html failed"
+	fi
+
+	if use python; then
+		newdoc swig/python/README.txt README-python.txt || die
+		insinto /usr/share/${PN}/samples
+		doins swig/python/samples/* || die
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize osgeo
+	fi
+	echo
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup osgeo
+	fi
+}

diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
new file mode 100644
index 0000000..d0172ef
--- /dev/null
+++ b/sci-libs/linux-gpib/Manifest
@@ -0,0 +1,7 @@
+AUX linux-gpib-3.2.15-build.patch 1681 RMD160 0d462f8d25790806c9699f6d5e480221f59e8978 SHA1 b421f3ef440426df3fa5e704c88495c1d8271664 SHA256 5845af9bf0660fc727c6a04ea41eb5e66f16915135d27c1a1aba69814d696704
+AUX linux-gpib-3.2.16-perl.patch 471 RMD160 9702c06a8ff7390105d217733487d5a2ceaf1073 SHA1 0476bfbf1f581fdbec391e7469893a02ca764f27 SHA256 7393237d7df3bad191d6c6790b87ff6e0b1f5fd006b77c0afeb5e1dcacb744fc
+DIST gpib_firmware-2006-11-12.tar.gz 169357 RMD160 9784b026ef41ce75439c635610ec56f037e88499 SHA1 584f9ffeba8194ab5d44fdfd4c97ab919750596c SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701
+DIST linux-gpib-3.2.16.tar.gz 1189792 RMD160 943f6c09ec54b03c7179bace50d2a3b9e0e413a0 SHA1 1f6e501a4f84da39ffccf9f2fd45d390f5d96f75 SHA256 a1d158679a41ae48f826c5cbcb08d39839c65606dcdffb6a6f680554c6286c5e
+EBUILD linux-gpib-3.2.16-r1.ebuild 5051 RMD160 ee5f371c41b3a3a5f66f56785613a19a23d70b0d SHA1 5010565f73ea6510e189407be7330281f9137daf SHA256 bac1f7581baf805b289becb3fd90d0a20eb9769ee4ca87324b88cccd81cab5a8
+MISC ChangeLog 1231 RMD160 17df6eca48cb60a8bd8b799b6bd5fa8022577599 SHA1 5e7674b2702e827b8d5ae55dab16f95b9359fb0c SHA256 56e86bb11b317f4d63bbab1659c159f48f8583bfded9ff7ec34a6821482f6e5f
+MISC metadata.xml 333 RMD160 53cc452da426b779f6231218f7700176efaa1418 SHA1 8041c003a5532b89964cd8b3deba4bf97a3a3b3f SHA256 94def6ae5ea540aab89b204a106ac9a1ffd7f6e07d537e445bb7373e3670d367

diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.15-build.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.15-build.patch
new file mode 100644
index 0000000..14a1868
--- /dev/null
+++ b/sci-libs/linux-gpib/files/linux-gpib-3.2.15-build.patch
@@ -0,0 +1,44 @@
+diff -ruN linux-gpib-3.2.15-0-orig/drivers/Makefile.am linux-gpib-3.2.15/drivers/Makefile.am
+--- linux-gpib-3.2.15-0-orig/drivers/Makefile.am	2007-04-19 17:21:04.000000000 +0200
++++ linux-gpib-3.2.15/drivers/Makefile.am	2011-01-24 23:20:59.000000000 +0100
+@@ -27,39 +27,13 @@
+ 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \
+ 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
+ 
+-install-data-hook: device-file-check /etc/gpib.conf
++install-data-hook: /etc/gpib.conf
+ 	$(MAKE) -C $(LINUX_SRCDIR) V=1 modules_install\
+ 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \
+ 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" INSTALL_MOD_DIR="gpib"
+-	$(DEPMOD) -ae
+-
+-/dev/gpib0:
+-	groupadd gpib || echo "group gpib exists"
+-	for i in `seq 0 15`; \
+-	do \
+-		mknod -m u=rw,g=rw,o= /dev/gpib$${i} c $(IBMAJOR) $${i} || exit 1; \
+-		chown root:gpib /dev/gpib$${i}; \
+-	done
+-
+-.PHONY : device-file-check
+-device-file-check: /dev/gpib0
+-	@if [ ! -c /dev/gpib0 ]; then \
+-		if [ -a /dev/gpib0 ]; then \
+-			echo "A file or directory called /dev/gpib0 exists but it is not" \
+-				"a character device.  Delete or move it and try again."; \
+-			exit 1; \
+-		fi; \
+-	fi
+-	@ls -l /dev/gpib0 | grep -q "$(IBMAJOR)"; \
+-	if [ $$? != 0 ]; then \
+-		echo "/dev/gpib0 has the wrong major number. " \
+-			"Delete your /dev/gpibX files and try again."; \
+-		exit 1; \
+-	fi
+ 
+ #should move this to util/templates Makefile.am when it exists
+ /etc/gpib.conf:
+-	$(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf /etc/gpib.conf
+ 
+ #make sure compiled files, etc don't make it into distribution tarballs
+ dist-hook:

diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch
new file mode 100644
index 0000000..16f2f15
--- /dev/null
+++ b/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch
@@ -0,0 +1,9 @@
+diff -ruN linux-gpib-3.2.16.orig/language/Makefile.am linux-gpib-3.2.16/language/Makefile.am
+--- linux-gpib-3.2.16.orig/language/Makefile.am	2009-09-16 19:26:53.000000000 +0200
++++ linux-gpib-3.2.16/language/Makefile.am	2011-08-14 03:32:53.000000000 +0200
+@@ -67,4 +67,4 @@
+ 	$(RM) perl/Makefile
+ 
+ perl/Makefile:
+-	-(cd perl && $(PERL) Makefile.PL)
++	-(cd perl && $(PERL) Makefile.PL PREFIX=$(EPREFIX)/usr INSTALLDIRS=vendor INSTALLMAN3DIR='none' DESTDIR="$(DESTDIR)" )

diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.16-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.16-r1.ebuild
new file mode 100644
index 0000000..9b380de
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-3.2.16-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/linux-gpib-3.2.16-r1.ebuild,v 1.2 2011/11/30 01:18:46 dilfridge Exp $
+
+EAPI="4-slot-abi"
+PERL_EXPORT_PHASE_FUNCTIONS=no
+GENTOO_DEPEND_ON_PERL=no
+inherit base linux-mod autotools perl-module
+
+DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="http://linux-gpib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
+	firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pcmcia static debug guile perl php python tcl doc firmware"
+
+COMMONDEPEND="
+	tcl? ( dev-lang/tcl )
+	guile? ( dev-scheme/guile )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php )
+	python? ( dev-lang/python )
+	firmware? ( sys-apps/fxload )
+"
+RDEPEND="${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}
+	sys-kernel/module-rebuild
+	doc? ( app-text/docbook-sgml-utils )
+	perl? ( virtual/perl-ExtUtils-MakeMaker )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.15-build.patch"
+	"${FILESDIR}/${PN}-3.2.16-perl.patch"
+)
+
+pkg_setup () {
+	perl-module_pkg_setup
+	linux-mod_pkg_setup
+
+	if kernel_is -lt 2 6 8 ; then
+		die "Kernel versions older than 2.6.8 are not supported."
+	fi
+}
+
+src_prepare () {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	set_arch_to_kernel
+	econf \
+		$(use_enable pcmcia) \
+		$(use_enable static) \
+		$(use_enable debug driver-debug) \
+		$(use_enable guile guile-binding) \
+		$(use_enable perl perl-binding) \
+		$(use_enable php php-binding) \
+		$(use_enable python python-binding) \
+		$(use_enable tcl tcl-binding) \
+		$(use_enable doc documentation) \
+		--with-linux-srcdir=${KV_DIR}
+}
+
+src_compile() {
+	set_arch_to_kernel
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR=${D} \
+		INSTALL_MOD_PATH=${D} \
+		HOTPLUG_USB_CONF_DIR=${D}/etc/hotplug/usb \
+		USB_FIRMWARE_DIR=${D}${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html
+}
+
+src_install () {
+	set_arch_to_kernel
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR=${D} \
+		INSTALL_MOD_PATH=${D} \
+		HOTPLUG_USB_CONF_DIR=${D}/etc/hotplug/usb \
+		USB_FIRMWARE_DIR=${D}${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html install
+
+	if use perl; then
+		einfo "Installing perl module"
+		cd "${S}/language/perl" || die
+		DESTDIR=${D} perl-module_src_install
+		cd "${S}" || die
+	fi
+
+	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
+	insinto /etc/udev/rules.d/
+	doins 99-gpib.rules
+
+	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
+
+	insinto /etc
+	newins util/templates/gpib.conf gpib.conf
+	newins util/templates/gpib.conf gpib.conf.example
+
+	if use pcmcia ; then
+		dodir /etc/pcmcia
+		insinto /etc/pcmcia
+		doins "${S}"/etc/pcmcia/*
+	fi
+
+	if use firmware ; then
+		insinto "${FIRM_DIR}/agilent_8237a"
+		doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_8237a/*
+
+		insinto "${FIRM_DIR}/ni_gpib_usb_b"
+		doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/*
+
+		insinto "/usr/share/linux-gpib/hp_82341"
+		doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/*
+	fi
+}
+
+pkg_preinst () {
+	linux-mod_pkg_preinst
+	perl-module_pkg_preinst
+	enewgroup gpib
+}
+
+pkg_postinst () {
+	linux-mod_pkg_postinst
+	perl-module_pkg_postinst
+
+	einfo "You need to run the 'gpib_config' utility to setup the driver before"
+	einfo "you can use it. In order to do it automatically you can add to your"
+	einfo "start script something like this (supposing the appropriate driver"
+	einfo "is loaded on the startup):"
+	einfo "		gpib_config --minor 0"
+	einfo ""
+	einfo "To give a user access to the computer's gpib board you will have to add"
+	einfo "them to the group 'gpib' or, you could change the permissions on the device"
+	einfo "files /dev/gpib[0-15] to something you like better, using 'chmod'."
+	einfo ""
+	einfo "Edit /etc/gpib.conf to match your interface board, and any devices you wish"
+	einfo "to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for"
+	einfo "more information."
+	einfo ""
+
+	if use pcmcia ; then
+		einfo "For PCMCIA cards:"
+		einfo "All files needed for a PCMCIA board were copied to /etc/pcmcia."
+		einfo "You may wish to edit the options passed to the gpib_config call in the"
+		einfo "/etc/pcmcia/linux-gpib-pcmcia script."
+		einfo "You may need to send a SIGHUP signal to the cardmgr daemon to force it"
+		einfo "to reload the files in /etc/pcmcia (alternatively you could use your"
+		einfo "pcmcia init.d script to restart the cardmgr, or you could just reboot)."
+		einfo "The driver module will be loaded as needed by the cardmgr."
+		einfo ""
+	fi
+
+	if use firmware ; then
+		einfo "For Agilent (HP) 82341C and 82341D cards:"
+		einfo "The firmware for these boards is uploaded by passing the appropriate"
+		einfo "firmware file from /usr/share/linux-gpib/hp_82341 directory to"
+		einfo "gpib_config using the -I or --init-data command line option. Example:"
+		einfo "gpib_config --minor 0 --init-data \\"
+		einfo "/usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin"
+		einfo ""
+	fi
+
+}

diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
new file mode 100644
index 0000000..6a861ec
--- /dev/null
+++ b/sys-cluster/slurm/Manifest
@@ -0,0 +1,9 @@
+AUX logrotate 360 RMD160 80cd0bcd242413dc2e69dfca7ccd6698b02e82ae SHA1 eac0e307c40f7575060662d4d570d66f135e06fe SHA256 22a0e4bf21c9387f34245ec3cdd3a59512e377f6a0509451088b17e6c5201f89
+AUX slurm.confd 155 RMD160 73a90f9f7fa3fe02a77ac10fbb81c337fa3f2469 SHA1 937e5a3898b7102bac37ee8540c2b3105073d2f5 SHA256 bc1b32f7b3c4a2fb5d97ae227ff15d40da16c346c0eed33a7956ed780a1a0d96
+AUX slurmctld.initd 1952 RMD160 780eab8a019e1b3cf984e1a1bcb349d9ab04ec1f SHA1 b58efc209c5f0e62791863342aa878ce2dae1d09 SHA256 eda111fbbc9f6493d41e2942c6ca59e3e1a56034b32d4f1c2f14f127699e3a78
+AUX slurmd.initd 2109 RMD160 871a020158f99501d223f2799c24c57af495885e SHA1 e289687ff005b4abdb7cc4261f31117b91f1bfb3 SHA256 1083215224462facd69418fdb6188246911cfe5ca8241fa3af65a124759bf3d1
+AUX slurmdbd.initd 1830 RMD160 a7910486720458d8c24cdba297064100059bd972 SHA1 95d10303b0aa4a2796b36de7a4333c0100c7389d SHA256 f23e1d6fdfa935bc0830cc963cf25621c9255ef50871712742cc425ea3fb034c
+DIST slurm-2.3.4.tar.bz2 5082579 RMD160 5dbad2f6b2535366ee47fad0b6a192a4c38881d6 SHA1 198ef06298f6f46edad097a0b6e7be63cff61914 SHA256 2a221316077c4b70df42042d1c94bc552b38060fe2b775bf2827543eef63aeb4
+EBUILD slurm-2.3.4.ebuild 7561 RMD160 c71a3566e46466b160f3949a83780a6c6aa4e9db SHA1 76500cc5e5c369d80dbac2992c8a8772f4c9778a SHA256 be344a794d4b5c2f94135394255e3ee283e7f94c2b20d19723f4648f092ff258
+MISC ChangeLog 2157 RMD160 a801afd1bcd79199a3f8a7d91d3acbf478612574 SHA1 0ad4bfa4e04b60f3cc08540e80741d9b728c3e28 SHA256 8aaa24393326294f67f83657193b4882734b60119f810246974421cb068b62b4
+MISC metadata.xml 497 RMD160 c7cea24c46cbba00b9d9f6a5b227067941f44f59 SHA1 01cfa11a96fbbd63bdea8806b32693f12dd259da SHA256 3cff82ac54ff70daf04862ee4ef12c7684563244af8d4996b04937654b155c38

diff --git a/sys-cluster/slurm/files/logrotate b/sys-cluster/slurm/files/logrotate
new file mode 100644
index 0000000..978a869
--- /dev/null
+++ b/sys-cluster/slurm/files/logrotate
@@ -0,0 +1,20 @@
+/var/log/slurm/*.log {
+    weekly
+    compress
+    missingok
+    nocopytruncate
+    nocreate
+    nodelaycompress
+    nomail
+    notifempty
+    noolddir
+    rotate 5
+    sharedscripts
+    size=5M
+    create 640 slurm slurm
+    postrotate
+        /etc/init.d/slurmd reload
+        /etc/init.d/slurmctld reload
+        /etc/init.d/slurmdbd reload
+    endscript
+}

diff --git a/sys-cluster/slurm/files/slurm.confd b/sys-cluster/slurm/files/slurm.confd
new file mode 100644
index 0000000..c406dc3
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm.confd
@@ -0,0 +1,6 @@
+# /etc/conf.d/slurm: config file for /etc/init.d/slurm*
+SLURMCTLD_OPTIONS=""
+SLURMDBD_OPTIONS=""
+SLURMD_OPTIONS=""
+SLURM_USE_MUNGE="0"
+SLURM_USE_YPBIND="0"
\ No newline at end of file

diff --git a/sys-cluster/slurm/files/slurmctld.initd b/sys-cluster/slurm/files/slurmctld.initd
new file mode 100644
index 0000000..75cb21e
--- /dev/null
+++ b/sys-cluster/slurm/files/slurmctld.initd
@@ -0,0 +1,69 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/files/slurmctld.initd,v 1.3 2012/04/18 13:53:03 alexxy Exp $
+
+extra_commands="reload"
+
+[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm
+
+depend() {
+	local _need="net"
+	[[ ${SLURM_USE_MUNGE} -ne 0 ]] && _need="${_need} munged"
+	[[ ${SLURM_USE_YPBIND} -ne 0 ]] && _need="${_need} ypbind"
+	after logger slurmdbd
+	need ${_need}
+}
+
+create_folder_and_set_permission() {
+    folder=${1}
+    # Fix permissions (/tmp is wiped at boot)
+    if [[ "${folder}" == "/tmp" ]]; then
+        eerror "SLURM: folder == ${folder} == /tmp"
+        exit
+    fi
+    if [[ "${folder}" == "/var/tmp" ]]; then
+        eerror "SLURM: folder == ${folder} == /var/tmp"
+        exit
+    fi
+    checkpath -d -o slurm:slurm ${folder}
+}
+
+checkconfig() {
+	if [ ! -e "/etc/slurm/slurm.conf" ]; then
+		eerror "Missing config /etc/slurm/slurm.conf"
+		eerror "Customize sample one or generate new by configurator.html"
+		eerror "in slurm doc directory"
+		return 1
+	fi
+	
+	# Make sure folders exists
+	. /etc/slurm/slurm.conf
+	folders=(${SlurmdSpoolDir} `dirname ${SlurmctldLogFile}` `dirname ${SlurmctldPidFile}` `dirname ${SlurmdLogFile}` `dirname ${SlurmdPidFile}` ${SlurmdSpoolDir} ${StateSaveLocation})
+	for folder in ${folders[*]}; do
+		create_folder_and_set_permission ${folder}
+	done
+}
+
+start() {
+	ebegin "Starting slurm control daemon"
+	checkconfig
+	start-stop-daemon --start --quiet --background \
+		--pidfile /var/run/slurm/slurmctld.pid \
+		--user slurm \
+		--group slurm \
+		--exec /usr/sbin/slurmctld -- ${SLURMCTLD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping slurm control daemon"
+	start-stop-daemon --stop --pidfile /var/run/slurm/slurmctld.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading slurm daemon configuration"
+	start-stop-daemon --signal HUP --pidfile /var/run/slurm/slurmctld.pid
+	eend $?
+}

diff --git a/sys-cluster/slurm/files/slurmd.initd b/sys-cluster/slurm/files/slurmd.initd
new file mode 100644
index 0000000..a3ce9a9
--- /dev/null
+++ b/sys-cluster/slurm/files/slurmd.initd
@@ -0,0 +1,72 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/files/slurmd.initd,v 1.4 2012/04/18 13:53:03 alexxy Exp $
+
+extra_commands="reload"
+
+[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm
+
+depend() {
+	local _need="net"
+	[[ ${SLURM_USE_MUNGE} -ne 0 ]] && _need="${_need} munged"
+	[[ ${SLURM_USE_YPBIND} -ne 0 ]] && _need="${_need} ypbind"
+	after logger
+	need ${_need}
+}
+
+create_folder_and_set_permission() {
+    folder=${1}
+    # Fix permissions (/tmp is wiped at boot)
+    if [[ "${folder}" == "/tmp" ]]; then
+        eerror "SLURM: folder == ${folder} == /tmp"
+        exit
+    fi
+    if [[ "${folder}" == "/var/tmp" ]]; then
+        eerror "SLURM: folder == ${folder} == /var/tmp"
+        exit
+    fi
+    checkpath -d -o slurm:slurm ${folder}
+}
+
+checkconfig() {
+	if [ ! -e "/etc/slurm/slurm.conf" ]; then
+		eerror "Missing config /etc/slurm/slurm.conf"
+		eerror "Customize sample one or generate new by configurator.html"
+		eerror "in slurm doc directory"
+		return 1
+	fi
+	# Make sure folders exists
+	. /etc/slurm/slurm.conf
+	folders=(${SlurmdSpoolDir} `dirname ${SlurmctldLogFile}` `dirname ${SlurmctldPidFile}` `dirname ${SlurmdLogFile}` `dirname ${SlurmdPidFile}` ${SlurmdSpoolDir} ${StateSaveLocation})
+	for folder in ${folders[*]}; do
+		create_folder_and_set_permission ${folder}
+	done
+}
+
+start() {
+	ebegin "Starting slurm daemon"
+	checkconfig
+	# Slurm does not propagate limits, which can brakes InfiniBand
+	# See http://www.open-mpi.org/faq/?category=openfabrics
+	# and https://computing.llnl.gov/linux/slurm/faq.html#rlimit
+	ulimit -l unlimited
+	start-stop-daemon --start --quiet --background \
+		--pidfile /var/run/slurm/slurmd.pid \
+		--user root \
+		--group root \
+		--exec /usr/sbin/slurmd -- ${SLURMD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping slurm daemon"
+	start-stop-daemon --stop --pidfile /var/run/slurm/slurmd.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading slurm daemon configuration"
+	start-stop-daemon --signal HUP --pidfile /var/run/slurm/slurmd.pid
+	eend $?
+}

diff --git a/sys-cluster/slurm/files/slurmdbd.initd b/sys-cluster/slurm/files/slurmdbd.initd
new file mode 100644
index 0000000..9a012c7
--- /dev/null
+++ b/sys-cluster/slurm/files/slurmdbd.initd
@@ -0,0 +1,67 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/files/slurmdbd.initd,v 1.3 2012/04/18 13:53:03 alexxy Exp $
+
+extra_commands="reload"
+
+[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm
+
+depend() {
+	local _need="net"
+	[[ ${SLURM_USE_MUNGE} -ne 0 ]] && _need="${_need} munged"
+    [[ ${SLURM_USE_YPBIND} -ne 0 ]] && _need="${_need} ypbind"
+	after logger
+	need ${_need}
+}
+
+create_folder_and_set_permission() {
+    folder=${1}
+    # Fix permissions (/tmp is wiped at boot)
+    if [[ "${folder}" == "/tmp" ]]; then
+        eerror "SLURM: folder == ${folder} == /tmp"
+        exit
+    fi
+    if [[ "${folder}" == "/var/tmp" ]]; then
+        eerror "SLURM: folder == ${folder} == /var/tmp"
+        exit
+    fi
+    checkpath -d -o slurm:slurm ${folder}
+}
+
+checkconfig() {
+	if [ ! -e "/etc/slurm/slurmdbd.conf" ]; then
+		eerror "Missing config /etc/slurm/slurmdbd.conf"
+		return 1
+	fi
+
+	# Make sure folders exists
+	. /etc/slurm/slurm.conf
+	folders=(${SlurmdSpoolDir} `dirname ${SlurmctldLogFile}` `dirname ${SlurmctldPidFile}` `dirname ${SlurmdLogFile}` `dirname ${SlurmdPidFile}` ${SlurmdSpoolDir} ${StateSaveLocation})
+	for folder in ${folders[*]}; do
+		create_folder_and_set_permission ${folder}
+	done
+}
+
+start() {
+	ebegin "Starting slurmdb daemon"
+	checkconfig
+	start-stop-daemon --start --quiet --background \
+		--pidfile /var/run/slurm/slurmdbd.pid \
+		--user slurm \
+		--group slurm \
+		--exec /usr/sbin/slurmdbd -- ${SLURMD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping slurmdb daemon"
+	start-stop-daemon --stop --pidfile /var/run/slurm/slurmdbd.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading slurmdb daemon configuration"
+	start-stop-daemon --signal HUP --pidfile /var/run/slurm/slurmdbd.pid
+	eend $?
+}

diff --git a/sys-cluster/slurm/slurm-2.3.4.ebuild b/sys-cluster/slurm/slurm-2.3.4.ebuild
new file mode 100644
index 0000000..17ab318
--- /dev/null
+++ b/sys-cluster/slurm/slurm-2.3.4.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.3.4.ebuild,v 1.3 2012/05/09 07:37:21 zmedico Exp $
+
+EAPI="4-slot-abi"
+RESTRICT="primaryuri"
+
+inherit eutils versionator pam perl-module
+
+MY_PV=$(replace_version_separator 3 '-') # stable releases
+#MY_PV=$(replace_version_separator 3 '-0.') # pre-releases
+MY_P="${PN}-${MY_PV}"
+MY_branch="latest"
+#MY_branch="development"
+
+DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
+HOMEPAGE="https://computing.llnl.gov/linux/slurm/"
+SRC_URI="http://www.schedmd.com/download/${MY_branch}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="maui +munge mysql pam perl postgres ssl static-libs torque ypbind"
+
+DEPEND="
+	!sys-cluster/torque
+	!net-analyzer/slurm
+	mysql? ( dev-db/mysql )
+	munge? ( sys-auth/munge )
+	ypbind? ( net-nds/ypbind )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	ssl? ( dev-libs/openssl )
+	>=sys-apps/hwloc-1.1.1-r1"
+RDEPEND="${DEPEND}
+	maui? ( sys-cluster/maui[slurm] )"
+
+REQUIRED_USE="torque? ( perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
+
+pkg_setup() {
+	enewgroup slurm 500
+	enewuser slurm 500 -1 /var/spool/slurm slurm
+}
+
+src_prepare() {
+	# Gentoo uses /sys/fs/cgroup instead of /cgroup
+	# FIXME: Can the "^/cgroup" and "\([ =\"]\)/cgroup" patterns be merged?
+	sed \
+		-e 's|\([ =\"]\)/cgroup|\1/sys/fs/cgroup|g' \
+		-e "s|^/cgroup|/sys/fs/cgroup|g" \
+		-i "${S}/doc/man/man5/cgroup.conf.5" \
+		-i "${S}/etc/cgroup.release_common.example" \
+		-i "${S}/src/common/xcgroup_read_config.c" \
+			|| die "Can't sed /cgroup for /sys/fs/cgroup"
+	# and pids should go to /var/run/slurm
+	sed -e 's:/var/run/slurmctld.pid:/var/run/slurm/slurmctld.pid:g' \
+		-e 's:/var/run/slurmd.pid:/var/run/slurm/slurmd.pid:g' \
+		-i "${S}/etc/slurm.conf.example" \
+			|| die "Can't sed for /var/run/slurmctld.pid"
+	# also state dirs are in /var/spool/slurm
+	sed -e 's:StateSaveLocation=*.:StateSaveLocation=/var/spool/slurm:g' \
+		-e 's:SlurmdSpoolDir=*.:SlurmdSpoolDir=/var/spool/slurm/slurmd:g' \
+		-i "${S}/etc/slurm.conf.example" \
+			|| die "Can't sed ${S}/etc/slurm.conf.example for StateSaveLocation=*. or SlurmdSpoolDir=*"
+	# and tmp should go to /var/tmp/slurm
+	sed -e 's:/tmp:/var/tmp:g' \
+		-i "${S}/etc/slurm.conf.example" \
+			|| die "Can't sed for StateSaveLocation=*./tmp"
+}
+
+src_configure() {
+	local myconf=(
+			--sysconfdir="${EPREFIX}/etc/${PN}"
+			--with-hwloc="${EPREFIX}/usr"
+			--docdir="${EPREFIX}/usr/share/doc/${P}"
+			--htmldir="${EPREFIX}/usr/share/doc/${P}"
+			)
+	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
+	use mysql || myconf+=( --without-mysql_config )
+	use postgres || myconf+=( --without-pg_config )
+	econf "${myconf[@]}" \
+		$(use_enable pam) \
+		$(use_with ssl) \
+		$(use_with munge) \
+		$(use_enable static-libs static)
+
+	# --htmldir does not seems to propagate... Documentations are installed
+	# in /usr/share/doc/slurm-2.3.0/html
+	# instead of /usr/share/doc/slurm-2.3.0.2/html
+	sed -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" -i doc/html/Makefile || die
+	if use perl ; then
+		# small hack to make it compile
+		mkdir -p "${S}/src/api/.libs"
+		mkdir -p "${S}/src/db_api/.libs"
+		touch "${S}/src/api/.libs/libslurm.so"
+		touch "${S}/src/db_api/.libs/libslurmdb.so"
+		cd "${LIBSLURM_PERL_S}"
+		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${LIBSLURMDB_PERL_S}"
+		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${S}"
+		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs"
+	fi
+}
+
+src_compile() {
+	default
+	use pam && emake -C contribs/pam || die
+	if use perl ; then
+		cd "${LIBSLURM_PERL_S}"
+		S="${LIBSLURM_PERL_S}" perl-module_src_compile
+		cd "${LIBSLURMDB_PERL_S}"
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
+		cd "${S}"
+	fi
+	if use torque ; then
+		emake -C contribs/torque || die
+	fi
+}
+
+src_install() {
+	default
+	use pam && emake DESTDIR="${D}" -C contribs/pam install || die
+	if use perl; then
+		cd "${LIBSLURM_PERL_S}"
+		S="${LIBSLURM_PERL_S}" perl-module_src_install
+		cd "${LIBSLURMDB_PERL_S}"
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
+		cd "${S}"
+	fi
+	if use torque; then
+		emake DESTDIR="${D}" -C contribs/torque || die
+		rm -f "${ED}/usr/bin/mpiexec" || die
+	fi
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	# install sample configs
+	keepdir /etc/slurm
+	insinto /etc/slurm
+	doins etc/cgroup.conf.example
+	doins etc/federation.conf.example
+	doins etc/slurm.conf.example
+	doins etc/slurmdbd.conf.example
+	exeinto /etc/slurm
+	doexe etc/cgroup.release_common.example
+	doexe etc/slurm.epilog.clean
+	# install init.d files
+	newinitd "${FILESDIR}/slurmd.initd" slurmd
+	newinitd "${FILESDIR}/slurmctld.initd" slurmctld
+	newinitd "${FILESDIR}/slurmdbd.initd" slurmdbd
+	# install conf.d files
+	newconfd "${FILESDIR}/slurm.confd" slurm
+	# Install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" slurm || die
+	# cgroups support
+	exeinto /etc/slurm/cgroup
+	doexe etc/cgroup.release_common.example
+	mv "${D}"/etc/slurm/cgroup/cgroup.release_common.example "${D}"/etc/slurm/cgroup/release_common || die "Can't move cgroup.release_common.example"
+	ln -s release_common "${D}"/etc/slurm/cgroup/release_cpuset  || die "Can't create symbolic link release_cpuset"
+	ln -s release_common "${D}"/etc/slurm/cgroup/release_devices || die "Can't create symbolic link release_devices"
+	ln -s release_common "${D}"/etc/slurm/cgroup/release_freezer || die "Can't create symbolic link release_freezer"
+}
+
+pkg_preinst() {
+	if use munge; then
+		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/slurm || die
+	fi
+	if use ypbind; then
+		sed -i 's,\(SLURM_USE_YPBIND=\).*,\11,' "${D}"etc/conf.d/slurm || die
+	fi
+}
+
+create_folders_and_fix_permissions() {
+	einfo "Fixing permissions in ${@}"
+	mkdir -p ${@}
+	chown -R ${PN}:${PN} ${@}
+}
+
+pkg_postinst() {
+	paths=(
+		/var/${PN}/checkpoint
+		/var/${PN}
+		/var/spool/${PN}/slurmd
+		/var/spool/${PN}
+		/var/run/${PN}
+		/var/log/${PN}
+		/var/tmp/${PN}/${PN}d
+		/var/tmp/${PN}
+		)
+	for folder_path in ${paths[@]}; do
+		create_folders_and_fix_permissions $folder_path
+	done
+	einfo
+
+	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
+	elog "through a (javascript enabled) browser to create a configureation file."
+	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
+	einfo
+	elog "For cgroup support, please see http://www.schedmd.com/slurmdocs/cgroup.conf.html"
+	elog "Your kernel must be compiled with the wanted cgroup feature:"
+	elog "    General setup  --->"
+	elog "        [*] Control Group support  --->"
+	elog "            [*]   Freezer cgroup subsystem"
+	elog "            [*]   Device controller for cgroups"
+	elog "            [*]   Cpuset support"
+	elog "            [*]   Simple CPU accounting cgroup subsystem"
+	elog "            [*]   Resource counters"
+	elog "            [*]     Memory Resource Controller for Control Groups"
+	elog "            [*]   Group CPU scheduler  --->"
+	elog "                [*]   Group scheduling for SCHED_OTHER"
+	elog "Then, set these options in /etc/slurm/slurm.conf:"
+	elog "    ProctrackType=proctrack/cgroup"
+	elog "    TaskPlugin=task/cgroup"
+	einfo
+	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
+	for folder_path in ${paths[@]}; do
+		ewarn "    ${folder_path}"
+	done
+}

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d70d2cb..dffccf3 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -21,8 +21,8 @@ DIST xorg-server-1.12.2.tar.bz2 5431841 RMD160 47530836ebe44e8823848fb87ef979c7d
 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.12.2.ebuild 6888 RMD160 840e616244a258a1b98e65136fa00d25b6541c50 SHA1 d263edddb221134b8105bc970cd34c9bfb0621f4 SHA256 9f52d1da7153ef5d1e732c784d7f85954948302e80bc0fb6187450ad66e098b1
 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 32248 RMD160 268f66d1c3af9a00a63f10056a909c6e7b9635f1 SHA1 db8b5823217289520051a2832a265a03bf87479d SHA256 6e722860dea78f50a9ef98048cf1b6c09c9c962e66916a0a93c60d99937e15ec
 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/xorg-server-1.12.2.ebuild b/x11-base/xorg-server/xorg-server-1.12.2.ebuild
index d5469ca..a468554 100644
--- a/x11-base/xorg-server/xorg-server-1.12.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.4 2012/06/24 18:58:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.6 2012/06/28 21:06:51 maekke Exp $
 
 EAPI="4-slot-abi"
 
@@ -9,9 +9,8 @@ inherit flag-o-matic xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 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"
 

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 294abea..6a1cc1a 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -11,9 +11,9 @@ DIST cairo-1.8-lcd_filter.patch.bz2 7067 RMD160 5c2ee470022788df88425da24cebea3b
 DIST cairo-1.8.10.tar.gz 7102657 RMD160 9538baf30f812b950beeb93893f46d1223fb44ce SHA1 fd5e8ca82ff0e8542ea4c51612cad387f2a49df3 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
 EBUILD cairo-1.10.2-r1.ebuild 4143 RMD160 e14e0fa96909873d630bd6604a504ce5155dd3be SHA1 d675a228e3f150d950c201a4a5c5f706f7d02d36 SHA256 f52c24bf2a3867ff449452e893e06d813ef2a80ced505b61b297f2afcd780e1d
 EBUILD cairo-1.10.2-r2.ebuild 4256 RMD160 1d014cc6ae1071d5060cee93615ea252cac283d3 SHA1 5992e8b9e536ac36dd5cfd835e1b63f81373d994 SHA256 022eb87121821ae601434fdb4483cd28fea03b1dbdc60a89bfb80943ccb9a420
-EBUILD cairo-1.12.0.ebuild 3711 RMD160 11f61ff8f71f12d068aa3ba1660ef8c45b350b8d SHA1 12ff057f246caddb30b996115b1b4551ec9b278d SHA256 aa1fa0efd8b34307f1dfb585a54d8d1f2a09be48314a51259a7b809a2566ba41
-EBUILD cairo-1.12.2.ebuild 3711 RMD160 f09acdc1753f173f93ce0bf41b42a62a3cf59551 SHA1 d96babd38bb8f3cb094daeaba4114feb3cab1e49 SHA256 26bb63b3f5070e9ef662a923e236fee002049d81596a2a41b7ad5b07b3ff4b62
+EBUILD cairo-1.12.0.ebuild 3714 RMD160 80ed48ad2474f3e0257e093fe9ce4fb08c0e3239 SHA1 ab4b6ef8e2c2b19b86992633c0b09d116c1ccbff SHA256 38fc1af8f7e5f4f76bcacc333fbfafb46dc0863830b8b20cc3c33213f62fe610
+EBUILD cairo-1.12.2.ebuild 3714 RMD160 a24d53f12e2990cb7954385a668c0a55deaa166d SHA1 d04dd0810efc7c0d527fefbd17f280e2d1015c4d SHA256 c6118adfa58ae1223123c5823d72ac16c5be969990db5582d128b28fc8f8a5af
 EBUILD cairo-1.8.10.ebuild 3440 RMD160 129eb98b9532feeb37472f14b643ce9cf4ea6c0f SHA1 06ef09cfb0e83931eb453e1ce59cc34e25883721 SHA256 41ef25a612af32eb6e7654e3f669f0f4030942bd84eb2db4da38278cb564794f
-EBUILD cairo-9999.ebuild 3641 RMD160 af1b19fb31085ded3c6c58d0828052248608df47 SHA1 8a947790f2543f5a6c78e38f74dfe9b9aada7d2e SHA256 7a53446d8accb1f053a10ecbf4aa8d291801510561ac572da74063d75ae90d4a
+EBUILD cairo-9999.ebuild 3653 RMD160 b3ab189487596fe2347a2301a2b66c1619dae56b SHA1 9e42c0c645b5cf5c9c2c7754d455cec3cbb81efa SHA256 66925c450ce94ff9e45e3fcd2ba3c4a25afec4cb399e6bbbe9effa5cda49e367
 MISC ChangeLog 42046 RMD160 ced037e26296241bb94015c0d435231cb024b617 SHA1 61de5bf527343bac086bd77b44787efda0ea7aa6 SHA256 1dbc68e031569bca2f5601cfbb159c3b4e2966d662ec8009ed996cee8f6e2e6a
 MISC metadata.xml 906 RMD160 0d5e3683121af2714405b458c8e8ab9ebffabbc0 SHA1 1825ccbb326c9d4f322e2f85de6430b95f90973f SHA256 1bb2bb12ba48c4dd28c601ff9bbee63faff51d44ebee86a32268cd7f6dac3776

diff --git a/x11-libs/cairo/cairo-1.12.0.ebuild b/x11-libs/cairo/cairo-1.12.0.ebuild
index b4032d3..c2bab1f 100644
--- a/x11-libs/cairo/cairo-1.12.0.ebuild
+++ b/x11-libs/cairo/cairo-1.12.0.ebuild
@@ -23,7 +23,7 @@ RESTRICT="test"
 
 RDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	sys-libs/zlib
 	>=x11-libs/pixman-0.18.4
 	directfb? ( dev-libs/DirectFB )
@@ -44,7 +44,7 @@ RDEPEND="media-libs/fontconfig
 	)
 	xcb? (
 		x11-libs/libxcb
-		x11-libs/xcb-util
+		x11-libs/xcb-util:=
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig

diff --git a/x11-libs/cairo/cairo-1.12.2.ebuild b/x11-libs/cairo/cairo-1.12.2.ebuild
index 7c617bc..e7c9f61 100644
--- a/x11-libs/cairo/cairo-1.12.2.ebuild
+++ b/x11-libs/cairo/cairo-1.12.2.ebuild
@@ -23,7 +23,7 @@ RESTRICT="test"
 
 RDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	sys-libs/zlib
 	>=x11-libs/pixman-0.18.4
 	directfb? ( dev-libs/DirectFB )
@@ -44,7 +44,7 @@ RDEPEND="media-libs/fontconfig
 	)
 	xcb? (
 		x11-libs/libxcb
-		x11-libs/xcb-util
+		x11-libs/xcb-util:=
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig

diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 950ec36..da4909c 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -2,7 +2,7 @@
 # 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
+EAPI=4-slot-abi
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
 [[ ${PV} == *9999 ]] && GIT_ECLASS="git-2"
@@ -23,7 +23,7 @@ RESTRICT="test"
 
 RDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	sys-libs/zlib
 	>=x11-libs/pixman-0.18.4
 	directfb? ( dev-libs/DirectFB )
@@ -44,7 +44,7 @@ RDEPEND="media-libs/fontconfig
 	)
 	xcb? (
 		x11-libs/libxcb
-		x11-libs/xcb-util
+		x11-libs/xcb-util:=
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig

diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 55b2644..69cb081 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,6 +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
+EBUILD libXmu-1.1.1.ebuild 836 RMD160 bc8e876a32588eaaa3d9150e2d49d09b33c04110 SHA1 b380a5d3952b96bc1840e650e68fc770048ab44b SHA256 9ee95fb9139e78fa0a43e15e1b79401b2018ae9d3e1c8790d34171f2e398ba58
+MISC ChangeLog 8349 RMD160 96e85520e42531a333c4235140379b8fbcbe1285 SHA1 eaf816eaa4cfed5c1ea39f6dc125c17c56180a56 SHA256 fbd187709dd0945566428109345be5ca52ab5a8ac6636ec7ae59fea375ee9597
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-libs/libXmu/libXmu-1.1.1.ebuild b/x11-libs/libXmu/libXmu-1.1.1.ebuild
index d31535f..0b148c3 100644
--- a/x11-libs/libXmu/libXmu-1.1.1.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.1.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/x11-libs/libXmu/libXmu-1.1.1.ebuild,v 1.4 2012/06/24 19:25:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXmu/libXmu-1.1.1.ebuild,v 1.5 2012/06/28 15:03:18 jer Exp $
 
 EAPI="4-slot-abi"
 
@@ -9,7 +9,7 @@ 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"
+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

diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 36d4754..8a80d6c 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -6,7 +6,7 @@ DIST libxcb-1.8.1.tar.bz2 375955 RMD160 19496c65b1e86d469a2fda6ea5037b4cadc4d681
 DIST libxcb-1.8.tar.bz2 372730 RMD160 f6adad4fdd1773e604df5e7b556107c7fa620321 SHA1 18b76759d5bbb863777f37bf3aec23ebaa31d5be SHA256 25c3600bec104c5aa6e9f559bfe0011b0e223bde726b849b58f758c2d4e6fc5e
 EBUILD libxcb-1.7.ebuild 1142 RMD160 fe501de9411ca172467ecc657b0d19ae13182e0f SHA1 35e5b3c19cbb48b3598d16f0f47da519a1c2e7c2 SHA256 5e46fd915c0dac79d0fd6c55737d34edd815b8da0b485d68eadf6a62b66ff9a0
 EBUILD libxcb-1.8-r1.ebuild 1144 RMD160 5674a45f1430f11a89221e77d094e79819f49a4a SHA1 a5d2a0ea5db5eb5e6cf1e26876f27fadd6fcc1f4 SHA256 53737bacc9df341b1dc84fd601755228436af2266bcde4cb71ae745da9503529
-EBUILD libxcb-1.8.1.ebuild 1048 RMD160 b83a0628edaa19cbe40a3fa708e3b5d2244569d1 SHA1 87c737d2e662bdef486b635de6dda9a97aece3e3 SHA256 ca924726eece4c70f1d75587828f6a3454783f783d214302de920d5203b18dc3
+EBUILD libxcb-1.8.1.ebuild 1046 RMD160 0453ccedbf952595cdb54474f9ed495cfa535aed SHA1 06da5121f7d27be5562f4a1357affe12e0502751 SHA256 3995ebe4bd507d8192c91523f7cb6896dac3c2e136d79af503247240f55fadae
 EBUILD libxcb-1.8.ebuild 1084 RMD160 0e34980de3ebd10ab1a1f1fd7efefda372199d9d SHA1 e06d695ea1c54a5c3b07f02e349bae7a50f02838 SHA256 926fb75f2953005a98e6fc9dff5da1b79aa1738c1abe0eaad2c0138e784ad4bf
-MISC ChangeLog 10807 RMD160 22bc181b40c44a6e366c95aa692806cc760c5148 SHA1 8c8f5921d6d77983b2ee308b702a15d8ea23f883 SHA256 61e1cd1bb3850a1fb14fc133be3795b47ddfdb1871a5bfbd767269ba29968fd0
+MISC ChangeLog 11005 RMD160 5478251807cec64df6b897d1c730a8a1509a0c05 SHA1 e4a301ff25c699c8451b7e48e0377307fb0ec110 SHA256 c1a452dc8fb7fb7f0ea699a8b18d9d45706bb39ebd984ca085ec754b52624016
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-libs/libxcb/libxcb-1.8.1.ebuild b/x11-libs/libxcb/libxcb-1.8.1.ebuild
index 9b7ed72..38350c8 100644
--- a/x11-libs/libxcb/libxcb-1.8.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.8.1.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/x11-libs/libxcb/libxcb-1.8.1.ebuild,v 1.5 2012/06/24 19:33:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.8.1.ebuild,v 1.7 2012/06/28 14:15:52 jer Exp $
 
 EAPI="4-slot-abi"
 
@@ -13,7 +13,7 @@ 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 ~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"
+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="selinux"
 
 RDEPEND="dev-libs/libpthread-stubs

diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index 5e833a6..a395416 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -3,6 +3,6 @@ DIST xcb-util-0.3.8.tar.bz2 266339 RMD160 d3d37bc6612a3e32e26f9f8c966d156730970e
 DIST xcb-util-0.3.9.tar.bz2 287855 RMD160 949b2d8666914185b106c2d0bafb4c625cd450c6 SHA1 02060d8e2e70838fc41cd3a27c7f2909090d8c20 SHA256 c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4
 EBUILD xcb-util-0.3.6.ebuild 1150 RMD160 14bdd6d130289d12a398a02019feea8f4f0e90b7 SHA1 edf3d20c3ce7f89214f3665a8a7a2a3e704ec985 SHA256 50c131db802b64dc5d34d869a4d9d14f44161613afa7d3c82a35ff7c2c75590d
 EBUILD xcb-util-0.3.8.ebuild 1125 RMD160 f75531540e1ef5c76f49b8d6ea456405d36e61fa SHA1 bb85a3d61fa0fabd899a10ec76e32605a234d977 SHA256 1c020a95180b68f9d48e553b08a2da6b2a159271e2809c363e269c0f606247cd
-EBUILD xcb-util-0.3.9.ebuild 1129 RMD160 098f9a460706f625ad42719d7d8c44faaef72838 SHA1 27eb8a0e8883a3ad2a6e4f83b6bd7d372a55f9ee SHA256 48f20e061d628e1aabe9a6d021ac97232d766d1f259b87d558ed7210e206a221
-MISC ChangeLog 7774 RMD160 b358ef5ca0fa301110350afb12da5aa8535a9a9d SHA1 3eeac17e6d9b6d6027f056579ee4a07137f1c027 SHA256 c3eb18fcc043dd090e0614c3c15948a85ab8d516bb49241118c2fa9e5a4f243a
+EBUILD xcb-util-0.3.9.ebuild 1127 RMD160 89c6b2545b1152437536c57ea7c903c2dcf41920 SHA1 d21475cc858178ab5b6d1147b4e2945623586a74 SHA256 dc006e79a05a4813459f47d4ec353994545e8e295642027ac8e5adc90651eeff
+MISC ChangeLog 7878 RMD160 94186e94c5cd5018c88e6a0af23d095b7c258032 SHA1 6ba6f06b431df40c6107e55d9fd611021e633b3b SHA256 536bc69ffb4170355ceb8ed3309299eeb14a5c4cb1ec5555a4575c663cf7240a
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-libs/xcb-util/xcb-util-0.3.9.ebuild b/x11-libs/xcb-util/xcb-util-0.3.9.ebuild
index 45616d9..bd269fc 100644
--- a/x11-libs/xcb-util/xcb-util-0.3.9.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.3.9.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/x11-libs/xcb-util/xcb-util-0.3.9.ebuild,v 1.3 2012/06/24 19:35:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/xcb-util-0.3.9.ebuild,v 1.4 2012/06/28 15:15:16 jer Exp $
 
 EAPI="4-slot-abi"
 
@@ -14,9 +14,8 @@ EGIT_HAS_SUBMODULES=yes
 
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 SLOT="0/1.0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~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.7