Drop old, change jpeg dep to virtual/jpeg (bug 347973).

(Portage version: 2.2.0_alpha17/cvs/Linux x86_64)

6 files changed, 10 insertions, 356 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 1b047a34139a..3e39489060c7 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/fontforge
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.134 2010/11/30 23:41:38 hanno Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.135 2011/01/19 19:45:50 spatz Exp $
+
+  19 Jan 2011; Dror Levin <spatz@gentoo.org> -fontforge-20090622.ebuild,
+  -fontforge-20090923.ebuild, -files/fontforge-20090923-configure.patch,
+  -files/fontforge-20090923-libpng14.patch, fontforge-20100501.ebuild:
+  Drop old, change jpeg dep to virtual/jpeg (bug 347973).
 
   30 Nov 2010; Hanno Boeck <hanno@gentoo.org> +files/fontforge-py27.diff,
   fontforge-20100501.ebuild:
diff --git a/media-gfx/fontforge/files/fontforge-20090923-configure.patch b/media-gfx/fontforge/files/fontforge-20090923-configure.patch
deleted file mode 100644
index bcacb9fe786d..000000000000
--- a/media-gfx/fontforge/files/fontforge-20090923-configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.dynamic.in b/configure.dynamic.in
-index 6998825..21aeb3f 100644
---- a/configure.dynamic.in
-+++ b/configure.dynamic.in
-@@ -1023,7 +1023,7 @@ if test "$gww_archlist" != "" ; then
-   LDFLAGS="$LDFLAGS $gww_archlist"
- fi
- AC_SUBST(CFLAGS_NOOPT)
--CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O2// | sed -e s/-O//`
-+CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O.//g | sed -e s/-O//g`
- 
- cp $ac_confdir/Makefile.dynamic.in $ac_confdir/Makefile.in
- cp $ac_confdir/Unicode/Makefile.dynamic.in $ac_confdir/Unicode/Makefile.in
-diff --git a/configure.in b/configure.in
-index 6998825..21aeb3f 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1023,7 +1023,7 @@ if test "$gww_archlist" != "" ; then
-   LDFLAGS="$LDFLAGS $gww_archlist"
- fi
- AC_SUBST(CFLAGS_NOOPT)
--CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O2// | sed -e s/-O//`
-+CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O.//g | sed -e s/-O//g`
- 
- cp $ac_confdir/Makefile.dynamic.in $ac_confdir/Makefile.in
- cp $ac_confdir/Unicode/Makefile.dynamic.in $ac_confdir/Unicode/Makefile.in
diff --git a/media-gfx/fontforge/files/fontforge-20090923-libpng14.patch b/media-gfx/fontforge/files/fontforge-20090923-libpng14.patch
deleted file mode 100644
index f72cf9ec08f1..000000000000
--- a/media-gfx/fontforge/files/fontforge-20090923-libpng14.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/fontforge/trunk/libpng14.patch
-http://www.mail-archive.com/arch-commits@archlinux.org/msg11199.html
-
---- gutils/gimagereadpng.c
-+++ gutils/gimagereadpng.c
-@@ -220,13 +220,13 @@
-     if ( (info_ptr->valid&PNG_INFO_tRNS) && info_ptr->num_trans>0 ) {
- 	if ( info_ptr->color_type==PNG_COLOR_TYPE_RGB || info_ptr->color_type==PNG_COLOR_TYPE_RGB_ALPHA )
- 	    base->trans = COLOR_CREATE(
--		    (info_ptr->trans_values.red>>8),
--		    (info_ptr->trans_values.green>>8),
--		    (info_ptr->trans_values.blue>>8));
-+		    (info_ptr->trans_color.red>>8),
-+		    (info_ptr->trans_color.green>>8),
-+		    (info_ptr->trans_color.blue>>8));
- 	else if ( base->image_type == it_mono )
--	    base->trans = info_ptr->trans[0];
-+	    base->trans = info_ptr->trans_alpha[0];
- 	else
--	    base->clut->trans_index = base->trans = info_ptr->trans[0];
-+	    base->clut->trans_index = base->trans = info_ptr->trans_alpha[0];
-     }
- 
-     row_pointers = galloc(info_ptr->height*sizeof(png_bytep));
---- gutils/gimagewritepng.c
-+++ gutils/gimagewritepng.c
-@@ -183,8 +183,8 @@
-        if ( info_ptr->num_palette<=16 )
- 	   _png_set_packing(png_ptr);
-        if ( base->trans!=-1 ) {
--	   info_ptr->trans = galloc(1);
--	   info_ptr->trans[0] = base->trans;
-+	   info_ptr->trans_alpha = galloc(1);
-+	   info_ptr->trans_alpha[0] = base->trans;
-        }
-    } else {
-        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-@@ -192,9 +192,9 @@
- 	   info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
- 
-        if ( base->trans!=-1 ) {
--	   info_ptr->trans_values.red = COLOR_RED(base->trans);
--	   info_ptr->trans_values.green = COLOR_GREEN(base->trans);
--	   info_ptr->trans_values.blue = COLOR_BLUE(base->trans);
-+	   info_ptr->trans_color.red = COLOR_RED(base->trans);
-+	   info_ptr->trans_color.green = COLOR_GREEN(base->trans);
-+	   info_ptr->trans_color.blue = COLOR_BLUE(base->trans);
-        }
-    }
-    _png_write_info(png_ptr, info_ptr);
-@@ -210,7 +210,7 @@
- 
-     _png_write_end(png_ptr, info_ptr);
- 
--    if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans);
-+    if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha);
-     if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette);
-     _png_destroy_write_struct(&png_ptr, &info_ptr);
-     gfree(rows);
---- gutils/gimagewritepng.c
-+++ gutils/gimagewritepng.c
-@@ -314,15 +314,15 @@
-        if ( info_ptr->num_palette<=16 )
- 	   png_set_packing(png_ptr);
-        if ( base->trans!=-1 ) {
--	   info_ptr->trans = galloc(1);
--	   info_ptr->trans[0] = base->trans;
-+	   info_ptr->trans_alpha = galloc(1);
-+	   info_ptr->trans_alpha[0] = base->trans;
-        }
-    } else {
-        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-        if ( base->trans!=-1 ) {
--	   info_ptr->trans_values.red = COLOR_RED(base->trans);
--	   info_ptr->trans_values.green = COLOR_GREEN(base->trans);
--	   info_ptr->trans_values.blue = COLOR_BLUE(base->trans);
-+	   info_ptr->trans_color.red = COLOR_RED(base->trans);
-+	   info_ptr->trans_color.green = COLOR_GREEN(base->trans);
-+	   info_ptr->trans_color.blue = COLOR_BLUE(base->trans);
-        }
-    }
-    png_write_info(png_ptr, info_ptr);
-@@ -338,7 +338,7 @@
- 
-     png_write_end(png_ptr, info_ptr);
- 
--    if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans);
-+    if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha);
-     if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette);
-     png_destroy_write_struct(&png_ptr, &info_ptr);
-     gfree(rows);
diff --git a/media-gfx/fontforge/fontforge-20090622.ebuild b/media-gfx/fontforge/fontforge-20090622.ebuild
deleted file mode 100644
index 8f87b596ebd8..000000000000
--- a/media-gfx/fontforge/fontforge-20090622.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20090622.ebuild,v 1.7 2009/12/15 18:16:30 armin76 Exp $
-
-# Some notes for maintainers this package:
-# 1. README-unix: freetype headers are required to make use of truetype debugger
-# in fontforge.
-# 2. --enable-{double,longdouble} these just make ff use more storage space. In
-# normal fonts neither is useful. Leave off.
-# 3. FontForge autodetects libraries but does not link with them. They are
-# dynamically loaded at run time if fontforge found them at build time.
-# --with-regular-link disables this behaviour. No reason to make it optional for
-# users. http://fontforge.sourceforge.net/faq.html#libraries. To see what
-# libraries fontforge thinks with use $ fontforge --library-status
-
-EAPI=2
-
-inherit eutils fdo-mime
-
-CIDMAPV="20090121"
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/fontforge/fontforge_htdocs-${PV}.tar.bz2 )
-	cjk? ( mirror://gentoo/cidmaps-${CIDMAPV}.tgz )"	# http://fontforge.sf.net/cidmaps.tgz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="cjk cairo doc gif debug jpeg nls pasteafter png +python tiff tilepath truetype truetype-debugger pango type3 svg unicode +X"
-
-RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	png? ( >=media-libs/libpng-1.2.4 )
-	python? ( dev-lang/python )
-	tiff? ( >=media-libs/tiff-3.5.7-r1 )
-	truetype? ( >=media-libs/freetype-2.1.4 )
-	truetype-debugger? ( >=media-libs/freetype-2.3.8[fontforge,-bindist] )
-	svg? ( >=dev-libs/libxml2-2.6.7 )
-	unicode? ( >=media-libs/libuninameslist-030713 )
-	cairo? ( >=x11-libs/cairo-1.6.4[X] )
-	pango? ( >=x11-libs/pango-1.20.3[X] )
-	x11-libs/libXi
-	x11-proto/inputproto
-	!media-gfx/pfaedit"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${PN}_full-${PV}.tar.bz2
-	use cjk && unpack cidmaps-${CIDMAPV}.tgz
-	if use doc; then
-		mkdir html
-		cd html
-		unpack fontforge_htdocs-${PV}.tar.bz2
-	fi
-	cd "${S}"
-	epatch "${FILESDIR}/fontforge-desktop.patch"
-}
-
-src_prepare() {
-	if use doc; then
-		cd "${WORKDIR}/html/"
-		chmod -x *.html
-	fi
-}
-
-src_configure() {
-	# no real way of disabling gettext/nls ...
-	use nls || export ac_cv_header_libintl_h=no
-	econf \
-		$(use_with truetype-debugger freetype-src "/usr/include/freetype2/internal4fontforge/") \
-		$(use_enable type3) \
-		$(use_with python) \
-		$(use_with python pyextension) \
-		$(use_enable pasteafter) \
-		$(use_with X x) \
-		$(use_enable cjk gb12345) \
-		$(use_enable tilepath) \
-		$(use_enable debug debug-raw-points) \
-		$(use_with pango) \
-		$(use_with cairo)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README*
-
-	if use cjk; then #129518
-		insinto /usr/share/fontforge
-		doins "${WORKDIR}"/*.cidmap
-	fi
-
-	doicon Packaging/fontforge.png
-	insinto /usr/share/applications
-	doins Packaging/fontforge.desktop
-	insinto /usr/share/mime/application
-	doins Packaging/fontforge.xml
-
-	if use doc; then
-		insinto /usr/share/doc/${PN}
-		cd "${WORKDIR}/html/"
-		doins -r *
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/fontforge/fontforge-20090923.ebuild b/media-gfx/fontforge/fontforge-20090923.ebuild
deleted file mode 100644
index d981932a761b..000000000000
--- a/media-gfx/fontforge/fontforge-20090923.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20090923.ebuild,v 1.12 2010/10/29 11:32:04 ssuominen Exp $
-
-# Some notes for maintainers this package:
-# 1. README-unix: freetype headers are required to make use of truetype debugger
-# in fontforge.
-# 2. --enable-{double,longdouble} these just make ff use more storage space. In
-# normal fonts neither is useful. Leave off.
-# 3. FontForge autodetects libraries but does not link with them. They are
-# dynamically loaded at run time if fontforge found them at build time.
-# --with-regular-link disables this behaviour. No reason to make it optional for
-# users. http://fontforge.sourceforge.net/faq.html#libraries. To see what
-# libraries fontforge thinks with use $ fontforge --library-status
-
-EAPI=2
-
-inherit autotools eutils fdo-mime
-
-HTDOCSV="20090914"
-CIDMAPV="20090121"
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/fontforge/fontforge_htdocs-${HTDOCSV}.tar.bz2 )
-	cjk? ( mirror://gentoo/cidmaps-${CIDMAPV}.tgz )"	# http://fontforge.sf.net/cidmaps.tgz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cjk cairo doc gif debug jpeg nls pasteafter png +python tiff tilepath truetype truetype-debugger pango type3 svg unicode +X"
-
-RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	png? ( >=media-libs/libpng-1.4 )
-	python? ( dev-lang/python )
-	tiff? ( >=media-libs/tiff-3.5.7-r1 )
-	truetype? ( >=media-libs/freetype-2.1.4 )
-	truetype-debugger? ( >=media-libs/freetype-2.3.8[fontforge,-bindist] )
-	svg? ( >=dev-libs/libxml2-2.6.7 )
-	unicode? ( >=media-libs/libuninameslist-030713 )
-	cairo? ( >=x11-libs/cairo-1.6.4[X] )
-	pango? ( >=x11-libs/pango-1.20.3[X] )
-	x11-libs/libXi
-	x11-proto/inputproto
-	!media-gfx/pfaedit"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${PN}_full-${PV}.tar.bz2
-	use cjk && unpack cidmaps-${CIDMAPV}.tgz
-	if use doc; then
-		mkdir html
-		cd html
-		unpack fontforge_htdocs-${HTDOCSV}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/fontforge-desktop.patch
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-
-	eautoconf
-	if use doc; then
-		cd "${WORKDIR}"/html/
-		chmod -x *.html
-	fi
-}
-
-src_configure() {
-	# no real way of disabling gettext/nls ...
-	use nls || export ac_cv_header_libintl_h=no
-	econf \
-		$(use_with truetype-debugger freetype-src "/usr/include/freetype2/internal4fontforge/") \
-		$(use_enable type3) \
-		$(use_with python) \
-		$(use_with python pyextension) \
-		$(use_enable pasteafter) \
-		$(use_with X x) \
-		$(use_enable cjk gb12345) \
-		$(use_enable tilepath) \
-		$(use_enable debug debug-raw-points) \
-		$(use_with pango) \
-		$(use_with cairo)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README*
-
-	if use cjk; then #129518
-		insinto /usr/share/fontforge
-		doins "${WORKDIR}"/*.cidmap
-	fi
-
-	doicon Packaging/fontforge.png
-	insinto /usr/share/applications
-	doins Packaging/fontforge.desktop
-	insinto /usr/share/mime/application
-	doins Packaging/fontforge.xml
-
-	if use doc; then
-		insinto /usr/share/doc/${PN}
-		cd "${WORKDIR}/html/"
-		doins -r *
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/fontforge/fontforge-20100501.ebuild b/media-gfx/fontforge/fontforge-20100501.ebuild
index 059be8a65574..098a3c650297 100644
--- a/media-gfx/fontforge/fontforge-20100501.ebuild
+++ b/media-gfx/fontforge/fontforge-20100501.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20100501.ebuild,v 1.8 2010/11/30 23:41:38 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20100501.ebuild,v 1.9 2011/01/19 19:45:50 spatz Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -31,7 +31,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-f
 IUSE="cjk cairo doc gif debug jpeg nls pasteafter png +python tiff tilepath truetype truetype-debugger pango type3 svg unicode +X"
 
 RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	jpeg? ( virtual/jpeg )
 	png? ( >=media-libs/libpng-1.2.4 )
 	python? ( dev-lang/python )
 	tiff? ( >=media-libs/tiff-3.5.7-r1 )