No need to keep the older around. Cleanup.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

3 files changed, 5 insertions, 180 deletions

diff --git a/media-fonts/dejavu/ChangeLog b/media-fonts/dejavu/ChangeLog
index c0903f12fa2b..454a96414f62 100644
--- a/media-fonts/dejavu/ChangeLog
+++ b/media-fonts/dejavu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/dejavu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/ChangeLog,v 1.166 2012/04/26 19:28:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/ChangeLog,v 1.167 2012/08/21 12:44:19 scarabeus Exp $
+
+  21 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> -dejavu-2.30.ebuild,
+  -dejavu-2.32.ebuild:
+  No need to keep the older around. Cleanup.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> dejavu-2.33.ebuild:
   keyword ~amd64-fbsd
@@ -625,4 +629,3 @@
   +dejavu-1.4.ebuild:
   Initial import. Ebuild submitted by Vaclov Slavik
   <vaclav.slavik@matfyz.cz>, closing bug #55950.
-
diff --git a/media-fonts/dejavu/dejavu-2.30.ebuild b/media-fonts/dejavu/dejavu-2.30.ebuild
deleted file mode 100644
index 300901c75395..000000000000
--- a/media-fonts/dejavu/dejavu-2.30.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.30.ebuild,v 1.8 2010/05/20 10:21:24 pva Exp $
-
-EAPI=1
-
-inherit font versionator
-
-DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters"
-HOMEPAGE="http://dejavu.sourceforge.net/"
-LICENSE="BitstreamVera"
-
-# If you want to test snapshot from dejavu.sf.net/snapshots/
-# just rename ebuild to dejavu-2.22.20071220.2156.ebuild
-MY_PV=$(get_version_component_range 1-2)
-snapv=$(get_version_component_range 3-4)
-snapv=${snapv/./-}
-MY_BP=${PN}-fonts-ttf-${MY_PV}
-MY_SP=${PN}-fonts-${MY_PV}
-
-if [ -z ${snapv} ]
-then
-	SRC_URI="!fontforge? (  mirror://sourceforge/${PN}/${MY_BP}.tar.bz2 )
-		fontforge? ( mirror://sourceforge/${PN}/${MY_SP}.tar.bz2 )"
-else
-	MY_BP=${MY_BP}-${snapv}
-	MY_SP=${MY_SP}-${snapv}
-	SRC_URI="!fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_BP}.tar.bz2 )
-		fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_SP}.tar.bz2 )"
-fi
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="fontforge"
-DEPEND="fontforge? ( x11-apps/mkfontscale
-		>=media-gfx/fontforge-20080429
-		x11-apps/mkfontdir
-		dev-perl/Font-TTF
-		app-i18n/unicode-data
-		>media-libs/fontconfig-2.6.0 )"
-RDEPEND=""
-
-if use fontforge
-then
-	S=${WORKDIR}/${MY_SP}
-	FONT_S=${S}/build
-else
-	S=${WORKDIR}/${MY_BP}
-	FONT_S=${S}/ttf
-fi
-
-FONT_CONF=(
-		"${S}"/fontconfig/20-unhint-small-dejavu-sans-mono.conf
-		"${S}"/fontconfig/20-unhint-small-dejavu-sans.conf
-		"${S}"/fontconfig/20-unhint-small-dejavu-serif.conf
-		"${S}"/fontconfig/57-dejavu-sans-mono.conf
-		"${S}"/fontconfig/57-dejavu-sans.conf
-		"${S}"/fontconfig/57-dejavu-serif.conf )
-
-FONT_SUFFIX="ttf"
-DOCS="AUTHORS NEWS README status.txt langcover.txt unicover.txt"
-
-src_compile() {
-	if use fontforge
-	then
-		emake -j1 \
-			BLOCKS=/usr/share/unicode-data/Blocks.txt \
-			UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \
-			FC-LANG=/usr/share/fc-lang \
-			full sans \
-			|| die "emake failed"
-	fi
-}
-
-src_install() {
-	font_src_install
-	if use fontforge
-	then
-		dodoc build/*.txt
-	fi
-
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-
-	ewarn
-	ewarn "Starting with ${PN}-2.22 font ligatures were re-imported in DejaVu"
-	ewarn "That means that you'll possibly encounter the infamous ligature bug"
-	ewarn "with pango-enabled Firefox (e.g. 'fi' and 'fl' will occasionally"
-	ewarn "overlap). This will be fixed in Firefox-3.x. Until this happens"
-	ewarn "either use Firefox without pango (MOZ_DISABLE_PANGO=1), or use"
-	ewarn "${PN}-2.21"
-	ewarn
-}
diff --git a/media-fonts/dejavu/dejavu-2.32.ebuild b/media-fonts/dejavu/dejavu-2.32.ebuild
deleted file mode 100644
index ff5a00dc3be9..000000000000
--- a/media-fonts/dejavu/dejavu-2.32.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.32.ebuild,v 1.6 2011/03/25 10:33:48 xarthisius Exp $
-
-EAPI=1
-
-inherit font versionator
-
-DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters"
-HOMEPAGE="http://dejavu.sourceforge.net/"
-LICENSE="BitstreamVera"
-
-# If you want to test snapshot from dejavu.sf.net/snapshots/
-# just rename ebuild to dejavu-2.22.20071220.2156.ebuild
-MY_PV=$(get_version_component_range 1-2)
-snapv=$(get_version_component_range 3-4)
-snapv=${snapv/./-}
-MY_BP=${PN}-fonts-ttf-${MY_PV}
-MY_SP=${PN}-fonts-${MY_PV}
-
-if [ -z ${snapv} ]
-then
-	SRC_URI="!fontforge? (  mirror://sourceforge/${PN}/${MY_BP}.tar.bz2 )
-		fontforge? ( mirror://sourceforge/${PN}/${MY_SP}.tar.bz2 )"
-else
-	MY_BP=${MY_BP}-${snapv}
-	MY_SP=${MY_SP}-${snapv}
-	SRC_URI="!fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_BP}.tar.bz2 )
-		fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_SP}.tar.bz2 )"
-fi
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="fontforge"
-DEPEND="fontforge? ( x11-apps/mkfontscale
-		>=media-gfx/fontforge-20080429
-		x11-apps/mkfontdir
-		dev-perl/Font-TTF
-		app-i18n/unicode-data
-		>media-libs/fontconfig-2.6.0 )"
-RDEPEND=""
-
-if use fontforge
-then
-	S=${WORKDIR}/${MY_SP}
-	FONT_S=${S}/build
-else
-	S=${WORKDIR}/${MY_BP}
-	FONT_S=${S}/ttf
-fi
-
-FONT_CONF=(
-		"${S}"/fontconfig/20-unhint-small-dejavu-sans-mono.conf
-		"${S}"/fontconfig/20-unhint-small-dejavu-sans.conf
-		"${S}"/fontconfig/20-unhint-small-dejavu-serif.conf
-		"${S}"/fontconfig/57-dejavu-sans-mono.conf
-		"${S}"/fontconfig/57-dejavu-sans.conf
-		"${S}"/fontconfig/57-dejavu-serif.conf )
-
-FONT_SUFFIX="ttf"
-DOCS="AUTHORS NEWS README status.txt langcover.txt unicover.txt"
-
-src_compile() {
-	if use fontforge
-	then
-		emake -j1 \
-			BLOCKS=/usr/share/unicode-data/Blocks.txt \
-			UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \
-			FC-LANG=/usr/share/fc-lang \
-			full sans \
-			|| die "emake failed"
-	fi
-}
-
-src_install() {
-	font_src_install
-	if use fontforge
-	then
-		dodoc build/*.txt
-	fi
-}