cleanup pic use flag on hardened amd64

diff --git a/profiles/hardened/linux/amd64/no-multilib/package.use b/profiles/hardened/linux/amd64/no-multilib/package.use
deleted file mode 100644 (file)
index 17a463f..0000000
--- a/profiles/hardened/linux/amd64/no-multilib/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.use,v 1.1 2014/07/17 21:22:55 zorry Exp $
-
-# Magnus Grenberg <zorry@gentoo.org> (17 Mar 2011)
-# Bug 358929 the pic flag need to be on don't know way.
-app-emulation/open-vm-tools pic

diff --git a/profiles/hardened/linux/amd64/package.use b/profiles/hardened/linux/amd64/package.use
index 844cb36942388b69bc59dceb5ab6015a48dd5a34..f1283ddb92dfb6c633d8d88d2c3c4ac3a8129fbc 100644 (file)
--- a/profiles/hardened/linux/amd64/package.use
+++ b/profiles/hardened/linux/amd64/package.use
@@ -1,28 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.use,v 1.6 2014/10/12 07:40:21 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.use,v 1.7 2015/01/14 21:38:02 zorry Exp $
 
-# Magnus Granberg <zorry@gentoo.org> (06 Mar 2011)
-# We will have pic enable on older package but not
-# new one. This will be removed when newer get
-# stable and older package is not in portage tree 
-# any longer. Tracker bug #348050
-<media-libs/mesa-7.10.1 pic
-<media-libs/xvid-1.3.0 pic
-<dev-lang/php-5.3.5-r1 pic
-
-# Magnus Grenberg <zorry@gentoo.org> (17 Mar 2011)
-# Bug 358929 the pic flag need to be on don't know way.
-# Anthony Basile <blueness@gentoo.org>
-# Bug 348050 comment 5 - fixed mispelling
-app-emulation/open-vm-tools pic
-
-# Magnus Granberg <zorry@gentoo.org> (08 Jul, 2014)
-# We need to have the pic flag on for the 32bit part on multilib build.
-# Bugs 490276, 513464, 523736 and 512208
+# Magnus Granberg <zorry@gentoo.org> (14 Jan, 2015)
+# We need to have the pic flag on.
+# Bugs 490276, 513464, 523736 and 512208.
 media-libs/x264 pic
 media-video/ffmpeg pic
 media-video/libav pic
 =media-libs/mesa-9.2.5-r1 pic
 >=media-libs/mesa-10.1.6 pic
 media-libs/libpostproc pic
+>=media-libs/xvid-1.3.3 pic

diff --git a/profiles/hardened/linux/amd64/package.use.force b/profiles/hardened/linux/amd64/package.use.force
new file mode 100644 (file)
index 0000000..2a1e0d6
--- /dev/null
+++ b/profiles/hardened/linux/amd64/package.use.force
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.use.force,v 1.1 2015/01/14 21:38:02 zorry Exp $
+
+# Magnus Granberg <zorry@gentoo.org> (14 Jan, 2015)
+# We need to have the pic flag on.
+# Bugs 358929
+app-emulation/open-vm-tools pic