From 4125c97a4abb7ea97f5b22f016a99ffb2b6e4ebb Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Wed, 24 Feb 2010 19:39:32 +0000 Subject: [PATCH] steps toward fixing pentoo ebuilds, breaking up into sensible chunks --- .../pentoo-etc-portage-9999.ebuild | 51 +++ sys-apps/pentoo/Manifest | 1 + sys-apps/pentoo/pentoo-2010.0-r3.ebuild | 419 ++++++++++++++++++ 3 files changed, 471 insertions(+) create mode 100644 sys-apps/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild create mode 100644 sys-apps/pentoo/pentoo-2010.0-r3.ebuild diff --git a/sys-apps/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild b/sys-apps/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild new file mode 100644 index 000000000..a00bfad83 --- /dev/null +++ b/sys-apps/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +inherit subversion +KEYWORDS="-*" +DESCRIPTION="One ebuild to rule them all and in the darkness bind them" +HOMEPAGE="http://www.pentoo.ch" +ESVN_REPO_URI="https://www.pentoo.ch/svn/livecd/trunk/portage/" +SLOT="0" +LICENSE="GPL" +IUSE="livecd" + +DEPEND="" + +RDEPEND="" + +pkg_setup() { + #We clean up old mistakes here, don't add as a blocker + grep -v 'x11-base/xorg-x11' /var/lib/portage/world > /var/lib/portage/world.cleansed + local grepret=$? + [ ${grepret} -ge 2 ] && [ -f ${ROOT}/var/lib/portage/world ] && die "Tried to grep the world file and got an error." + [ ${grepret} == 0 ] && einfo "x11-base/xorg-x11 has been purged from world. It's a good thing." + [ ${grepret} == 1 ] && einfo "x11-base/xorg-x11 was found not in the world file. It's a good thing." + mv /var/lib/portage/world.cleansed /var/lib/portage/world || die "Fixing world failed" +} + +src_install() { + if ! use livecd; then + insinto /etc/portage/ + doins -r "${S}"/* || die "/etc/portage failed!" + fi +} + +pkg_postinst() { + if [ ! -e "${ROOT}"/etc/portage/package.keywords ] + if [ -e "${ROOT}"/etc/portage/package.keywords ] + if [ ! -e "${ROOT}"/etc/portage/package.keywords/user-keywords ]; then + cp "${FILESDIR}"/user-keywords "${ROOT}"/etc/portage/package.keywords/user-keywords || die "Copy failed, blame Zero" + fi +} + +#pseudo code for checks + +# if exist /etc/portage/example + # if exist /etc/portage/example is file then copy to $T and put in new dir format + # elif exist /etc/portage/example is dir + # if ! exist /etc/portage/example/user-example then go for it + # else break? +#else go for it diff --git a/sys-apps/pentoo/Manifest b/sys-apps/pentoo/Manifest index bff117709..1c990a450 100644 --- a/sys-apps/pentoo/Manifest +++ b/sys-apps/pentoo/Manifest @@ -10,4 +10,5 @@ EBUILD pentoo-2009.1-r2.ebuild 1189 RMD160 0c808303b31d2242195c5e1ae347317db2012 EBUILD pentoo-2009.1.ebuild 742 RMD160 800e8bc740199dc5c1f9daf77e0cb66876e12abf SHA1 1e86c8f888e0308795b0b2c31c9af512688a09ee SHA256 05072a1b4832596fb12454a72d7514329000e69d85a9a4347576b33531b651c7 EBUILD pentoo-2010.0-r1.ebuild 10330 RMD160 c2f9c5e0834ab42f125a0d8b0ac215e6182f8a57 SHA1 65ca5c7b63fee188eb91a3b6a7a57e8b96419bf8 SHA256 bf0a3783e5185e230c7a5a759d30d79c204fa3dd93c45d8fcbc6f564d530b49a EBUILD pentoo-2010.0-r2.ebuild 10589 RMD160 e2bfbcfd4aae692be261ed995684410a637e626d SHA1 bbd3405f07900346f33b07679369224ad3bbe575 SHA256 db71c45c41cf0ae374b84ec5f933638f42d2d4bb1c789027aa6331e3a779ae47 +EBUILD pentoo-2010.0-r3.ebuild 9719 RMD160 d4c36807a39c376688b26c608e932807c5ff268b SHA1 14ec50460171cc809799849841a1421e958f7f54 SHA256 78df55e0e656f39484ac1a1f0cab8368eb97b4e79c7eb11abd0ff31c8a97d82e EBUILD pentoo-2010.0.ebuild 2587 RMD160 b2d9b2034c85cea6cb307e83ebaac7869e8a17a2 SHA1 46d9d808163f6ce560feac41596d672e12b0c860 SHA256 cac3c3ad1bee21b1932a81194e74c41a512e01a823c4cc69844bd52a85a71d03 diff --git a/sys-apps/pentoo/pentoo-2010.0-r3.ebuild b/sys-apps/pentoo/pentoo-2010.0-r3.ebuild new file mode 100644 index 000000000..d7b6fcdb9 --- /dev/null +++ b/sys-apps/pentoo/pentoo-2010.0-r3.ebuild @@ -0,0 +1,419 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +KEYWORDS="-*" +DESCRIPTION="One ebuild to rule them all and in the darkness bind them" +HOMEPAGE="http://www.pentoo.ch" +SLOT="0" +LICENSE="GPL" +IUSE="dwm +enlightenment +forensics kde livecd +managedetcportage +sqlsec +webappsec +wirelesssec xfce" + +DEPEND="" + +#main atoms +RDEPEND="=sys-kernel/pentoo-sources-2.6.32-r1" + +#things not permitted to exist (due to security holes) +RDEPEND="${RDEPEND} + !