Fixed built_with_use_error() internal function name, closing bug #160651. Removed 0.10.2 ebuild.

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 152 deletions

diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index ed54d4d56a72..d62f75e9c91a 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -15,29 +15,24 @@ MD5 4dc8d28369a56b8efd84fd118c2cb28b files/tracd.initd 743
 RMD160 ddc2bcf9dc907054882f35b5cc0f835c6fb450be files/tracd.initd 743
 SHA256 c55b46edae5e7600890c426362f7e00b3a5fd5290fe3616d189f809b8626265d files/tracd.initd 743
 DIST trac-0.10.1.tar.gz 439941 RMD160 13fc90cc6023d9279721eaa583be2a09bd42737d SHA1 076b1f71ede1ecce533c71d16f1c0740065cd2ee SHA256 a5528c5e5ca865842628ad5fc6984df774d61b72e13db34a525496e3136c87c7
-DIST trac-0.10.2.tar.gz 440277 RMD160 c7dac7b93d8f06fa3ad22de35c9a2303154a2023 SHA1 251ea65d6dce57dbe78ef36bfb4fd579eaa24a25 SHA256 09286ad24ffcd4f1bdd0d0cb534217728043645d605ac6711a192bebc622408a
 DIST trac-0.10.3.tar.gz 440811 RMD160 bfd3c16a2fb9e849ef068a0640a2c14cd2fb4423 SHA1 02f5f3e5904c8629123890b99ad6568ad5d12577 SHA256 b0d5826ff502172fec68d183088e1ac794369e848a541c031eeb53c3fe19da90
 DIST trac-0.9.6.tar.gz 339647 RMD160 3bf086f8c5a6b3b7d6584359dbc916f6ee61dfdc SHA1 b64b193ec014113341f493149e0de2876a32fc7d SHA256 67862c30c2dd0852ba4778a23bba79ab2387e9b40a85b40865cb76c4fa878dfc
-EBUILD trac-0.10.1.ebuild 3931 RMD160 6f799730ec43f8c207532a12f177b3999142ee3b SHA1 8603ba09e2be82ca9c497e058d62e12c64ce8253 SHA256 145fa1fd96042c406cbfb8b80fc93a08c2f2e5aa660fd0912fdaf87603b2155a
-MD5 1cfa590bafbfb6ac2a31bc7b302197ea trac-0.10.1.ebuild 3931
-RMD160 6f799730ec43f8c207532a12f177b3999142ee3b trac-0.10.1.ebuild 3931
-SHA256 145fa1fd96042c406cbfb8b80fc93a08c2f2e5aa660fd0912fdaf87603b2155a trac-0.10.1.ebuild 3931
-EBUILD trac-0.10.2.ebuild 3933 RMD160 4d31609e1911a069d4f113aee5882ccf4ab7cf31 SHA1 93255d1060a3221c9a75bc2a74754fba1c50925f SHA256 800a9efbc8cc477ba75863e83f41aef4b51aafa3e67412af4186582e62e72f94
-MD5 c626b8f104fecb025d104c3c9472ea16 trac-0.10.2.ebuild 3933
-RMD160 4d31609e1911a069d4f113aee5882ccf4ab7cf31 trac-0.10.2.ebuild 3933
-SHA256 800a9efbc8cc477ba75863e83f41aef4b51aafa3e67412af4186582e62e72f94 trac-0.10.2.ebuild 3933
-EBUILD trac-0.10.3.ebuild 3932 RMD160 82284cc14dd0134f6689fc6d207043ada16e622f SHA1 d089df7f33c04a8110a2f3bd3544c91706bbb886 SHA256 f8fb425d367bfc5fef0a9928178ce6ecd72cf2c2af5236488999221dacae982e
-MD5 215c4ab4fed70d4c3051995269ddbdef trac-0.10.3.ebuild 3932
-RMD160 82284cc14dd0134f6689fc6d207043ada16e622f trac-0.10.3.ebuild 3932
-SHA256 f8fb425d367bfc5fef0a9928178ce6ecd72cf2c2af5236488999221dacae982e trac-0.10.3.ebuild 3932
+EBUILD trac-0.10.1.ebuild 3926 RMD160 e5131698e649ab91e8745ce4539906610949d1e8 SHA1 aabb91a189854b242db390929e82ebafd1926fc3 SHA256 9cd6bf27685bd71324b86c62abc052034ea8d85b75330a880e020b830e837253
+MD5 989d03c2a931188883a40585d66ecd9f trac-0.10.1.ebuild 3926
+RMD160 e5131698e649ab91e8745ce4539906610949d1e8 trac-0.10.1.ebuild 3926
+SHA256 9cd6bf27685bd71324b86c62abc052034ea8d85b75330a880e020b830e837253 trac-0.10.1.ebuild 3926
+EBUILD trac-0.10.3.ebuild 3928 RMD160 92d632075fd60239817967828bf74e2d150fb55b SHA1 e97f4c22a32d1544663625684c4e2d00ce9135bc SHA256 b7687f8a33c3576d78201c6ab4bec271733c255aa22ae7b00e954c1070c3577f
+MD5 d04aa013d9ec566bdfb4f6551b65a64c trac-0.10.3.ebuild 3928
+RMD160 92d632075fd60239817967828bf74e2d150fb55b trac-0.10.3.ebuild 3928
+SHA256 b7687f8a33c3576d78201c6ab4bec271733c255aa22ae7b00e954c1070c3577f trac-0.10.3.ebuild 3928
 EBUILD trac-0.9.6.ebuild 3165 RMD160 78552ad73e99e2c01d4e1f15dc087f36886240e1 SHA1 551dc24435df81e920cca85d3a4028431c4cef6a SHA256 cea05e5c55f86c74c2a7c42ffe7b7b2febb8347a68a424abed7ffa8fc26bd548
 MD5 99851d8e651b9abf1d55afdf9fd418bd trac-0.9.6.ebuild 3165
 RMD160 78552ad73e99e2c01d4e1f15dc087f36886240e1 trac-0.9.6.ebuild 3165
 SHA256 cea05e5c55f86c74c2a7c42ffe7b7b2febb8347a68a424abed7ffa8fc26bd548 trac-0.9.6.ebuild 3165
