From c89820c323868a467d8023c9c14afcfcb6faefc4 Mon Sep 17 00:00:00 2001 From: randomdan Date: Tue, 23 Mar 2010 19:32:04 +0000 Subject: keep going and parallel preserved rebuild --- virtual/miller-base/Manifest | 4 +- virtual/miller-base/files/update-install2 | 2 +- virtual/miller-base/miller-base-7-r1.ebuild | 98 ----------------------------- virtual/miller-base/miller-base-7-r2.ebuild | 98 +++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 101 deletions(-) delete mode 100644 virtual/miller-base/miller-base-7-r1.ebuild create mode 100644 virtual/miller-base/miller-base-7-r2.ebuild (limited to 'virtual') diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index a6d43aa..6afc6f5 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -36,7 +36,7 @@ AUX restart/unscd 27 RMD160 73e53d26fabc6f096716611fb49079eec087d5de SHA1 d66cf3 AUX restart/vsftpd 27 RMD160 91be22938c872d12b96c8c695f9cba1c2767ed45 SHA1 016b411d34273ae75962ac4023b1c9e6c632a19a SHA256 75ecac8ca02bf650883aecdc5e8d7d4c233ad1d96d4497f99135703930c38932 AUX sync-distclean-exec.cron 48 RMD160 06f9d602ab5c35a524e1605aa2296975fbf93fef SHA1 fda026a86c93267d3e29aae42e39cc10be150428 SHA256 48d786065199b15d7e9ec719fa5f519ff11b546022057245c08a27a722544eb6 AUX update-autoshutdown 88 RMD160 f029249c1e727d4feaa06bbdc8bac1a9e84ba178 SHA1 2f55e2283efae01ae9fa30d5ae136989257563c2 SHA256 e90d95d158222c493d4fbf8ebcd9c2927535048d97ee743fe658d47e50aa6fb6 -AUX update-install2 433 RMD160 4502c28c312a52d25a3f9c910c298756c85fe087 SHA1 a2c43865c87ac92e6e71088ead6725cf22f69d82 SHA256 7d0c4381a0509aafb3a0b1457810e93b81d1d9495a2f2c29f15980d3b5241a85 +AUX update-install2 450 RMD160 ab805d0e0fe691bc646d78efcc29ac5e3d5f7a3f SHA1 32506a311b5eacc78c73bad85505c4b808725804 SHA256 725810ddf9ea624d8d12aa1a5c64762bfbbcfcaf068ba13c128354ef0ab98563 AUX update-kernel 435 RMD160 0b7becad4f9a43110cc7e9b0b8912c97cfafe4b7 SHA1 6634ec3b65d631a496bfaade36385b82cf8251ff SHA256 272a3ed8d5d2f863279ec77bc81578f0547c716cfa852ba3d32072d2600754fa AUX update.portage.cron 171 RMD160 c388289e78342b65d48077868f4acbe9b3b00849 SHA1 d7430ff8e906ad8d66918750c29722bfa6030c73 SHA256 394b727e294166db136d5b5c46ab0ac180952d6f20cd93b4a356a2cfc9bedf03 AUX update.portage.cron-2 159 RMD160 eada35db78d363502c4d0486cfcbc8493514562f SHA1 4be58a5f236829928865c800585cc9c811a6aad3 SHA256 a910ae7e18b6e759380f1d9e30bffa100912b3a6f1c60c69f33b9cd186d0e92c @@ -44,4 +44,4 @@ AUX weekly-av-scan.cron 232 RMD160 1eb8c0e031fc10a8299f8d00cddf46aee7dc011a SHA1 AUX weekly-distclean-exec-eclean.cron 40 RMD160 3c0f801ebbb3e575590aa7764e5020a820e5f5fe SHA1 a077c7c5265c3d9817fa4846dbbab8bc9addfeb5 SHA256 dbb37593b994102324c5a24b5d5d21597c215924a29d065d84b8c64af3049b38 AUX weekly-distclean-exec.cron 664 RMD160 af55d070f6f442feedbfb7a324ccaa5ceff53037 SHA1 76f91d4eac90a44f3d9e636640279d1754f2739e SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141 AUX write-new-updates 108 RMD160 1eccc342427d7c6523f23f8d7bd4bf2966638cb2 SHA1 8886bae7ac2c2f01c6cbd47ffcaa15ffcc210214 SHA256 b910f8d64a069e8038965c1c8af3bf05729f027e2da264cd6e0fa2ea627ec164 -EBUILD miller-base-7-r1.ebuild 3000 RMD160 dcee8f2a28a755b02aec31858874096cdb79ac5e SHA1 ab0aa3da23c09d8abe5e516198c5fda808e87097 SHA256 29dd0e4b07263523b6a924dba7b39fb0b2f5533e40dcbfb46521ec65eb429e73 +EBUILD miller-base-7-r2.ebuild 3000 RMD160 dcee8f2a28a755b02aec31858874096cdb79ac5e SHA1 ab0aa3da23c09d8abe5e516198c5fda808e87097 SHA256 29dd0e4b07263523b6a924dba7b39fb0b2f5533e40dcbfb46521ec65eb429e73 diff --git a/virtual/miller-base/files/update-install2 b/virtual/miller-base/files/update-install2 index add1cf1..7d5936e 100755 --- a/virtual/miller-base/files/update-install2 +++ b/virtual/miller-base/files/update-install2 @@ -10,7 +10,7 @@ TTYTEST=$? emerge -uqDN -j2 @world @system --keep-going && \ rm -f $file ) || \ /etc/portage/postsync.d/50-write-new-updates ) && \ - emerge --depclean -q 2>&1 | tee $dpfile && \ + emerge --depclean -q -j2 --keep-going 2>&1 | tee $dpfile && \ emerge -q @preserved-rebuild \ ) revdep-rebuild -q -i diff --git a/virtual/miller-base/miller-base-7-r1.ebuild b/virtual/miller-base/miller-base-7-r1.ebuild deleted file mode 100644 index c7d72f8..0000000 --- a/virtual/miller-base/miller-base-7-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -DESCRIPTION="Virtual for Miller servers" - -EAPI="2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" -IUSE="cdr hardened nohourlyupdate fuse xfs bash-completion nomedia git -minimal autoupdate autoshutdown autoservicerestart" - -DEPEND=" - !minimal? ( www-servers/apache ) - sys-cluster/glusterfs - sys-apps/inotail - cdr? ( app-cdr/k3b ) - !nomedia? ( media-tv/mythtv media-plugins/mythvideo ) - sys-apps/hdparm - sys-apps/unscd - !minimal? ( net-dns/bind-tools ) - fuse? ( sys-fs/sshfs-fuse ) - !minimal? ( || ( net-fs/mount-cifs net-fs/samba-client ) ) - xfs? ( sys-fs/xfsdump ) - sys-fs/lvm2 - >=app-portage/gentoolkit-0.2.1 - sys-process/vixie-cron - !minimal? ( sys-apps/eject ) - app-admin/sudo - mail-client/mailx - sys-apps/pciutils - !minimal? ( app-dicts/myspell-en ) - net-misc/ntp - !minimal? ( net-analyzer/netcat ) - !minimal? ( net-ftp/ncftp ) - dev-util/cvs - !minimal? ( x11-apps/xauth ) - sys-process/lsof - app-portage/layman[cvs] - app-admin/syslog-ng - app-admin/logrotate - !minimal? ( app-antivirus/clamav ) - !hardened? ( sys-kernel/tuxonice-sources ) - hardened? ( sys-kernel/hardened-sources ) - !minimal? ( || - ( app-text/dos2unix =app-text/dos2unix-5 !app-text/unix2dos ) ) - app-misc/screen - sys-boot/grub - app-vim/gentoo-syntax - sys-apps/kexec-tools - sys-auth/pam_ldap - sys-auth/nss_ldap - app-editors/gvim - git? ( dev-vcs/git ) - !minimal? ( dev-util/strace ) - bash-completion? ( app-shells/bash-completion ) - net-misc/wakeonlan - " - -src_install() { - exeinto /etc/cron.weekly - use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan - - exeinto /etc/cron.daily - use !minimal && newexe "${FILESDIR}"/daily-av-update.cron av-update - - if [ -n "${UPDATETIME}" ]; then - mkdir -p ${D}/etc/cron.d - echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update - exeinto /sbin - else - use nohourlyupdate && exeinto /etc/cron.daily - use !nohourlyupdate && exeinto /etc/cron.hourly - fi - newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update - - exeinto /etc/portage/postsync.d/ - newexe "${FILESDIR}"/sync-distclean-exec.cron 88-portage-distclean-exec - use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 89-auto-download-package - newexe "${FILESDIR}"/auto-update-overlays 10-auto-update-overlays - newexe "${FILESDIR}"/write-new-updates 50-write-new-updates - if use autoupdate ; then - dosym /sbin/update-install /etc/portage/postsync.d/98-update-install - if use autoshutdown ; then - newexe "${FILESDIR}"/update-autoshutdown 99-auto-shutdown - else - if use autoservicerestart ; then - exeinto /usr/libexec/scripts/auto-restart - for f in ${FILESDIR}/restart/* ; do - newexe ${FILESDIR}/restart/`basename $f` `basename $f` - done - exeinto /etc/portage/postsync.d/ - newexe "${FILESDIR}"/auto-restart-services 99-auto-restart-services - fi - fi - fi - - exeinto /sbin - newexe "${FILESDIR}"/update-install2 update-install - newexe "${FILESDIR}"/update-kernel update-kernel -} diff --git a/virtual/miller-base/miller-base-7-r2.ebuild b/virtual/miller-base/miller-base-7-r2.ebuild new file mode 100644 index 0000000..c7d72f8 --- /dev/null +++ b/virtual/miller-base/miller-base-7-r2.ebuild @@ -0,0 +1,98 @@ +DESCRIPTION="Virtual for Miller servers" + +EAPI="2" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" +IUSE="cdr hardened nohourlyupdate fuse xfs bash-completion nomedia git +minimal autoupdate autoshutdown autoservicerestart" + +DEPEND=" + !minimal? ( www-servers/apache ) + sys-cluster/glusterfs + sys-apps/inotail + cdr? ( app-cdr/k3b ) + !nomedia? ( media-tv/mythtv media-plugins/mythvideo ) + sys-apps/hdparm + sys-apps/unscd + !minimal? ( net-dns/bind-tools ) + fuse? ( sys-fs/sshfs-fuse ) + !minimal? ( || ( net-fs/mount-cifs net-fs/samba-client ) ) + xfs? ( sys-fs/xfsdump ) + sys-fs/lvm2 + >=app-portage/gentoolkit-0.2.1 + sys-process/vixie-cron + !minimal? ( sys-apps/eject ) + app-admin/sudo + mail-client/mailx + sys-apps/pciutils + !minimal? ( app-dicts/myspell-en ) + net-misc/ntp + !minimal? ( net-analyzer/netcat ) + !minimal? ( net-ftp/ncftp ) + dev-util/cvs + !minimal? ( x11-apps/xauth ) + sys-process/lsof + app-portage/layman[cvs] + app-admin/syslog-ng + app-admin/logrotate + !minimal? ( app-antivirus/clamav ) + !hardened? ( sys-kernel/tuxonice-sources ) + hardened? ( sys-kernel/hardened-sources ) + !minimal? ( || + ( app-text/dos2unix =app-text/dos2unix-5 !app-text/unix2dos ) ) + app-misc/screen + sys-boot/grub + app-vim/gentoo-syntax + sys-apps/kexec-tools + sys-auth/pam_ldap + sys-auth/nss_ldap + app-editors/gvim + git? ( dev-vcs/git ) + !minimal? ( dev-util/strace ) + bash-completion? ( app-shells/bash-completion ) + net-misc/wakeonlan + " + +src_install() { + exeinto /etc/cron.weekly + use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan + + exeinto /etc/cron.daily + use !minimal && newexe "${FILESDIR}"/daily-av-update.cron av-update + + if [ -n "${UPDATETIME}" ]; then + mkdir -p ${D}/etc/cron.d + echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update + exeinto /sbin + else + use nohourlyupdate && exeinto /etc/cron.daily + use !nohourlyupdate && exeinto /etc/cron.hourly + fi + newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update + + exeinto /etc/portage/postsync.d/ + newexe "${FILESDIR}"/sync-distclean-exec.cron 88-portage-distclean-exec + use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 89-auto-download-package + newexe "${FILESDIR}"/auto-update-overlays 10-auto-update-overlays + newexe "${FILESDIR}"/write-new-updates 50-write-new-updates + if use autoupdate ; then + dosym /sbin/update-install /etc/portage/postsync.d/98-update-install + if use autoshutdown ; then + newexe "${FILESDIR}"/update-autoshutdown 99-auto-shutdown + else + if use autoservicerestart ; then + exeinto /usr/libexec/scripts/auto-restart + for f in ${FILESDIR}/restart/* ; do + newexe ${FILESDIR}/restart/`basename $f` `basename $f` + done + exeinto /etc/portage/postsync.d/ + newexe "${FILESDIR}"/auto-restart-services 99-auto-restart-services + fi + fi + fi + + exeinto /sbin + newexe "${FILESDIR}"/update-install2 update-install + newexe "${FILESDIR}"/update-kernel update-kernel +} -- cgit v1.2.3