From a79ecf76c81b7eba4beb50fd5807783facc18b62 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Fri, 6 Jan 2017 00:26:27 +0000 Subject: Move as29 category to pants-on --- as29/base/Manifest | 3 --- as29/base/base-20160903.ebuild | 27 --------------------------- as29/base/base-20160926.ebuild | 27 --------------------------- as29/base/metadata.xml | 8 -------- eclass/linux-build.eclass | 2 +- metadata/layout.conf | 4 ++-- pants-on/base/Manifest | 3 +++ pants-on/base/base-20160903.ebuild | 27 +++++++++++++++++++++++++++ pants-on/base/base-20160926.ebuild | 27 +++++++++++++++++++++++++++ pants-on/base/metadata.xml | 8 ++++++++ profiles/categories | 2 +- profiles/common/package.use | 2 +- profiles/common/package.use.mask | 2 +- profiles/common/packages | 2 +- profiles/repo_name | 2 +- profiles/updates/1Q-2017 | 1 + scripts/hook-metadata | 2 +- 17 files changed, 75 insertions(+), 74 deletions(-) delete mode 100644 as29/base/Manifest delete mode 100644 as29/base/base-20160903.ebuild delete mode 100644 as29/base/base-20160926.ebuild delete mode 100644 as29/base/metadata.xml create mode 100644 pants-on/base/Manifest create mode 100644 pants-on/base/base-20160903.ebuild create mode 100644 pants-on/base/base-20160926.ebuild create mode 100644 pants-on/base/metadata.xml create mode 100644 profiles/updates/1Q-2017 diff --git a/as29/base/Manifest b/as29/base/Manifest deleted file mode 100644 index 79a845a4..00000000 --- a/as29/base/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -EBUILD base-20160903.ebuild 508 SHA256 14828c6275614ee7da6004f58011b1b55689e780e4e54bf4b62d623ffae27186 WHIRLPOOL 37955c8de137c5ddb01fe5d23977d99819184b62f4ed2e48d44028803c7825e14a88fb22e94702ebde9757f16997a595e8359e857983d05660ef3769d8809c5c -EBUILD base-20160926.ebuild 508 SHA256 14828c6275614ee7da6004f58011b1b55689e780e4e54bf4b62d623ffae27186 WHIRLPOOL 37955c8de137c5ddb01fe5d23977d99819184b62f4ed2e48d44028803c7825e14a88fb22e94702ebde9757f16997a595e8359e857983d05660ef3769d8809c5c -MISC metadata.xml 270 SHA256 c04cdb11fb00afb6ff02df034d8b5b9f0e81547e40c6222532f7093720e11830 WHIRLPOOL 265753a2137d4b55b97549114cf475b9996e2358f570533f3db7ec7a91b7d3cfb60372ac9ebf83284ef963fc4c36f7e6fbeb144fba17a9cef6c402a74557cf94 diff --git a/as29/base/base-20160903.ebuild b/as29/base/base-20160903.ebuild deleted file mode 100644 index 3e9d07d8..00000000 --- a/as29/base/base-20160903.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit git-r3 user - -DESCRIPTION="Base file for Pants On installs" -HOMEPAGE="https://pants-on.net" -EGIT_REPO_URI="git://git.meleeweb.net/srv/git/as29/base.git" -EGIT_COMMIT="v${PVR}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -pkg_setup() { - enewuser as29 429 /bin/bash /home/as29 wheel -} - -src_install () { - emake install DESTDIR="${ED}" -} diff --git a/as29/base/base-20160926.ebuild b/as29/base/base-20160926.ebuild deleted file mode 100644 index 3e9d07d8..00000000 --- a/as29/base/base-20160926.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit git-r3 user - -DESCRIPTION="Base file for Pants On installs" -HOMEPAGE="https://pants-on.net" -EGIT_REPO_URI="git://git.meleeweb.net/srv/git/as29/base.git" -EGIT_COMMIT="v${PVR}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -pkg_setup() { - enewuser as29 429 /bin/bash /home/as29 wheel -} - -src_install () { - emake install DESTDIR="${ED}" -} diff --git a/as29/base/metadata.xml b/as29/base/metadata.xml deleted file mode 100644 index 82f7232e..00000000 --- a/as29/base/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - bertrand@jacquin.bzh - Bertrand Jacquin - - diff --git a/eclass/linux-build.eclass b/eclass/linux-build.eclass index 3c87e8fe..0e956cb8 100644 --- a/eclass/linux-build.eclass +++ b/eclass/linux-build.eclass @@ -248,7 +248,7 @@ _linux-build_src_prepare_build() { x509_extensions = ${PF}_exts [ ${PF}_subj ] - O = as29 + O = Pants On CN = ${KBUILD_BUILD_HOST:-${HOSTNAME}} emailAddress = ${KBUILD_BUILD_USER:-${PORTAGE_USERNAME}}@${KBUILD_BUILD_HOST:-${HOSTNAME}}" diff --git a/metadata/layout.conf b/metadata/layout.conf index 0b23e5a5..07648031 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -1,7 +1,7 @@ -repo-name = as29 +repo-name = pants-on # eclass precedence from right to left -masters = gentoo as29 +masters = gentoo pants-on # sign commits in this repo sign-commits = true diff --git a/pants-on/base/Manifest b/pants-on/base/Manifest new file mode 100644 index 00000000..79a845a4 --- /dev/null +++ b/pants-on/base/Manifest @@ -0,0 +1,3 @@ +EBUILD base-20160903.ebuild 508 SHA256 14828c6275614ee7da6004f58011b1b55689e780e4e54bf4b62d623ffae27186 WHIRLPOOL 37955c8de137c5ddb01fe5d23977d99819184b62f4ed2e48d44028803c7825e14a88fb22e94702ebde9757f16997a595e8359e857983d05660ef3769d8809c5c +EBUILD base-20160926.ebuild 508 SHA256 14828c6275614ee7da6004f58011b1b55689e780e4e54bf4b62d623ffae27186 WHIRLPOOL 37955c8de137c5ddb01fe5d23977d99819184b62f4ed2e48d44028803c7825e14a88fb22e94702ebde9757f16997a595e8359e857983d05660ef3769d8809c5c +MISC metadata.xml 270 SHA256 c04cdb11fb00afb6ff02df034d8b5b9f0e81547e40c6222532f7093720e11830 WHIRLPOOL 265753a2137d4b55b97549114cf475b9996e2358f570533f3db7ec7a91b7d3cfb60372ac9ebf83284ef963fc4c36f7e6fbeb144fba17a9cef6c402a74557cf94 diff --git a/pants-on/base/base-20160903.ebuild b/pants-on/base/base-20160903.ebuild new file mode 100644 index 00000000..3e9d07d8 --- /dev/null +++ b/pants-on/base/base-20160903.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit git-r3 user + +DESCRIPTION="Base file for Pants On installs" +HOMEPAGE="https://pants-on.net" +EGIT_REPO_URI="git://git.meleeweb.net/srv/git/as29/base.git" +EGIT_COMMIT="v${PVR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +pkg_setup() { + enewuser as29 429 /bin/bash /home/as29 wheel +} + +src_install () { + emake install DESTDIR="${ED}" +} diff --git a/pants-on/base/base-20160926.ebuild b/pants-on/base/base-20160926.ebuild new file mode 100644 index 00000000..3e9d07d8 --- /dev/null +++ b/pants-on/base/base-20160926.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit git-r3 user + +DESCRIPTION="Base file for Pants On installs" +HOMEPAGE="https://pants-on.net" +EGIT_REPO_URI="git://git.meleeweb.net/srv/git/as29/base.git" +EGIT_COMMIT="v${PVR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +pkg_setup() { + enewuser as29 429 /bin/bash /home/as29 wheel +} + +src_install () { + emake install DESTDIR="${ED}" +} diff --git a/pants-on/base/metadata.xml b/pants-on/base/metadata.xml new file mode 100644 index 00000000..82f7232e --- /dev/null +++ b/pants-on/base/metadata.xml @@ -0,0 +1,8 @@ + + + + + bertrand@jacquin.bzh + Bertrand Jacquin + + diff --git a/profiles/categories b/profiles/categories index b9345285..792259f0 100644 --- a/profiles/categories +++ b/profiles/categories @@ -1,2 +1,2 @@ -as29 +pants-on flx diff --git a/profiles/common/package.use b/profiles/common/package.use index 9aec6a44..45c97cf3 100644 --- a/profiles/common/package.use +++ b/profiles/common/package.use @@ -49,7 +49,7 @@ media-gfx/pngcrush system-libs www-client/firefox system-cairo system-icu system-jpeg system-libvpx system-sqlite system-harfbuzz system-libevent # 19/05/2014 - beber -# required by sys-boot/grub::as29 +# required by sys-boot/grub::pants-on sys-libs/ncurses abi_x86_32 # 14/02/2015 - beber diff --git a/profiles/common/package.use.mask b/profiles/common/package.use.mask index f3ad1c1d..3fa4cd64 100644 --- a/profiles/common/package.use.mask +++ b/profiles/common/package.use.mask @@ -1,3 +1,3 @@ # 17/09/2014 - beber -# Needed for sys-boot/grub::as29 +# Needed for sys-boot/grub::pants-on sys-libs/ncurses -abi_x86_32 diff --git a/profiles/common/packages b/profiles/common/packages index 2c518bc1..7f2f3249 100644 --- a/profiles/common/packages +++ b/profiles/common/packages @@ -36,7 +36,7 @@ *sys-process/cronie *sys-process/lsof -*as29/base +*pants-on/base # 25/01/2015 - beber -*sys-apps/busybox diff --git a/profiles/repo_name b/profiles/repo_name index 23d14475..d659072e 100644 --- a/profiles/repo_name +++ b/profiles/repo_name @@ -1 +1 @@ -as29 +pants-on diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017 new file mode 100644 index 00000000..a05b4b4d --- /dev/null +++ b/profiles/updates/1Q-2017 @@ -0,0 +1 @@ +move as29/base pants-on/base diff --git a/scripts/hook-metadata b/scripts/hook-metadata index fd5d4244..219ecb22 100755 --- a/scripts/hook-metadata +++ b/scripts/hook-metadata @@ -13,7 +13,7 @@ ROOT="$(git rev-parse --show-toplevel)" REPO="$(< ${ROOT}/profiles/repo_name)" -if [[ "${REPO}" != "as29" ]] ; then +if [[ "${REPO}" != "pants-on" ]] ; then exit 0 fi -- cgit v1.2.3