-MISC ChangeLog 8710 RMD160 5fdb95a80d2d288f52fc017e0a3e0d5d29a183c7 SHA1 062e0aaa352786aecebd87d7c9aa1a6dbfe1ad92 SHA256 d5895235d06d67171348f518329bf5f3c6c75ce35dc3c63046612be6d8abd664
-MD5 90c50f1c080c3a0a6ff3ef4af98c3aac ChangeLog 8710
-RMD160 5fdb95a80d2d288f52fc017e0a3e0d5d29a183c7 ChangeLog 8710
-SHA256 d5895235d06d67171348f518329bf5f3c6c75ce35dc3c63046612be6d8abd664 ChangeLog 8710
+MISC ChangeLog 8922 RMD160 31c3c1e8faaff88a399330208f2c6369e11a392c SHA1 14e1143005381808c694f1963f3a0c7bcdad0b5b SHA256 58806e446c2c81c80fd65b1d40f4582c40bc882e06c453639e71a72f4a9f5e4b
+MD5 2c0cfdde00076483d3b70f800b169f68 ChangeLog 8922
+RMD160 31c3c1e8faaff88a399330208f2c6369e11a392c ChangeLog 8922
+SHA256 58806e446c2c81c80fd65b1d40f4582c40bc882e06c453639e71a72f4a9f5e4b ChangeLog 8922
 MISC metadata.xml 220 RMD160 dcc7b97d4b6eb6a017014b427fa9fd9c2ce04583 SHA1 2cf693a9408713395fdedb16da9edd6b33e5c2e7 SHA256 09bece3580791397bbf0b4d68ff9ac4abbc37150cf11fe7848f924119ca76b84
 MD5 fc3b5dec4ccef02547c54bf840024aa6 metadata.xml 220
 RMD160 dcc7b97d4b6eb6a017014b427fa9fd9c2ce04583 metadata.xml 220
@@ -45,9 +40,6 @@ SHA256 09bece3580791397bbf0b4d68ff9ac4abbc37150cf11fe7848f924119ca76b84 metadata
 MD5 1f3fb495ed3541dea7b8437c3e0bee4e files/digest-trac-0.10.1 235
 RMD160 aeb2626e7ecc5ab9d29b491e1357d8f03b63a133 files/digest-trac-0.10.1 235
 SHA256 a0cd4933dde76336d6b601e3d2b8454c7dee2f32e88d437a79212094b2095f7f files/digest-trac-0.10.1 235
-MD5 7b8e3fb84cef4975938b01519592c82c files/digest-trac-0.10.2 235
-RMD160 1dc32e1422ec9d88a3f323e8eec6c878c626e6fd files/digest-trac-0.10.2 235
-SHA256 607ebe71ec8775e0596d7f13e94777fc3576f9a6f8f60bc621b654da94c2dd9a files/digest-trac-0.10.2 235
 MD5 c72034b263afb4bffe68edf9ab447626 files/digest-trac-0.10.3 235
 RMD160 4346649969e05523bd96a383a109c2c64b3c49a3 files/digest-trac-0.10.3 235
 SHA256 a861320180f72af7f7082b8fd962e592551241686b46513e2532d91495b77b5a files/digest-trac-0.10.3 235
