profile flags && inline flags seem to fight each other, disable the later, and let hardened profile do it's magic...and some cleanup of course

14 files changed, 4 insertions, 28 deletions

diff --git a/conf/intel/portage/env/O3.amd64.conf b/conf/intel/portage/env/O3.amd64.conf
deleted file mode 100644
index 90787c5..0000000
--- a/conf/intel/portage/env/O3.amd64.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Set -O3 for perf. critical packages
-FEATURES="test compressdebug splitdebug"
-CFLAGS="-O3 -march=x86-64 -pipe ${GRAPHITE}"
-#CFLAGS="-O3 -ffast-math -march=x86-64 -pipe ${GRAPHITE}"
-CXXFLAGS="${CFLAGS}"
diff --git a/conf/intel/portage/env/disable.debug+userpriv.conf b/conf/intel/portage/env/disable.debug+userpriv.conf
deleted file mode 100644
index f3fe9c6..0000000
--- a/conf/intel/portage/env/disable.debug+userpriv.conf
+++ /dev/null
@@ -1 +0,0 @@
-FEATURES="parallel-fetch protect-owned -debug -compressdebug -splitdebug -userpriv"
diff --git a/conf/intel/portage/env/disable.debug.conf b/conf/intel/portage/env/disable.debug.conf
deleted file mode 100644
index 610b188..0000000
--- a/conf/intel/portage/env/disable.debug.conf
+++ /dev/null
@@ -1 +0,0 @@
-FEATURES="parallel-fetch protect-owned -debug -compressdebug -splitdebug"
diff --git a/conf/intel/portage/env/disable.userpriv.conf b/conf/intel/portage/env/disable.userpriv.conf
deleted file mode 100644
index acacbdb..0000000
--- a/conf/intel/portage/env/disable.userpriv.conf
+++ /dev/null
@@ -1 +0,0 @@
-FEATURES="parallel-fetch protect-owned -userpriv"
diff --git a/conf/intel/portage/env/linguas-en.conf b/conf/intel/portage/env/linguas-en.conf
deleted file mode 100644
index b8a76e0..0000000
--- a/conf/intel/portage/env/linguas-en.conf
+++ /dev/null
@@ -1 +0,0 @@
-LINGUAS="en"
diff --git a/conf/intel/portage/env/nofortify.conf b/conf/intel/portage/env/nofortify.conf
deleted file mode 100644
index 7a34013..0000000
--- a/conf/intel/portage/env/nofortify.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong"
-CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,now -Wl,-z,relro"
-CHOST="x86_64-pc-linux-gnu"
-MAKEOPTS="-j10"
diff --git a/conf/intel/portage/env/noparallelmake.conf b/conf/intel/portage/env/noparallelmake.conf
index 5f09bbe..a004e6e 100644
--- a/conf/intel/portage/env/noparallelmake.conf
+++ b/conf/intel/portage/env/noparallelmake.conf
@@ -1,5 +1,5 @@
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie -Wp,-D_FORTIFY_SOURCE=2"
-CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie -Wp,-D_FORTIFY_SOURCE=2"
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations"
+CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations"
 LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,now -Wl,-z,relro"
 CHOST="x86_64-pc-linux-gnu"
 MAKEOPTS="-j1"
diff --git a/conf/intel/portage/env/ufortify.conf b/conf/intel/portage/env/ufortify.conf
deleted file mode 100644
index 83fd54b..0000000
--- a/conf/intel/portage/env/ufortify.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -Wp,-U_FORTIFY_SOURCE"
-CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -Wp,-U_FORTIFY_SOURCE"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,now -Wl,-z,relro"
-CHOST="x86_64-pc-linux-gnu"
-MAKEOPTS="-j10"
diff --git a/conf/intel/portage/global.conf/cflags.conf b/conf/intel/portage/global.conf/cflags.conf
index 5b7ff0d..6a9d4c6 100644
--- a/conf/intel/portage/global.conf/cflags.conf
+++ b/conf/intel/portage/global.conf/cflags.conf
@@ -1,5 +1,5 @@
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2"
-CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2"
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations"
+CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations"
 LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,now -Wl,-z,relro"
 CHOST="x86_64-pc-linux-gnu"
 MAKEOPTS="-j10"
diff --git a/conf/intel/portage/package.env/00-games.package.env b/conf/intel/portage/package.env/00-games.package.env
deleted file mode 100644
index 944ea63..0000000
--- a/conf/intel/portage/package.env/00-games.package.env
+++ /dev/null
@@ -1 +0,0 @@
-games-fps/xonotic O3.amd64.conf
diff --git a/conf/intel/portage/package.env/00-mail.package.env b/conf/intel/portage/package.env/00-mail.package.env
deleted file mode 100644
index 7e0f3b4..0000000
--- a/conf/intel/portage/package.env/00-mail.package.env
+++ /dev/null
@@ -1 +0,0 @@
-mail-client/thunderbird disable.debug.conf
diff --git a/conf/intel/portage/package.env/00-media.package.env b/conf/intel/portage/package.env/00-media.package.env
index bc7f2ec..8a350f7 100644
--- a/conf/intel/portage/package.env/00-media.package.env
+++ b/conf/intel/portage/package.env/00-media.package.env
@@ -1,2 +1 @@
 media-libs/x264 noframepointer.conf
-media-video/ffmpeg O3.amd64.conf
diff --git a/conf/intel/portage/package.env/00-www.package.env b/conf/intel/portage/package.env/00-www.package.env
deleted file mode 100644
index e171ada..0000000
--- a/conf/intel/portage/package.env/00-www.package.env
+++ /dev/null
@@ -1 +0,0 @@
-www-client/firefox linguas-en.conf
diff --git a/conf/intel/portage/package.env/00-x11.package.env b/conf/intel/portage/package.env/00-x11.package.env
deleted file mode 100644
index 2dde2c5..0000000
--- a/conf/intel/portage/package.env/00-x11.package.env
+++ /dev/null
@@ -1 +0,0 @@
-x11-libs/cairo ufortify.conf