diff --git a/app-cdr/liblightscribe/Manifest b/app-cdr/liblightscribe/Manifest
index 894f82e1..48146cab 100644
--- a/app-cdr/liblightscribe/Manifest
+++ b/app-cdr/liblightscribe/Manifest
@@ -4,7 +4,9 @@ RMD160 9c63f02504848d22ceccf37d261315682d6847da files/80liblightscribe 30
 SHA256 ec396642c57e39565e5bcf8bbec587789a3c40450a241e366b417f2f17b4c9e8 files/80liblightscribe 30
 DIST lightscribe-1.4.113.1-linux-2.6-intel.rpm 481410 RMD160 b4b60e81700f30a9aee4bdb31d17f76c594a0ddc SHA1 79855e36bff6ceb15eb5558ce0f358045182c5ac SHA256 af3d4620bb15a2026e243ccb915481688c6636b85cbeaf6a9b275a2ad4fbce56
 DIST lightscribe-1.4.142.1-linux-2.6-intel.rpm 497525 RMD160 e803fe21d79ef9478a6b7fab01718b44b77f5617 SHA1 8fa4d951e7af8dee2e983f03191d8d73dcb052a5 SHA256 7924c646e5d03989ca39c958d0cff5d2a0b2d8b6db86a9d81f504f7780cb9572
+DIST lightscribe-1.8.15.1-linux-2.6-intel.rpm 598634 RMD160 a939f050d709cdd3a0b3d6457d5cd69248a0f01e SHA1 85080159e380a405c9c3c52b00daf89b24c7f928 SHA256 9bbfd65766131884b859128907d21ca887156dd9d0834c25dc388a7eadb4f4f6
 DIST lightscribePublicSDK-1.4.142.1-linux-2.6-intel.rpm 619747 RMD160 8d92f0da78effe85d3c896780208522151fda930 SHA1 c652fcfb33472322b9e008108736b2bd2bb91ad4 SHA256 56f63b4e26bf566cd1b352970c074c0a1853b49a358fa7488fad13456eea3217
+DIST lightscribePublicSDK-1.8.15.1-linux-2.6-intel.rpm 619750 RMD160 03797dc087679c72ee6c062d6d26ba026ac7f63b SHA1 d75a348fe65c1313da671a2f36fc1df9a070c260 SHA256 115477bf2c7ba5179ecd2532b67f36cfe111580b63fb67622dc5cc7aebe18467
 EBUILD liblightscribe-1.4.113.1.ebuild 982 RMD160 b24085ebe128b6e38d74ca6bf035df775faf2944 SHA1 5a4385592feb1bf87ff24aad0403964068c93859 SHA256 b840ced3434888c07e8f57e901062ecbbd0d1cca9bd70126275b2cb2a64cf7f4
 MD5 aca96f3ba9acc84defc5cf1a2c47c31a liblightscribe-1.4.113.1.ebuild 982
 RMD160 b24085ebe128b6e38d74ca6bf035df775faf2944 liblightscribe-1.4.113.1.ebuild 982
@@ -13,6 +15,10 @@ EBUILD liblightscribe-1.4.142.1.ebuild 1182 RMD160 ae236e91f1f419bf34d3f7676c65e
 MD5 0b588165b7bd302ade2abfb56a763e78 liblightscribe-1.4.142.1.ebuild 1182
 RMD160 ae236e91f1f419bf34d3f7676c65e99f7240a9f5 liblightscribe-1.4.142.1.ebuild 1182
 SHA256 1277fa9db322dca4f226470872fce618acbb287c04d2d56012b4de066e2d2290 liblightscribe-1.4.142.1.ebuild 1182
+EBUILD liblightscribe-1.8.15.1.ebuild 1294 RMD160 04bb79e35b95b58deb867b2692f4c3c9c5146e5d SHA1 8426e6366a511d8e9134970f54d9fb3a5d0364ea SHA256 8acbdfc74c7165dca1f4487836e8ef655e19f155f8a4dd0225d713697dc8cadd
+MD5 4f625375bedfa4855bd7fd389f9485a0 liblightscribe-1.8.15.1.ebuild 1294
+RMD160 04bb79e35b95b58deb867b2692f4c3c9c5146e5d liblightscribe-1.8.15.1.ebuild 1294
+SHA256 8acbdfc74c7165dca1f4487836e8ef655e19f155f8a4dd0225d713697dc8cadd liblightscribe-1.8.15.1.ebuild 1294
 MISC ChangeLog 283 RMD160 e84cd36b5348fca00cf31f61737ef8084f0f501d SHA1 c2a9462a436798b0a2b4af1a114893faadaeeaaf SHA256 3f17a096256217535bc8e5d34b3980167514dc376482be28322203eab15c5ad1
 MD5 f72b084f8c082e969ccc294e8b654ec2 ChangeLog 283
 RMD160 e84cd36b5348fca00cf31f61737ef8084f0f501d ChangeLog 283