diff --git a/www-apps/trac/files/digest-trac-0.10.2 b/www-apps/trac/files/digest-trac-0.10.2
deleted file mode 100644
index c56d2e27fbe2..000000000000
--- a/www-apps/trac/files/digest-trac-0.10.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 18df3bb6c9699297c6f41a5a1a448ff9 trac-0.10.2.tar.gz 440277
-RMD160 c7dac7b93d8f06fa3ad22de35c9a2303154a2023 trac-0.10.2.tar.gz 440277
-SHA256 09286ad24ffcd4f1bdd0d0cb534217728043645d605ac6711a192bebc622408a trac-0.10.2.tar.gz 440277
diff --git a/www-apps/trac/trac-0.10.2.ebuild b/www-apps/trac/trac-0.10.2.ebuild
deleted file mode 100644
index 55817c2c13f8..000000000000
--- a/www-apps/trac/trac-0.10.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.10.2.ebuild,v 1.2 2006/11/23 17:31:14 vivo Exp $
-
-inherit distutils webapp
-
-DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system."
-HOMEPAGE="http://trac.edgewall.com/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${P}.tar.gz"
-
-LICENSE="trac"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="cgi fastcgi mysql postgres sqlite enscript silvercity"
-
-# doing so because utils (such as trac-admin), manpages... overlap
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-
-# we need to depend on virtual/httpd-cgi to pull apache/lighttpd/whatever in when USE cgi
-# we need to depend on virtual/httpd-fcgi to pull mod_fastcgi/lighttpd/whatever in when USE fastcgi
-# we need to depend on virtual/httpd-python to pull mod_python/whatever in when USE python (python
-# is rather confusing here, as dev-lang/python is a required dependency, but httpd-python isn't)
-DEPEND="${DEPEND}
-	>=dev-lang/python-2.3
-	app-text/pytextile
-	>=dev-python/docutils-0.3.9
-	dev-libs/clearsilver
-	>=dev-util/subversion-1.3.2
-	mysql? (
-		>=virtual/mysql-4.1
-		>=dev-python/mysql-python-1.2.1
-	)
-	sqlite? (
-		>=dev-db/sqlite-3.3.4
-		>=dev-python/pysqlite-2.3
-	)
-	postgres? ( >=dev-python/psycopg-2 )
-	enscript? ( app-text/enscript )
-	silvercity? ( app-text/silvercity )"
-
-# The following function should be added to eutils.eclass (see bug #143572):
-
-# Generate an standard error message for missing USE flags
-# in existing packages, and die.
-#
-# Usage: built_with_use_error <category/package> <functionality> [<USE flag>]
-#    ex: built_with_use_error dev-util/subversion python
-#    or: built_with_use_error net-www/apache LDAP ldap
-#
-# Typical usage:
-#	if ! built_with_use dev-util/subversion python ; then
-#        built_with_use_error dev-util/subversion python
-#   fi
-#
-# Note: when <USE flag> is not specified, <functionality> is used for the USE flag name.
-built_with_use_error_msg() {
-	local package=$1
-	local func=$2
-	local use_flag=$3
-
-	[[ -z ${use_flag} ]] && use_flag=${func}
-
-	eerror "Your ${package} package has been built without"
-	eerror "${func} support, please enable the '${use_flag}' USE flag and"
-	eerror "re-emerge ${package}."
-	einfo "You can enable this USE flag either globally in /etc/make.conf,"
-	einfo "or just for specific packages in /etc/portage/package.use."
-	die "${package} missing ${func} support"
-}
-
-pkg_setup () {
-	if ! use mysql && ! use postgres && ! use sqlite ; then
-		eerror "You must select at least one database backend, by enabling"
-		eerror "at least one of the 'mysql', 'postgres' or 'sqlite' USE flags."
-		die "no database backend selected"
-	fi
-
-	if ! built_with_use dev-util/subversion python ; then
-		built_with_use_error dev-util/subversion python
-	fi
-
-	if ! built_with_use dev-libs/clearsilver python ; then
-		built_with_use_error dev-libs/clearsilver python
-	fi
-
-	ebegin "Creating tracd group and user"
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-	eend ${?}
-
-	webapp_pkg_setup
-}
-
-src_install () {
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	webapp_src_preinst
-	distutils_src_install
-
-	dodoc AUTHORS INSTALL RELEASE THANKS UPGRADE
-	rm ${D}/usr/share/doc/${P}/MANIFEST.in.gz
-	rm ${D}/usr/share/doc/${P}/PKG-INFO.gz
-
-	docinto contrib
-	dodoc contrib/*
-
-	# if needed, install cgi/fcgi scripts for webapp-config
-	local my_dir=${D}/usr/share/trac
-	if use cgi ; then
-		mv ${my_dir}/cgi-bin/trac.cgi ${D}${MY_CGIBINDIR} || die
-	fi
-	if use fastcgi ; then
-		mv ${my_dir}/cgi-bin/trac.fcgi ${D}${MY_CGIBINDIR} || die
-	fi
-	rm -rf ${my_dir}/cgi-bin || die
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} ${FILESDIR}/postinst-${lang}.txt
-	done
-
-	# copy graphics, css & js
-	cp -r htdocs/* ${D}/${MY_HTDOCSDIR}
-
-	webapp_src_install
-
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-}