As per current fonts team policy, only install the superior opentype format

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

4 files changed, 12 insertions, 43 deletions

diff --git a/media-fonts/libertine/ChangeLog b/media-fonts/libertine/ChangeLog
index 1b267b6c5cee..92c9af760e13 100644
--- a/media-fonts/libertine/ChangeLog
+++ b/media-fonts/libertine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-fonts/libertine
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/libertine/ChangeLog,v 1.3 2015/02/27 09:34:09 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/libertine/ChangeLog,v 1.4 2015/04/05 06:11:41 yngwin Exp $
+
+*libertine-5.3.0.20120702-r2 (05 Apr 2015)
+
+  05 Apr 2015; Ben de Groot <yngwin@gentoo.org>
+  +libertine-5.3.0.20120702-r2.ebuild, -libertine-5.3.0.20120702-r1.ebuild,
+  -libertine-5.3.0.20120702.ebuild, metadata.xml:
+  As per current fonts team policy, only install the superior opentype format
 
 *libertine-5.3.0.20120702-r1 (27 Feb 2015)
 
diff --git a/media-fonts/libertine/libertine-5.3.0.20120702-r1.ebuild b/media-fonts/libertine/libertine-5.3.0.20120702-r1.ebuild
deleted file mode 100644
index f637f086e90f..000000000000
--- a/media-fonts/libertine/libertine-5.3.0.20120702-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/libertine/libertine-5.3.0.20120702-r1.ebuild,v 1.1 2015/02/27 09:34:09 yngwin Exp $
-
-EAPI=5
-inherit font versionator
-
-MY_DATE=$(get_version_component_range 4)
-MY_PV=$(get_version_component_range 1-3)_${MY_DATE:0:4}_${MY_DATE:4:2}_${MY_DATE:6}
-MY_P_OTF="LinLibertineOTF_${MY_PV}"
-MY_P_TTF="LinLibertineTTF_${MY_PV}"
-
-DESCRIPTION="Fonts from the Linux Libertine Open Fonts Project"
-HOMEPAGE="http://linuxlibertine.org/"
-SRC_URI="mirror://sourceforge/linuxlibertine/${MY_P_OTF}.tgz
-	mirror://sourceforge/linuxlibertine/${MY_P_TTF}.tgz"
-
-LICENSE="|| ( GPL-2-with-font-exception OFL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+opentype"
-
-RDEPEND="!<x11-libs/pango-1.20.4"
-
-S="${WORKDIR}"
-FONT_S="${S}"
-DOCS="Bugs.txt ChangeLog.txt README Readme-TEX.txt"
-
-if use opentype; then
-	FONT_SUFFIX="otf"
-else
-	FONT_SUFFIX="ttf"
-fi
diff --git a/media-fonts/libertine/libertine-5.3.0.20120702.ebuild b/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
index 0e9eb61eee80..a51d81cc3ce2 100644
--- a/media-fonts/libertine/libertine-5.3.0.20120702.ebuild
+++ b/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/libertine/libertine-5.3.0.20120702.ebuild,v 1.1 2015/02/22 06:41:41 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild,v 1.1 2015/04/05 06:11:41 yngwin Exp $
 
 EAPI=5
 inherit font versionator
@@ -8,12 +8,10 @@ inherit font versionator
 MY_DATE=$(get_version_component_range 4)
 MY_PV=$(get_version_component_range 1-3)_${MY_DATE:0:4}_${MY_DATE:4:2}_${MY_DATE:6}
 MY_P_OTF="LinLibertineOTF_${MY_PV}"
-MY_P_TTF="LinLibertineTTF_${MY_PV}"
 
 DESCRIPTION="Fonts from the Linux Libertine Open Fonts Project"
 HOMEPAGE="http://linuxlibertine.org/"
-SRC_URI="mirror://sourceforge/linuxlibertine/${MY_P_OTF}.tgz
-	mirror://sourceforge/linuxlibertine/${MY_P_TTF}.tgz"
+SRC_URI="mirror://sourceforge/linuxlibertine/${MY_P_OTF}.tgz"
 
 LICENSE="|| ( GPL-2-with-font-exception OFL-1.1 )"
 SLOT="0"
@@ -24,5 +22,5 @@ RDEPEND="!<x11-libs/pango-1.20.4"
 
 S="${WORKDIR}"
 FONT_S="${S}"
+FONT_SUFFIX="otf"
 DOCS="Bugs.txt ChangeLog.txt README Readme-TEX.txt"
-FONT_SUFFIX="otf ttf"
diff --git a/media-fonts/libertine/metadata.xml b/media-fonts/libertine/metadata.xml
index bdf7b3955547..c62efd4a8c1d 100644
--- a/media-fonts/libertine/metadata.xml
+++ b/media-fonts/libertine/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>fonts</herd>
-  <use>
-    <flag name='opentype'>Prefer installing OpenType over TrueType fonts</flag>
-  </use>
 </pkgmetadata>