@@ -23,3 +29,6 @@ SHA256 186e0175c3a18bec56dec204701b72bc46e448dbc84a9bcd3cf65aacd11b5a5d files/di
 MD5 01bc59696fedbc860fa99aa130a793c3 files/digest-liblightscribe-1.4.142.1 635
 RMD160 ab3d19485df236b17f3910a98bc3a706733593a5 files/digest-liblightscribe-1.4.142.1 635
 SHA256 c83ea202f4fd36a4819cbec2c81db0e9fb637732d2858af49f129d03d8179ccd files/digest-liblightscribe-1.4.142.1 635
+MD5 e03563bcfb90793cb8b20339cd2d9eb8 files/digest-liblightscribe-1.8.15.1 629
+RMD160 84c17930f1205e2cc5253d75fdad5c9b71affd5b files/digest-liblightscribe-1.8.15.1 629
+SHA256 f0bf64d4d0ce2b2a14943cdd9a4d7bf4b3958a87c3a45d95cbee766784a39713 files/digest-liblightscribe-1.8.15.1 629
diff --git a/app-cdr/liblightscribe/files/digest-liblightscribe-1.8.15.1 b/app-cdr/liblightscribe/files/digest-liblightscribe-1.8.15.1
new file mode 100644
index 00000000..b7151f58
--- /dev/null
+++ b/app-cdr/liblightscribe/files/digest-liblightscribe-1.8.15.1
@@ -0,0 +1,6 @@
+MD5 8db900f25a35a74f193a3acc8b60ea97 lightscribe-1.8.15.1-linux-2.6-intel.rpm 598634
+RMD160 a939f050d709cdd3a0b3d6457d5cd69248a0f01e lightscribe-1.8.15.1-linux-2.6-intel.rpm 598634
+SHA256 9bbfd65766131884b859128907d21ca887156dd9d0834c25dc388a7eadb4f4f6 lightscribe-1.8.15.1-linux-2.6-intel.rpm 598634
+MD5 6962cfbbec1ef2f5e7d2c2ddd613bbd5 lightscribePublicSDK-1.8.15.1-linux-2.6-intel.rpm 619750
+RMD160 03797dc087679c72ee6c062d6d26ba026ac7f63b lightscribePublicSDK-1.8.15.1-linux-2.6-intel.rpm 619750
+SHA256 115477bf2c7ba5179ecd2532b67f36cfe111580b63fb67622dc5cc7aebe18467 lightscribePublicSDK-1.8.15.1-linux-2.6-intel.rpm 619750
diff --git a/app-cdr/liblightscribe/liblightscribe-1.8.15.1.ebuild b/app-cdr/liblightscribe/liblightscribe-1.8.15.1.ebuild
new file mode 100644
index 00000000..728c310e
--- /dev/null
+++ b/app-cdr/liblightscribe/liblightscribe-1.8.15.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils rpm multilib
+
+DESCRIPTION="Binary only Library for LightScribe"
+HOMEPAGE="http://www.lightscribe.com/"
+SRC_URI="http://download.lightscribe.com/ls/lightscribe-${PV}-linux-2.6-intel.rpm
+	http://download.lightscribe.com/ls/lightscribePublicSDK-${PV}-linux-2.6-intel.rpm"
+
+LICENSE="HP-LightScribe"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="multilib"
+
+DEPEND=""
+
+RDEPEND="virtual/libc
+	sys-libs/libstdc++-v3"
+
+RESTRICT="mirror strip fetch"
+
+src_unpack() {
+	rpm_src_unpack
+}
+
+src_compile() { :; }
+
+src_install() {
+	has_multilib_profile && ABI="x86"
+	
+	insinto /opt/liblightscribe/$(get_libdir)/lightscribe
+	doins -r ${WORKDIR}/usr/lib/lightscribe/*
+	into /opt/liblightscribe
+	dolib.so ${WORKDIR}/usr/$(get_libdir)/liblightscribe.so.*
+	dosym liblightscribe.so.1 /opt/liblightscribe/$(get_libdir)/liblightscribe.so
+	insinto /usr/include/liblightsribe
+	doins -r ${WORKDIR}/usr/include/*
+	insinto /etc
+	doins -r ${WORKDIR}/etc/*
+	dosed "s%/usr/lib%/opt/liblightscribe/lib%" /etc/lightscribe.rc
+	dodoc ${WORKDIR}/usr/share/doc/*
+	dodoc ${WORKDIR}/usr/share/doc/lightscribe-sdk/*
+	dodoc ${WORKDIR}/usr/share/doc/lightscribe-sdk/docs/*
+	doenvd ${FILESDIR}/80liblightscribe
+}
\ No newline at end of file
diff --git a/dev-embedded/cc65/ChangeLog b/dev-embedded/cc65/ChangeLog
new file mode 100644
index 00000000..1eea8436
--- /dev/null
+++ b/dev-embedded/cc65/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for dev-embedded/cc65
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  30 Jul 2007; Mario Fetka <mario-fetka@gmx.at>
+  +cc65-2.11.9.20070704.ebuild:
+  Update cc65 to latest snapshot
+
diff --git a/dev-embedded/cc65/Manifest b/dev-embedded/cc65/Manifest
index 9ebeca3f..409e7ebe 100644
--- a/dev-embedded/cc65/Manifest
+++ b/dev-embedded/cc65/Manifest
@@ -1,8 +1,20 @@
 DIST cc65-snapshot-sources-2.11.9.20070329.tar.bz2 1020942 RMD160 ccbf10ad16dd5951ddea9caa0fd7762f7f4fabfd SHA1 a80b2b6d941487373270470f3adec855699cb10d SHA256 71ebec814b7866f0746bdc8c3c2a7ab1b3ce4d7ebc21888deb004f225b2bbe81
+DIST cc65-snapshot-sources-2.11.9.20070704.tar.bz2 1045275 RMD160 d23c31f44531981ecfc4a18af9c9b380f668367d SHA1 7b1aa7cc0478c63b66ecc34ce88cb08b4aaecc81 SHA256 4eab7cdc9c2573912a5a1ebae5364b83f592d974adda074c85d92fa75141c492
 EBUILD cc65-2.11.9.20070329.ebuild 1687 RMD160 054ff6ab1a3d22908a959c0064fbfe1496cf9705 SHA1 2ed56bc25d7f7fec154ef22a204986535a1024ae SHA256 c78158da4a0b69bf72cadfd0cd49d3b0f5495876543d1daee772dbade1483a13
 MD5 81d8577975533a69a7ceb1f258d1aa55 cc65-2.11.9.20070329.ebuild 1687
 RMD160 054ff6ab1a3d22908a959c0064fbfe1496cf9705 cc65-2.11.9.20070329.ebuild 1687
 SHA256 c78158da4a0b69bf72cadfd0cd49d3b0f5495876543d1daee772dbade1483a13 cc65-2.11.9.20070329.ebuild 1687
+EBUILD cc65-2.11.9.20070704.ebuild 1687 RMD160 99a6915c7b730064f3fd79c363dbaf2346538b77 SHA1 137acd6fe7565bbbff6d295552a9b76621403e1b SHA256 4f9da7b7fb0a4a4dac217d50cfcd28e8dcba12e75eb6c12665afa338cfbc0a07
+MD5 4867f87a7cda1933e85284c662e19d7c cc65-2.11.9.20070704.ebuild 1687
+RMD160 99a6915c7b730064f3fd79c363dbaf2346538b77 cc65-2.11.9.20070704.ebuild 1687
+SHA256 4f9da7b7fb0a4a4dac217d50cfcd28e8dcba12e75eb6c12665afa338cfbc0a07 cc65-2.11.9.20070704.ebuild 1687
+MISC ChangeLog 232 RMD160 76b83fc5910761a7ce2525b3f4f9c984552fa41f SHA1 828f9546849c836ebf61ea0c88ce7a1a8fa3d703 SHA256 e5732256363e1fbc66a25ef7902aea2fdad70135291b42113b15783e75f3f3fe
+MD5 f8de446c6c549b1d53b99fc1c1f6dcda ChangeLog 232
+RMD160 76b83fc5910761a7ce2525b3f4f9c984552fa41f ChangeLog 232
+SHA256 e5732256363e1fbc66a25ef7902aea2fdad70135291b42113b15783e75f3f3fe ChangeLog 232
 MD5 17a3b6e33944f58b38e2c2fe80544756 files/digest-cc65-2.11.9.20070329 319
 RMD160 1af84ce5fa19e5921c126e4989c62f76d852ede5 files/digest-cc65-2.11.9.20070329 319
 SHA256 a4a240acef5520e56827128de12bd342a5bb7e0b654534a639656911b49e2913 files/digest-cc65-2.11.9.20070329 319
+MD5 be4e83d89aaca6fe5b70dc77b18d3718 files/digest-cc65-2.11.9.20070704 319
+RMD160 1fd4c638d621367c2ac6219322c3cb8b21943275 files/digest-cc65-2.11.9.20070704 319
+SHA256 1ae196b75a2bbd0bc51992530d4c0b2d60f063eceadc65bd23078eb57fcc0c14 files/digest-cc65-2.11.9.20070704 319
diff --git a/dev-embedded/cc65/cc65-2.11.9.20070704.ebuild b/dev-embedded/cc65/cc65-2.11.9.20070704.ebuild
new file mode 100644
index 00000000..ea86dd05
--- /dev/null
+++ b/dev-embedded/cc65/cc65-2.11.9.20070704.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="cc65 is a complete cross development package for 65(C)02 systems."
+HOMEPAGE="http://www.cc65.org"
+SRC_URI="ftp://ftp.musoftware.de/pub/uz/cc65/snapshot/cc65-snapshot-sources-${PV}.tar.bz2"
+
+LICENSE="GPL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+DEPEND="dev-libs/boehm-gc
+	app-text/linuxdoc-tools"
+
+S=${WORKDIR}/${PN}-snapshot-${PV}
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e "s:od65:od65 sim65:g" src/make/gcc.mak
+	sed -i -e "s:)/lib:)/$(get_libdir):g" make/gcc.mak
+	sed -i -e "s:/lib/cc65/inc:/$(get_libdir)/cc65/inc:g" src/cc65/make/gcc.mak
+	sed -i -e "s:/lib/cc65/lib:/$(get_libdir)/cc65/lib:g" src/ld65/make/gcc.mak
+	sed -i -e "s:/lib/cc65/lib:/$(get_libdir)/cc65/lib:g" doc/ld65.sgml
+}
+
+src_compile() {
+	emake -C src -f make/gcc.mak
+	emake -C libsrc
+	emake -C doc
+}
+
+src_install() {
+	dobin src/*65/*65
+	dobin src/ca65html/ca65html
+	dobin src/grc/grc
+	insinto /usr/$(get_libdir)/cc65/emd
+	doins libsrc/*.emd
+	insinto /usr/$(get_libdir)/cc65/joy
+	doins libsrc/*.joy
+	insinto /usr/$(get_libdir)/cc65/mou
+	doins libsrc/*.mou
+	insinto /usr/$(get_libdir)/cc65/ser
+	doins libsrc/*.ser
+	insinto /usr/$(get_libdir)/cc65/tgi
+	doins libsrc/*.tgi
+	insinto /usr/$(get_libdir)/cc65/asminc
+	doins asminc/*.inc
+	insinto /usr/$(get_libdir)/cc65/include
+	doins -r include/*
+	insinto /usr/$(get_libdir)/cc65/lib
+	doins libsrc/*.lib
+	doins libsrc/*.o
+	use doc && dohtml doc/*.htm*
+	doman packages/debian/*.1
+	doinfo doc/*.info
+	dodoc src/ld65/cfg/*.cfg
+	dodoc src/ca65/macpack/*.mac
+}
diff --git a/dev-embedded/cc65/files/digest-cc65-2.11.9.20070704 b/dev-embedded/cc65/files/digest-cc65-2.11.9.20070704
new file mode 100644
index 00000000..66c9e152
--- /dev/null
+++ b/dev-embedded/cc65/files/digest-cc65-2.11.9.20070704
@@ -0,0 +1,3 @@
+MD5 08be0f4ea0328eafb2cda72490871993 cc65-snapshot-sources-2.11.9.20070704.tar.bz2 1045275
+RMD160 d23c31f44531981ecfc4a18af9c9b380f668367d cc65-snapshot-sources-2.11.9.20070704.tar.bz2 1045275
+SHA256 4eab7cdc9c2573912a5a1ebae5364b83f592d974adda074c85d92fa75141c492 cc65-snapshot-sources-2.11.9.20070704.tar.bz2 1045275
diff --git a/dev-libs/mozldap/Manifest b/dev-libs/mozldap/Manifest
new file mode 100644
index 00000000..495e1008
--- /dev/null
+++ b/dev-libs/mozldap/Manifest
@@ -0,0 +1,12 @@
+AUX mozldap-6.0.4-pkgconfig.patch 714 RMD160 e0380bc0d6af49924c9e599f3ce8e1512ae8105f SHA1 d427f59df496bf5eff0aa5b33918a19142bce22c SHA256 d93fc59fa49f825484d8456288d6d98aaaccf4ee729ca27f0887a9ba6d812a10
+MD5 ac5146836b8b1d824aed7514312c9872 files/mozldap-6.0.4-pkgconfig.patch 714
+RMD160 e0380bc0d6af49924c9e599f3ce8e1512ae8105f files/mozldap-6.0.4-pkgconfig.patch 714
+SHA256 d93fc59fa49f825484d8456288d6d98aaaccf4ee729ca27f0887a9ba6d812a10 files/mozldap-6.0.4-pkgconfig.patch 714
+DIST mozldap-6.0.4.tar.gz 706636 RMD160 55c0dc58c0fd199aef3c986478237e96d0f1c389 SHA1 516d00f052aa9315de6506a51e12400d1707c6db SHA256 0f3710e5c69160f411b7e3622cef420378f51c2aec38e87a4f0ff47028b060db
+EBUILD mozldap-6.0.4.ebuild 3088 RMD160 dbb5cabf53dc05c586cde047ff2c5269026fa7b4 SHA1 43869f61f9752f6e55f29884adbb2a01603251a5 SHA256 6028fccf27696770a2fe96bda278485591c3555fe96396ab974bb5ecb74e759b
+MD5 e3a94ba75f16052abdd80463ff164005 mozldap-6.0.4.ebuild 3088
+RMD160 dbb5cabf53dc05c586cde047ff2c5269026fa7b4 mozldap-6.0.4.ebuild 3088
+SHA256 6028fccf27696770a2fe96bda278485591c3555fe96396ab974bb5ecb74e759b mozldap-6.0.4.ebuild 3088
+MD5 359083adcc58b99c3b2d18ce1a46ecdc files/digest-mozldap-6.0.4 241
+RMD160 7aa1c47c47f8dcf606222a1a0eb57667d5c4f1b7 files/digest-mozldap-6.0.4 241
+SHA256 50d3334d916996d5b499a13698e332de230b28bbe4366bf216a88abadbfbe841 files/digest-mozldap-6.0.4 241
diff --git a/dev-libs/mozldap/files/digest-mozldap-6.0.4 b/dev-libs/mozldap/files/digest-mozldap-6.0.4
new file mode 100644
index 00000000..c5f9ca50
--- /dev/null
+++ b/dev-libs/mozldap/files/digest-mozldap-6.0.4
@@ -0,0 +1,3 @@
+MD5 f08dcb93dc64ae1c661d91125cd7ec3b mozldap-6.0.4.tar.gz 706636
+RMD160 55c0dc58c0fd199aef3c986478237e96d0f1c389 mozldap-6.0.4.tar.gz 706636
+SHA256 0f3710e5c69160f411b7e3622cef420378f51c2aec38e87a4f0ff47028b060db mozldap-6.0.4.tar.gz 706636
diff --git a/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch b/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch
new file mode 100644
index 00000000..7aa8b86e
--- /dev/null
+++ b/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch
@@ -0,0 +1,12 @@
+diff -uNr mozldap-6.0.4.orig/mozilla/directory/c-sdk/mozldap.pc.in mozldap-6.0.4/mozilla/directory/c-sdk/mozldap.pc.in
+--- mozldap-6.0.4.orig/mozilla/directory/c-sdk/mozldap.pc.in	2006-10-06 01:01:43.000000000 +0200
++++ mozldap-6.0.4/mozilla/directory/c-sdk/mozldap.pc.in	2007-08-06 21:27:09.000000000 +0200
+@@ -11,6 +11,6 @@
+ Name: mozldap
+ Description: Mozilla LDAP C SDK
+ Version: %MOZLDAP_VERSION%
+-Requires: nspr >= %NSPR_VERSION% , nss >= %NSS_VERSION%
+-Libs: -lssldap%libsuffix% -lprldap%libsuffix% -lldap%libsuffix%
++Requires: nspr >= %NSPR_VERSION% , nss >= %NSS_VERSION% , svrcore >= %SVRCORE_VERSION%
++Libs: -L${libdir} -lssldap%libsuffix% -lprldap%libsuffix% -lldap%libsuffix%
+ Cflags: -I${includedir}
diff --git a/dev-libs/mozldap/mozldap-6.0.4.ebuild b/dev-libs/mozldap/mozldap-6.0.4.ebuild
new file mode 100644
index 00000000..9b1df2ca
--- /dev/null
+++ b/dev-libs/mozldap/mozldap-6.0.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils multilib versionator
+
+DESCRIPTION="Mozilla LDAP C SDK"
+HOMEPAGE="http://wiki.mozilla.org/LDAP_C_SDK"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64  ~x86"
+IUSE="ipv6 debug sasl"
+
+DEPEND=">=dev-libs/nss-3.11.4
+	>=dev-libs/nspr-4.0.1
+	>=dev-libs/svrcore-4.0.0"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-pkgconfig.patch
+}
+
+src_compile() {
+	cd mozilla/directory/c-sdk
+
+	if use amd64 ; then
+		myconf="${myconf} --enable-64bit"
+	else
+		myconf=""
+	fi
+
+	if use ipv6; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	myconf="${myconf} --libdir=/usr/$(get_libdir)/mozldap"
+
+	econf $(use_enable debug) $(use_with sasl) \
+		--with-svrcore-inc=/usr/include/svrcore \
+		--with-svrcore-lib=/usr/$(get_libdir)/svrcore \
+		--enable-clu \
+	        --enable-optimize \
+		${myconf} || die "econf failed"
+	make || die
+}
+
+src_install () {
+	# Their build system is royally fucked, as usual
+	cd ${S}/mozilla/directory/c-sdk
+	sed -e "s,%libdir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
+    	    -e "s,%prefix%,/usr,g" \
+	    -e "s,%major%,$(get_major_version ${PV}),g" \
+	    -e "s,%minor%,$(get_version_component_range 2 ${PV}),g" \
+	    -e "s,%submin%,$(get_version_component_range 3 ${PV}),g" \
+	    -e "s,%libsuffix%,$(get_major_version ${PV})$(get_version_component_range 2 ${PV}),g" \
+	    -e "s,%bindir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
+	    -e "s,%exec_prefix%,\$\{prefix\},g" \
+	    -e "s,%includedir%,\$\{exec_prefix\}/include/${PN},g" \
+	    -e "s,%NSPR_VERSION%,$(pkg-config --modversion nspr),g" \
+	    -e "s,%NSS_VERSION%,$(pkg-config --modversion nss),g" \
+	    -e "s,%SVRCORE_VERSION%,$(pkg-config --modversion svrcore),g" \
+	    -e "s,%MOZLDAP_VERSION%,${PV},g" \
+	    ${PN}.pc.in > ${PN}.pc
+	make install
+	rm -rf ${S}/mozilla/dist/bin/lib*.so
+	rm -rf ${S}/mozilla/dist/public/ldap-private
+
+	exeinto /usr/$(get_libdir)/mozldap
+	doexe ${S}/mozilla/dist/lib/*so*
+	doexe ${S}/mozilla/dist/lib/*.a
+	doexe ${S}/mozilla/dist/bin/*
+	# move the headers around
+	insinto /usr/include/mozldap
+	doins ${S}/mozilla/dist/public/ldap/*.h
+	# add sample config
+	insinto /usr/share/mozldap
+	doins ${S}/mozilla/dist/etc/*.conf
+	#and while at it move them to files with versions-ending
+	#and link them back :)
+	cd ${D}/usr/$(get_libdir)/mozldap
+	for file in *.so; do
+		mv ${file} ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV})
+		ln -s ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) ${file}
+		ln -s ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) ${file}.$(get_major_version ${PV})
+	done
+	# cope with libraries being in /usr/lib/mozldap
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/mozldap" > ${D}/etc/env.d/08mozldap
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins ${S}/mozilla/directory/c-sdk/mozldap.pc
+}
diff --git a/dev-libs/svrcore/Manifest b/dev-libs/svrcore/Manifest
new file mode 100644
index 00000000..425aea1e
--- /dev/null
+++ b/dev-libs/svrcore/Manifest
@@ -0,0 +1,12 @@
+AUX svrcore-4.0.4-gentoo.patch 1101 RMD160 b321740e051844fa0b6d8f471a5cffae9e0bbec1 SHA1 b370fc287d1032266c6e62e6a16b337ffea6aec9 SHA256 c73c8f353df752a9124e816601b8b32216c200ce39630b8e4783362a6c4fa3c6
+MD5 a5004351e824f9cf362bc7f14803a1dd files/svrcore-4.0.4-gentoo.patch 1101
+RMD160 b321740e051844fa0b6d8f471a5cffae9e0bbec1 files/svrcore-4.0.4-gentoo.patch 1101
+SHA256 c73c8f353df752a9124e816601b8b32216c200ce39630b8e4783362a6c4fa3c6 files/svrcore-4.0.4-gentoo.patch 1101
+DIST svrcore-4.0.4.tar.bz2 217076 RMD160 d3d6e7bfad7aa3c8f0e51b270e13b7b514f29bcd SHA1 cfd07bbffeab10c4edca331b980a3f614dac996e SHA256 4772fb4705492de11f10d3e020f0ceca2541415c009ae5444988d6becca36a58
+EBUILD svrcore-4.0.4.ebuild 970 RMD160 c1ddf1fe2b717986f3b603367bb28443dc0b0483 SHA1 59afab1ae2b072aa84b3b06bcc50d2955a4d27d0 SHA256 99a481d41ec321d44651737e83aa567923b7c822117deb6b701bb3a08cfbca29
+MD5 0c4cacba3b245d59d1648554b1eb40c0 svrcore-4.0.4.ebuild 970
+RMD160 c1ddf1fe2b717986f3b603367bb28443dc0b0483 svrcore-4.0.4.ebuild 970
+SHA256 99a481d41ec321d44651737e83aa567923b7c822117deb6b701bb3a08cfbca29 svrcore-4.0.4.ebuild 970
+MD5 493997b0e0502539f2ed1881f4e0d1a0 files/digest-svrcore-4.0.4 244
+RMD160 bf33d47ce6ae032af92ceb99ba3a23aa352af3d2 files/digest-svrcore-4.0.4 244
+SHA256 00e494c7b98566cff6f94105f5d375c53b175b0f9bd6cb7e30b740b1846a94f9 files/digest-svrcore-4.0.4 244
diff --git a/dev-libs/svrcore/files/digest-svrcore-4.0.4 b/dev-libs/svrcore/files/digest-svrcore-4.0.4
new file mode 100644
index 00000000..f2a5b314
--- /dev/null
+++ b/dev-libs/svrcore/files/digest-svrcore-4.0.4
@@ -0,0 +1,3 @@
+MD5 46bcdc82624d11c1bb168cf9f15e066c svrcore-4.0.4.tar.bz2 217076
+RMD160 d3d6e7bfad7aa3c8f0e51b270e13b7b514f29bcd svrcore-4.0.4.tar.bz2 217076
+SHA256 4772fb4705492de11f10d3e020f0ceca2541415c009ae5444988d6becca36a58 svrcore-4.0.4.tar.bz2 217076
diff --git a/dev-libs/svrcore/files/svrcore-4.0.4-gentoo.patch b/dev-libs/svrcore/files/svrcore-4.0.4-gentoo.patch
new file mode 100644
index 00000000..9dad2ea3
--- /dev/null
+++ b/dev-libs/svrcore/files/svrcore-4.0.4-gentoo.patch
@@ -0,0 +1,32 @@
+diff -uNr svrcore-4.0.4.orig/src/Makefile.am svrcore-4.0.4/src/Makefile.am
+--- svrcore-4.0.4.orig/src/Makefile.am	2006-12-14 18:07:32.000000000 +0100
++++ svrcore-4.0.4/src/Makefile.am	2007-08-06 17:37:17.000000000 +0200
+@@ -4,8 +4,8 @@
+ 	     Makefile.win \
+ 	     ntgetpin.rc
+ 
+-lib_LTLIBRARIES = libsvrcore.la
+-include_HEADERS = svrcore.h
++pkglib_LTLIBRARIES = libsvrcore.la
++pkginclude_HEADERS = svrcore.h
+ libsvrcore_la_SOURCES =	alt.c \
+ 		      	cache.c \
+ 		      	errors.c \
+diff -uNr svrcore-4.0.4.orig/svrcore.pc.in svrcore-4.0.4/svrcore.pc.in
+--- svrcore-4.0.4.orig/svrcore.pc.in	2006-12-14 18:07:32.000000000 +0100
++++ svrcore-4.0.4/svrcore.pc.in	2007-08-06 17:38:12.000000000 +0200
+@@ -1,11 +1,11 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=@libdir@/@PACKAGE@
++includedir=@includedir@/@PACKAGE@
+ 
+ Name: svrcore
+ Description: Svrcore - Secure PIN handling using NSS crypto
+ Version: @VERSION@
+ Requires: @NSPR_NAME@ >= @NSPR_MIN_VER@ , @NSS_NAME@ >= @NSS_MIN_VER@
+-Libs: -lsvrcore
++Libs: -L${libdir} -lsvrcore
+ Cflags: -I${includedir}
diff --git a/dev-libs/svrcore/svrcore-4.0.4.ebuild b/dev-libs/svrcore/svrcore-4.0.4.ebuild
new file mode 100644
index 00000000..b37e78b7
--- /dev/null
+++ b/dev-libs/svrcore/svrcore-4.0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils multilib autotools
+
+DESCRIPTION="Mozilla LDAP C SDK"
+HOMEPAGE="http://wiki.mozilla.org/LDAP_C_SDK"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/${PV}/src/${P}.tar.bz2"
+
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 debug"
+
+DEPEND=">=dev-libs/nss-3.11
+	>=dev-libs/nspr-4.6"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	cd ${S}
+	eautoreconf
+}
+
+src_compile() {
+	if use amd64 ; then
+		myconf="${myconf} --enable-64bit"
+	else
+		myconf=""
+	fi
+
+	econf $(use_enable debug) ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR=${D} install || die "emake failed"
+	
+	# cope with libraries being in /usr/lib/svrcore
+        dodir /etc/env.d
+        echo "LDPATH=/usr/$(get_libdir)/svrcore" > ${D}/etc/env.d/08svrcore
+
+}
diff --git a/dev-perl/perl-mozldap/Manifest b/dev-perl/perl-mozldap/Manifest
new file mode 100644
index 00000000..27a8fdc5
--- /dev/null
+++ b/dev-perl/perl-mozldap/Manifest
@@ -0,0 +1,8 @@
+DIST perl-mozldap-1.5.2.tar.gz 109175 RMD160 18afac710f48cc4199242a2bddcab6fbd849e8ce SHA1 fb0caac00555c882d82626c1297123ed7f789776 SHA256 fdfc02b0c0be704980e93f12aa5ed2c13c7bae5a50e68ba446c06a7adee9991b
+EBUILD perl-mozldap-1.5.2.ebuild 734 RMD160 0b1309fe81c0c0cb9fb9fbbc7f61a038087436ba SHA1 a98919e34ce27e7e66fe47d4a5ca50b844c7d1ca SHA256 0d3f61c56c91664d0bbcde3d551592ead78f6d1d8c9629090c60f67302e6817d
+MD5 1914297a66aa677c167662ecf71169c3 perl-mozldap-1.5.2.ebuild 734
+RMD160 0b1309fe81c0c0cb9fb9fbbc7f61a038087436ba perl-mozldap-1.5.2.ebuild 734
+SHA256 0d3f61c56c91664d0bbcde3d551592ead78f6d1d8c9629090c60f67302e6817d perl-mozldap-1.5.2.ebuild 734
+MD5 e202333d898c35e6b465a97024b9c6c9 files/digest-perl-mozldap-1.5.2 256
+RMD160 1582dea7531f21d6d329b80fd4487d403552c77a files/digest-perl-mozldap-1.5.2 256
+SHA256 d8e9a3d4466d76c0c4208b884da980f3f3837821df981668c8517386dec4b415 files/digest-perl-mozldap-1.5.2 256
diff --git a/dev-perl/perl-mozldap/files/digest-perl-mozldap-1.5.2 b/dev-perl/perl-mozldap/files/digest-perl-mozldap-1.5.2
new file mode 100644
index 00000000..80e15f7b
--- /dev/null
+++ b/dev-perl/perl-mozldap/files/digest-perl-mozldap-1.5.2
@@ -0,0 +1,3 @@
+MD5 1f7af40a8ca42f4a8b805942129915e0 perl-mozldap-1.5.2.tar.gz 109175
+RMD160 18afac710f48cc4199242a2bddcab6fbd849e8ce perl-mozldap-1.5.2.tar.gz 109175
+SHA256 fdfc02b0c0be704980e93f12aa5ed2c13c7bae5a50e68ba446c06a7adee9991b perl-mozldap-1.5.2.tar.gz 109175
diff --git a/dev-perl/perl-mozldap/perl-mozldap-1.5.2.ebuild b/dev-perl/perl-mozldap/perl-mozldap-1.5.2.ebuild
new file mode 100644
index 00000000..489e0cca
--- /dev/null
+++ b/dev-perl/perl-mozldap/perl-mozldap-1.5.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit perl-module
+
+DESCRIPTION=" Mozilla PerLDAP"
+HOMEPAGE="http://www.mozilla.org/directory/perldap.html"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/${PV}/src/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-libs/nspr-4.0.1
+	>=dev-libs/nss-3.11.6
+	>=dev-libs/mozldap-6.0.1
+	dev-lang/perl"
+
+src_compile() {
+	LDAPPKGNAME=mozldap perl Makefile.PL.rpm DESTDIR=${D} INSTALLDIRS=vendor
+	perl-module_src_test
+}