aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-05-07 20:40:10 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-05-11 14:58:00 +0100
commit6ee67af5c2c4d38b2b21898c6790c180c99da036 (patch)
tree238e38fbbbf5775e19e49e54d74082e286ebfe69
parent244f59e309f2616ff34cb536a646c570ec80232d (diff)
downloadpaludis-6ee67af5c2c4d38b2b21898c6790c180c99da036.tar.gz
paludis-6ee67af5c2c4d38b2b21898c6790c180c99da036.tar.xz
EAPI 3 has docompress
-rw-r--r--configure.ac1
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc10
-rwxr-xr-xpaludis/repositories/e/e_repository_TEST_setup.sh17
-rw-r--r--paludis/repositories/e/eapis/3.conf1
-rw-r--r--paludis/repositories/e/ebuild/utils/3/Makefile.am37
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/3/docompress21
-rw-r--r--paludis/repositories/e/ebuild/utils/Makefile.am2
7 files changed, 88 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 1ffe865..9a0c560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1626,6 +1626,7 @@ AC_OUTPUT(
paludis/repositories/e/ebuild/paludis-1/Makefile
paludis/repositories/e/ebuild/pbin-1/Makefile
paludis/repositories/e/ebuild/utils/Makefile
+ paludis/repositories/e/ebuild/utils/3/Makefile
paludis/repositories/e/ebuild/utils/exheres-0/Makefile
paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile
paludis/repositories/e/qa/Makefile
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index 6da4ef8..1162129 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -1647,6 +1647,16 @@ namespace test_cases
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "3");
id->perform_action(action);
}
+
+ {
+ TestMessageSuffix suffix("docompress 3", true);
+ const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ PackageDepSpec(parse_user_package_dep_spec("=cat/docompress-3",
+ &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ TEST_CHECK(id);
+ TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "3");
+ id->perform_action(action);
+ }
}
} test_e_repository_install_eapi_3;
diff --git a/paludis/repositories/e/e_repository_TEST_setup.sh b/paludis/repositories/e/e_repository_TEST_setup.sh
index e061f00..9588f18 100755
--- a/paludis/repositories/e/e_repository_TEST_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_setup.sh
@@ -1277,6 +1277,23 @@ pkg_preinst() {
[[ -e ${D}/EATME ]] || die EATME
}
END
+mkdir -p "cat/docompress" || exit 1
+cat << 'END' > cat/docompress/docompress-3.ebuild || exit 1
+EAPI="${PV}"
+DESCRIPTION="The Description"
+HOMEPAGE="http://example.com/"
+SRC_URI=""
+SLOT="0"
+IUSE="spork"
+LICENSE="GPL-2"
+KEYWORDS="test"
+EAPI="3"
+
+src_install() {
+ docompress foo || die
+ docompress bar || die
+}
+END
cd ..
mkdir -p repo14/{profiles/profile,metadata,eclass} || exit 1
diff --git a/paludis/repositories/e/eapis/3.conf b/paludis/repositories/e/eapis/3.conf
index 29af8ea..b5a49d0 100644
--- a/paludis/repositories/e/eapis/3.conf
+++ b/paludis/repositories/e/eapis/3.conf
@@ -28,6 +28,7 @@ package_dep_spec_parse_options = ${package_dep_spec_parse_options} \
allow_slot_equal_deps allow_slot_star_deps allow_use_dep_defaults
ebuild_module_suffixes = 3 2 1 0
+utility_path_suffixes = 3 2 1 0
ebuild_pretend = \
skipname=pretend skipifno=pretend sandbox userpriv : pretend
diff --git a/paludis/repositories/e/ebuild/utils/3/Makefile.am b/paludis/repositories/e/ebuild/utils/3/Makefile.am
new file mode 100644
index 0000000..e77c545
--- /dev/null
+++ b/paludis/repositories/e/ebuild/utils/3/Makefile.am
@@ -0,0 +1,37 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = .
+
+libexecprog3dir = $(libexecdir)/paludis/utils/3/
+
+libexecprog3_SCRIPTS = \
+ docompress
+
+TESTS_ENVIRONMENT = env \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise \
+ $(top_srcdir)/paludis/repositories/e/ebuild/`" \
+ PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
+ TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
+ PALUDIS_EBUILD_LOG_LEVEL="silent" \
+ PALUDIS_DISTRIBUTION="gentoo" \
+ PALUDIS_OPTIONS="" \
+ PALUDIS_NO_CHOWN="yes" \
+ TEST_SCRIPT_DIR="$(srcdir)/" \
+ PALUDIS_TMPDIR="`pwd`/" \
+ bash $(top_srcdir)/paludis/repositories/e/ebuild/utils/run_test.bash
+
+TESTS =
+EXTRA_DIST = $(TESTS)
+
+CLEANFILES = *~ *.epicfail
+
+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/utils/3/docompress b/paludis/repositories/e/ebuild/utils/3/docompress
new file mode 100755
index 0000000..b7ec0cb
--- /dev/null
+++ b/paludis/repositories/e/ebuild/utils/3/docompress
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# vim: set sw=4 sts=4 et :
+
+# Copyright (c) 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 as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
+#
+# 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
+
+exit 0
+
diff --git a/paludis/repositories/e/ebuild/utils/Makefile.am b/paludis/repositories/e/ebuild/utils/Makefile.am
index c47aab3..2cbaba4 100644
--- a/paludis/repositories/e/ebuild/utils/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/Makefile.am
@@ -1,5 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = . exheres-0 kdebuild-1
+SUBDIRS = . 3 exheres-0 kdebuild-1
libexecprogdir = $(libexecdir)/paludis/utils