Initial import of remaining gentoolkit-dev packages

Unable to merge due to confilts in history, removed gnetoolkit paths in gentoolkit-dev...
So do a basic new files commit instead.

For the previous history of the different packages, refer to the gentoolkit-dev branch.

6 files changed, 565 insertions, 0 deletions

diff --git a/ebump/AUTHORS b/ebump/AUTHORS
new file mode 100644
index 0000000..0cf8ad8
--- /dev/null
+++ b/ebump/AUTHORS
@@ -0,0 +1,4 @@
+Christian Ruppert <idl0r@gentoo.org>
+
+Original author:
+Karl Trygve Kalleberg <karltk@gentoo.org>
diff --git a/ebump/ChangeLog b/ebump/ChangeLog
new file mode 100644
index 0000000..4434b94
--- /dev/null
+++ b/ebump/ChangeLog
@@ -0,0 +1,8 @@
+2004-06-21 Karl Trygve Kalleberg <karltk@gentoo.org>
+	* Fixed handling of deletion.
+
+2004-03-11 Karl Trygve Kalleberg <karltk@gentoo.org>
+	* Fixed incorrect cut'ing of wc -l output when updating ChangeLog
+	
+2004-02-08 Karl Trygve Kalleberg <karltk@gentoo.org>
+	* Initial import
diff --git a/ebump/Makefile b/ebump/Makefile
new file mode 100644
index 0000000..61afab3
--- /dev/null
+++ b/ebump/Makefile
@@ -0,0 +1,20 @@
+# Copyright 2004 Karl Trygve Kalleberg <karltk@gentoo.org>
+# Copyright 2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+#
+# $Header$
+
+include ../../makedefs.mak
+
+.PHONY: all
+all: 
+
+dist: 
+	mkdir -p ../../$(DISTDIR)/src/ebump/
+	cp Makefile AUTHORS README ChangeLog ebump ebump.1 ../../$(DISTDIR)/src/ebump/
+
+install: all
+	install -m 0755 ebump $(BINDIR)/
+	install -d $(DOCDIR)/ebump
+	install -m 0644 AUTHORS README ChangeLog $(DOCDIR)/ebump/
+	install -m 0644 ebump.1 $(MAN1DIR)/
diff --git a/ebump/README b/ebump/README
new file mode 100644
index 0000000..f13592e
--- /dev/null
+++ b/ebump/README
@@ -0,0 +1,18 @@
+
+Package : ebump
+Version : 0.1.1
+Author  : See AUTHORS
+
+MOTIVATION
+
+The ebump utility is a Gentoo-specific tool for bumping the revision of
+a given ebuild and auxiliary files in the Portage tree. It is only
+useful for Gentoo developers with CVS commit access.
+
+MECHANICS
+
+N/A
+
+IMPROVEMENTS
+
+N/A
diff --git a/ebump/ebump b/ebump/ebump
new file mode 100755
index 0000000..47ffd86
--- /dev/null
+++ b/ebump/ebump
@@ -0,0 +1,389 @@
+#! /bin/sh
+# Copyright (c) 2004 Karl Trygve Kalleberg <karltk@gentoo.org>
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+__version__="0.1.1"
+__author__="Karl Trygve Kalleberg"
+__email__="<karltk@gentoo.org>"
+__description__="Ebuild version bumping tool"
+
+
+
+die() {
+	echo $1 >&2
+	exit -1
+}
+
+einfo() {
+	if [ ${opt_verbosity:-0} -eq 1 ] ; then
+		echo $*
+	fi
+}
+
+print_version() {
+	echo "${__description__}, v${__version__}"
+	echo "Copyright (c) 2004 ${__author__} ${__email__}"
+	echo "Copyright 1999-2010 Gentoo Foundation"
+	echo "Distributed under the terms of the GNU General Public License v2"
+}
+
+print_usage() {
+	echo "Usage: ebump <options> foo<.ebuild>"
+	echo "Ebuild version bumping tool, v${__version__}"
+	echo "  -V|--version           show version info"
+	echo "  -v|--verbose           increase verbosity"
+	echo "  -q|--quiet             turn off output"
+	echo "  -a|--no-auxfiles       don't bump auxfiles (files/*)"
+	echo "  -c|--no-changelog      do not update ChangeLog (via echangelog)"
+	echo "  -C|--no-vcs            do not add to VCS"
+	echo "  -m|--message           append message to ChangeLog"
+	echo "  -d|--delete-old        delete previous revision from VCS (DANGEROUS!)"
+}
+
+#
+# Load options from /etc/gentoolkit/ebump.conf and ${HOME}/.gentoo/ebump.conf
+# Home directory file takes precedence.
+#
+load_options() {
+	# FIXME: Sourcing config files like this is really a bad idea; users may
+	# easily override any function in this program inside his config files.
+	if [ -f "/etc/gentoolkit/ebump.conf" ] ; then
+		. /etc/gentoolkit/ebump.conf
+	fi
+	if [ -f "${HOME}/.gentoo/gentool-env" ] ; then
+		. ${HOME}/.gentoo/gentool-env
+	fi
+	if [ -f "${HOME}/.gentoo/ebump.conf" ] ; then
+		. ${HOME}/.gentoo/ebump.conf
+	fi
+
+	# FIXME: remove this warning in 2-3 releases.
+	if [ -n "${opt_add_cvs}" ]; then
+		echo "Warning: opt_add_cvs is deprecated, please use opt_add_vcs from now on!" >&2
+	fi
+}
+
+#
+# Find closes ebuild to ${1}, if any
+#
+find_ebuild() {
+	local f=${1}
+
+	if [ -f "${f}" ] ; then
+		echo ${f}
+	fi
+
+	if [ -f "${f}.ebuild" ] ; then
+		echo ${f}
+	fi
+}
+
+#
+# splitname (version|name|revision) package-name-version-revision
+#
+splitname() {
+	case $1 in
+		version)
+			echo ${2} | sed -r "s/.*-([0-9].*)/\1/"
+		;;
+		name)
+			name=$(echo ${2} | sed -r "s/(.*)-[0-9].*/\1/")
+			if [ ${name} = ${2} ] ; then
+				if [ $(echo ${2} | grep "^[0-9].*") ] ; then
+					# The filename starts with a version number, thus it has no
+					# name
+					name=""
+				else
+					# The filename doesn't have a recognizeable version number;
+					# everything is a name
+					name=${2}
+				fi
+			fi
+			echo ${name}
+		;;
+		revision)
+			rev=$(echo ${2} | sed -r "s/.*-r([0-9][0-9]*)/\1/")
+			if [ ${rev} = ${2} ] ; then
+				rev=0
+			fi
+			echo ${rev}
+		;;
+		vernorev)
+			ver=$(echo ${2} | sed -r "s/.*-([0-9].*)-r[0-9]+/\1/")
+			if [ ${ver} = ${2} ] ; then
+				ver=$(echo ${2} | sed -r "s/.*-([0-9].*)/\1/")
+			fi
+			echo ${ver}
+		;;
+		*)
+			echo
+		;;
+	esac
+}
+
+process_ebuild() {
+	local vcs=$1
+	shift
+	local ebuild_arg="${*}"
+	shift $#
+
+	# Files to add to VCS
+	local addfiles=""
+	# Files to remove from VCS
+	local delfiles=""
+
+	if [ -z "${ebuild_arg}" ] ; then
+		print_usage
+		exit
+	fi
+
+	for ebuild in $ebuild_arg; do
+		#
+		# Try to find a matching ebuild
+		#
+		local ebuild_name=$(find_ebuild ${ebuild})
+		if [ -z "${ebuild_name}" ] ; then
+			die "Could not find ${ebuild}"
+		fi
+
+		einfo "Processing ebuild ${ebuild_name}"
+
+		#
+		# Bump revision suffix (or add one)
+		#
+		local PF=$(basename ${ebuild_name} .ebuild)
+		local PN=$(splitname name ${PF})
+		local PV=$(splitname version ${PF})
+		local rev=$(splitname revision ${PF})
+		local PV_norev=$(splitname vernorev ${PF})
+		local newPF=${PN}-${PV_norev}-r$((rev+1))
+
+#		echo $PF / $PN / $PV / $rev / $PV_norev / $newPF
+
+		einfo "Bumped ${PF}.ebuild to ${newPF}.ebuild"
+
+		if [ "${vcs}" = "svn" ]; then
+			svn cp ${PF}.ebuild ${newPF}.ebuild
+		else
+			cp ${PF}.ebuild ${newPF}.ebuild
+		fi
+
+		einfo "Reset keywords to ~arch"
+
+		ekeyword '~all' "${newPF}.ebuild"
+
+		addfiles="${addfiles} ${newPF}.ebuild"
+		delfiles="${delfiles} ${PF}.ebuild"
+
+		#
+		# (Optional) Bump relevant files in files/
+		#
+		if [ "${opt_bump_auxfiles}" = "y" ] ; then
+			# Gather list of auxiliary files in files/ that has a versioned
+			# filename, where the version matches our current version.
+			local bumplist=""
+			for x in $(echo files/*) ; do
+				if [ ! -z "$(echo $x | grep "${PV}$")" ] ; then
+					bumplist="${bumplist} ${x}"
+				fi
+			done
+
+			# Bump version of all matches
+			for x in ${bumplist} ; do
+				local bn=$(basename ${x})
+				local dn=$(dirname ${x})
+				local newbn
+
+				PN=$(splitname name ${bn})
+				PV=$(splitname version ${bn})
+				rev=$(splitname revision ${bn})
+				PV_norev=$(splitname vernorev ${bn})
+
+#				echo $PN / ${PV_norev} / ${rev}
+
+				# Special case for when we have no name part; filename
+				# is just a version number
+				if [ -z "${PN}" ] ; then
+					newbn=${PV_norev}-r$((rev+1))
+				else
+					newbn=${PN}-${PV_norev}-r$((rev+1))
+				fi
+
+				if [ -d ${dn}/${bn} ] ; then
+					if [ -e ${dn}/${newbn} ] ; then
+						echo "Directory ${dn}/${newbn} exists, not copying" >&2
+					else
+						cp -a ${dn}/${bn} ${dn}/${newbn}
+						# uhm, is that necessary?
+#						find ${dn}/${newbn} -name CVS | xargs rm -rf
+					fi
+				else
+					cp ${dn}/${bn} ${dn}/${newbn}
+				fi
+
+				addfiles="${addfiles} ${dn}/${newbn}"
+				delfiles="${delfiles} ${dn}/${bn}"
+
+				einfo "Bumped ${dn}/${bn} to ${dn}/${newbn}"
+			done
+		fi
+	done
+
+#	echo "addfiles ${addfiles}"
+#	echo "delfiles ${delfiles}"
+
+	#
+	# (Optional) Add VCS entry for all new files
+	#
+	if [ "${opt_add_vcs}" = "y" ] ; then
+#		for x in ${addfiles} ; do
+#			if [ -d ${x} ] ; then
+#				find ${x} -exec ${vcs} add {} ';'
+#			else
+#				${vcs} add ${x}
+#			fi
+#		done
+		$vcs add $addfiles
+		einfo "Added ${addfiles} to VCS"
+	fi
+
+
+	#
+	# (Optional) Delete previous entry
+	#
+	# Could we use 'rm' instead of remove for all vcs?
+	if [ "${opt_delete_old}" = "y" ] ; then
+#		for x in ${delfiles} ; do
+#			if [ "${vcs}" = "cvs" ]; then
+#				${vcs} remove -f ${x}
+#			elif [ "${vcs}" = "git" ]; then
+#				${vcs} rm ${x}
+#			else
+#				${vcs} remove ${x}
+#			fi
+#		done
+		if [ "${vcs}" = "cvs" ]; then
+			$vcs remove -f $delfiles
+		elif [ "${vcs}" = "git" ]; then
+			$vcs rm $delfiles
+		else
+			$vcs remove $delfiles
+		fi
+		einfo "Removed ${delfiles} from VCS"
+	fi
+
+	#
+	# (Optional) Add ChangeLog entry
+	#
+	if [ "${opt_add_changelog}" = "y" ] && [ "${opt_add_vcs}" = "y" ]; then
+		# FIXME: remove this warning in 2-3 releases
+		if [ -n "${AUTHORNAME}" ] || [ -n "${AUTHOREMAIL}" ]; then
+			echo "Warning: AUTHORNAME and AUTHOREMAIL is deprecated!" >&2
+			echo "Please take a look at echangelog(1)." >&2
+			echo "To avoid this warning unset AUTHORNAME and AUTHOREMAIL." >&2
+		fi
+
+		echangelog "${opt_commitmessage}" || set $?
+
+		if [ ${1:-0} -ne 0 ]; then
+			einfo "Modifying ChangeLog failed!"
+		else
+			einfo "Added ChangeLog entry"
+		fi
+	fi
+}
+
+get_vcs() {
+	if [ -d "CVS" ]; then
+		echo "cvs"
+		return 0
+	elif [ -d ".svn" ]; then
+		echo "svn"
+		return 0
+	else
+		if [ -x "$(which git)" ]; then
+			if [ -n "$(git rev-parse --git-dir 2>/dev/null)" ]; then
+				echo "git"
+				return 0
+			fi
+		fi
+
+		echo
+		return 1
+	fi
+}
+
+#
+# Global options
+#
+opt_verbosity=0
+opt_add_changelog=y
+opt_add_vcs=y
+opt_bump_auxfiles=y
+opt_delete_old=n
+opt_commitmessage=""
+
+load_options
+
+while [ ${#} -gt 0 ] ; do
+	arg=${1}
+	shift
+
+	case ${arg} in
+		-h|--help)
+			print_usage
+			exit 0
+		;;
+		-m|--message)
+			opt_commitmessage="${1}"
+			shift
+			continue
+		;;
+		-a|--no-auxfiles)
+			opt_bump_auxfiles=n
+			continue
+		;;
+		-c|--no-changelog)
+			opt_add_changelog=n
+			continue
+		;;
+		-C|--no-vcs)
+			opt_add_vcs=n
+			continue
+		;;
+		-V|--version)
+			print_version
+			exit
+		;;
+		-v|--verbose)
+			opt_verbosity=1
+			continue
+		;;
+		-q|--quiet)
+			opt_verbosity=0
+			continue
+		;;
+		-d|--delete-old)
+			opt_delete_old=y
+			continue
+		;;
+		*)
+			ebuild_arg="${ebuild_arg:+${ebuild_arg} }${arg}"
+			continue
+		;;
+	esac
+done
+
+vcs=$(get_vcs)
+if [ -z "${vcs}" ]; then
+	echo "Warning: no cvs, git or svn repository found!" >&2
+	echo "Changes can't be added to the VCS" >&2
+	opt_add_vcs=n
+	opt_delete_old=n
+fi
+
+process_ebuild "${vcs}" $ebuild_arg
+
+# TODO:
+# - put cli parser into separate functions
diff --git a/ebump/ebump.1 b/ebump/ebump.1
new file mode 100644
index 0000000..b1e473d
--- /dev/null
+++ b/ebump/ebump.1
@@ -0,0 +1,126 @@
+.TH "ebump" "1" "0.1.1" "Gentoolkit" "Gentoo Administration"
+.SH "NAME"
+.LP 
+ebump \- Gentoo: Ebuild revision bumper
+.SH "SYNTAX"
+.LP 
+ebump [\fIoption\fP] <\fIpackage-name[-version]\fP>
+
+.SH "DESCRIPTION" 
+
+.LP
+\fIebump\fR bumps the revision of a particular ebuild, and all auxiliary
+files in the files/ directory that have a matching version suffix.
+
+.LP
+By default, the all new revision files will be added to the VCS.
+
+.LP 
+You must stand in the directory of the ebuild to be bumped.
+
+.SH "OPTIONS"
+.LP 
+\fB\-C\fR
+.br
+\fB--no-vcs\fB
+.IP 
+Do not add new files to VCS.
+
+.LP 
+\fB\-V\fR
+.br
+\fB--version\fB
+.IP 
+Display version information and exit.
+
+.LP 
+\fB\-v\fR
+.br
+\fB--verbose\fB
+.IP 
+Increase verbosity level. May be used more than once.
+
+.LP 
+\fB\-q\fR
+.br
+\fB--quiet\fB
+.IP 
+Do not output any non-essential information.
+
+.LP
+\fB\-a\fR
+.br
+\fB--no-auxfiles\fB
+.IP
+don't bump auxfiles (files/*)
+
+.LP
+\fB\-c\fR
+.br
+\fB--no-changelog\fB
+.IP
+do not update ChangeLog (via echangelog)
+
+.LP 
+\fB\-m\fR <\fIChangeLog text\fR>
+.br 
+\fB\--message\fR <\fIChangeLog text\fR>
+.IP 
+Specifies the message to add to the ChangeLog, instead of the standard
+placeholder.
+
+.LP 
+\fB\-d\fR
+.br
+\fB\--delete-old\fR
+.IP 
+Delete old revision and old auxiliary files from VCS. This is
+\fIdangerous\fR and should only be used if you know exactly what you are
+doing, because
+.br
+1) the old revision may be stable on a different architecture than the one you
+are working on.
+.br
+2) the auxiliary files may be required by other versions of the ebuild.
+.br
+3) the new revision should usually undergo a period of testing before being marked stable.
+
+.SH "CONFIGURATION"
+
+.LP
+\fB/etc/gentoolkit/ebump.conf\fR
+.br
+\fB~/.gentoo/ebump.conf\fR
+.IP
+From these files, \fIebump\fR will load the settings
+.br
+\fBopt_verbosity\fR (default \fI1\fR) - verbosity level 0-10
+.br
+\fBopt_add_changelog\fR (default \fIy\fR) - add entry in ChangeLog
+.br
+\fBopt_add_vcs\fR (default \fIy\fR) - add new files to VCS
+.br
+\fBopt_bump_auxfiles\fR (default \fIy\fR) - bump auxiliary files in files/
+.br
+\fBopt_delete_old\fR (default \fIn\fR) - delete old revision (DANGEROUS!)
+.br
+\fBopt_commitmessage\fR (default \fI""\fR) - default ChangeLog message
+
+.LP
+\fB(DEPRECATED)\fR
+.br
+\fB~/.gentoo/gentool-env\fR
+.IR
+From this file, \fIebump\fR will load the env vars \fBAUTHORNAME\fR and 
+\fBAUTHOREMAIL\fR, which are used to generate proper ChangeLog entries.
+
+.SH "SEE ALSO"
+.LP 
+The rest of the utilities in \fIapp-portage/gentoolkit-dev\fR, such as
+\fIechangelog(1)\fR and \fIekeyword(1)\fR.
+
+.SH "AUTHORS"
+.LP 
+Karl Trygve Kalleberg <karltk@gentoo.org>
+.br
+Christian Ruppert <idl0r@gentoo.org>