diff --git a/app-crypt/hashcat-bin/Manifest b/app-crypt/hashcat-bin/Manifest
new file mode 100644
index 000000000000..be9038cc5eb2
--- /dev/null
+++ b/app-crypt/hashcat-bin/Manifest
@@ -0,0 +1 @@
+DIST hashcat-0.39.7z 716387 RMD160 d5c8983c5938e273d055772a1ae59970e5109beb SHA1 baf0d3660cfc241c635f772eef1682980744521d SHA256 9d86cb175030de5b5872077028456f944c18e94749fc79cb63fb2f74106bed4e
diff --git a/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild b/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild
new file mode 100644
index 000000000000..d61fb35bb452
--- /dev/null
+++ b/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild,v 1.2 2012/07/02 01:19:04 zerochaos Exp $
+
+EAPI=4
+
+MY_P="hashcat-${PV}"
+
+inherit eutils pax-utils
+DESCRIPTION="An multi-threaded multihash cracker"
+HOMEPAGE="http://hashcat.net/hashcat/"
+
+SRC_URI="http://hashcat.net/files/${MY_P}.7z"
+
+#license applies to this version per http://hashcat.net/forum/thread-1348.html
+LICENSE="hashcat"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ app-arch/p7zip"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="strip"
+QA_PREBUILT="hashcat-cli*.bin"
+
+src_install() {
+ dodoc docs/*
+ rm -rf *.exe docs
+ use x86 && rm hashcat-cli64.bin
+ use amd64 && rm hashcat-cli32.bin
+
+ #I assume this is needed but I didn't check
+ pax-mark m hashcat-cli*.bin
+
+ insinto /opt/${PN}
+ doins -r "${S}"/*
+
+ dodir /usr/bin
+ if [ -f "${ED}"/opt/${PN}/hashcat-cli32.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cli32.bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/hashcat-cli32.bin
+ echo 'cd /opt/hashcat-bin' >> "${ED}"/usr/bin/hashcat-cli32.bin
+ echo 'echo "Warning: hashcat-cli32.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/hashcat-cli32.bin
+ echo './hashcat-cli32.bin $@' >> "${ED}"/usr/bin/hashcat-cli32.bin
+ fperms +x /usr/bin/hashcat-cli32.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cli64.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cli64.bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/hashcat-cli64.bin
+ echo 'cd /opt/hashcat-bin' >> "${ED}"/usr/bin/hashcat-cli64.bin
+ echo 'echo "Warning: hashcat-cli64.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/hashcat-cli64.bin
+ echo './hashcat-cli64.bin $@' >> "${ED}"/usr/bin/hashcat-cli64.bin
+ fperms +x /usr/bin/hashcat-cli64.bin
+ fi
+}
diff --git a/games-util/nforenum/metadata.xml b/app-crypt/hashcat-bin/metadata.xml
similarity index 56%
rename from games-util/nforenum/metadata.xml
rename to app-crypt/hashcat-bin/metadata.xml
index d3c2cc926f0b..88e9eb110229 100644
--- a/games-util/nforenum/metadata.xml
+++ b/app-crypt/hashcat-bin/metadata.xml
@@ -1,5 +1,10 @@
-games
+crypto
+
+zerochaos@gentoo.org
+Rick Farina
+
+
diff --git a/app-crypt/hashcat-gui/Manifest b/app-crypt/hashcat-gui/Manifest
new file mode 100644
index 000000000000..9576eeb6c8ef
--- /dev/null
+++ b/app-crypt/hashcat-gui/Manifest
@@ -0,0 +1 @@
+DIST hashcat-gui-0.5.1.zip 130106 RMD160 d91a57592dbfd95e7dc5f81c9c54c7e1765d2f5e SHA1 907d21a4844a515b9c23285570de4ef25e9009de SHA256 d8294724ce6ea5980ba98f43e44be6dd706c0bffc56128d2cd0db3c71aedd0d3
diff --git a/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild b/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild
new file mode 100644
index 000000000000..5ee715c080b5
--- /dev/null
+++ b/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild,v 1.1 2012/07/02 02:12:24 zerochaos Exp $
+
+EAPI=4
+
+inherit eutils qt4-r2
+
+DESCRIPTION="A gui for the *hashcat* suite of tools"
+HOMEPAGE="https://github.com/scandium/hashcat-gui"
+#HOMEPAGE="http://hashcat.net/hashcat-gui/"
+
+SRC_URI="https://github.com/scandium/hashcat-gui/zipball/b6b01be723742ad89ba31fdb2c30b35306318f8b -> ${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="app-crypt/hashcat-bin
+ app-crypt/oclhashcat-plus-bin
+ app-crypt/oclhashcat-lite-bin
+ x11-libs/qt-gui
+ x11-libs/qt-core"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/scandium-hashcat-gui-b6b01be
+
+src_prepare() {
+ sed -i 's#./hashcat#/opt/hashcat-bin#g' src/mainwindow.cpp
+ sed -i 's#./oclHashcat-plus#/opt/oclhashcat-plus-bin#g' src/mainwindow.cpp
+ sed -i 's#./oclHashcat-lite#/opt/oclhashcat-lite-bin#g' src/mainwindow.cpp
+}
+
+src_install() {
+ dodoc ChangeLog FAQ INSTALL README TODO
+
+ cd src
+ eqmake4 -config release
+ emake
+
+ dobin hashcat-gui
+}
diff --git a/app-crypt/hashcat-gui/metadata.xml b/app-crypt/hashcat-gui/metadata.xml
new file mode 100644
index 000000000000..88e9eb110229
--- /dev/null
+++ b/app-crypt/hashcat-gui/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+crypto
+
+zerochaos@gentoo.org
+Rick Farina
+
+
+
diff --git a/app-crypt/oclhashcat-lite-bin/Manifest b/app-crypt/oclhashcat-lite-bin/Manifest
new file mode 100644
index 000000000000..e7eb372f7c66
--- /dev/null
+++ b/app-crypt/oclhashcat-lite-bin/Manifest
@@ -0,0 +1 @@
+DIST oclHashcat-lite-0.10.7z 2478892 RMD160 bb4354b4bd03aa2d0dc686b649d64431fd5f109e SHA1 94aefe2091e6b9422f7ee77d0db8ef814b9d42ce SHA256 4d4d668981c249e4a7dff139f0952794300ac1d6dac6b9cd355a90928af98b78
diff --git a/app-crypt/oclhashcat-lite-bin/metadata.xml b/app-crypt/oclhashcat-lite-bin/metadata.xml
new file mode 100644
index 000000000000..88e9eb110229
--- /dev/null
+++ b/app-crypt/oclhashcat-lite-bin/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+crypto
+
+zerochaos@gentoo.org
+Rick Farina
+
+
+
diff --git a/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild b/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild
new file mode 100644
index 000000000000..dbfcbc0ffe87
--- /dev/null
+++ b/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild,v 1.1 2012/07/02 01:25:52 zerochaos Exp $
+
+EAPI=4
+
+inherit eutils pax-utils
+
+DESCRIPTION="An opencl hash cracker"
+HOMEPAGE="http://hashcat.net/oclhashcat-lite/"
+MY_P="oclHashcat-lite-${PV}"
+SRC_URI="http://hashcat.net/files/${MY_P}.7z"
+
+#license applies to this version per http://hashcat.net/forum/thread-1348.html
+LICENSE="hashcat"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_fglrx
+ video_cards_nvidia"
+
+IUSE="${IUSE_VIDEO_CARDS}"
+
+RDEPEND="sys-libs/zlib
+ video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.40 )
+ video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.4 )"
+DEPEND="${RDEPEND}
+ app-arch/p7zip"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="strip"
+QA_PREBUILT="*Hashcat-lite*.bin"
+
+src_install() {
+ dodoc docs/*
+ rm -rf *.exe docs
+ if use x86; then
+ rm oclHashcat-lite64.bin
+ rm cudaHashcat-lite64.bin
+ fi
+ if use amd64; then
+ rm oclHashcat-lite32.bin
+ rm cudaHashcat-lite32.bin
+ fi
+ if ! use video_cards_fglrx; then
+ rm -rf kernels/4098
+ rm -f oclHashcat-lite*.bin
+ fi
+ if ! use video_cards_nvidia; then
+ rm -rf kernels/4318
+ rm -f cudaHashcat-lite*.bin
+ fi
+
+ #I assume this is needed but I didn't check
+ pax-mark m *Hashcat-lite*.bin
+
+ insinto /opt/${PN}
+ doins -r "${S}"/*
+
+ dodir /usr/bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/oclhashcat-lite
+ echo 'echo "oclHashcat-lite and all related files have been installed in /opt/oclhashcat-lite-bin"' >> "${ED}"/usr/bin/oclhashcat-lite
+ echo 'echo "Please run one of the following binaries to use gpu accelerated hashcat:"' >> "${ED}"/usr/bin/oclhashcat-lite
+ if [ -f "${ED}"/opt/${PN}/oclHashcat-lite64.bin ]
+ then
+ echo 'echo "64 bit ATI accelerated \"oclHashcat-lite64.bin\""' >> "${ED}"/usr/bin/oclhashcat-lite
+ fperms +x /opt/${PN}/oclHashcat-lite64.bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/oclHashcat-lite64.bin
+ echo 'cd /opt/oclhashcat-lite-bin' >> "${ED}"/usr/bin/oclHashcat-lite64.bin
+ echo 'echo "Warning: oclHashcat-lite64.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/oclHashcat-lite64.bin
+ echo './oclHashcat-lite64.bin $@' >> "${ED}"/usr/bin/oclHashcat-lite64.bin
+ fperms +x /usr/bin/oclHashcat-lite64.bin
+
+ fi
+ if [ -f "${ED}"/opt/${PN}/oclHashcat-lite32.bin ]
+ then
+ echo 'echo "32 bit ATI accelerated \"oclHashcat-lite32.bin\""' >> "${ED}"/usr/bin/oclhashcat-lite
+ fperms +x /opt/${PN}/oclHashcat-lite32.bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/oclHashcat-lite32.bin
+ echo 'cd /opt/oclhashcat-lite-bin' >> "${ED}"/usr/bin/oclHashcat-lite32.bin
+ echo 'echo "Warning: oclHashcat-lite32.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/oclHashcat-lite32.bin
+ echo './oclHashcat-lite32.bin $@' >> "${ED}"/usr/bin/oclHashcat-lite32.bin
+ fperms +x /usr/bin/oclHashcat-lite32.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/cudaHashcat-lite64.bin ]
+ then
+ echo 'echo "64 bit NVIDIA accelerated \"cudaHashcat-lite64.bin\""' >> "${ED}"/usr/bin/oclhashcat-lite
+ fperms +x /opt/${PN}/cudaHashcat-lite64.bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/cudaHashcat-lite64.bin
+ echo 'cd /opt/oclhashcat-lite-bin' >> "${ED}"/usr/bin/cudaHashcat-lite64.bin
+ echo 'echo "Warning: cudaHashcat-lite64.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/cudaHashcat-lite64.bin
+ echo './cudaHashcat-lite64.bin $@' >> "${ED}"/usr/bin/cudaHashcat-lite64.bin
+ fperms +x /usr/bin/cudaHashcat-lite64.bin
+
+ fi
+ if [ -f "${ED}"/opt/${PN}/cudaHashcat-lite32.bin ]
+ then
+ echo 'echo 32 bit NVIDIA accelerated \"cudaHashcat-lite32.bin\""' >> "${ED}"/usr/bin/oclhashcat-lite
+ fperms +x /opt/${PN}/cudaHashcat-lite32.bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/cudaHashcat-lite32.bin
+ echo 'cd /opt/oclhashcat-lite-bin' >> "${ED}"/usr/bin/cudaHashcat-lite32.bin
+ echo 'echo "Warning: cudaHashcat-lite32.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/cudaHashcat-lite32.bin
+ echo './cudaHashcat-lite32.bin $@' >> "${ED}"/usr/bin/cudaHashcat-lite32.bin
+ fperms +x /usr/bin/oclHashcat-lite32.bin
+ fi
+ fperms +x /usr/bin/oclhashcat-lite
+ fowners root:video /opt/${PN}
+ einfo "oclhashcat-lite can be run as user if you are in the video group"
+}
diff --git a/app-crypt/oclhashcat-plus-bin/Manifest b/app-crypt/oclhashcat-plus-bin/Manifest
new file mode 100644
index 000000000000..e496cc968c34
--- /dev/null
+++ b/app-crypt/oclhashcat-plus-bin/Manifest
@@ -0,0 +1,2 @@
+DIST oclHashcat-plus-0.081-32.7z 2896 RMD160 29096952f9d4c296e3b9c65a3dedcb7aad618274 SHA1 8031b111d5ffd70a092f0a0b6dc9deb1889e8998 SHA256 e0e892edb4c4853dcb2e8c7e4763b58d966d03d2fa76a1294cde61049f736e71
+DIST oclHashcat-plus-0.081-64.7z 22259753 RMD160 4acbece6a1911e84ca7df2edfbd2f5ab7e61a027 SHA1 2fc8a56e2182e9835d9184da2ce82b16f8fc320f SHA256 5390a8a3c6b8887536e936c918ca2cfeba6b971e4cd9a57dca36a3cfa5e83684
diff --git a/app-crypt/oclhashcat-plus-bin/metadata.xml b/app-crypt/oclhashcat-plus-bin/metadata.xml
new file mode 100644
index 000000000000..88e9eb110229
--- /dev/null
+++ b/app-crypt/oclhashcat-plus-bin/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+crypto
+
+zerochaos@gentoo.org
+Rick Farina
+
+
+
diff --git a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild
new file mode 100644
index 000000000000..e1c742bc184e
--- /dev/null
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild,v 1.1 2012/07/02 01:52:04 zerochaos Exp $
+
+EAPI=4
+
+inherit eutils pax-utils
+
+DESCRIPTION="An opencl multihash cracker"
+HOMEPAGE="http://hashcat.net/oclhashcat-plus/"
+
+MY_P="oclHashcat-plus-${PV}"
+SRC_URI="amd64? ( http://hashcat.net/files/${MY_P}-64.7z ) \
+ x86? ( http://hashcat.net/files/${MY_P}-32.7z )"
+
+LICENSE="hashcat"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_fglrx
+ video_cards_nvidia"
+
+IUSE="${IUSE_VIDEO_CARDS}"
+
+RDEPEND="sys-libs/zlib
+ video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.40 )
+ video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.4 )"
+DEPEND="${RDEPEND}
+ app-arch/p7zip"
+
+#S="${WORKDIR}/${MY_P}"
+#temporary hack needed due to 0.81 patch release
+S="${WORKDIR}/oclHashcat-plus-0.08"
+
+RESTRICT="strip"
+QA_PREBUILT="*Hashcat-plus*.bin"
+
+src_install() {
+ dodoc docs/*
+ rm -rf *.exe docs
+ if use x86; then
+ rm oclHashcat-plus64.bin
+ rm cudaHashcat-plus64.bin
+ rm kernels/4098/*64* kernels/4318/*64*
+ fi
+ if use amd64; then
+ rm oclHashcat-plus32.bin
+ rm cudaHashcat-plus32.bin
+ rm kernels/4098/*32* kernels/4318/*32*
+ fi
+ if ! use video_cards_fglrx; then
+ rm -rf kernels/4098
+ rm -f oclHashcat-plus*.bin
+ fi
+ if ! use video_cards_nvidia; then
+ rm -rf kernels/4318
+ rm -f cudaHashcat-plus*.bin
+ fi
+ pax-mark m *Hashcat-plus*.bin
+
+ insinto /opt/${PN}
+ doins -r "${S}"/* || die "Copy files failed"
+
+ dodir /usr/bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/oclhashcat-plus
+ echo 'echo "oclHashcat-plus and all related files have been installed in /opt/oclhashcat-plus-bin"' >> "${ED}"/usr/bin/oclhashcat-plus
+ echo 'echo "Please run one of the following binaries to use gpu accelerated hashcat:"' >> "${ED}"/usr/bin/oclhashcat-plus
+ if [ -f "${ED}"/opt/${PN}/oclHashcat-plus64.bin ]
+ then
+ echo 'echo "64 bit ATI accelerated \"oclHashcat-plus64.bin\""' >> "${ED}"/usr/bin/oclhashcat-plus
+ fperms +x /opt/${PN}/oclHashcat-plus64.bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/oclHashcat-plus64.bin
+ echo 'cd /opt/oclhashcat-plus-bin' >> "${ED}"/usr/bin/oclHashcat-plus64.bin
+ echo 'echo "Warning: oclHashcat-plus64.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/oclHashcat-plus64.bin
+ echo './oclHashcat-plus64.bin $@' >> "${ED}"/usr/bin/oclHashcat-plus64.bin
+ fperms +x /usr/bin/oclHashcat-plus64.bin
+
+ fi
+ if [ -f "${ED}"/opt/${PN}/oclHashcat-plus32.bin ]
+ then
+ echo 'echo "32 bit ATI accelerated \"oclHashcat-plus32.bin\""' >> "${ED}"/usr/bin/oclhashcat-plus
+ fperms +x /opt/${PN}/oclHashcat-plus32.bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/oclHashcat-plus32.bin
+ echo 'cd /opt/oclhashcat-plus-bin' >> "${ED}"/usr/bin/oclHashcat-plus32.bin
+ echo 'echo "Warning: oclHashcat-plus32.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/oclHashcat-plus32.bin
+ echo './oclHashcat-plus32.bin $@' >> "${ED}"/usr/bin/oclHashcat-plus32.bin
+ fperms +x /usr/bin/oclHashcat-plus32.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/cudaHashcat-plus64.bin ]
+ then
+ echo 'echo "64 bit NVIDIA accelerated \"cudaHashcat-plus64.bin\""' >> "${ED}"/usr/bin/oclhashcat-plus
+ fperms +x /opt/${PN}/cudaHashcat-plus64.bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/cudaHashcat-plus64.bin
+ echo 'cd /opt/oclhashcat-plus-bin' >> "${ED}"/usr/bin/cudaHashcat-plus64.bin
+ echo 'echo "Warning: cudaHashcat-plus64.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/cudaHashcat-plus64.bin
+ echo './cudaHashcat-plus64.bin $@' >> "${ED}"/usr/bin/cudaHashcat-plus64.bin
+ fperms +x /usr/bin/cudaHashcat-plus64.bin
+
+ fi
+ if [ -f "${ED}"/opt/${PN}/cudaHashcat-plus32.bin ]
+ then
+ echo 'echo 32 bit NVIDIA accelerated \"cudaHashcat-plus32.bin\""' >> "${ED}"/usr/bin/oclhashcat-plus
+ fperms +x /opt/${PN}/cudaHashcat-plus32.bin
+ echo '#! /bin/sh' > "${ED}"/usr/bin/cudaHashcat-plus32.bin
+ echo 'cd /opt/oclhashcat-plus-bin' >> "${ED}"/usr/bin/cudaHashcat-plus32.bin
+ echo 'echo "Warning: cudaHashcat-plus32.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/cudaHashcat-plus32.bin
+ echo './cudaHashcat-plus32.bin $@' >> "${ED}"/usr/bin/cudaHashcat-plus32.bin
+ fperms +x /usr/bin/oclHashcat-plus32.bin
+ fi
+ fperms +x /usr/bin/oclhashcat-plus
+}
diff --git a/app-doc/linuxfromscratch/Manifest b/app-doc/linuxfromscratch/Manifest
index 00f4eb6c002f..7da5937b2431 100644
--- a/app-doc/linuxfromscratch/Manifest
+++ b/app-doc/linuxfromscratch/Manifest
@@ -4,6 +4,10 @@ DIST LFS-BOOK-6.8.pdf 1389722 RMD160 b5f934dd9e0a4e2f7a551cf4bca94e8ce52f162b SH
DIST LFS-BOOK-7.0-NOCHUNKS.html.bz2 173208 RMD160 2d5cdfeac5247f75e996efdf12e5ef64cfc0733a SHA1 ce8f4f7cea2de83d2b1083f0851c8212804505c0 SHA256 f2e9a7fc45fad6166ab380d91a77cd20aa82202050b4b8d64e02bfb33deb2059
DIST LFS-BOOK-7.0.pdf 1582136 RMD160 d7b48016756db0568f98f4c5562faf2353a4ee4d SHA1 86572093e696a30f8104b82714d2ebd1c7314ba1 SHA256 a01fec839d0e80972e80a146a0648c37079d70898512d4b97e95a6d342820c59
DIST LFS-BOOK-7.0.tar.bz2 196919 RMD160 aa0151f23bfc0d594a08739c770d36b875f6d596 SHA1 575cb6d19d963aba4c54bd2e0443e6b093df9831 SHA256 74fdcaebef455a2c7d6ccc64c16b7fdaa948fa935e5826a9034c334f8025e8af
+DIST LFS-BOOK-7.1-NOCHUNKS.html.bz2 174148 RMD160 ccb1703087d0eb8c871e386e5c522b19013b308c SHA1 b64f9b33235c29858f9cce38abee4ca6b608263c SHA256 54516ff72f0e8e98980f750e7100baeeea0f7cd7ecf08f67afdbacd04644807c
+DIST LFS-BOOK-7.1.pdf 1580414 RMD160 7a395753af2f323217512d842c574372b1c7f61e SHA1 b68379802fa8b6605dc18bf9815310878ef2e103 SHA256 16f4ccdb0d8be1f789841189964f851c4104de170bc11831353f9d6a99f19f48
+DIST LFS-BOOK-7.1.tar.bz2 198259 RMD160 5ab090018cf8b57fa5928821dfa0545db7816ba8 SHA1 b548e0ff43c9e1edb64e10366ca0157db331a1ec SHA256 c50e838cf8bb5cac790ad1fbf6baf382dce5d7a998d7e928bfd500042d7980b0
DIST lfs-bootscripts-20100627.tar.bz2 43257 RMD160 dd5532f903ee32981c740cacf93315251a013257 SHA1 b5cb2e95d7780f1c26ac3c974fda5023b2daa213 SHA256 5d10126b0b17b5595f4fedff8c081e071bfdf121d9dde88d271215152a2bd74a
DIST lfs-bootscripts-20111017.tar.bz2 31955 RMD160 3617cb6437df1474ff250c21095d720ad97bbced SHA1 aff9e9722290b12d89be0d47fb8a83abeaa30f72 SHA256 9494ccda0dee86e8c6807182d85adc8cafc2d4e27eb3c771aeccbdf4df1a1bbb
+DIST lfs-bootscripts-20120229.tar.bz2 32701 RMD160 18e48a44c0e8d2c26cf019b19437b4db395e24d4 SHA1 9a5369730ce0baa4359171493b34d897fdd29580 SHA256 b7fb0d44a4fc041d3a066defeb8d3eedc259e4b7fd667790c8f100f1335a76d6
DIST udev-config-20100128.tar.bz2 6283 RMD160 bb7ef96b927e925fd93c22e6c00d756aa977e71e SHA1 07829bbda4139f64e0c66249deef2e7e32861484 SHA256 cc765ce0879bd8fb9347f43603ecfb45bbc2244ae2c8816b1018c86e23f7c02c
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-7.1.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-7.1.ebuild
new file mode 100644
index 000000000000..14ee8842c2c3
--- /dev/null
+++ b/app-doc/linuxfromscratch/linuxfromscratch-7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/linuxfromscratch-7.1.ebuild,v 1.1 2012/07/01 22:18:29 dirtyepic Exp $
+
+EAPI="4"
+
+MY_SRC="http://www.linuxfromscratch.org/lfs/downloads/${PV}"
+
+BOOTSCRIPT_PV="20120229"
+UDEV_PV="20100128"
+
+DESCRIPTION="LFS documents building a Linux system entirely from source."
+HOMEPAGE="http://www.linuxfromscratch.org/lfs"
+SRC_URI="${MY_SRC}/LFS-BOOK-${PV}.tar.bz2
+ ${MY_SRC}/lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2
+ ${MY_SRC}/udev-config-${UDEV_PV}.tar.bz2
+ htmlsingle? ( ${MY_SRC}/LFS-BOOK-${PV}-NOCHUNKS.html.bz2 )
+ pdf? ( ${MY_SRC}/LFS-BOOK-${PV}.pdf )"
+
+LICENSE="CCPL-Attribution-ShareAlike-NonCommercial-2.5 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="htmlsingle pdf"
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+ unpack LFS-BOOK-${PV}.tar.bz2 \
+ lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2 \
+ udev-config-${UDEV_PV}.tar.bz2
+
+ use htmlsingle && unpack LFS-BOOK-${PV}-NOCHUNKS.html.bz2
+ use pdf && cp "${DISTDIR}"/LFS-BOOK-${PV}.pdf "${S}"
+}
+
+src_install() {
+ dodoc -r *
+ docompress -x /usr/share/doc/${PF}
+}
diff --git a/app-doc/linuxfromscratch/metadata.xml b/app-doc/linuxfromscratch/metadata.xml
index 65efb67106e4..87cf073c0f67 100644
--- a/app-doc/linuxfromscratch/metadata.xml
+++ b/app-doc/linuxfromscratch/metadata.xml
@@ -1,11 +1,11 @@
+ app-doc
- dirtyepic@gentoo.org
- Ryan Hill
+ app-doc@gentoo.org
diff --git a/app-doc/single-unix-specification/metadata.xml b/app-doc/single-unix-specification/metadata.xml
index 285437793fb6..9b52710817dd 100644
--- a/app-doc/single-unix-specification/metadata.xml
+++ b/app-doc/single-unix-specification/metadata.xml
@@ -1,8 +1,5 @@
-
- dirtyepic@gentoo.org
- Ryan Hill
-
+ app-doc
diff --git a/app-doc/tldp-howto/metadata.xml b/app-doc/tldp-howto/metadata.xml
index 12ca69218c7a..7f6f66d8af53 100644
--- a/app-doc/tldp-howto/metadata.xml
+++ b/app-doc/tldp-howto/metadata.xml
@@ -1,10 +1,7 @@
-
- dirtyepic@gentoo.org
- Ryan Hill
-
+ app-doc
diff --git a/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild b/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild
index ec46a387c416..12c32e08cd35 100644
--- a/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild
+++ b/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild,v 1.4 2012/05/04 07:10:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild,v 1.5 2012/07/02 06:38:12 jdhore Exp $
EAPI="1"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
IUSE=""
RDEPEND="
diff --git a/sys-apps/pacman/Manifest b/sys-apps/pacman/Manifest
index 82cf267cf3e7..61fabf982a19 100644
--- a/sys-apps/pacman/Manifest
+++ b/sys-apps/pacman/Manifest
@@ -1 +1,2 @@
DIST pacman-4.0.1.tar.gz 1897685 RMD160 bd7da5ef866dba08e8f53df691e6d11abc1989d9 SHA1 9dedc26c84ab61cae72e5a6221c30fa4b0247cce SHA256 04f6822b31022100de6cd0a1905b199bbd1eaf878ef0726b6242ee032f3c33b1
+DIST pacman-4.0.3.tar.gz 1961839 RMD160 e2bf4721ab20a7dc5280b85b1e13f221e46bb7cb SHA1 c39f55d3ea763dc9fd88ab1dfa21da96d768b9d9 SHA256 a48696ae51aaccf31a69ea7916ba9b06e7836eb933b8a281c666729c9d55ce25
diff --git a/sys-apps/pacman/pacman-4.0.3.ebuild b/sys-apps/pacman/pacman-4.0.3.ebuild
new file mode 100644
index 000000000000..a402c4b33946
--- /dev/null
+++ b/sys-apps/pacman/pacman-4.0.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/pacman-4.0.3.ebuild,v 1.1 2012/07/02 06:03:57 binki Exp $
+
+EAPI=4
+
+inherit autotools autotools-utils bash-completion-r1 eutils
+
+DESCRIPTION="Archlinux's binary package manager"
+HOMEPAGE="http://archlinux.org/pacman/"
+SRC_URI="ftp://ftp.archlinux.org/other/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug doc gpg test"
+
+COMMON_DEPEND="app-arch/libarchive
+ dev-libs/openssl
+ virtual/libiconv
+ virtual/libintl
+ sys-devel/gettext
+ curl? ( net-misc/curl )
+ gpg? ( app-crypt/gpgme )"
+RDEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils"
+# autoconf macros from gpgme requied unconditionally
+DEPEND="${COMMON_DEPEND}
+ app-crypt/gpgme
+ doc? ( app-doc/doxygen
+ app-text/asciidoc )
+ test? ( dev-lang/python )"
+
+RESTRICT="test"
+
+src_prepare() {
+ # Adds AM_GPGME_PATH call which requires app-crypt/gpgme to be
+ # DEPENDed on unconditionally:
+ epatch "${FILESDIR}"/${PN}-4.0.0-gpgme.patch
+
+ # Remove a line that adds -Werror in ./configure when --enable-debug
+ # is passed:
+ sed -i -e '/-Werror/d' configure.ac || die "-Werror"
+
+ # autopoint is unwilling to replace m4/gettext.m4 with the correct
+ # version even though it'll gladly replace */po/Makefile.in.in,
+ # creating an inconsistency between gettext m4 macros and
+ # Makefile.in.in. Also, AM_MKINSTALLDIRS apparently doesn't exist
+ # anymore, so we need newer gettext macros. #420469
+ rm m4/gettext.m4 || die
+ sed -i -e '/AM_GNU_GETTEXT_VERSION/s/0\.13\.1/0.18.1/' configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --localstatedir=/var
+ --disable-git-version
+ --with-openssl
+ # Help protect user from shooting his/her Gentoo installation in
+ # its foot.
+ --with-root-dir="${EPREFIX}"/var/chroot/archlinux
+ $(use_enable debug)
+ $(use_enable doc)
+ $(use_enable doc doxygen)
+ $(use_with curl libcurl)
+ $(use_with gpg gpgme)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ dodir /etc/pacman.d
+ newbashcomp "${AUTOTOOLS_BUILD_DIR}"/contrib/bash_completion pacman
+}
+
+pkg_postinst() {
+ einfo "Please see http://ohnopub.net/~ohnobinki/gentoo/arch/ for information"
+ einfo "about setting up an archlinux chroot."
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d42e1ba89c6a..45d41aaf9299 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,3 @@
-DIST portage-2.1.10.49.tar.bz2 803941 RMD160 088a21151b66c7fdb4ed39c46b25fee1b4ecce9e SHA1 11322e216b6d6a2f753f45a150c3f618e4bf0c45 SHA256 b50cdbb4ececba27cddfe24d63517c73a32b905bcf3b7d55b692f6661247590e
DIST portage-2.1.10.65.tar.bz2 826100 RMD160 b3481229954b67d73c027d5e8ca0398e71836033 SHA1 0ec3daf9aa4909939a2c840a570a42add7bea369 SHA256 aaeba4789b05864e8ca142752dc31c017d47976332394c1bf533aba6b3748f8c
DIST portage-2.1.11.3.tar.bz2 837481 RMD160 f8e7402035d9988ef75d7aea4c3ed281c2ffac65 SHA1 8d7ff5f4149c55e7e1907bc2a02dd1283a4d5f04 SHA256 767f1223a144a3e714b0adb9ed01aa666576ae64bb851941965b6d1130093f61
DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
@@ -8,6 +7,4 @@ DIST portage-2.2.0_alpha108.tar.bz2 821498 RMD160 9a5beedfc71db0b88f0929d43a894e
DIST portage-2.2.0_alpha110.patch.bz2 14215 RMD160 d07d2d35a5fb20777ac54fe069705409e1a74029 SHA1 3fd7539f037b7930e1b5c7ca04c418c2b364360e SHA256 af73f05b918634835a0d99a914502b6d0870f3a59a7af0f2aa3b3e2aa0f52c88
DIST portage-2.2.0_alpha111.tar.bz2 836193 RMD160 80cf9bad52e8b5c9ea23a5f3ec5ec6f85211aeba SHA1 32b0fa6e9c7eb25bec3f7760b256d0762dddfcf3 SHA256 3187c6915aaab681e444eca0cbe050f8e68f714176b3f7c0cbec0e7e23d5c5df
DIST portage-2.2.0_alpha114.patch.bz2 8978 RMD160 d8d983869d9777f2f5cc0dc0b99a87c8e0604b44 SHA1 490d931c08431a433e7434167bc1e64373d0cae4 SHA256 2d1ebdd54ac301abea5dd6221da5c7076b89d25de7a673d7287a5b524ca46111
-DIST portage-2.2.0_alpha88.tar.bz2 803852 RMD160 9c6a87c2a8de996286e74245faeaacf89fab0aea SHA1 d2f698470f0df250f51f937d78ea484d27ad0068 SHA256 75b74a87c4f4b1a13857f62aeb42522b491b06b66fe686ef4036993f55125130
-DIST portage-2.2.0_alpha89.patch.bz2 4205 RMD160 ff17958771ee571ccc45604682882356d2d54e5e SHA1 bf5ed24e13f89bcad128e8773f40ceea8bbd8ed2 SHA256 677bc5cce25723cefbdb8f147ac6fc7162d541eb0a149fbd1b96d79f4b2a07d1
DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
diff --git a/sys-apps/portage/portage-2.1.10.49.ebuild b/sys-apps/portage/portage-2.1.10.49.ebuild
deleted file mode 100644
index 7c096ee4b979..000000000000
--- a/sys-apps/portage/portage-2.1.10.49.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.49.ebuild,v 1.10 2012/06/13 06:11:55 zmedico Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
-inherit eutils multilib python
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
- !pypy1_9? ( !python2? ( !python3? (
- || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
- ) ) )
- pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) )
- python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
- !build? ( >=sys-apps/sed-4.0.5 )
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
- epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-RDEPEND="${python_dep}
- !build? ( >=sys-apps/sed-4.0.5
- >=app-shells/bash-3.2_p17
- >=app-admin/eselect-1.2 )
- elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
- elibc_glibc? ( >=sys-apps/sandbox-2.2 )
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
- >=app-misc/pax-utils-0.1.17
- xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
- selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] =net-misc/rsync-2.6.4
- userland_GNU? ( >=sys-apps/coreutils-6.4 )
- )"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=$PV
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
- linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
- $(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
- SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
- $(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
- [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
- [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
- /usr/bin/python -c 'import xattr' 2>/dev/null
-}
-
-pkg_setup() {
- # Bug #359731 - Die early if get_libdir fails.
- [[ -z $(get_libdir) ]] && \
- die "get_libdir returned an empty string"
-
- if use python2 && use python3 ; then
- ewarn "Both python2 and python3 USE flags are enabled, but only one"
- ewarn "can be in the shebangs. Using python3."
- fi
- if use pypy1_9 && use python3 ; then
- ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
- ewarn "can be in the shebangs. Using python3."
- fi
- if use pypy1_9 && use python2 ; then
- ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
- ewarn "can be in the shebangs. Using python2"
- fi
- if ! use pypy1_9 && ! use python2 && ! use python3 && \
- ! compatible_python_is_selected ; then
- ewarn "Attempting to select a compatible default python interpreter"
- local x success=0
- for x in /usr/bin/python2.* ; do
- x=${x#/usr/bin/python2.}
- if [[ $x -ge 6 ]] 2>/dev/null ; then
- eselect python set python2.$x
- if compatible_python_is_selected ; then
- elog "Default python interpreter is now set to python-2.$x"
- success=1
- break
- fi
- fi
- done
- if [ $success != 1 ] ; then
- eerror "Unable to select a compatible default python interpreter!"
- die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
- fi
- fi
-
- if use python3; then
- python_set_active_version 3
- elif use python2; then
- python_set_active_version 2
- elif use pypy1_9; then
- python_set_active_version 2.7-pypy-1.9
- fi
-}
-
-src_prepare() {
- if [ -n "${PATCHVER}" ] ; then
- if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
- rm "$S/bin/ebuild-helpers/portageq" \
- || die "failed to remove portageq helper symlink"
- fi
- epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
- fi
- einfo "Setting portage.VERSION to ${PVR} ..."
- sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
- die "Failed to patch portage.VERSION"
- sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
- die "Failed to patch VERSION in doc/fragment/version"
- sed -e "1s/VERSION/${PVR}/" -i man/* || \
- die "Failed to patch VERSION in man page headers"
-
- if ! use ipc ; then
- einfo "Disabling ipc..."
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
- -i pym/_emerge/AbstractEbuildProcess.py || \
- die "failed to patch AbstractEbuildProcess.py"
- fi
-
- if use xattr && use kernel_linux ; then
- einfo "Adding FEATURES=xattr to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- if use python3; then
- einfo "Converting shebangs for python3..."
- python_convert_shebangs -r 3 .
- elif use python2; then
- einfo "Converting shebangs for python2..."
- python_convert_shebangs -r 2 .
- elif use pypy1_9; then
- einfo "Converting shebangs for pypy-c1.9..."
- python_convert_shebangs -r 2.7-pypy-1.9 .
- fi
-}
-
-src_compile() {
- if use doc; then
- cd "${S}"/doc
- touch fragment/date
- make xhtml xhtml-nochunks || die "failed to make docs"
- fi
-
- if use epydoc; then
- einfo "Generating api docs"
- mkdir "${WORKDIR}"/api
- local my_modules epydoc_opts=""
- my_modules="$(find "${S}/pym" -name "*.py" \
- | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
- -e 's:/:.:g' | sort)" || die "error listing modules"
- # workaround for bug 282760
- > "$S/pym/pysqlite2.py"
- PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
- epydoc -o "${WORKDIR}"/api \
- -qqqqq --no-frames --show-imports $epydoc_opts \
- --name "${PN}" --url "${HOMEPAGE}" \
- ${my_modules} || die "epydoc failed"
- rm "$S/pym/pysqlite2.py"
- fi
-}
-
-src_test() {
- # make files executable, in case they were created by patch
- find bin -type f | xargs chmod +x
- ./pym/portage/tests/runTests || die "test(s) failed"
-}
-
-src_install() {
- local libdir=$(get_libdir)
- local portage_base="/usr/${libdir}/portage"
- local portage_share_config=/usr/share/portage/config
-
- cd "${S}"/cnf
- insinto /etc
- doins etc-update.conf dispatch-conf.conf || die
-
- insinto "$portage_share_config"
- doins "$S/cnf/make.globals" || die
- if [ -f "make.conf.${ARCH}".diff ]; then
- patch make.conf "make.conf.${ARCH}".diff || \
- die "Failed to patch make.conf.example"
- newins make.conf make.conf.example || die
- else
- eerror ""
- eerror "Portage does not have an arch-specific configuration for this arch."
- eerror "Please notify the arch maintainer about this issue. Using generic."
- eerror ""
- newins make.conf make.conf.example || die
- fi
-
- dosym ..${portage_share_config}/make.globals /etc/make.globals
-
- insinto /etc/logrotate.d
- doins "${S}"/cnf/logrotate.d/elog-save-summary || die
-
- # BSD and OSX need a sed wrapper so that find/xargs work properly
- if use userland_GNU; then
- rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
- fi
-
- local x symlinks files
-
- cd "$S" || die "cd failed"
- for x in $(find bin -type d) ; do
- exeinto $portage_base/$x || die "exeinto failed"
- cd "$S"/$x || die "cd failed"
- files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
- if [ -n "$files" ] ; then
- doexe $files || die "doexe failed"
- fi
- symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
- if [ -n "$symlinks" ] ; then
- cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
- fi
- done
-
- cd "$S" || die "cd failed"
- for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
- insinto $portage_base/$x || die "insinto failed"
- cd "$S"/$x || die "cd failed"
- # __pycache__ directories contain no py files
- [[ "*.py" != $(echo *.py) ]] || continue
- doins *.py || die "doins failed"
- symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
- if [ -n "$symlinks" ] ; then
- cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
- fi
- done
-
- # We install some minimal tests for use as a preinst sanity check.
- # These tests must be able to run without a full source tree and
- # without relying on a previous portage instance being installed.
- cd "$S" || die "cd failed"
- exeinto $portage_base/pym/portage/tests || die
- doexe pym/portage/tests/runTests || die
- insinto $portage_base/pym/portage/tests || die
- doins pym/portage/tests/*.py || die
- insinto $portage_base/pym/portage/tests/lint || die
- doins pym/portage/tests/lint/*.py || die
- doins pym/portage/tests/lint/__test__ || die
-
- # Symlinks to directories cause up/downgrade issues and the use of these
- # modules outside of portage is probably negligible.
- for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
- [ ! -L "${x}" ] && continue
- die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
- done
-
- doman "${S}"/man/*.[0-9]
- if use linguas_pl; then
- doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
- doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
- fi
-
- dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
- use doc && dohtml -r "${S}"/doc/*
- use epydoc && dohtml -r "${WORKDIR}"/api
-
- dodir /usr/bin
- for x in ebuild egencache emerge portageq quickpkg repoman ; do
- dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
- done
-
- dodir /usr/sbin
- local x
- for x in archive-conf dispatch-conf emaint emerge-webrsync env-update \
- etc-update fixpackages regenworld ; do
- dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
- done
- dosym env-update /usr/sbin/update-env
- dosym etc-update /usr/sbin/update-etc
-
- dodir /etc/portage
- keepdir /etc/portage
-}
-
-pkg_preinst() {
- if [[ $ROOT == / ]] ; then
- # Run some minimal tests as a sanity check.
- local test_runner=$(find "$D" -name runTests)
- if [[ -n $test_runner && -x $test_runner ]] ; then
- einfo "Running preinst sanity tests..."
- "$test_runner" || die "preinst sanity tests failed"
- fi
- fi
-
- if use xattr && ! current_python_has_xattr ; then
- ewarn "For optimal performance in xattr handling, install"
- ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
- ewarn "enable USE=python3 for $CATEGORY/$PN."
- fi
-
- if ! use build && ! has_version dev-python/pycrypto && \
- ! has_version '>=dev-lang/python-2.6[ssl]' ; then
- ewarn "If you are an ebuild developer and you plan to commit ebuilds"
- ewarn "with this system then please install dev-python/pycrypto or"
- ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
- ewarn "to enable RMD160 hash support."
- ewarn "See bug #198398 for more information."
- fi
- if [ -f "${ROOT}/etc/make.globals" ]; then
- rm "${ROOT}/etc/make.globals"
- fi
-
- if [[ -d ${ROOT}var/log/portage && \
- $(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
- has_version '=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
- ) ) )
- pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) )
- python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
- !build? ( >=sys-apps/sed-4.0.5 )
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
- epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-RDEPEND="${python_dep}
- !build? ( >=sys-apps/sed-4.0.5
- >=app-shells/bash-3.2_p17
- >=app-admin/eselect-1.2 )
- elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
- elibc_glibc? ( >=sys-apps/sandbox-2.2 )
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
- >=app-misc/pax-utils-0.1.17
- xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
- selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] =net-misc/rsync-2.6.4
- userland_GNU? ( >=sys-apps/coreutils-6.4 )
- )"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=2.2.0_alpha88
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
- linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
- $(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
- SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
- $(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
- [[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
- [[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
- "${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null
-}
-
-pkg_setup() {
- # Bug #359731 - Die early if get_libdir fails.
- [[ -z $(get_libdir) ]] && \
- die "get_libdir returned an empty string"
-
- if use python2 && use python3 ; then
- ewarn "Both python2 and python3 USE flags are enabled, but only one"
- ewarn "can be in the shebangs. Using python3."
- fi
- if use pypy1_9 && use python3 ; then
- ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
- ewarn "can be in the shebangs. Using python3."
- fi
- if use pypy1_9 && use python2 ; then
- ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
- ewarn "can be in the shebangs. Using python2"
- fi
- if ! use pypy1_9 && ! use python2 && ! use python3 && \
- ! compatible_python_is_selected ; then
- ewarn "Attempting to select a compatible default python interpreter"
- local x success=0
- for x in /usr/bin/python2.* ; do
- x=${x#/usr/bin/python2.}
- if [[ $x -ge 6 ]] 2>/dev/null ; then
- eselect python set python2.$x
- if compatible_python_is_selected ; then
- elog "Default python interpreter is now set to python-2.$x"
- success=1
- break
- fi
- fi
- done
- if [ $success != 1 ] ; then
- eerror "Unable to select a compatible default python interpreter!"
- die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
- fi
- fi
-
- if use python3; then
- python_set_active_version 3
- elif use python2; then
- python_set_active_version 2
- elif use pypy1_9; then
- python_set_active_version 2.7-pypy-1.9
- fi
-}
-
-src_prepare() {
- if [ -n "${PATCHVER}" ] ; then
- if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
- rm "$S/bin/ebuild-helpers/portageq" \
- || die "failed to remove portageq helper symlink"
- fi
- epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
- fi
- einfo "Setting portage.VERSION to ${PVR} ..."
- sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
- die "Failed to patch portage.VERSION"
- sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
- die "Failed to patch VERSION in doc/fragment/version"
- sed -e "1s/VERSION/${PVR}/" -i man/* || \
- die "Failed to patch VERSION in man page headers"
-
- if ! use ipc ; then
- einfo "Disabling ipc..."
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
- -i pym/_emerge/AbstractEbuildProcess.py || \
- die "failed to patch AbstractEbuildProcess.py"
- fi
-
- if use xattr && use kernel_linux ; then
- einfo "Adding FEATURES=xattr to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- if use python3; then
- einfo "Converting shebangs for python3..."
- python_convert_shebangs -r 3 .
- elif use python2; then
- einfo "Converting shebangs for python2..."
- python_convert_shebangs -r 2 .
- elif use pypy1_9; then
- einfo "Converting shebangs for pypy-c1.9..."
- python_convert_shebangs -r 2.7-pypy-1.9 .
- fi
-
- if [[ -n ${EPREFIX} ]] ; then
- einfo "Setting portage.const.EPREFIX ..."
- sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
- -i pym/portage/const.py || \
- die "Failed to patch portage.const.EPREFIX"
-
- einfo "Prefixing shebangs ..."
- find . -type f -print0 | \
- while read -r -d $'\0' ; do
- local shebang=$(head -n1 "$REPLY")
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
- die "sed failed"
- fi
- done
-
- einfo "Adjusting make.globals ..."
- sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
- -e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
- -e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
- -i cnf/make.globals || die "sed failed"
-
- einfo "Adding FEATURES=force-prefix to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
-}
-
-src_compile() {
- if use doc; then
- cd "${S}"/doc
- touch fragment/date
- make xhtml xhtml-nochunks || die "failed to make docs"
- fi
-
- if use epydoc; then
- einfo "Generating api docs"
- mkdir "${WORKDIR}"/api
- local my_modules epydoc_opts=""
- my_modules="$(find "${S}/pym" -name "*.py" \
- | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
- -e 's:/:.:g' | sort)" || die "error listing modules"
- # workaround for bug 282760
- > "$S/pym/pysqlite2.py"
- PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
- epydoc -o "${WORKDIR}"/api \
- -qqqqq --no-frames --show-imports $epydoc_opts \
- --name "${PN}" --url "${HOMEPAGE}" \
- ${my_modules} || die "epydoc failed"
- rm "$S/pym/pysqlite2.py"
- fi
-}
-
-src_test() {
- # make files executable, in case they were created by patch
- find bin -type f | xargs chmod +x
- ./pym/portage/tests/runTests || die "test(s) failed"
-}
-
-src_install() {
- local libdir=$(get_libdir)
- local portage_base="/usr/${libdir}/portage"
- local portage_share_config=/usr/share/portage/config
-
- cd "${S}"/cnf
- insinto /etc
- doins etc-update.conf dispatch-conf.conf || die
-
- insinto "$portage_share_config/sets"
- doins "$S"/cnf/sets/*.conf || die
- insinto "$portage_share_config"
- doins "$S/cnf/make.globals" || die
- if [ -f "make.conf.${ARCH}".diff ]; then
- patch make.conf "make.conf.${ARCH}".diff || \
- die "Failed to patch make.conf.example"
- newins make.conf make.conf.example || die
- else
- eerror ""
- eerror "Portage does not have an arch-specific configuration for this arch."
- eerror "Please notify the arch maintainer about this issue. Using generic."
- eerror ""
- newins make.conf make.conf.example || die
- fi
-
- dosym ..${portage_share_config}/make.globals /etc/make.globals
-
- insinto /etc/logrotate.d
- doins "${S}"/cnf/logrotate.d/elog-save-summary || die
-
- # BSD and OSX need a sed wrapper so that find/xargs work properly
- if use userland_GNU; then
- rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
- fi
-
- local x symlinks files
-
- cd "$S" || die "cd failed"
- for x in $(find bin -type d) ; do
- exeinto $portage_base/$x || die "exeinto failed"
- cd "$S"/$x || die "cd failed"
- files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
- if [ -n "$files" ] ; then
- doexe $files || die "doexe failed"
- fi
- symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
- if [ -n "$symlinks" ] ; then
- cp -P $symlinks "$ED$portage_base/$x" || die "cp failed"
- fi
- done
-
- cd "$S" || die "cd failed"
- for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
- insinto $portage_base/$x || die "insinto failed"
- cd "$S"/$x || die "cd failed"
- # __pycache__ directories contain no py files
- [[ "*.py" != $(echo *.py) ]] || continue
- doins *.py || die "doins failed"
- symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
- if [ -n "$symlinks" ] ; then
- cp -P $symlinks "$ED$portage_base/$x" || die "cp failed"
- fi
- done
-
- # We install some minimal tests for use as a preinst sanity check.
- # These tests must be able to run without a full source tree and
- # without relying on a previous portage instance being installed.
- cd "$S" || die "cd failed"
- exeinto $portage_base/pym/portage/tests || die
- doexe pym/portage/tests/runTests || die
- insinto $portage_base/pym/portage/tests || die
- doins pym/portage/tests/*.py || die
- insinto $portage_base/pym/portage/tests/lint || die
- doins pym/portage/tests/lint/*.py || die
- doins pym/portage/tests/lint/__test__ || die
-
- # Symlinks to directories cause up/downgrade issues and the use of these
- # modules outside of portage is probably negligible.
- for x in "${ED}${portage_base}/pym/"{cache,elog_modules} ; do
- [ ! -L "${x}" ] && continue
- die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
- done
-
- doman "${S}"/man/*.[0-9]
- if use linguas_pl; then
- doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
- doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
- fi
-
- dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
- use doc && dohtml -r "${S}"/doc/*
- use epydoc && dohtml -r "${WORKDIR}"/api
-
- dodir /usr/bin
- for x in ebuild egencache emerge portageq quickpkg repoman ; do
- dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
- done
-
- dodir /usr/sbin
- local x
- for x in archive-conf dispatch-conf emaint emerge-webrsync env-update \
- etc-update fixpackages regenworld ; do
- dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
- done
- dosym env-update /usr/sbin/update-env
- dosym etc-update /usr/sbin/update-etc
-
- dodir /etc/portage
- keepdir /etc/portage
-}
-
-pkg_preinst() {
- if [[ $ROOT == / ]] ; then
- # Run some minimal tests as a sanity check.
- local test_runner=$(find "$ED" -name runTests)
- if [[ -n $test_runner && -x $test_runner ]] ; then
- einfo "Running preinst sanity tests..."
- "$test_runner" || die "preinst sanity tests failed"
- fi
- fi
-
- if use xattr && ! current_python_has_xattr ; then
- ewarn "For optimal performance in xattr handling, install"
- ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
- ewarn "enable USE=python3 for $CATEGORY/$PN."
- fi
-
- if ! use build && ! has_version dev-python/pycrypto && \
- ! has_version '>=dev-lang/python-2.6[ssl]' ; then
- ewarn "If you are an ebuild developer and you plan to commit ebuilds"
- ewarn "with this system then please install dev-python/pycrypto or"
- ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
- ewarn "to enable RMD160 hash support."
- ewarn "See bug #198398 for more information."
- fi
- if [ -f "${EROOT}/etc/make.globals" ]; then
- rm "${EROOT}/etc/make.globals"
- fi
-
- has_version "<${CATEGORY}/${PN}-2.2_alpha" \
- && MINOR_UPGRADE=true || MINOR_UPGRADE=false
-
- has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
- && WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
-
- # If portage-2.1.6 is installed and the preserved_libs_registry exists,
- # assume that the NEEDED.ELF.2 files have already been generated.
- has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
- ! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
- has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
- && NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-
- [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
- && REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
-}
-
-pkg_postinst() {
- # Compile all source files recursively. Any orphans
- # will be identified and removed in postrm.
- python_mod_optimize /usr/$(get_libdir)/portage/pym
-
- if $WORLD_MIGRATION_UPGRADE ; then
- einfo "moving set references from the worldfile into world_sets"
- cd "${EROOT}/var/lib/portage/"
- grep "^@" world >> world_sets
- sed -i -e '/^@/d' world
- fi
-
- if $NEEDED_REBUILD_UPGRADE ; then
- einfo "rebuilding NEEDED.ELF.2 files"
- for cpv in "${EROOT}/var/db/pkg"/*/*; do
- if [ -f "${cpv}/NEEDED" ]; then
- rm -f "${cpv}/NEEDED.ELF.2"
- while read line; do
- filename=${line% *}
- needed=${line#* }
- needed=${needed//+/++}
- needed=${needed//#/##}
- needed=${needed//%/%%}
- newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
- newline=${newline// - }
- echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
- done < "${cpv}/NEEDED"
- fi
- done
- fi
-
- if $REPO_LAYOUT_CONF_WARN ; then
- ewarn
- echo "If you want overlay eclasses to override eclasses from" \
- "other repos then see the portage(5) man page" \
- "for information about the new layout.conf and repos.conf" \
- "configuration files." \
- | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
- ewarn
- fi
-
- if $MINOR_UPGRADE ; then
- elog "If you're upgrading from a pre-2.2 version of portage you might"
- elog "want to remerge world (emerge -e world) to take full advantage"
- elog "of some of the new features in 2.2."
- elog "This is not required however for portage to function properly."
- elog
- fi
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}
diff --git a/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch b/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
deleted file mode 100644
index 590c6958cf2b..000000000000
--- a/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- util/grub.d/10_linux.in
-+++ util/grub.d/10_linux.in
-@@ -150,7 +150,8 @@
- EOF
- }
-
--case x`uname -m` in
-+machine=`uname -m`
-+case "x$machine" in
- xi?86 | xx86_64)
- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
- if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
-@@ -161,6 +162,14 @@
- done` ;;
- esac
-
-+case "$machine" in
-+ i?86) GENKERNEL_ARCH="x86" ;;
-+ mips|mips64) GENKERNEL_ARCH="mips" ;;
-+ mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
-+ arm*) GENKERNEL_ARCH="arm" ;;
-+ *) GENKERNEL_ARCH="$machine" ;;
-+esac
-+
- prepare_boot_cache=
- prepare_root_cache=
- boot_device_id=
-@@ -187,7 +196,9 @@
- "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
- "initrd-${alt_version}" "initramfs-${alt_version}.img" \
- "initramfs-genkernel-${version}" \
-- "initramfs-genkernel-${alt_version}"; do
-+ "initramfs-genkernel-${alt_version}" \
-+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
- if test -e "${dirname}/${i}" ; then
- initrd="$i"
- break
-
diff --git a/sys-boot/grub/files/grub-2.00-manpage-race.patch b/sys-boot/grub/files/grub-2.00-manpage-race.patch
new file mode 100644
index 000000000000..0781942f4fbf
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.00-manpage-race.patch
@@ -0,0 +1,16 @@
+Fix race condition when generating manpages.
+https://bugs.gentoo.org/show_bug.cgi?id=424231
+https://savannah.gnu.org/bugs/?36758
+
+--- gentpl.py 2012-05-28 15:57:18 +0000
++++ gentpl.py 2012-07-01 20:17:09 +0000
+@@ -487,7 +487,7 @@
+ def manpage():
+ r = "if COND_MAN_PAGES\n"
+ r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
+- r += rule("[+ name +].[+ mansection +]", "[+ name +]", """
++ r += rule("[+ name +].[+ mansection +]", "[+ name +] grub-mkconfig_lib", """
+ chmod a+x [+ name +]
+ PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +]
+ """)
+
diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00.ebuild
index fef8e8bb8ed0..85ea67f6061b 100644
--- a/sys-boot/grub/grub-2.00.ebuild
+++ b/sys-boot/grub/grub-2.00.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/sys-boot/grub/grub-2.00.ebuild,v 1.8 2012/06/29 22:06:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.10 2012/07/01 22:11:04 floppym Exp $
EAPI=4
@@ -19,6 +19,7 @@ else
fi
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
+ DO_AUTORECONF="true"
fi
inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
@@ -70,6 +71,7 @@ DEPEND="${RDEPEND}
>=dev-lang/python-2.5.2
sys-devel/flex
sys-devel/bison
+ sys-apps/help2man
sys-apps/texinfo
static? (
truetype? (
@@ -84,7 +86,7 @@ RDEPEND+="
grub_platforms_efi-64? ( sys-boot/efibootmgr )
"
if [[ -n ${DO_AUTORECONF} ]] ; then
- DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+ DEPEND+=" >=sys-devel/autogen-5.10"
else
DEPEND+=" app-arch/xz-utils"
fi
@@ -207,6 +209,10 @@ grub_src_install() {
src_prepare() {
local i j
+ if [[ ${PV} != 9999 ]]; then
+ epatch "${FILESDIR}/${P}-manpage-race.patch"
+ fi
+
# fix texinfo file name, bug 416035
sed -i \
-e 's/^\* GRUB:/* GRUB2:/' \
@@ -241,7 +247,7 @@ src_prepare() {
src_configure() {
local i
- use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+ use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
use static && append-ldflags -static
# Sandbox bug 404013.
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index e1441639b298..9e593804912c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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/sys-boot/grub/grub-9999.ebuild,v 1.74 2012/06/29 22:06:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.76 2012/07/01 22:11:04 floppym Exp $
EAPI=4
@@ -19,6 +19,7 @@ else
fi
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
+ DO_AUTORECONF="true"
fi
inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
@@ -70,6 +71,7 @@ DEPEND="${RDEPEND}
>=dev-lang/python-2.5.2
sys-devel/flex
sys-devel/bison
+ sys-apps/help2man
sys-apps/texinfo
static? (
truetype? (
@@ -84,7 +86,7 @@ RDEPEND+="
grub_platforms_efi-64? ( sys-boot/efibootmgr )
"
if [[ -n ${DO_AUTORECONF} ]] ; then
- DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+ DEPEND+=" >=sys-devel/autogen-5.10"
else
DEPEND+=" app-arch/xz-utils"
fi
@@ -207,6 +209,10 @@ grub_src_install() {
src_prepare() {
local i j
+ if [[ ${PV} != 9999 ]]; then
+ epatch "${FILESDIR}/${P}-manpage-race.patch"
+ fi
+
# fix texinfo file name, bug 416035
sed -i \
-e 's/^\* GRUB:/* GRUB2:/' \
@@ -241,7 +247,7 @@ src_prepare() {
src_configure() {
local i
- use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+ use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
use static && append-ldflags -static
# Sandbox bug 404013.
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index d5a64190450e..2de54410a5af 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -35,6 +35,7 @@ DIST hardened-patches-3.2.20-1.extras.tar.bz2 576830 RMD160 f0463d9582e1649833e6
DIST hardened-patches-3.2.20-2.extras.tar.bz2 588061 RMD160 b74563eb428c1fedd0a511a607d6fd79dec1f85e SHA1 86e857892be2444d595ec39c3da5cbe2293499d9 SHA256 3f14543be3b5fd882c01f66cb1a25056190ee2e5d69b0f4b16d785bccda010a9
DIST hardened-patches-3.2.21-1.extras.tar.bz2 563495 RMD160 3756d134285056b3a4c9f0dcbea406a9c69f3f43 SHA1 dfbb0eba27c3a7224278b717999a14406007e567 SHA256 9acbefe1e35a233f3509c5fae79174803f28230fbee49f8f5efccf84743dae69
DIST hardened-patches-3.2.21-2.extras.tar.bz2 563622 RMD160 cfd319f525229b277446a58a7942d399ffa9b86a SHA1 09173557d61eb01fe314c012c27ebafaf70b1fcb SHA256 5e3532665389e95060996ff293e292c9d2ead72fd2cb3a26d2371497a63be1f3
+DIST hardened-patches-3.2.21-3.extras.tar.bz2 563724 RMD160 d4a2abec6c3f187654a2416a665f41598e999f4b SHA1 519903ceeab5537aff468a8219f76b2bf2ede7a8 SHA256 8b2c0305acc6ae4709131c875427ff4006822f1e78ffb9a1b1e38fb720f75e04
DIST hardened-patches-3.4.2-1.extras.tar.bz2 546639 RMD160 23b07aaa0c87b11b4945fd6f84e31e286dc2c964 SHA1 29fd884c8f4bd53a923bb08835b15a26fa20b9bf SHA256 a513ad66af2e1feccc40c89b492336525db3c4c9e9227b6d957a05ee9fcabfd3
DIST hardened-patches-3.4.3-1.extras.tar.bz2 562591 RMD160 afea8d716eb27286b9179446f688b68174959150 SHA1 7617f40c7e23562566d47ddd8232874fd401c1a0 SHA256 a2d3d78f5ec904239aeb084965c628da96aaa60f576f73628aedba15f261494b
DIST hardened-patches-3.4.3-2.extras.tar.bz2 551688 RMD160 76ca77896b19f72a216300b420a8372575a54abf SHA1 500c26c2b03585668426c8eef41b5e8fbae4b3de SHA256 d7aa3138473eedae5772a1a24b7d023ec7bf498183222fa0fe9bd396d9ca0491
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.21-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.21-r2.ebuild
new file mode 100644
index 000000000000..edfcaf173e12
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.21-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.21-r2.ebuild,v 1.1 2012/07/01 20:37:35 blueness Exp $
+
+EAPI="4"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="16"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+
+ local GRADM_COMPAT="sys-apps/gradm-2.9.1"
+
+ ewarn
+ ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
+ ewarn "[server], [workstation], and [virtualization]. Those who intend to"
+ ewarn "use one of these predefined grsecurity levels should read the help"
+ ewarn "associated with the level. Because some options require >=gcc-4.5,"
+ ewarn "users with more, than one version of gcc installed should use gcc-config"
+ ewarn "to select a compatible version."
+ ewarn
+ ewarn "Users of grsecurity's RBAC system must ensure they are using"
+ ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+ ewarn "It is strongly recommended that the following command is issued"
+ ewarn "prior to booting a ${PF} kernel for the first time:"
+ ewarn
+ ewarn "emerge -na =${GRADM_COMPAT}*"
+ ewarn
+}
diff --git a/x11-apps/ccsm/ccsm-0.8.4-r1.ebuild b/x11-apps/ccsm/ccsm-0.8.4-r1.ebuild
index 618f968f77ba..9f6f478a5484 100644
--- a/x11-apps/ccsm/ccsm-0.8.4-r1.ebuild
+++ b/x11-apps/ccsm/ccsm-0.8.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ccsm/ccsm-0.8.4-r1.ebuild,v 1.3 2012/04/20 01:35:42 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ccsm/ccsm-0.8.4-r1.ebuild,v 1.4 2012/07/01 22:55:20 naota Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -19,7 +19,6 @@ IUSE=""
DEPEND="
>=dev-python/compizconfig-python-${PV}
>=dev-python/pygtk-2.12:2
- dev-python/sexy-python
dev-util/intltool
gnome-base/librsvg
"
diff --git a/x11-apps/ccsm/metadata.xml b/x11-apps/ccsm/metadata.xml
index 0c38f410cc17..9e18ae4c96ca 100644
--- a/x11-apps/ccsm/metadata.xml
+++ b/x11-apps/ccsm/metadata.xml
@@ -2,7 +2,7 @@
- pinkbyte@mail.ru
+ admin@pinkbyte.ru
Pinkbyte
diff --git a/x11-libs/goffice/goffice-0.8.17-r1.ebuild b/x11-libs/goffice/goffice-0.8.17-r1.ebuild
index af61886aaaa8..9a2dfadd79e9 100644
--- a/x11-libs/goffice/goffice-0.8.17-r1.ebuild
+++ b/x11-libs/goffice/goffice-0.8.17-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.8.17-r1.ebuild,v 1.3 2012/07/01 18:27:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.8.17-r1.ebuild,v 1.4 2012/07/02 06:38:09 jdhore Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://git.gnome.org/browse/goffice/"
LICENSE="GPL-2"
SLOT="0.8"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="doc gnome"
# Build fails with -gtk
diff --git a/x11-themes/tangerine-icon-theme/Manifest b/x11-themes/tangerine-icon-theme/Manifest
index d1c35ae6d6e4..b89539008195 100644
--- a/x11-themes/tangerine-icon-theme/Manifest
+++ b/x11-themes/tangerine-icon-theme/Manifest
@@ -1,3 +1,2 @@
DIST gentoo-logo.svg 13764 RMD160 62b740f670377486eb1350c4f180d9f0ab63948c SHA1 a81d7fb4be541547be78d648bbeb0d3c51f1a41e SHA256 ad81a212991cd24faaddbc260c806c805fd7a67f65b24655908a8971fa10794e
-DIST tangerine-icon-theme_0.26.tar.gz 1167388 RMD160 0b35f6c60fce6f0228568f0945158579e577da47 SHA1 38602a729a5d760eebbd79a79905a834ba449553 SHA256 ff35de84580b15a472994f6338a50b96e4df3da2ab5c4cb086c7e0a1af82ea5a
DIST tangerine-icon-theme_0.27.tar.gz 1163543 RMD160 faad4ce47916a0bac93864477162fd56fe905cee SHA1 235645dc235558701784b4c8da06419a9523be93 SHA256 4842f55143694a4d5b12517ff0b53d3dac1a67413b32c4a46bbf1b4b805f5489
diff --git a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild
deleted file mode 100644
index 9f9ee4468510..000000000000
--- a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild,v 1.11 2012/05/05 04:10:04 jdhore Exp $
-
-EAPI=2
-inherit autotools gnome2-utils
-
-DESCRIPTION="a derivative of the standard Tango theme, using a more orange approach"
-HOMEPAGE="http://packages.ubuntu.com/gutsy/x11/tangerine-icon-theme"
-SRC_URI="mirror://gentoo/${PN}_${PV}.tar.gz
- http://www.gentoo.org/images/gentoo-logo.svg"
-
-LICENSE="CCPL-Attribution-ShareAlike-2.5"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="png"
-
-RDEPEND=">=x11-themes/gnome-icon-theme-2.24"
-DEPEND=">=gnome-base/librsvg-2.12.3
- || ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png?] )
- >=x11-misc/icon-naming-utils-0.8.2
- virtual/pkgconfig
- dev-util/intltool
- sys-devel/gettext"
-
-RESTRICT="binchecks strip"
-
-src_unpack() { unpack ${PN}_${PV}.tar.gz; }
-src_prepare() {
- cp "${DISTDIR}"/gentoo-logo.svg scalable/places/start-here.svg \
- || die "cp failed"
-
- for res in 16 22 32; do
- rsvg -w ${res} -h ${res} scalable/places/start-here.svg \
- ${res}x${res}/places/start-here.png || die
- done
-
- intltoolize --force --copy --automake || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable png png-creation) \
- $(use_enable png icon-framing)
-}
-
-src_install() {
- addwrite /root/.gnome2
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog README
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
index 5a420b776da3..2356a5ed1260 100644
--- a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
+++ b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild,v 1.7 2012/03/17 18:00:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild,v 1.8 2012/07/02 06:54:35 ssuominen Exp $
-EAPI=3
+EAPI=4
inherit gnome2-utils
DESCRIPTION="a derivative of the standard Tango theme, using a more orange approach"
@@ -13,16 +13,22 @@ SRC_URI="mirror://ubuntu/pool/universe/t/${PN}/${PN}_${PV}.tar.gz
LICENSE="CCPL-Attribution-ShareAlike-2.5 LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="|| ( kde-base/oxygen-icons x11-themes/gnome-icon-theme )"
-DEPEND="gnome-base/librsvg
- >=x11-misc/icon-naming-utils-0.8.90
- dev-util/intltool
- sys-devel/gettext"
+IUSE="minimal"
RESTRICT="binchecks strip"
+RDEPEND="!minimal? ( || ( x11-themes/gnome-icon-theme kde-base/oxygen-icons ) )"
+DEPEND="dev-util/intltool
+ >=gnome-base/librsvg-2.34
+ sys-devel/gettext
+ >=x11-misc/icon-naming-utils-0.8.90"
+
+DOCS="AUTHORS README"
+
+src_unpack() {
+ unpack ${PN}_${PV}.tar.gz
+}
+
src_prepare() {
sed -i \
-e 's:lib/icon-naming-utils/icon:libexec/icon:' \
@@ -32,18 +38,13 @@ src_prepare() {
local res
for res in 16 22 32; do
- rsvg -w ${res} -h ${res} scalable/places/start-here.svg \
- ${res}x${res}/places/start-here.png || die
+ rsvg-convert -w ${res} -h ${res} scalable/places/start-here.svg \
+ > ${res}x${res}/places/start-here.png || die
done
}
src_compile() {
- emake index.theme || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS README
+ emake index.theme
}
pkg_preinst() { gnome2_icon_savelist; }
diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild
index 6893e805c87d..7c53fa020cfa 100644
--- a/x11-wm/notion/notion-9999.ebuild
+++ b/x11-wm/notion/notion-9999.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-wm/notion/notion-9999.ebuild,v 1.2 2012/06/20 19:49:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-9999.ebuild,v 1.3 2012/07/02 07:15:59 jdhore Exp $
EAPI="4"
@@ -26,7 +26,7 @@ RDEPEND="dev-lang/lua
xrandr? ( x11-libs/libXrandr )"
DEPEND="${RDEPEND}
- dev-util/pkgconfig"
+ virtual/pkgconfig"
src_prepare() {
sed -e "/^CFLAGS=/s:=:+=:" \