diff --git a/pentoo/pentoo-etc-portage/Manifest b/pentoo/pentoo-etc-portage/Manifest index 0c4c7b8ec..b4c64fddc 100644 --- a/pentoo/pentoo-etc-portage/Manifest +++ b/pentoo/pentoo-etc-portage/Manifest @@ -1,2 +1,2 @@ AUX user- 476 RMD160 29f23706f36de37cfd23927c242fa2aad26fa851 SHA1 357495affe70b5dab7350ba1b5ce0fb652908eac SHA256 91e90203e8ddd5ebac3869203818551ada3a0a5c596079a30476366e88e68b8f -EBUILD pentoo-etc-portage-9999.ebuild 1735 RMD160 1d0a79d4e58085a766b86aeac42bec23ad324987 SHA1 4f5977a1489982070936c268967a71edaa8aac95 SHA256 d761e929786dddeaee0a0a227bfb47ed23280e23d49403c1572e6ffde39a3c02 +EBUILD pentoo-etc-portage-9999.ebuild 1638 RMD160 4fa4a64915a9f75117467977881f5c66d4295367 SHA1 e87dba657e764723e15079f1b242cb7bbad24bc3 SHA256 0f1461fca7e3af97c78fdd760eea3a8b4091b8409dfba32c06eef344db0e2816 diff --git a/pentoo/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild b/pentoo/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild index 1903f2d7a..e226d045d 100644 --- a/pentoo/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild +++ b/pentoo/pentoo-etc-portage/pentoo-etc-portage-9999.ebuild @@ -16,9 +16,8 @@ DEPEND="" RDEPEND="" src_install() { - if ! use livecd; then - insinto /etc/portage/ - doins -r "${S}"/* || die "/etc/portage failed!" + insinto /etc/portage/ + doins -r "${S}"/* || die "/etc/portage failed!" for i in keywords use mask unmask; do if [ ! -e "${ROOT}"/etc/portage/package.$i/user-$i ]; then @@ -36,11 +35,9 @@ src_install() { fi fi done - fi } pkg_preinst() { - if ! use livecd; then for i in keywords use mask unmask; do if [ -f "${T}"/user-$i ]; then rm -f "${ROOT}"/etc/portage/package.$i @@ -49,13 +46,10 @@ pkg_preinst() { echo "/etc/portage/package.$i has been moved to /etc/portage/package.$i/user-$i" fi done - fi } pkg_postinst() { - if ! use livecd; then ewarn "You very much likely need to run etc-update or dispatch-conf right now." ewarn "No, seriously, do it now." epause 5 - fi }