aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-05-07 20:40:09 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-05-11 14:57:59 +0100
commit2c6c00d1e9dc582ca5491de1ad7b1d56b938c74e (patch)
treebd347a41fe75fda114ea2ef0b6bd5ae2cba29f3f
parented7973f4a4df35da4fae14700d2b33c7d5701651 (diff)
downloadpaludis-2c6c00d1e9dc582ca5491de1ad7b1d56b938c74e.tar.gz
paludis-2c6c00d1e9dc582ca5491de1ad7b1d56b938c74e.tar.xz
Add EAPI 3, equal to EAPI 2
-rw-r--r--configure.ac1
-rw-r--r--paludis/repositories/e/eapis/3.conf9
-rw-r--r--paludis/repositories/e/eapis/Makefile.am1
-rw-r--r--paludis/repositories/e/ebuild/3/Makefile.am41
-rw-r--r--paludis/repositories/e/ebuild/3/output_functions.bash30
-rw-r--r--paludis/repositories/e/ebuild/Makefile.am2
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc8
-rwxr-xr-xpaludis/repositories/e/vdb_repository_TEST_setup.sh48
-rw-r--r--paludis/util/echo_functions.bash.in1
9 files changed, 136 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 44d80b9..1ffe865 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1619,6 +1619,7 @@ AC_OUTPUT(
paludis/repositories/e/ebuild/0/Makefile
paludis/repositories/e/ebuild/1/Makefile
paludis/repositories/e/ebuild/2/Makefile
+ paludis/repositories/e/ebuild/3/Makefile
paludis/repositories/e/ebuild/Makefile
paludis/repositories/e/ebuild/exheres-0/Makefile
paludis/repositories/e/ebuild/kdebuild-1/Makefile
diff --git a/paludis/repositories/e/eapis/3.conf b/paludis/repositories/e/eapis/3.conf
new file mode 100644
index 0000000..e643ef8
--- /dev/null
+++ b/paludis/repositories/e/eapis/3.conf
@@ -0,0 +1,9 @@
+# Configuration for EAPI 3
+# EAPI 3 is specified in PMS.
+
+source ${PALUDIS_EAPIS_DIR}/2.conf
+exported_name = 3
+can_be_pbin = true
+
+ebuild_module_suffixes = 3 2 1 0
+
diff --git a/paludis/repositories/e/eapis/Makefile.am b/paludis/repositories/e/eapis/Makefile.am
index c2e84f0..762d4cd 100644
--- a/paludis/repositories/e/eapis/Makefile.am
+++ b/paludis/repositories/e/eapis/Makefile.am
@@ -6,6 +6,7 @@ eapis = \
0.conf \
1.conf \
2.conf \
+ 3.conf \
exheres-0.conf \
kdebuild-1.conf \
paludis-1.conf \
diff --git a/paludis/repositories/e/ebuild/3/Makefile.am b/paludis/repositories/e/ebuild/3/Makefile.am
new file mode 100644
index 0000000..8b015a3
--- /dev/null
+++ b/paludis/repositories/e/ebuild/3/Makefile.am
@@ -0,0 +1,41 @@
+MAINTAINERCLEANFILES = Makefile.in
+CLEANFILES = *~ *.epicfail
+SUBDIRS = .
+
+libexecprog3dir = $(libexecdir)/paludis/3
+
+libexecprog3_SCRIPTS = \
+ output_functions.bash
+
+TESTS_ENVIRONMENT = env \
+ PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
+ PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
+ PALUDIS_EBUILD_MODULE_SUFFIXES="1 0" \
+ PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
+ PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
+ PALUDIS_DISTRIBUTION="gentoo" \
+ PALUDIS_OPTIONS="" \
+ PALUDIS_EBUILD_LOG_LEVEL="warning" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
+ PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
+ TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
+ TEST_SCRIPT_DIR="$(srcdir)/" \
+ PALUDIS_TMPDIR="`pwd`/" \
+ bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
+
+TESTS =
+check_SCRIPTS = $(TESTS)
+
+EXTRA_DIST = $(libexecprog2_SCRIPTS)
+
+built-sources : $(BUILT_SOURCES)
+ for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
+
+distcheck-deps-local : $(DISTCHECK_DEPS)
+
+distcheck-deps : distcheck-deps-subdirs
+
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/paludis/repositories/e/ebuild/3/output_functions.bash b/paludis/repositories/e/ebuild/3/output_functions.bash
new file mode 100644
index 0000000..dec0f3f
--- /dev/null
+++ b/paludis/repositories/e/ebuild/3/output_functions.bash
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# vim: set sw=4 sts=4 et :
+
+# Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh
+#
+# This file is part of the Paludis package manager. Paludis is free software;
+# you can redistribute it and/or modify it under the terms of the GNU General
+# Public License, version 2, as published by the Free Software Foundation.
+#
+# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA
+
+ebuild_notice()
+{
+ [[ -z "${PALUDIS_PIPE_COMMANDS_SUPPORTED}" ]] && return
+ paludis_pipe_command LOG "$EAPI" "$@" >/dev/null
+}
+
+ebuild_section()
+{
+ echo -ne "${COLOUR_PURPLE}>>>${COLOUR_NORMAL} "
+ echo "$@"
+}
+
diff --git a/paludis/repositories/e/ebuild/Makefile.am b/paludis/repositories/e/ebuild/Makefile.am
index 4f3ac0c..25543af 100644
--- a/paludis/repositories/e/ebuild/Makefile.am
+++ b/paludis/repositories/e/ebuild/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *~ *.epicfail
-SUBDIRS = . 0 1 2 exheres-0 kdebuild-1 paludis-1 pbin-1 utils
+SUBDIRS = . 0 1 2 3 exheres-0 kdebuild-1 paludis-1 pbin-1 utils
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 3fff791..9a03b32 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -418,8 +418,8 @@ namespace test_cases
id->perform_action(uninstall_action);
}
}
- } test_phases_eapi_0("0"), test_phases_eapi_1("1"), test_phases_eapi_exheres_0("exheres-0"),
- test_phases_eapi_kdebuild_1("kdebuild-1");
+ } test_phases_eapi_0("0"), test_phases_eapi_1("1"), test_phases_eapi_2("2"), test_phases_eapi_3("3"),
+ test_phases_eapi_exheres_0("exheres-0"), test_phases_eapi_kdebuild_1("kdebuild-1");
struct VarsTest : TestCase
{
@@ -547,8 +547,8 @@ namespace test_cases
id->perform_action(uninstall_action);
}
}
- } test_vdb_vars_eapi_0("0"), test_vdb_vars_eapi_1("1"), test_vdb_vars_eapi_exheres_0("exheres-0"),
- test_vdb_vars_eapi_kdebuild_1("kdebuild-1");
+ } test_vdb_vars_eapi_0("0"), test_vdb_vars_eapi_1("1"), test_vdb_vars_eapi_2("2"),
+ test_vdb_vars_eapi_exheres_0("exheres-0"), test_vdb_vars_eapi_kdebuild_1("kdebuild-1");
struct NamesCacheIncrementalTest : TestCase
{
diff --git a/paludis/repositories/e/vdb_repository_TEST_setup.sh b/paludis/repositories/e/vdb_repository_TEST_setup.sh
index 868f46c..b213138 100755
--- a/paludis/repositories/e/vdb_repository_TEST_setup.sh
+++ b/paludis/repositories/e/vdb_repository_TEST_setup.sh
@@ -141,6 +141,54 @@ pkg_config() {
}
END
+cat <<'END' > srcrepo/cat/target/target-2.ebuild
+EAPI="2"
+DESCRIPTION="The Description"
+HOMEPAGE="http://example.com/"
+SRC_URI=""
+SLOT="0"
+IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="test"
+DEPEND="foo/bar"
+
+src_install() {
+ echo MONKEY > ${D}/monkey
+}
+
+pkg_info() {
+ echo "This is pkg_info"
+}
+
+pkg_config() {
+ echo "This is pkg_config"
+}
+END
+
+cat <<'END' > srcrepo/cat/target/target-3.ebuild
+EAPI="3"
+DESCRIPTION="The Description"
+HOMEPAGE="http://example.com/"
+SRC_URI=""
+SLOT="0"
+IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="test"
+DEPEND="foo/bar"
+
+src_install() {
+ echo MONKEY > ${D}/monkey
+}
+
+pkg_info() {
+ echo "This is pkg_info"
+}
+
+pkg_config() {
+ echo "This is pkg_config"
+}
+END
+
cat <<'END' > srcrepo/cat/target-exheres/target-exheres-0.ebuild
EAPI="exheres-0"
DESCRIPTION="The Description"
diff --git a/paludis/util/echo_functions.bash.in b/paludis/util/echo_functions.bash.in
index 65ee50a..e45b2b8 100644
--- a/paludis/util/echo_functions.bash.in
+++ b/paludis/util/echo_functions.bash.in
@@ -31,6 +31,7 @@ COLOUR_BLUE=$'\e[34;01m'
COLOUR_PINK=$'\e[35;01m'
COLOUR_CYAN=$'\e[36;01m'
COLOUR_BROWN=$'\e[33m'
+COLOUR_PURPLE=$'\e[35m'
if [[ ${PALUDIS_COLOURS} == pink ]]; then
COLOUR_GOOD=${COLOUR_PINK}