aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-08-16 23:13:25 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-08-16 23:13:25 +0100
commit40b30301b395c737736b87ff2ed8434634b562af (patch)
tree35736979f0279a75a0a760ddb1245dd547ac405d
parent56777f2da961298152da4815a2055d4596adef21 (diff)
downloadpaludis-40b30301b395c737736b87ff2ed8434634b562af.tar.gz
paludis-40b30301b395c737736b87ff2ed8434634b562af.tar.xz
Rename LICENSE -> LICENCES, SRC_URI -> SOURCES for exheres.
-rwxr-xr-xpaludis/repositories/e/e_repository_TEST_setup.sh217
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf18
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash4
-rwxr-xr-xpaludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh70
-rw-r--r--paludis/repositories/e/exheres_layout.cc2
-rwxr-xr-xpaludis/repositories/e/qa/visibility_TEST_setup.sh12
-rwxr-xr-xpaludis/repositories/e/vdb_repository_TEST_setup.sh16
-rwxr-xr-xruby/dep_spec_TEST_setup.sh4
-rwxr-xr-xsrc/clients/paludis/pretend_TEST_setup.sh4
9 files changed, 175 insertions, 172 deletions
diff --git a/paludis/repositories/e/e_repository_TEST_setup.sh b/paludis/repositories/e/e_repository_TEST_setup.sh
index 9ae3d95..9b7a571 100755
--- a/paludis/repositories/e/e_repository_TEST_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_setup.sh
@@ -141,10 +141,10 @@ EAPI="exheres-0"
SUMMARY="This is the short description"
DESCRIPTION="This is the long description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
BUGS_TO="fred@example.com joe@example.com"
UPSTREAM_CHANGELOG="http://example.com/foo"
@@ -339,10 +339,10 @@ cat <<END > packages/cat/no-files/no-files-1.exheres-0 || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -351,10 +351,10 @@ cat <<END > packages/cat/fetched-files/fetched-files-1.exheres-0 || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI="file:///var/empty/already-fetched.txt"
+SOURCES="file:///var/empty/already-fetched.txt"
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -363,10 +363,10 @@ cat <<END > packages/cat/fetchable-files/fetchable-files-1.exheres-0 || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI="file:///$(dirname $(pwd ) )/fetchable/fetchable-1.txt"
+SOURCES="file:///$(dirname $(pwd ) )/fetchable/fetchable-1.txt"
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -375,10 +375,10 @@ cat <<END > packages/cat/arrow-files/arrow-files-1.exheres-0 || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI="file:///$(dirname $(pwd ) )/fetchable/fetchable-1.txt -> arrowed.txt"
+SOURCES="file:///$(dirname $(pwd ) )/fetchable/fetchable-1.txt -> arrowed.txt"
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -387,10 +387,10 @@ cat <<END > packages/cat/unfetchable-files/unfetchable-files-1.exheres-0 || exit
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI="file:///var/empty/unfetchable-file.txt"
+SOURCES="file:///var/empty/unfetchable-file.txt"
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -399,10 +399,10 @@ cat <<END > packages/cat/no-files-restricted/no-files-restricted-1.exheres-0 ||
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -411,10 +411,10 @@ cat <<END > packages/cat/fetched-files-restricted/fetched-files-restricted-1.exh
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI="manual: file:///var/empty/already-fetched.txt"
+SOURCES="manual: file:///var/empty/already-fetched.txt"
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -423,10 +423,10 @@ cat <<END > packages/cat/fetchable-files-restricted/fetchable-files-restricted-1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI="manual: file:///$(dirname $(pwd ) )/fetchable/fetchable-2.txt"
+SOURCES="manual: file:///$(dirname $(pwd ) )/fetchable/fetchable-2.txt"
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -1308,10 +1308,10 @@ cat <<END > packages/cat/in-ebuild-die/in-ebuild-die-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
pkg_setup() {
@@ -1323,10 +1323,10 @@ cat <<END > packages/cat/in-subshell-die/in-subshell-die-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
pkg_setup() {
@@ -1338,10 +1338,10 @@ cat <<END > packages/cat/success/success-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
pkg_setup() {
@@ -1353,10 +1353,10 @@ cat <<"END" > packages/cat/expatch-success/expatch-success-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_unpack() {
@@ -1372,10 +1372,10 @@ cat <<END > packages/cat/expatch-die/expatch-die-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_prepare() {
@@ -1387,10 +1387,10 @@ cat <<END > packages/cat/nonfatal-expatch-fail/nonfatal-expatch-fail-1.ebuild ||
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_prepare() {
@@ -1402,10 +1402,10 @@ cat <<END > packages/cat/nonfatal-expatch-die/nonfatal-expatch-die-1.ebuild || e
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_prepare() {
@@ -1417,10 +1417,10 @@ cat <<END > packages/cat/unpack-die/unpack-die-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_unpack() {
@@ -1433,10 +1433,10 @@ cat <<END > packages/cat/nonfatal-unpack-fail/nonfatal-unpack-fail-1.ebuild || e
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_unpack() {
@@ -1449,10 +1449,10 @@ cat <<END > packages/cat/nonfatal-unpack-die/nonfatal-unpack-die-1.ebuild || exi
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_unpack() {
@@ -1465,10 +1465,10 @@ cat <<END > packages/cat/econf-fail/econf-fail-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_configure() {
@@ -1480,10 +1480,10 @@ cat <<END > packages/cat/nonfatal-econf/nonfatal-econf-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_configure() {
@@ -1495,10 +1495,10 @@ cat <<END > packages/cat/nonfatal-econf-die/nonfatal-econf-die-1.ebuild || exit
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_configure() {
@@ -1510,10 +1510,10 @@ cat <<END > packages/cat/emake-fail/emake-fail-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_compile() {
@@ -1525,10 +1525,10 @@ cat <<END > packages/cat/nonfatal-emake/nonfatal-emake-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_compile() {
@@ -1540,10 +1540,10 @@ cat <<END > packages/cat/nonfatal-emake-die/nonfatal-emake-die-1.ebuild || exit
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_compile() {
@@ -1555,10 +1555,10 @@ cat <<END > packages/cat/keepdir-success/keepdir-success-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1570,10 +1570,10 @@ cat <<"END" > packages/cat/keepdir-fail/keepdir-fail-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1587,10 +1587,10 @@ cat <<"END" > packages/cat/nonfatal-keepdir/nonfatal-keepdir-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1604,10 +1604,10 @@ cat <<"END" > packages/cat/nonfatal-keepdir-die/nonfatal-keepdir-die-1.ebuild ||
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1621,10 +1621,10 @@ cat <<END > packages/cat/einstall-fail/einstall-fail-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1636,10 +1636,10 @@ cat <<END > packages/cat/nonfatal-einstall/nonfatal-einstall-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1651,10 +1651,10 @@ cat <<END > packages/cat/nonfatal-einstall-die/nonfatal-einstall-die-1.ebuild ||
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1666,10 +1666,10 @@ cat <<END > packages/cat/dobin-success/dobin-success-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_compile() {
@@ -1685,10 +1685,10 @@ cat <<END > packages/cat/dobin-fail/dobin-fail-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1700,10 +1700,10 @@ cat <<END > packages/cat/nonfatal-dobin-success/nonfatal-dobin-success-1.ebuild
DESCRIPTION="The Lnog Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_compile() {
@@ -1719,10 +1719,10 @@ cat <<END > packages/cat/nonfatal-dobin-fail/nonfatal-dobin-fail-1.ebuild || exi
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1734,10 +1734,10 @@ cat <<END > packages/cat/nonfatal-dobin-die/nonfatal-dobin-die-1.ebuild || exit
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1749,10 +1749,10 @@ cat <<END > packages/cat/fperms-success/fperms-success-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_compile() {
@@ -1768,10 +1768,10 @@ cat <<END > packages/cat/fperms-fail/fperms-fail-1.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1783,10 +1783,10 @@ cat <<END > packages/cat/nonfatal-fperms-success/nonfatal-fperms-success-1.ebuil
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_compile() {
@@ -1802,10 +1802,10 @@ cat <<END > packages/cat/nonfatal-fperms-fail/nonfatal-fperms-fail-1.ebuild || e
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1817,10 +1817,10 @@ cat <<END > packages/cat/nonfatal-fperms-die/nonfatal-fperms-die-1.ebuild || exi
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
@@ -1832,10 +1832,10 @@ cat <<'END' > packages/cat/best-version/best-version-0.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
pkg_setup() {
@@ -1876,10 +1876,10 @@ cat <<'END' > packages/cat/has-version/has-version-0.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
pkg_setup() {
@@ -1897,10 +1897,10 @@ cat <<'END' > packages/cat/match/match-0.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
pkg_setup() {
@@ -1923,10 +1923,10 @@ else
fi
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
pkg_setup() {
@@ -1945,10 +1945,10 @@ DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_unpack() {
@@ -1967,10 +1967,10 @@ DESCRIPTION="The Long Description"
DESCRIPTION="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="enabled-hamster gerbil dormouse"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEFAULT_SRC_CONFIGURE_PARAMS=( --nice-juicy-steak )
@@ -1995,10 +1995,10 @@ cat <<"END" > packages/cat/expand-vars/expand-vars-0.ebuild || exit 1
DESCRIPTION="The Long Description"
SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="enabled-weasel broccoli linguas:enabled-en_GB"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
pkg_setup() {
@@ -2007,12 +2007,13 @@ pkg_setup() {
END
mkdir -p "packages/cat/doman-success"
cat <<END > packages/cat/doman-success/doman-success-0.ebuild || exit 1
-DESCRIPTION="The Description"
+DESCRIPTION="The Long Description"
+SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_compile() {
@@ -2053,12 +2054,13 @@ src_install() {
END
mkdir -p "packages/cat/doman-failure"
cat <<END > packages/cat/doman-failure/doman-failure-0.ebuild || exit 1
-DESCRIPTION="The Description"
+DESCRIPTION="The Long Description"
+SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_compile() {
@@ -2071,12 +2073,13 @@ src_install() {
END
mkdir -p "packages/cat/doman-nonfatal"
cat <<END > packages/cat/doman-nonfatal/doman-nonfatal-0.ebuild || exit 1
-DESCRIPTION="The Description"
+DESCRIPTION="The Long Description"
+SUMMARY="The Short Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS="spork"
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
src_install() {
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index d3639bb..fa47175 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -26,8 +26,8 @@ ignore_pivot_env_variables =
vdb_from_env_variables = \
CATEGORY CHOST DEPENDENCIES SUMMARY EAPI \
- HOMEPAGE INHERITED MYOPTIONS PLATFORMS LICENSE PF \
- SLOT SRC_URI OPTIONS CONFIG_PROTECT CONFIG_PROTECT_MASK \
+ HOMEPAGE INHERITED MYOPTIONS PLATFORMS LICENCES PF \
+ SLOT SOURCES OPTIONS CONFIG_PROTECT CONFIG_PROTECT_MASK \
VDB_FORMAT PKGMANAGER SUBOPTIONS
vdb_from_env_unless_empty_variables = \
@@ -37,8 +37,8 @@ vdb_from_env_unless_empty_variables = \
UPSTREAM_RELEASE_NOTES UPSTREAM_DOCUMENTATION DESCRIPTION
binary_from_env_variables = \
- CHOST DEPENDENCIES DESCRIPTION EAPI HOMEPAGE INHERITED MYOPTIONS PLATFORMS LICENSE \
- SLOT SRC_URI OPTIONS GENERATED_USING GENERATED_TIME SUBOPTIONS \
+ CHOST DEPENDENCIES DESCRIPTION EAPI HOMEPAGE INHERITED MYOPTIONS PLATFORMS LICENCES \
+ SLOT SOURCES OPTIONS GENERATED_USING GENERATED_TIME SUBOPTIONS \
ASFLAGS CBUILD CC CFLAGS CHOST CTARGET CXX CXXFLAGS \
EXTRA_ECONF EXTRA_EINSTALL EXTRA_EMAKE LDFLAGS LIBCXXFLAGS \
GENERATED_FROM_REPOSITORY PLATFORMS BINARY_PLATFORMS \
@@ -56,7 +56,7 @@ directory_if_exists_variables = \
build:FILESDIR
ebuild_must_not_set_variables = \
- DEPEND RDEPEND PDEPEND PROVIDE USE IUSE KEYWORDS
+ DEPEND RDEPEND PDEPEND PROVIDE USE IUSE KEYWORDS LICENSE SRC_URI
eclass_must_not_set_variables = PLATFORMS
@@ -150,10 +150,10 @@ ebuild_new_upgrade_phase_order = true
metadata_build_depend =
metadata_run_depend =
metadata_slot = SLOT
-metadata_src_uri = SRC_URI
+metadata_src_uri = SOURCES
metadata_restrict = RESTRICT
metadata_homepage = HOMEPAGE
-metadata_license = LICENSE
+metadata_license = LICENCES
metadata_short_description = SUMMARY
metadata_long_description = DESCRIPTION
metadata_keywords = PLATFORMS
@@ -178,13 +178,13 @@ description_homepage = Homepage
description_inherited = Inherited
description_iuse = Relevant option flags
description_keywords = Supported platforms
-description_license = License
+description_license = Licence
description_pdepend =
description_provide =
description_restrict = Restrictions
description_run_depend =
description_slot = Slot
-description_src_uri = Source URI
+description_src_uri = Sources
description_use = Selected option flags
description_dependencies = Dependencies
description_bugs_to = Bugs to
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index e2ba10e..5c4f143 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -27,8 +27,8 @@ eval unset LANG ${!LC_*}
export LC_ALL=C
# The list below should include all variables from all EAPIs
-EBUILD_METADATA_VARIABLES="DEPEND RDEPEND PDEPEND IUSE SRC_URI RESTRICT \
- LICENSE KEYWORDS INHERITED PROVIDE HOMEPAGE DESCRIPTION DEPENDENCIES \
+EBUILD_METADATA_VARIABLES="DEPEND RDEPEND PDEPEND IUSE SRC_URI SOURCES RESTRICT \
+ LICENSE LICENCES KEYWORDS INHERITED PROVIDE HOMEPAGE DESCRIPTION DEPENDENCIES \
E_IUSE E_DEPEND E_RDEPEND E_PDEPEND PLATFORMS \
MYOPTIONS E_MYOPTIONS E_DEPENDENCIES BINARY_KEYWORDS BINARY_URI \
GENERATED_USING GENERATED_TIME BINARY_PLATFORMS REMOTE_IDS \
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh
index 87a843d..352bb73 100755
--- a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh
@@ -741,10 +741,10 @@ _mtime_=60
_exlibs_=foo ebuild_flat_metadata_cache_TEST_dir/repo/exlibs 180
DEPENDENCIES=the/depend
SLOT=the-slot
-SRC_URI=the-src-uri
+SOURCES=the-src-uri
RESTRICT=the-restrict
HOMEPAGE=the-homepage
-LICENSE=the-license
+LICENCES=the-license
SUMMARY=the-description-flat_hash-exlib
PLATFORMS=the-keywords
MYOPTIONS=the-iuse
@@ -760,10 +760,10 @@ _mtime_=60
_exlibs_=foo ebuild_flat_metadata_cache_TEST_dir/repo/exlibs 180 bar ebuild_flat_metadata_cache_TEST_dir/repo/cat/exlibs 180
DEPENDENCIES=the/depend
SLOT=the-slot
-SRC_URI=the-src-uri
+SOURCES=the-src-uri
RESTRICT=the-restrict
HOMEPAGE=the-homepage
-LICENSE=the-license
+LICENCES=the-license
SUMMARY=the-description-flat_hash-exlib-percat
PLATFORMS=the-keywords
MYOPTIONS=the-iuse
@@ -775,10 +775,10 @@ mkdir cat/flat_hash-exlib-stale
cat <<END > cat/flat_hash-exlib-stale/flat_hash-exlib-stale-1.ebuild || exit 1
SUMMARY="The Generated Description flat_hash-exlib-stale"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -787,10 +787,10 @@ _mtime_=60
_exlibs_=foo ebuild_flat_metadata_cache_TEST_dir/repo/exlibs 120
DEPENDENCIES=the/depend
SLOT=the-slot
-SRC_URI=the-src-uri
+SOURCES=the-src-uri
RESTRICT=the-restrict
HOMEPAGE=the-homepage
-LICENSE=the-license
+LICENCES=the-license
SUMMARY=The Stale Description
PLATFORMS=the-keywords
MYOPTIONS=the-iuse
@@ -802,10 +802,10 @@ mkdir cat/flat_hash-exlib-wrong
cat <<END > cat/flat_hash-exlib-wrong/flat_hash-exlib-wrong-1.ebuild || exit 1
SUMMARY="The Generated Description flat_hash-exlib-wrong"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -814,10 +814,10 @@ _mtime_=60
_exlibs_=foo ebuild_flat_metadata_cache_TEST_dir/repo/exlibs 180 bar ebuild_flat_metadata_cache_TEST_dir/repo/exlibs 180
DEPENDENCIES=the/depend
SLOT=the-slot
-SRC_URI=the-src-uri
+SOURCES=the-src-uri
RESTRICT=the-restrict
HOMEPAGE=the-homepage
-LICENSE=the-license
+LICENCES=the-license
SUMMARY=The Stale Description
PLATFORMS=the-keywords
MYOPTIONS=the-iuse
@@ -829,10 +829,10 @@ mkdir cat/flat_hash-exlib-gone
cat <<END > cat/flat_hash-exlib-gone/flat_hash-exlib-gone-1.ebuild || exit 1
SUMMARY="The Generated Description flat_hash-exlib-gone"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -841,10 +841,10 @@ _mtime_=60
_exlibs_=baz ebuild_flat_metadata_cache_TEST_dir/repo/exlibs 180
DEPENDENCIES=the/depend
SLOT=the-slot
-SRC_URI=the-src-uri
+SOURCES=the-src-uri
RESTRICT=the-restrict
HOMEPAGE=the-homepage
-LICENSE=the-license
+LICENCES=the-license
SUMMARY=The Stale Description
PLATFORMS=the-keywords
MYOPTIONS=the-iuse
@@ -856,10 +856,10 @@ mkdir cat/flat_hash-exlibs-truncated
cat <<END > cat/flat_hash-exlibs-truncated/flat_hash-exlibs-truncated-1.ebuild || exit 1
SUMMARY="The Generated Description flat_hash-exlibs-truncated"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -868,10 +868,10 @@ _mtime_=60
_exlibs_=foo ebuild_flat_metadata_cache_TEST_dir/repo/exlibs
DEPENDENCIES=the/depend
SLOT=the-slot
-SRC_URI=the-src-uri
+SOURCES=the-src-uri
RESTRICT=the-restrict
HOMEPAGE=the-homepage
-LICENSE=the-license
+LICENCES=the-license
SUMMARY=The Stale Description
PLATFORMS=the-keywords
MYOPTIONS=the-iuse
@@ -881,10 +881,10 @@ TZ=UTC touch -t 197001010001 cat/flat_hash-exlibs-truncated/flat_hash-exlibs-tru
cat <<END > cat/flat_hash-exlibs-truncated/flat_hash-exlibs-truncated-2.ebuild || exit 1
SUMMARY="The Generated Description flat_hash-exlibs-truncated-2"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -893,10 +893,10 @@ _mtime_=60
_exlibs_=foo
DEPENDENCIES=the/depend
SLOT=the-slot
-SRC_URI=the-src-uri
+SOURCES=the-src-uri
RESTRICT=the-restrict
HOMEPAGE=the-homepage
-LICENSE=the-license
+LICENCES=the-license
SUMMARY=The Stale Description
PLATFORMS=the-keywords
MYOPTIONS=the-iuse
@@ -908,10 +908,10 @@ mkdir cat/flat_hash-exlibs-bad-mtime
cat <<END > cat/flat_hash-exlibs-bad-mtime/flat_hash-exlibs-bad-mtime-1.ebuild || exit 1
SUMMARY="The Generated Description flat_hash-exlibs-bad-mtime"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -920,10 +920,10 @@ _mtime_=60
_exlibs_=foo bar
DEPENDENCIES=the/depend
SLOT=the-slot
-SRC_URI=the-src-uri
+SOURCES=the-src-uri
RESTRICT=the-restrict
HOMEPAGE=the-homepage
-LICENSE=the-license
+LICENCES=the-license
SUMMARY=The Stale Description
PLATFORMS=the-keywords
MYOPTIONS=the-iuse
@@ -935,10 +935,10 @@ mkdir cat/flat_hash-exlibs-spaces
cat <<END > cat/flat_hash-exlibs-spaces/flat_hash-exlibs-spaces-1.ebuild || exit 1
SUMMARY="The Generated Description flat_hash-exlibs-spaces"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
@@ -947,10 +947,10 @@ _mtime_=60
_exlibs_=foo 180
DEPENDENCIES=the/depend
SLOT=the-slot
-SRC_URI=the-src-uri
+SOURCES=the-src-uri
RESTRICT=the-restrict
HOMEPAGE=the-homepage
-LICENSE=the-license
+LICENCES=the-license
SUMMARY=The Stale Description
PLATFORMS=the-keywords
MYOPTIONS=the-iuse
@@ -990,8 +990,8 @@ cat <<END > cat/write-exlibs/write-exlibs-1.ebuild || exit 1
require foo bar
SUMMARY="A nice package"
HOMEPAGE="http://example.com/"
-SRC_URI=""
-LICENSE="GPL-2"
+SOURCES=""
+LICENCES="GPL-2"
SLOT="0"
PLATFORMS="test"
MYOPTIONS="bar"
@@ -1036,7 +1036,7 @@ _exlibs_=bar ebuild_flat_metadata_cache_TEST_dir/repo/cat/exlibs 180 foo ebuild_
DEPENDENCIES=( build: cat/foo bar? ( cat/bar ) ) cat/baz ( build: bar? ( ) ) cat/baz ( build: bar? ( ) )
SLOT=0
HOMEPAGE=http://example.com/
-LICENSE=GPL-2
+LICENCES=GPL-2
SUMMARY=A nice package
PLATFORMS=test
MYOPTIONS=bar quux
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index e08cd81..d1bf01e 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -543,7 +543,7 @@ ExheresLayout::licenses_dirs() const
std::tr1::shared_ptr<const FSEntrySequence> master(_imp->repository->params().master_repository->layout()->licenses_dirs());
std::copy(master->begin(), master->end(), result->back_inserter());
}
- result->push_back(_imp->tree_root / "licenses");
+ result->push_back(_imp->tree_root / "licences");
return result;
}
diff --git a/paludis/repositories/e/qa/visibility_TEST_setup.sh b/paludis/repositories/e/qa/visibility_TEST_setup.sh
index 6eb0724..7170be3 100755
--- a/paludis/repositories/e/qa/visibility_TEST_setup.sh
+++ b/paludis/repositories/e/qa/visibility_TEST_setup.sh
@@ -72,7 +72,7 @@ HOMEPAGE="http://example.com/"
SRC_URI=""
SLOT="0"
IUSE=""
-LICENCE="GPL-2"
+LICENSE="GPL-2"
KEYWORDS="test test64"
DEPEND="foo? ( cat-one/visible )"
RDEPEND=""
@@ -83,7 +83,7 @@ HOMEPAGE="http://example.com/"
SRC_URI=""
SLOT="0"
IUSE=""
-LICENCE="GPL-2"
+LICENSE="GPL-2"
KEYWORDS="test test64"
DEPEND="!foo? ( cat-one/visible )"
RDEPEND=""
@@ -94,7 +94,7 @@ HOMEPAGE="http://example.com/"
SRC_URI=""
SLOT="0"
IUSE=""
-LICENCE="GPL-2"
+LICENSE="GPL-2"
KEYWORDS="test test64"
DEPEND="masked? ( cat-one/visible )"
RDEPEND=""
@@ -105,7 +105,7 @@ HOMEPAGE="http://example.com/"
SRC_URI=""
SLOT="0"
IUSE=""
-LICENCE="GPL-2"
+LICENSE="GPL-2"
KEYWORDS="test test64"
DEPEND="!forced? ( cat-one/visible )"
RDEPEND=""
@@ -116,7 +116,7 @@ HOMEPAGE="http://example.com/"
SRC_URI=""
SLOT="0"
IUSE=""
-LICENCE="GPL-2"
+LICENSE="GPL-2"
KEYWORDS="test test64"
DEPEND="test? ( cat-one/visible )"
RDEPEND=""
@@ -127,7 +127,7 @@ HOMEPAGE="http://example.com/"
SRC_URI=""
SLOT="0"
IUSE=""
-LICENCE="GPL-2"
+LICENSE="GPL-2"
KEYWORDS="test test64"
DEPEND="!test64? ( cat-one/visible )"
RDEPEND=""
diff --git a/paludis/repositories/e/vdb_repository_TEST_setup.sh b/paludis/repositories/e/vdb_repository_TEST_setup.sh
index ac36ddf..a457c8d 100755
--- a/paludis/repositories/e/vdb_repository_TEST_setup.sh
+++ b/paludis/repositories/e/vdb_repository_TEST_setup.sh
@@ -143,10 +143,10 @@ cat <<'END' > srcrepo/cat/target-exheres/target-exheres-0.ebuild
EAPI="exheres-0"
DESCRIPTION="The Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
@@ -167,10 +167,10 @@ cat <<'END' > srcrepo/cat/target-kdebuild/target-kdebuild-1.ebuild
EAPI="exheres-0"
DESCRIPTION="The Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
@@ -275,10 +275,10 @@ cat <<'END' > srcrepo/cat/vars-exheres/vars-exheres-0.ebuild
EAPI="exheres-0"
DESCRIPTION="The Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES="foo/bar"
@@ -317,10 +317,10 @@ cat <<'END' > srcrepo/cat/vars-kdebuild/vars-kdebuild-1.ebuild
EAPI="exheres-0"
DESCRIPTION="The Description"
HOMEPAGE="http://example.com/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES="foo/bar"
diff --git a/ruby/dep_spec_TEST_setup.sh b/ruby/dep_spec_TEST_setup.sh
index df21af5..f8a57c4 100755
--- a/ruby/dep_spec_TEST_setup.sh
+++ b/ruby/dep_spec_TEST_setup.sh
@@ -49,10 +49,10 @@ cat <<"END" > bar/foo/foo-1.0.ebuild || exit 1
EAPI="exheres-0"
DESCRIPTION="Test package"
HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="mirrors-first: mirrors-only: listed-only: listed-first: local-only: manual: "
+SOURCES="mirrors-first: mirrors-only: listed-only: listed-first: local-only: manual: "
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
DEPENDENCIES=""
END
diff --git a/src/clients/paludis/pretend_TEST_setup.sh b/src/clients/paludis/pretend_TEST_setup.sh
index e623b68..2e741ec 100755
--- a/src/clients/paludis/pretend_TEST_setup.sh
+++ b/src/clients/paludis/pretend_TEST_setup.sh
@@ -70,10 +70,10 @@ END
cat <<"END" > test-category/target/target-1.exheres-0 || exit 1
DESCRIPTION="Test target"
HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI=""
+SOURCES=""
SLOT="0"
MYOPTIONS=""
-LICENSE="GPL-2"
+LICENCES="GPL-2"
PLATFORMS="test"
pkg_pretend() {