Merge pull request #187 from renegart/17.1

new profile scheme
shiznix · Jan 12, 2018 · c9e4c61 · c9e4c61
2 parents 1c051c2 + 6385c17
commit c9e4c61
Show file tree

Hide file tree

Showing 150 changed files with 77 additions and 265 deletions.
diff --git a/eclass/ubuntu-versionator.eclass b/eclass/ubuntu-versionator.eclass
@@ -143,7 +143,7 @@ ubuntu-versionator_pkg_setup() {
                 if [ -z "$(echo ${CURRENT_PROFILE} | grep unity-gentoo)" ]; then
                         die "Invalid profile detected, please select a 'unity-gentoo' profile for your architecture shown in 'eselect profile list'"
                 else
-			PROFILE_RELEASE=$(echo "${CURRENT_PROFILE}" | awk -F/ '{print $(NF-1)}')
+			PROFILE_RELEASE=$(echo "${CURRENT_PROFILE}" | awk -F/ '{print $(NF-0)}')
                 fi
 
                 has_version unity-base/unity-build-env:0/${PROFILE_RELEASE} || \

diff --git a/profiles/artful/amd64/parent b/profiles/artful/amd64/parent
diff --git a/profiles/artful/base/profile.bashrc b/profiles/artful/base/profile.bashrc
diff --git a/profiles/artful/x86/parent b/profiles/artful/x86/parent
diff --git a/profiles/artful/amd64/eapi → profiles/linux/amd64/17.0/artful/eapi b/profiles/artful/amd64/eapi → profiles/linux/amd64/17.0/artful/eapi
diff --git a/profiles/linux/amd64/17.0/artful/parent b/profiles/linux/amd64/17.0/artful/parent
@@ -0,0 +1,2 @@
+..
+unity-gentoo:releases/artful/base
diff --git a/profiles/artful/base/eapi → profiles/linux/amd64/17.0/eapi b/profiles/artful/base/eapi → profiles/linux/amd64/17.0/eapi
diff --git a/profiles/linux/amd64/17.0/parent b/profiles/linux/amd64/17.0/parent
@@ -0,0 +1,2 @@
+gentoo:default/linux/amd64/17.0
+gentoo:arch/amd64/lib32
diff --git a/profiles/artful/x86/eapi → profiles/linux/amd64/17.0/zesty/eapi b/profiles/artful/x86/eapi → profiles/linux/amd64/17.0/zesty/eapi
diff --git a/profiles/linux/amd64/17.0/zesty/parent b/profiles/linux/amd64/17.0/zesty/parent
@@ -0,0 +1,2 @@
+..
+unity-gentoo:releases/zesty/base
diff --git a/profiles/zesty/amd64/eapi → profiles/linux/amd64/17.1/artful/eapi b/profiles/zesty/amd64/eapi → profiles/linux/amd64/17.1/artful/eapi
diff --git a/profiles/linux/amd64/17.1/artful/parent b/profiles/linux/amd64/17.1/artful/parent
@@ -0,0 +1,2 @@
+..
+unity-gentoo:releases/artful/base
diff --git a/profiles/zesty/base/eapi → profiles/linux/amd64/17.1/eapi b/profiles/zesty/base/eapi → profiles/linux/amd64/17.1/eapi
diff --git a/profiles/linux/amd64/17.1/parent b/profiles/linux/amd64/17.1/parent
@@ -0,0 +1,2 @@
+gentoo:default/linux/amd64/17.1
+..
diff --git a/profiles/zesty/x86/eapi → profiles/linux/amd64/17.1/zesty/eapi b/profiles/zesty/x86/eapi → profiles/linux/amd64/17.1/zesty/eapi
diff --git a/profiles/linux/amd64/17.1/zesty/parent b/profiles/linux/amd64/17.1/zesty/parent
@@ -0,0 +1,2 @@
+..
+unity-gentoo:releases/zesty/base
diff --git a/profiles/linux/amd64/eapi b/profiles/linux/amd64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/linux/amd64/parent b/profiles/linux/amd64/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/linux/eapi b/profiles/linux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/linux/parent b/profiles/linux/parent
@@ -0,0 +1,2 @@
+gentoo:targets/desktop/gnome
+gentoo:targets/systemd
diff --git a/profiles/linux/x86/17.0/artful/eapi b/profiles/linux/x86/17.0/artful/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/linux/x86/17.0/artful/parent b/profiles/linux/x86/17.0/artful/parent
@@ -0,0 +1,3 @@
+..
+unity-gentoo:releases/artful/base
+
diff --git a/profiles/linux/x86/17.0/eapi b/profiles/linux/x86/17.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/linux/x86/17.0/parent b/profiles/linux/x86/17.0/parent
@@ -0,0 +1 @@
+gentoo:default/linux/x86/17.0
diff --git a/profiles/linux/x86/17.0/zesty/eapi b/profiles/linux/x86/17.0/zesty/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/linux/x86/17.0/zesty/parent b/profiles/linux/x86/17.0/zesty/parent
@@ -0,0 +1,2 @@
+..
+unity-gentoo:releases/zesty/base
diff --git a/profiles/linux/x86/eapi b/profiles/linux/x86/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/linux/x86/parent b/profiles/linux/x86/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
@@ -1,5 +1,10 @@
-amd64	zesty/amd64	stable
-x86	zesty/x86	stable
+amd64	linux/amd64/17.0/zesty	stable
+x86	linux/x86/17.0/zesty	stable
 
-amd64	artful/amd64	dev
-x86	artful/amd64	dev
+amd64	linux/amd64/17.0/artful	dev
+x86	linux/x86/17.0/artful	dev
+
+# Experimental SYMLINK_LIB=no profiles
+# Run app-portage/unsymlink-lib *before* switching the profile.
+amd64	linux/amd64/17.1/zesty	exp
+amd64	linux/amd64/17.1/artful	exp
diff --git a/profiles/releases/artful/base/eapi b/profiles/releases/artful/base/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/releases/artful/base/make.defaults b/profiles/releases/artful/base/make.defaults
@@ -0,0 +1 @@
+../../make.defaults
diff --git a/profiles/artful/base/package.mask → profiles/releases/artful/base/package.mask b/profiles/artful/base/package.mask → profiles/releases/artful/base/package.mask
diff --git a/profiles/releases/artful/base/profile.bashrc b/profiles/releases/artful/base/profile.bashrc
@@ -0,0 +1 @@
+../../profile.bashrc
diff --git a/profiles/releases/artful/base/use.mask b/profiles/releases/artful/base/use.mask
@@ -0,0 +1 @@
+../../use.mask
diff --git a/...t-spi2-core-2.22/01-pre_src_prepare.ehook → ...t-spi2-core-2.22/01-pre_src_prepare.ehook b/...t-spi2-core-2.22/01-pre_src_prepare.ehook → ...t-spi2-core-2.22/01-pre_src_prepare.ehook
diff --git a/...-spi2-core-2.22/02-post_src_install.ehook → ...-spi2-core-2.22/02-post_src_install.ehook b/...-spi2-core-2.22/02-post_src_install.ehook → ...-spi2-core-2.22/02-post_src_install.ehook
diff --git a/...ore-2.22/files/01-at-spi-by-default.patch → ...ore-2.22/files/01-at-spi-by-default.patch b/...ore-2.22/files/01-at-spi-by-default.patch → ...ore-2.22/files/01-at-spi-by-default.patch
diff --git a/...-2.22/files/02-revert-register-late.patch → ...-2.22/files/02-revert-register-late.patch b/...-2.22/files/02-revert-register-late.patch → ...-2.22/files/02-revert-register-late.patch
diff --git a/...es/03-register-client-not-too-early.patch → ...es/03-register-client-not-too-early.patch b/...es/03-register-client-not-too-early.patch → ...es/03-register-client-not-too-early.patch
diff --git a/...ibility/at-spi2-core-2.22/files/90qt-a11y → ...ibility/at-spi2-core-2.22/files/90qt-a11y b/...ibility/at-spi2-core-2.22/files/90qt-a11y → ...ibility/at-spi2-core-2.22/files/90qt-a11y
diff --git a/...ity/at-spi2-core/01-pre_src_prepare.ehook → ...ity/at-spi2-core/01-pre_src_prepare.ehook b/...ity/at-spi2-core/01-pre_src_prepare.ehook → ...ity/at-spi2-core/01-pre_src_prepare.ehook
diff --git a/...ty/at-spi2-core/02-post_src_install.ehook → ...ty/at-spi2-core/02-post_src_install.ehook b/...ty/at-spi2-core/02-post_src_install.ehook → ...ty/at-spi2-core/02-post_src_install.ehook
diff --git a/...ccessibility/at-spi2-core/files/90qt-a11y → ...ccessibility/at-spi2-core/files/90qt-a11y b/...ccessibility/at-spi2-core/files/90qt-a11y → ...ccessibility/at-spi2-core/files/90qt-a11y
diff --git a/...ooks/app-i18n/ibus/01-pre_pkg_setup.ehook → ...ooks/app-i18n/ibus/01-pre_pkg_setup.ehook b/...ooks/app-i18n/ibus/01-pre_pkg_setup.ehook → ...ooks/app-i18n/ibus/01-pre_pkg_setup.ehook
diff --git a/...ks/app-i18n/ibus/02-pre_src_prepare.ehook → ...ks/app-i18n/ibus/02-pre_src_prepare.ehook b/...ks/app-i18n/ibus/02-pre_src_prepare.ehook → ...ks/app-i18n/ibus/02-pre_src_prepare.ehook
diff --git a/...n/ibus/files/ubuntu-no-notification.patch → ...n/ibus/files/ubuntu-no-notification.patch b/...n/ibus/files/ubuntu-no-notification.patch → ...n/ibus/files/ubuntu-no-notification.patch
diff --git a/...ient/thunderbird/01-pre_src_prepare.ehook → ...ient/thunderbird/01-pre_src_prepare.ehook b/...ient/thunderbird/01-pre_src_prepare.ehook → ...ient/thunderbird/01-pre_src_prepare.ehook
diff --git a/...ent/thunderbird/02-post_src_install.ehook → ...ent/thunderbird/02-post_src_install.ehook b/...ent/thunderbird/02-post_src_install.ehook → ...ent/thunderbird/02-post_src_install.ehook
diff --git a/...nt/thunderbird/03-post_pkg_postinst.ehook → ...nt/thunderbird/03-post_pkg_postinst.ehook b/...nt/thunderbird/03-post_pkg_postinst.ehook → ...nt/thunderbird/03-post_pkg_postinst.ehook
diff --git a/.../thunderbird/files/thunderbird.desktop.in → .../thunderbird/files/thunderbird.desktop.in b/.../thunderbird/files/thunderbird.desktop.in → .../thunderbird/files/thunderbird.desktop.in
diff --git a/...ent/thunderbird/files/unity-menubar.patch → ...ent/thunderbird/files/unity-menubar.patch b/...ent/thunderbird/files/unity-menubar.patch → ...ent/thunderbird/files/unity-menubar.patch
diff --git a/...ase/mate-desktop/01-pre_src_prepare.ehook → ...ase/mate-desktop/01-pre_src_prepare.ehook b/...ase/mate-desktop/01-pre_src_prepare.ehook → ...ase/mate-desktop/01-pre_src_prepare.ehook
diff --git a/...sktop/files/1000_global_menu_support.diff → ...sktop/files/1000_global_menu_support.diff b/...sktop/files/1000_global_menu_support.diff → ...sktop/files/1000_global_menu_support.diff
diff --git a/...ubuntu-font-family/post_src_prepare.ehook → ...ubuntu-font-family/post_src_prepare.ehook b/...ubuntu-font-family/post_src_prepare.ehook → ...ubuntu-font-family/post_src_prepare.ehook
diff --git a/.../net-irc/quassel/01-pre_src_prepare.ehook → .../net-irc/quassel/01-pre_src_prepare.ehook b/.../net-irc/quassel/01-pre_src_prepare.ehook → .../net-irc/quassel/01-pre_src_prepare.ehook
diff --git a/...et-irc/quassel/02-post_pkg_postinst.ehook → ...et-irc/quassel/02-post_pkg_postinst.ehook b/...et-irc/quassel/02-post_pkg_postinst.ehook → ...et-irc/quassel/02-post_pkg_postinst.ehook
diff --git a/...t-irc/quassel/files/SNI-systray_fix.patch → ...t-irc/quassel/files/SNI-systray_fix.patch b/...t-irc/quassel/files/SNI-systray_fix.patch → ...t-irc/quassel/files/SNI-systray_fix.patch
diff --git a/...s/sys-apps/systemd/01-pre_pkg_setup.ehook → ...s/sys-apps/systemd/01-pre_pkg_setup.ehook b/...s/sys-apps/systemd/01-pre_pkg_setup.ehook → ...s/sys-apps/systemd/01-pre_pkg_setup.ehook
diff --git a/...sys-apps/systemd/02-pre_src_prepare.ehook → ...sys-apps/systemd/02-pre_src_prepare.ehook b/...sys-apps/systemd/02-pre_src_prepare.ehook → ...sys-apps/systemd/02-pre_src_prepare.ehook
diff --git a/...tunixsession_sessionid_from_display.patch → ...tunixsession_sessionid_from_display.patch b/...tunixsession_sessionid_from_display.patch → ...tunixsession_sessionid_from_display.patch
diff --git a/...oks/sys-auth/polkit/pre_src_prepare.ehook → ...oks/sys-auth/polkit/pre_src_prepare.ehook b/...oks/sys-auth/polkit/pre_src_prepare.ehook → ...oks/sys-auth/polkit/pre_src_prepare.ehook
diff --git a/...ehooks/templates/aa-pre_src_prepare.ehook → ...ehooks/templates/aa-pre_src_prepare.ehook b/...ehooks/templates/aa-pre_src_prepare.ehook → ...ehooks/templates/aa-pre_src_prepare.ehook
diff --git a/...hooks/templates/ab-post_src_prepare.ehook → ...hooks/templates/ab-post_src_prepare.ehook b/...hooks/templates/ab-post_src_prepare.ehook → ...hooks/templates/ab-post_src_prepare.ehook
diff --git a/...ehooks/templates/ba-pre_src_prepare.ehook → ...ehooks/templates/ba-pre_src_prepare.ehook b/...ehooks/templates/ba-pre_src_prepare.ehook → ...ehooks/templates/ba-pre_src_prepare.ehook
diff --git a/...hooks/templates/bb-post_src_prepare.ehook → ...hooks/templates/bb-post_src_prepare.ehook b/...hooks/templates/bb-post_src_prepare.ehook → ...hooks/templates/bb-post_src_prepare.ehook
diff --git a/...l/ehooks/templates/ca-pre_pkg_setup.ehook → ...l/ehooks/templates/ca-pre_pkg_setup.ehook b/...l/ehooks/templates/ca-pre_pkg_setup.ehook → ...l/ehooks/templates/ca-pre_pkg_setup.ehook
diff --git a/...ooks/templates/cb-post_pkg_postinst.ehook → ...ooks/templates/cb-post_pkg_postinst.ehook b/...ooks/templates/cb-post_pkg_postinst.ehook → ...ooks/templates/cb-post_pkg_postinst.ehook
diff --git a/...-client/firefox-52/01-pre_pkg_setup.ehook → ...-client/firefox-52/01-pre_pkg_setup.ehook b/...-client/firefox-52/01-pre_pkg_setup.ehook → ...-client/firefox-52/01-pre_pkg_setup.ehook
diff --git a/...lient/firefox-52/02-pre_src_prepare.ehook → ...lient/firefox-52/02-pre_src_prepare.ehook b/...lient/firefox-52/02-pre_src_prepare.ehook → ...lient/firefox-52/02-pre_src_prepare.ehook
diff --git a/...ient/firefox-52/03-post_src_install.ehook → ...ient/firefox-52/03-post_src_install.ehook b/...ient/firefox-52/03-post_src_install.ehook → ...ient/firefox-52/03-post_src_install.ehook
diff --git a/...ent/firefox-52/04-post_pkg_postinst.ehook → ...ent/firefox-52/04-post_pkg_postinst.ehook b/...ent/firefox-52/04-post_pkg_postinst.ehook → ...ent/firefox-52/04-post_pkg_postinst.ehook
diff --git a/...lient/firefox-52/files/firefox.desktop.in → ...lient/firefox-52/files/firefox.desktop.in b/...lient/firefox-52/files/firefox.desktop.in → ...lient/firefox-52/files/firefox.desktop.in
diff --git a/...ient/firefox-52/files/unity-menubar.patch → ...ient/firefox-52/files/unity-menubar.patch b/...ient/firefox-52/files/unity-menubar.patch → ...ient/firefox-52/files/unity-menubar.patch
diff --git a/...www-client/firefox/01-pre_pkg_setup.ehook → ...www-client/firefox/01-pre_pkg_setup.ehook b/...www-client/firefox/01-pre_pkg_setup.ehook → ...www-client/firefox/01-pre_pkg_setup.ehook
diff --git a/...w-client/firefox/02-pre_src_prepare.ehook → ...w-client/firefox/02-pre_src_prepare.ehook b/...w-client/firefox/02-pre_src_prepare.ehook → ...w-client/firefox/02-pre_src_prepare.ehook
diff --git a/...-client/firefox/03-post_src_install.ehook → ...-client/firefox/03-post_src_install.ehook b/...-client/firefox/03-post_src_install.ehook → ...-client/firefox/03-post_src_install.ehook
diff --git a/...client/firefox/04-post_pkg_postinst.ehook → ...client/firefox/04-post_pkg_postinst.ehook b/...client/firefox/04-post_pkg_postinst.ehook → ...client/firefox/04-post_pkg_postinst.ehook
diff --git a/...w-client/firefox/files/firefox.desktop.in → ...w-client/firefox/files/firefox.desktop.in b/...w-client/firefox/files/firefox.desktop.in → ...w-client/firefox/files/firefox.desktop.in
diff --git a/...-client/firefox/files/unity-menubar.patch → ...-client/firefox/files/unity-menubar.patch b/...-client/firefox/files/unity-menubar.patch → ...-client/firefox/files/unity-menubar.patch
diff --git a/profiles/artful/env/no-sandbox → profiles/releases/artful/env/no-sandbox b/profiles/artful/env/no-sandbox → profiles/releases/artful/env/no-sandbox
diff --git a/profiles/artful/unity-portage.penv → profiles/releases/artful/unity-portage.penv b/profiles/artful/unity-portage.penv → profiles/releases/artful/unity-portage.penv
diff --git a/profiles/artful/unity-portage.pkeywords → ...s/releases/artful/unity-portage.pkeywords b/profiles/artful/unity-portage.pkeywords → ...s/releases/artful/unity-portage.pkeywords
diff --git a/profiles/artful/unity-portage.pmask → profiles/releases/artful/unity-portage.pmask b/profiles/artful/unity-portage.pmask → profiles/releases/artful/unity-portage.pmask
diff --git a/profiles/artful/unity-portage.punmask → ...les/releases/artful/unity-portage.punmask b/profiles/artful/unity-portage.punmask → ...les/releases/artful/unity-portage.punmask
diff --git a/profiles/artful/unity-portage.puse → profiles/releases/artful/unity-portage.puse b/profiles/artful/unity-portage.puse → profiles/releases/artful/unity-portage.puse
diff --git a/profiles/artful/base/make.defaults → profiles/releases/make.defaults b/profiles/artful/base/make.defaults → profiles/releases/make.defaults
diff --git a/profiles/zesty/base/profile.bashrc → profiles/releases/profile.bashrc b/profiles/zesty/base/profile.bashrc → profiles/releases/profile.bashrc
@@ -1,13 +1,34 @@
 if [[ ${EBUILD_PHASE} == "setup" ]] ; then
 	CURRENT_PROFILE="$(readlink /etc/portage/make.profile)"
+	PROFILE_DESC="/etc/portage/${CURRENT_PROFILE%%profiles*}/profiles/profiles.desc"
+	PROFILE_NAME="${CURRENT_PROFILE#*profiles}"
+	PROFILE_NAME="${PROFILE_NAME#"/"}"
+
 	if [ -z "$(echo ${CURRENT_PROFILE} | grep unity-gentoo)" ]; then
 		die "Invalid profile detected, please select a 'unity-gentoo' profile for your architecture shown in 'eselect profile list'"
 	else
-		PROFILE_RELEASE=$(echo "${CURRENT_PROFILE}" | awk -F/ '{print $(NF-1)}')
+		PROFILE_RELEASE=$(echo "${CURRENT_PROFILE}" | awk -F/ '{print $(NF-0)}')
 	fi
-#	if [ "$(eval echo \${UNITY_DEVELOPMENT_${PROFILE_RELEASE}})" != "yes" ]; then
-#		die "Oops! A development profile has been detected. Set 'UNITY_DEVELOPMENT_${PROFILE_RELEASE}=yes' in make.conf if you really know how broken this profile could be"
-#	fi
+
+	while read -r line; do
+	        [[ "$line" =~ ^#.*$ ]] && continue
+		[[ -z "$line" ]] && continue
+
+		name=$(echo "${line}" | awk -F' ' '{print $(NF-1)}')
+		edition=$(echo "${line}" | awk -F' ' '{print $(NF-0)}')
+		if [[ "${PROFILE_NAME}" == "${name}" ]]; then
+			if [[ "${edition}" == "dev" ]]; then
+				if [ "$(eval echo \${UNITY_DEVELOPMENT_${PROFILE_RELEASE}})" != "yes" ]; then
+					die "Oops! A development profile has been detected. Set 'UNITY_DEVELOPMENT_${PROFILE_RELEASE}=yes' in make.conf if you really know how broken this profile could be"
+				fi
+			fi
+			if [[ "${edition}" == "exp" ]]; then
+					if [ "$(eval echo \${UNITY_EXPERIMENTAL_PROFILE_${PROFILE_RELEASE}})" != "yes" ]; then
+						die "Oops! A experimental profile has been detected. Set 'UNITY_EXPERIMENTAL_PROFILE_${PROFILE_RELEASE}=yes' in make.conf if you really know what you are doing!\nHave also a look at: https://www.gentoo.org/support/news-items/2017-12-26-experimental-amd64-17-1-profiles.html"
+					fi
+			fi
+		fi
+	done < "$PROFILE_DESC"
 
 	KEYWORD_STATE="${KEYWORD_STATE:=`grep ACCEPT_KEYWORDS /etc/portage/make.conf 2>/dev/null`}"
 	KEYWORD_STATE="${KEYWORD_STATE:=`grep ACCEPT_KEYWORDS /etc/make.conf 2>/dev/null`}"
@@ -38,7 +59,7 @@ if [[ ${EBUILD_PHASE} == "setup" ]] ; then
 		repodir=$(/usr/bin/portageq get_repo_path / unity-gentoo) \
 		optdir=${PORTAGE_CONFIGROOT%/}/etc/portage/ehooks
 	local -a basedirs=(
-		"${repodir}"/profiles/${PROFILE_RELEASE}/ehooks
+		"${repodir}"/profiles/releases/${PROFILE_RELEASE}/ehooks
 		"${optdir}"
 	)
 

diff --git a/profiles/artful/base/use.mask → profiles/releases/use.mask b/profiles/artful/base/use.mask → profiles/releases/use.mask
diff --git a/profiles/releases/zesty/base/eapi b/profiles/releases/zesty/base/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/releases/zesty/base/make.defaults b/profiles/releases/zesty/base/make.defaults
@@ -0,0 +1 @@
+../../make.defaults
diff --git a/profiles/zesty/base/package.mask → profiles/releases/zesty/base/package.mask b/profiles/zesty/base/package.mask → profiles/releases/zesty/base/package.mask
diff --git a/profiles/releases/zesty/base/profile.bashrc b/profiles/releases/zesty/base/profile.bashrc
@@ -0,0 +1 @@
+../../profile.bashrc
diff --git a/profiles/releases/zesty/base/use.mask b/profiles/releases/zesty/base/use.mask
@@ -0,0 +1 @@
+../../use.mask
diff --git a/...t-spi2-core-2.22/01-pre_src_prepare.ehook → ...t-spi2-core-2.22/01-pre_src_prepare.ehook b/...t-spi2-core-2.22/01-pre_src_prepare.ehook → ...t-spi2-core-2.22/01-pre_src_prepare.ehook
diff --git a/...-spi2-core-2.22/02-post_src_install.ehook → ...-spi2-core-2.22/02-post_src_install.ehook b/...-spi2-core-2.22/02-post_src_install.ehook → ...-spi2-core-2.22/02-post_src_install.ehook
diff --git a/...ore-2.22/files/01-at-spi-by-default.patch → ...ore-2.22/files/01-at-spi-by-default.patch b/...ore-2.22/files/01-at-spi-by-default.patch → ...ore-2.22/files/01-at-spi-by-default.patch
diff --git a/...-2.22/files/02-revert-register-late.patch → ...-2.22/files/02-revert-register-late.patch b/...-2.22/files/02-revert-register-late.patch → ...-2.22/files/02-revert-register-late.patch
diff --git a/...es/03-register-client-not-too-early.patch → ...es/03-register-client-not-too-early.patch b/...es/03-register-client-not-too-early.patch → ...es/03-register-client-not-too-early.patch
diff --git a/...ibility/at-spi2-core-2.22/files/90qt-a11y → ...ibility/at-spi2-core-2.22/files/90qt-a11y b/...ibility/at-spi2-core-2.22/files/90qt-a11y → ...ibility/at-spi2-core-2.22/files/90qt-a11y
diff --git a/...ity/at-spi2-core/01-pre_src_prepare.ehook → ...ity/at-spi2-core/01-pre_src_prepare.ehook b/...ity/at-spi2-core/01-pre_src_prepare.ehook → ...ity/at-spi2-core/01-pre_src_prepare.ehook
diff --git a/...ty/at-spi2-core/02-post_src_install.ehook → ...ty/at-spi2-core/02-post_src_install.ehook b/...ty/at-spi2-core/02-post_src_install.ehook → ...ty/at-spi2-core/02-post_src_install.ehook
diff --git a/...ccessibility/at-spi2-core/files/90qt-a11y → ...ccessibility/at-spi2-core/files/90qt-a11y b/...ccessibility/at-spi2-core/files/90qt-a11y → ...ccessibility/at-spi2-core/files/90qt-a11y
diff --git a/...ooks/app-i18n/ibus/01-pre_pkg_setup.ehook → ...ooks/app-i18n/ibus/01-pre_pkg_setup.ehook b/...ooks/app-i18n/ibus/01-pre_pkg_setup.ehook → ...ooks/app-i18n/ibus/01-pre_pkg_setup.ehook
diff --git a/...ks/app-i18n/ibus/02-pre_src_prepare.ehook → ...ks/app-i18n/ibus/02-pre_src_prepare.ehook b/...ks/app-i18n/ibus/02-pre_src_prepare.ehook → ...ks/app-i18n/ibus/02-pre_src_prepare.ehook
diff --git a/...n/ibus/files/ubuntu-no-notification.patch → ...n/ibus/files/ubuntu-no-notification.patch b/...n/ibus/files/ubuntu-no-notification.patch → ...n/ibus/files/ubuntu-no-notification.patch
diff --git a/...ient/thunderbird/01-pre_src_prepare.ehook → ...ient/thunderbird/01-pre_src_prepare.ehook b/...ient/thunderbird/01-pre_src_prepare.ehook → ...ient/thunderbird/01-pre_src_prepare.ehook
diff --git a/...ent/thunderbird/02-post_src_install.ehook → ...ent/thunderbird/02-post_src_install.ehook b/...ent/thunderbird/02-post_src_install.ehook → ...ent/thunderbird/02-post_src_install.ehook
diff --git a/...nt/thunderbird/03-post_pkg_postinst.ehook → ...nt/thunderbird/03-post_pkg_postinst.ehook b/...nt/thunderbird/03-post_pkg_postinst.ehook → ...nt/thunderbird/03-post_pkg_postinst.ehook
diff --git a/.../thunderbird/files/thunderbird.desktop.in → .../thunderbird/files/thunderbird.desktop.in b/.../thunderbird/files/thunderbird.desktop.in → .../thunderbird/files/thunderbird.desktop.in
diff --git a/...ent/thunderbird/files/unity-menubar.patch → ...ent/thunderbird/files/unity-menubar.patch b/...ent/thunderbird/files/unity-menubar.patch → ...ent/thunderbird/files/unity-menubar.patch
diff --git a/...ase/mate-desktop/01-pre_src_prepare.ehook → ...ase/mate-desktop/01-pre_src_prepare.ehook b/...ase/mate-desktop/01-pre_src_prepare.ehook → ...ase/mate-desktop/01-pre_src_prepare.ehook
diff --git a/...sktop/files/1000_global_menu_support.diff → ...sktop/files/1000_global_menu_support.diff b/...sktop/files/1000_global_menu_support.diff → ...sktop/files/1000_global_menu_support.diff
diff --git a/...ubuntu-font-family/post_src_prepare.ehook → ...ubuntu-font-family/post_src_prepare.ehook b/...ubuntu-font-family/post_src_prepare.ehook → ...ubuntu-font-family/post_src_prepare.ehook
diff --git a/.../net-irc/quassel/01-pre_src_prepare.ehook → .../net-irc/quassel/01-pre_src_prepare.ehook b/.../net-irc/quassel/01-pre_src_prepare.ehook → .../net-irc/quassel/01-pre_src_prepare.ehook
diff --git a/...et-irc/quassel/02-post_pkg_postinst.ehook → ...et-irc/quassel/02-post_pkg_postinst.ehook b/...et-irc/quassel/02-post_pkg_postinst.ehook → ...et-irc/quassel/02-post_pkg_postinst.ehook
diff --git a/...t-irc/quassel/files/SNI-systray_fix.patch → ...t-irc/quassel/files/SNI-systray_fix.patch b/...t-irc/quassel/files/SNI-systray_fix.patch → ...t-irc/quassel/files/SNI-systray_fix.patch
diff --git a/...s/sys-apps/systemd/01-pre_pkg_setup.ehook → ...s/sys-apps/systemd/01-pre_pkg_setup.ehook b/...s/sys-apps/systemd/01-pre_pkg_setup.ehook → ...s/sys-apps/systemd/01-pre_pkg_setup.ehook
diff --git a/...sys-apps/systemd/02-pre_src_prepare.ehook → ...sys-apps/systemd/02-pre_src_prepare.ehook b/...sys-apps/systemd/02-pre_src_prepare.ehook → ...sys-apps/systemd/02-pre_src_prepare.ehook
diff --git a/...tunixsession_sessionid_from_display.patch → ...tunixsession_sessionid_from_display.patch b/...tunixsession_sessionid_from_display.patch → ...tunixsession_sessionid_from_display.patch
diff --git a/...oks/sys-auth/polkit/pre_src_prepare.ehook → ...oks/sys-auth/polkit/pre_src_prepare.ehook b/...oks/sys-auth/polkit/pre_src_prepare.ehook → ...oks/sys-auth/polkit/pre_src_prepare.ehook
diff --git a/...ehooks/templates/aa-pre_src_prepare.ehook → ...ehooks/templates/aa-pre_src_prepare.ehook b/...ehooks/templates/aa-pre_src_prepare.ehook → ...ehooks/templates/aa-pre_src_prepare.ehook
diff --git a/...hooks/templates/ab-post_src_prepare.ehook → ...hooks/templates/ab-post_src_prepare.ehook b/...hooks/templates/ab-post_src_prepare.ehook → ...hooks/templates/ab-post_src_prepare.ehook
diff --git a/...ehooks/templates/ba-pre_src_prepare.ehook → ...ehooks/templates/ba-pre_src_prepare.ehook b/...ehooks/templates/ba-pre_src_prepare.ehook → ...ehooks/templates/ba-pre_src_prepare.ehook
diff --git a/...hooks/templates/bb-post_src_prepare.ehook → ...hooks/templates/bb-post_src_prepare.ehook b/...hooks/templates/bb-post_src_prepare.ehook → ...hooks/templates/bb-post_src_prepare.ehook
diff --git a/...y/ehooks/templates/ca-pre_pkg_setup.ehook → ...y/ehooks/templates/ca-pre_pkg_setup.ehook b/...y/ehooks/templates/ca-pre_pkg_setup.ehook → ...y/ehooks/templates/ca-pre_pkg_setup.ehook
diff --git a/...ooks/templates/cb-post_pkg_postinst.ehook → ...ooks/templates/cb-post_pkg_postinst.ehook b/...ooks/templates/cb-post_pkg_postinst.ehook → ...ooks/templates/cb-post_pkg_postinst.ehook
diff --git a/...-client/firefox-52/01-pre_pkg_setup.ehook → ...-client/firefox-52/01-pre_pkg_setup.ehook b/...-client/firefox-52/01-pre_pkg_setup.ehook → ...-client/firefox-52/01-pre_pkg_setup.ehook
diff --git a/...lient/firefox-52/02-pre_src_prepare.ehook → ...lient/firefox-52/02-pre_src_prepare.ehook b/...lient/firefox-52/02-pre_src_prepare.ehook → ...lient/firefox-52/02-pre_src_prepare.ehook
diff --git a/...ient/firefox-52/03-post_src_install.ehook → ...ient/firefox-52/03-post_src_install.ehook b/...ient/firefox-52/03-post_src_install.ehook → ...ient/firefox-52/03-post_src_install.ehook
diff --git a/...ent/firefox-52/04-post_pkg_postinst.ehook → ...ent/firefox-52/04-post_pkg_postinst.ehook b/...ent/firefox-52/04-post_pkg_postinst.ehook → ...ent/firefox-52/04-post_pkg_postinst.ehook
diff --git a/...lient/firefox-52/files/firefox.desktop.in → ...lient/firefox-52/files/firefox.desktop.in b/...lient/firefox-52/files/firefox.desktop.in → ...lient/firefox-52/files/firefox.desktop.in
diff --git a/...ient/firefox-52/files/unity-menubar.patch → ...ient/firefox-52/files/unity-menubar.patch b/...ient/firefox-52/files/unity-menubar.patch → ...ient/firefox-52/files/unity-menubar.patch
diff --git a/...www-client/firefox/01-pre_pkg_setup.ehook → ...www-client/firefox/01-pre_pkg_setup.ehook b/...www-client/firefox/01-pre_pkg_setup.ehook → ...www-client/firefox/01-pre_pkg_setup.ehook
diff --git a/...w-client/firefox/02-pre_src_prepare.ehook → ...w-client/firefox/02-pre_src_prepare.ehook b/...w-client/firefox/02-pre_src_prepare.ehook → ...w-client/firefox/02-pre_src_prepare.ehook
diff --git a/...-client/firefox/03-post_src_install.ehook → ...-client/firefox/03-post_src_install.ehook b/...-client/firefox/03-post_src_install.ehook → ...-client/firefox/03-post_src_install.ehook
diff --git a/...client/firefox/04-post_pkg_postinst.ehook → ...client/firefox/04-post_pkg_postinst.ehook b/...client/firefox/04-post_pkg_postinst.ehook → ...client/firefox/04-post_pkg_postinst.ehook
diff --git a/...w-client/firefox/files/firefox.desktop.in → ...w-client/firefox/files/firefox.desktop.in b/...w-client/firefox/files/firefox.desktop.in → ...w-client/firefox/files/firefox.desktop.in
diff --git a/...-client/firefox/files/unity-menubar.patch → ...-client/firefox/files/unity-menubar.patch b/...-client/firefox/files/unity-menubar.patch → ...-client/firefox/files/unity-menubar.patch
diff --git a/profiles/zesty/env/no-sandbox → profiles/releases/zesty/env/no-sandbox b/profiles/zesty/env/no-sandbox → profiles/releases/zesty/env/no-sandbox
diff --git a/profiles/zesty/unity-portage.penv → profiles/releases/zesty/unity-portage.penv b/profiles/zesty/unity-portage.penv → profiles/releases/zesty/unity-portage.penv
diff --git a/profiles/zesty/unity-portage.pkeywords → ...es/releases/zesty/unity-portage.pkeywords b/profiles/zesty/unity-portage.pkeywords → ...es/releases/zesty/unity-portage.pkeywords
diff --git a/profiles/zesty/unity-portage.pmask → profiles/releases/zesty/unity-portage.pmask b/profiles/zesty/unity-portage.pmask → profiles/releases/zesty/unity-portage.pmask
diff --git a/profiles/zesty/unity-portage.punmask → ...iles/releases/zesty/unity-portage.punmask b/profiles/zesty/unity-portage.punmask → ...iles/releases/zesty/unity-portage.punmask
diff --git a/profiles/zesty/unity-portage.puse → profiles/releases/zesty/unity-portage.puse b/profiles/zesty/unity-portage.puse → profiles/releases/zesty/unity-portage.puse
diff --git a/profiles/zesty/amd64/parent b/profiles/zesty/amd64/parent
diff --git a/profiles/zesty/base/make.defaults b/profiles/zesty/base/make.defaults
diff --git a/profiles/zesty/base/use.mask b/profiles/zesty/base/use.mask
diff --git a/profiles/zesty/x86/parent b/profiles/zesty/x86/parent