nearly complete on the pentoo modifications to make pentoo ebuilds work

This commit is contained in:
Zero_Chaos 2010-03-05 02:29:50 +00:00
parent d0dd3ffa79
commit 2df9b996be
4 changed files with 27 additions and 4 deletions

View file

@ -1,2 +1,2 @@
AUX user- 476 RMD160 f7297498398ef10163194f8e419c9b0d3ed0f9e3 SHA1 6ad6198a5304f4a38eff44af477a34b5cb290175 SHA256 cd8bdd570b4f8f368448b77ea28985b4da3ddaec279c7576291c11596bd6cb30
EBUILD pentoo-etc-portage-9999.ebuild 2067 RMD160 0a0f00c8c531ff69c023afc33163dc1640338c03 SHA1 86e85e241f9b51547288171ec5ee02052e62341b SHA256 1db86af766e5c12eab7557b8175afff98d7f263db59367fb905e07fca2d15d72
EBUILD pentoo-etc-portage-9999.ebuild 2042 RMD160 039047bf15ea267baf7084e2f7b5a951dab01ff0 SHA1 769ea136ffc9b91f41f6a798052f4f9c63f3ea5f SHA256 ac75ec9af6c4b6f038ac464c4554c94f80dc5d288000b6f31c79c053c805242f

View file

@ -17,12 +17,12 @@ 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
grep -v 'x11-base/xorg-x11' "${ROOT}"/var/lib/portage/world > "{T}"/world
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"
mv "${T}"/world "${ROOT}"/var/lib/portage/world || die "Fixing world failed"
}
src_install() {

View file

@ -10,5 +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 9712 RMD160 6f9923b2d340f21f492841b5cc62f3ba0491a1c0 SHA1 7127ab7967bd0e3b518a95275e6980ddae56438c SHA256 029f56bf6bd8b13ac6de496629c77ddcab857fd0b4f25632e03b073a29275d4a
EBUILD pentoo-2010.0-r3.ebuild 11171 RMD160 c59c1a3eabe77aa6fba0d4eca38e0ac647f6a554 SHA1 cb1321c60f3d4e82f135d048814be7dfe7a7c475 SHA256 1936f2f551c107b1867670280327a74d85114a7827be6db3d887d0d43ed60694
EBUILD pentoo-2010.0.ebuild 3936 RMD160 c9a608c706aeba29b7f48515c89d95ef89976e63 SHA1 d5744654ea2b4e67f1dca027bb9c349e7b5ebfee SHA256 0329956191fe71135cf9cdbe2c5c623fc73351be285ff4796505a9b653694375

View file

@ -395,6 +395,25 @@ RDEPEND="${RDEPEND}
#dev-db/sqlinject
#dev-db/sqlat
pkg_setup() {
#pam_pwdb and pam_console are no longer supported
grep -v pam_console "${ROOT}"/etc/pam.d/entrance > "${T}"/entrance
local grepret=$?
[ ${grepret} -ge 2 ] && [ -f "${ROOT}"/etc/pam.d/entrance ] && die "Tried to grep the pam files and got an error."
[ ${grepret} == 0 ] && einfo "pam_console has been purged from /etc/pam.d/entrance. It's a good thing."
[ ${grepret} == 1 ] && einfo "pam_console was not found in /etc/pam.d/entrance. It's a good thing"
mv "${T}"/entrance "${ROOT}"/etc/pam.d/entrance
grep pam_console "${ROOT}/etc/pam.d/*"
local grepret=$?
[ ${grepret} == 0 ] && die "pam_console still exists in /etc/pam.d/ and is no longer supported. Please remove all instances of pam_console."
[ ${grepret} == 1 ] && einfo "pam_console no longer exists in /etc/pam.d. It's a good thing."
grep pam_pwdb "${ROOT}/etc/pam.d/*"
local grepret=$?
[ ${grepret} == 0 ] && die "pam_pwdb still exists in /etc/pam.d/ and is no longer supported. Please remove all instances of pam_pwdb."
[ ${grepret} == 1 ] && einfo "pam_pwdb no longer exists in /etc/pam.d. It's a good thing."
}
src_install() {
##here is where we merge in things from root_overlay which make sense
exeinto /root
@ -416,4 +435,8 @@ pkg_postinst() {
elog "meta-package which can be used to make sure the installed users can be"
elog "updated when we make fairly major changes. This may not handle everything,"
elog "but it is a start..."
ewarn "Significant changes have been made to your system, you must type 'etc-update'."
ewarn "This command will help you merge the changed configuration files onto your system."
epause "Seriously, stop what you are doing now and run 'etc-update'"
}