Bug #168334 ; q -r dies with a segfault after emerge --sync

Bug #168442 ; does not  properly parse the profile location
Bug #170795 ; add a -E/--eclass option to qgrep
Bug #170797 ; add a -s/--skip-comments option to qgrep
Bug #171024 ; opening '/usr/portage/.metadata.x' failed
Bug #171374 ; Misc enhancements for qgrep
Bug #172240 ; -A/-B options for qgrep (context lines)
Bug #172338 ; qgrepping through installed ebuilds (in the VDB)
Bug #173005 ; Colorized output for qgrep.
(Portage version: 2.1.2_pre1)

3 files changed, 77 insertions, 1 deletions

diff --git a/app-portage/portage-utils/ChangeLog b/app-portage/portage-utils/ChangeLog
index 3b40c7183f74..81e134ab131e 100644
--- a/app-portage/portage-utils/ChangeLog
+++ b/app-portage/portage-utils/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-portage/portage-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.74 2007/02/11 22:49:21 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.75 2007/04/05 18:40:59 solar Exp $
+
+*portage-utils-0.1.25 (05 Apr 2007)
+
+  05 Apr 2007; <solar@gentoo.org> +portage-utils-0.1.25.ebuild:
+  Bug #168334 ; q -r dies with a segfault after emerge --sync
+  Bug #168442 ; does not  properly parse the profile location
+  Bug #170795 ; add a -E/--eclass option to qgrep
+  Bug #170797 ; add a -s/--skip-comments option to qgrep
+  Bug #171024 ; opening '/usr/portage/.metadata.x' failed
+  Bug #171374 ; Misc enhancements for qgrep
+  Bug #172240 ; -A/-B options for qgrep (context lines) 
+  Bug #172338 ; qgrepping through installed ebuilds (in the VDB) 
+  Bug #173005 ; Colorized output for qgrep.
 
 *portage-utils-0.1.24 (11 Feb 2007)
 
diff --git a/app-portage/portage-utils/files/digest-portage-utils-0.1.25 b/app-portage/portage-utils/files/digest-portage-utils-0.1.25
new file mode 100644
index 000000000000..3ddb329e09f7
--- /dev/null
+++ b/app-portage/portage-utils/files/digest-portage-utils-0.1.25
@@ -0,0 +1,3 @@
+MD5 143a9fd367c1d0441d84a4b8869e50bb portage-utils-0.1.25.tar.bz2 76749
+RMD160 f1c9d1eb548a9656810345b437a517b06e5e6135 portage-utils-0.1.25.tar.bz2 76749
+SHA256 fd2a8e6c76e7e4e8414cfc7daeb264d8f7207d4772d239cd1a8f19caf6fc7831 portage-utils-0.1.25.tar.bz2 76749
diff --git a/app-portage/portage-utils/portage-utils-0.1.25.ebuild b/app-portage/portage-utils/portage-utils-0.1.25.ebuild
new file mode 100644
index 000000000000..89a0006fbcf5
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.1.25.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.1.25.ebuild,v 1.1 2007/04/05 18:40:59 solar Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="small and fast portage helper tools written in C"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+src_compile() {
+	tc-export CC
+	emake || die
+}
+
+src_install() {
+	dobin q || die "dobin failed"
+	doman man/*.[0-9]
+	for applet in $(<applet-list) ; do
+		dosym q /usr/bin/${applet}
+	done
+}
+
+pkg_postinst() {
+	[ -e ${ROOT}/etc/portage/bin/post_sync ] && return 0
+	mkdir -p ${ROOT}/etc/portage/bin/
+
+cat <<__EOF__ > ${ROOT}/etc/portage/bin/post_sync
+#!/bin/sh
+# Copyright 2006-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ -d /etc/portage/postsync.d/ ]; then
+	for f in /etc/portage/postsync.d/* ; do
+		if [ -x \${f} ] ; then
+			\${f}
+		fi
+	done
+else
+	:
+fi
+__EOF__
+	chmod 755 ${ROOT}/etc/portage/bin/post_sync
+	if [ ! -e ${ROOT}/etc/portage/postsync.d/q-reinitialize ]; then
+		mkdir -p ${ROOT}/etc/portage/postsync.d/
+		echo '[ -x /usr/bin/q ] && /usr/bin/q -qr' > ${ROOT}/etc/portage/postsync.d/q-reinitialize
+		elog "${ROOT}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
+		elog "If you wish for it to be automatically run at the end of every --sync simply chmod +x ${ROOT}/etc/portage/postsync.d/q-reinitialize"
+		elog "Normally this should only take a few seconds to run but file systems such as ext3 can take a lot longer."
+		elog "If ever you find this to be an inconvenience simply chmod -x ${ROOT}/etc/portage/postsync.d/q-reinitialize"
+	fi
+	:
+}