diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2012-10-30 16:26:37 +0000 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2012-10-30 16:26:37 +0000 |
| commit | e20a09caa9c076c551d86b124508545dcf2471f2 (patch) | |
| tree | 1c48ea578ec6303d22a1cd37e34ed5964d515eee | |
| parent | 22d9ff9ae7d6eaf376fe1980bb850000ab098fb2 (diff) | |
| download | paludis-e20a09caa9c076c551d86b124508545dcf2471f2.tar.gz paludis-e20a09caa9c076c551d86b124508545dcf2471f2.tar.xz | |
Enable EAPI 5 pbins
4 files changed, 8 insertions, 2 deletions
diff --git a/paludis/repositories/e/e_repository_TEST_pbin.cc b/paludis/repositories/e/e_repository_TEST_pbin.cc index 7ba2f7f..3f94e55 100644 --- a/paludis/repositories/e/e_repository_TEST_pbin.cc +++ b/paludis/repositories/e/e_repository_TEST_pbin.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh + * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012 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 @@ -196,6 +196,7 @@ INSTANTIATE_TEST_CASE_P(Works, ERepositoryInstallEAPIPBinTest, testing::Values( std::string("2"), std::string("3"), std::string("4"), + std::string("5"), std::string("exheres-0") )); diff --git a/paludis/repositories/e/e_repository_TEST_pbin_setup.sh b/paludis/repositories/e/e_repository_TEST_pbin_setup.sh index c338544..2e44b12 100755 --- a/paludis/repositories/e/e_repository_TEST_pbin_setup.sh +++ b/paludis/repositories/e/e_repository_TEST_pbin_setup.sh @@ -14,7 +14,7 @@ ln -s build symlinked_build mkdir -p distdir -for e in 0 1 2 3 4 ; do +for e in 0 1 2 3 4 5 ; do mkdir -p repo${e}/{profiles/profile,metadata,eclass} || exit 1 cd repo${e} || exit 1 echo "repo${e}" >> profiles/repo_name || exit 1 diff --git a/paludis/repositories/e/eapis/Makefile.am b/paludis/repositories/e/eapis/Makefile.am index 831f6f4..fb06909 100644 --- a/paludis/repositories/e/eapis/Makefile.am +++ b/paludis/repositories/e/eapis/Makefile.am @@ -18,6 +18,7 @@ eapis = \ pbin-1+2.conf \ pbin-1+3.conf \ pbin-1+4.conf \ + pbin-1+5.conf \ pbin-1+paludis-1.conf \ pbin-1+exheres-0.conf diff --git a/paludis/repositories/e/ebuild_entries_suffixes.conf b/paludis/repositories/e/ebuild_entries_suffixes.conf index 7b42853..19613e0 100644 --- a/paludis/repositories/e/ebuild_entries_suffixes.conf +++ b/paludis/repositories/e/ebuild_entries_suffixes.conf @@ -26,6 +26,10 @@ suffix_pbin-1+4_known = yes guess_eapi_pbin-1+4 = pbin-1+4 manifest_key_pbin-1+4 = PBIN +suffix_pbin-1+5_known = yes +guess_eapi_pbin-1+5 = pbin-1+5 +manifest_key_pbin-1+5 = PBIN + suffix_pbin-1+exheres-0_known = yes guess_eapi_pbin-1+exheres-0 = pbin-1+exheres-0 manifest_key_pbin-1+exheres-0 = PBIN |