prepare bump of app-office/glabels to 2.2.0, cleanup use.mask (iptc on hardened profiles)

5 files changed, 14 insertions, 15 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 9c852b73db14..2bf404ec5b3f 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.959 2007/12/31 02:58:23 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.960 2007/12/31 11:00:14 eva Exp $
+
+  31 Dec 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  default-linux/x86/no-nptl/2.4/package.mask,
+  hardened/ia64/package.use.mask, hardened/ppc/package.use.mask,
+  hardened/ppc64/package.use.mask:
+  prepare bump of app-office/glabels to 2.2.0
+
+  31 Dec 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  hardened/ia64/package.use.mask, hardened/ppc/package.use.mask,
+  hardened/ppc64/package.use.mask:
+  clean up iptc package.use.mask since bug #156398 is fixed
 
   30 Dec 2007; Christian Faulhammer <opfer@gentoo.org> use.desc, use.local.desc:
   adjust description of svg and app-editors/emacs-cvs:xft USE flags
diff --git a/profiles/default-linux/x86/no-nptl/2.4/package.mask b/profiles/default-linux/x86/no-nptl/2.4/package.mask
index 07b493e53e52..2e761f5f4286 100644
--- a/profiles/default-linux/x86/no-nptl/2.4/package.mask
+++ b/profiles/default-linux/x86/no-nptl/2.4/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/no-nptl/2.4/package.mask,v 1.161 2007/12/28 18:11:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/no-nptl/2.4/package.mask,v 1.162 2007/12/31 11:00:14 eva Exp $
 
 # Depends on Xen
 app-emulation/ganeti
@@ -392,6 +392,7 @@ dev-db/mysql-gui-tools
 >=app-mobilephone/gnome-phone-manager-0.20
 app-accessibility/gnopernicus
 rox-base/devtray
+>=app-office/glabels-2.2
 
 # Hanno Boeck <hanno@gentoo.org>
 # Needs gnome 2.16
diff --git a/profiles/hardened/ia64/package.use.mask b/profiles/hardened/ia64/package.use.mask
index d1bedc8914f5..63a3a3bf8b71 100644
--- a/profiles/hardened/ia64/package.use.mask
+++ b/profiles/hardened/ia64/package.use.mask
@@ -5,8 +5,3 @@ dev-java/sun-jdk -nsplugin
 dev-java/sun-jre-bin -nsplugin
 dev-java/ibm-jdk-bin -nsplugin 
 dev-java/ibm-jre-bin -nsplugin
-
-# 18 September 2007: Gilles Dartiguelongue <eva@gentoo.org>
-# Mask iptc flag until libiptcdata is keyworded
-media-gfx/gthumb iptc
-
diff --git a/profiles/hardened/ppc/package.use.mask b/profiles/hardened/ppc/package.use.mask
index 4ddd9caf829b..f243e9ec6f97 100644
--- a/profiles/hardened/ppc/package.use.mask
+++ b/profiles/hardened/ppc/package.use.mask
@@ -10,10 +10,6 @@ sys-apps/paludis python
 #requires virtual/jdk-1.6
 ~dev-util/checkstyle-4.3 test
 
-# 18 September 2007: Gilles Dartiguelongue <eva@gentoo.org>
-# Mask iptc flag until libiptcdata is keyworded
-media-gfx/gthumb iptc
-
 # Diego Pettenò <flameeyes@gentoo.org> (10 Nov 2007)
 # Tests for Linux-PAM 0.99 require >=sys-libs/glibc-2.4
 =sys-libs/pam-0.99* test
diff --git a/profiles/hardened/ppc64/package.use.mask b/profiles/hardened/ppc64/package.use.mask
index 0deb58ec4b30..0be0b9c81e3a 100644
--- a/profiles/hardened/ppc64/package.use.mask
+++ b/profiles/hardened/ppc64/package.use.mask
@@ -1,7 +1,3 @@
-# 18 September 2007: Gilles Dartiguelongue <eva@gentoo.org>
-# Mask iptc flag until libiptcdata is keyworded
-media-gfx/gthumb iptc
-
 # Diego Pettenò <flameeyes@gentoo.org> (10 Nov 2007)
 # Tests for Linux-PAM 0.99 require >=sys-libs/glibc-2.4
 =sys-libs/pam-0.99* test