Clean up old revisions.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key C6085806)

5 files changed, 7 insertions, 296 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index e85664ad022d..b126416c19ff 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/dia
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.154 2012/10/28 15:22:42 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.155 2013/03/05 22:59:41 eva Exp $
+
+  05 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -dia-0.97.1.ebuild,
+  -files/dia-0.97.1-libpng15.patch, -dia-0.97.2.ebuild,
+  -files/dia-0.97-acinclude-python-fixes.patch:
+  Clean up old revisions.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> dia-0.97.2-r1.ebuild:
   ia64/sparc stable wrt #427544
diff --git a/app-office/dia/dia-0.97.1.ebuild b/app-office/dia/dia-0.97.1.ebuild
deleted file mode 100644
index e5b8fcc202e7..000000000000
--- a/app-office/dia/dia-0.97.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.15 2012/05/03 20:00:39 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-PYTHON_DEPEND="python? 2"
-
-inherit eutils gnome2 libtool autotools versionator python multilib
-
-MY_P=${P/_/-}
-DESCRIPTION="Diagram/flowchart creation program"
-HOMEPAGE="http://live.gnome.org/Dia"
-LICENSE="GPL-2"
-
-# dia used -1 instead of .1 for the new version.
-MY_PV_MM=$(get_version_component_range 1-2)
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${MY_P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-# the doc USE flag doesn't seem to do anything without docbook2html
-IUSE="cairo doc gnome python"
-
-RDEPEND=">=x11-libs/gtk+-2.6.0:2
-	>=dev-libs/glib-2.6.0
-	>=x11-libs/pango-1.8
-	>=dev-libs/libxml2-2.3.9
-	>=dev-libs/libxslt-1
-	>=media-libs/freetype-2.0.95
-	dev-libs/popt
-	sys-libs/zlib
-	media-libs/libpng
-	>=media-libs/libart_lgpl-2
-	gnome? (
-		>=gnome-base/libgnome-2.0
-		>=gnome-base/libgnomeui-2.0 )
-	cairo? ( >=x11-libs/cairo-1 )
-	python? ( >=dev-python/pygtk-1.99 )
-	doc? (
-		~app-text/docbook-xml-dtd-4.5
-		 app-text/docbook-xsl-stylesheets )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	doc? ( dev-libs/libxslt )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
-	G2CONF="${G2CONF}
-		$(use_with cairo)
-		$(use_with python)
-		$(use_enable doc db2html)
-		$(use_enable gnome)
-		--disable-libemf
-		--without-swig
-		--without-hardbooks
-		--disable-static
-		--docdir=${EPREFIX}/usr/share/doc/${PF}
-		--exec-prefix=${EPREFIX}/usr"
-	# --exec-prefix makes Python look for modules in the Prefix
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-
-	# Fix compilation in a gnome environment, bug #159831
-	epatch "${FILESDIR}/${PN}-0.97.0-gnome-doc.patch"
-
-	# Fix compilation with USE="python", bug #271855
-	if use python; then
-		epatch "${FILESDIR}/${PN}-0.97-acinclude-python-fixes.patch"
-		# use proper shared lib extension, #298232
-		sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die
-	fi
-
-	# Skip man generation
-	if ! use doc; then
-		sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am \
-			|| die "sed 2 failed"
-	fi
-
-	# Fix naming conflict on Darwin/OSX
-	sed -i -e 's/isspecial/char_isspecial/' \
-		objects/GRAFCET/boolequation.c || die
-
-	# Don't use -DGTK_DISABLE_DEPRECATED, bug #333439
-	sed -i -e 's:-DGTK_DISABLE_DEPRECATED::g' configure.in || die "sed 3 failed"
-
-	use python && python_convert_shebangs -r 2 .
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "failed to remove *.la"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize /usr/share/dia
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	use python && python_mod_cleanup /usr/share/dia
-}
diff --git a/app-office/dia/dia-0.97.2.ebuild b/app-office/dia/dia-0.97.2.ebuild
deleted file mode 100644
index 1454de2205f1..000000000000
--- a/app-office/dia/dia-0.97.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2.ebuild,v 1.11 2012/07/15 16:24:04 armin76 Exp $
-
-EAPI=4
-
-GCONF_DEBUG=yes
-GNOME2_LA_PUNT=yes
-
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils gnome2 python multilib
-
-DESCRIPTION="Diagram/flowchart creation program"
-HOMEPAGE="http://live.gnome.org/Dia"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-# the doc USE flag doesn't seem to do anything without docbook2html
-IUSE="cairo doc gnome python"
-
-RDEPEND=">=dev-libs/glib-2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/popt
-	>=media-libs/freetype-2
-	>=media-libs/libart_lgpl-2
-	media-libs/libpng
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	x11-libs/pango
-	cairo? ( x11-libs/cairo )
-	doc? (
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		)
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		)
-	python? ( >=dev-python/pygtk-2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? ( dev-libs/libxslt )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
-
-	# --exec-prefix makes Python look for modules in the Prefix
-	G2CONF="--exec-prefix=${EPREFIX}/usr
-		--docdir=${EPREFIX}/usr/share/doc/${PF}
-		$(use_enable gnome)
-		--disable-libemf
-		$(use_enable doc db2html)
-		$(use_with cairo)
-		$(use_with python)
-		--without-swig
-		--without-hardbooks"
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159831
-	epatch "${FILESDIR}"/${PN}-0.97.2-glib-2.31.patch #401331
-
-	if use python; then
-		python_convert_shebangs -r 2 .
-		sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die #298232
-	fi
-
-	if ! use doc; then
-		# Skip man generation
-		sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die
-	fi
-
-	# Fix naming conflict on Darwin/OSX
-	sed -i -e 's/isspecial/char_isspecial/' objects/GRAFCET/boolequation.c || die
-
-	intltoolize --force --copy --automake || die
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize /usr/share/dia
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	use python && python_mod_cleanup /usr/share/dia
-}
diff --git a/app-office/dia/files/dia-0.97-acinclude-python-fixes.patch b/app-office/dia/files/dia-0.97-acinclude-python-fixes.patch
deleted file mode 100644
index cbb69f05bfc9..000000000000
--- a/app-office/dia/files/dia-0.97-acinclude-python-fixes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
- acinclude.m4 |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 57a2188..1bf3ad0 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -128,7 +128,7 @@ else:
-   AC_CACHE_CHECK([for $am_display_PYTHON script directory],
-     [am_cv_python_pythondir],
-     [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
--     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
-+     echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"`])
-   AC_SUBST([pythondir], [$am_cv_python_pythondir])
- 
-   dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
-@@ -145,7 +145,7 @@ else:
-   AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
-     [am_cv_python_pyexecdir],
-     [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
--     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
-+     echo "${PYTHON_EXEC_PREFIX}/${py_lib}/python${PYTHON_VERSION}/site-packages"`])
-   AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
- 
-   dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
-@@ -202,6 +202,7 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
- AC_MSG_CHECKING(for headers required to compile python extensions)
- dnl deduce PYTHON_INCLUDES
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-+py_lib=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)" | cut -d '/' -f 3`
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
- if test "$py_prefix" != "$py_exec_prefix"; then
-@@ -225,7 +226,7 @@ AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
- 
- AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a)
- 
--py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
-+py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config"
- 
- py_makefile="${py_config_dir}/Makefile"
- if test -f "$py_makefile"; then
-@@ -235,7 +236,7 @@ dnl extra required libs
-   py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
- 
- dnl now the actual libpython
--  if test -e "${py_config_dir}/libpython${PYTHON_VERSION}.a"; then
-+  if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
-     PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
-     AC_MSG_RESULT(found)
-   else
diff --git a/app-office/dia/files/dia-0.97.1-libpng15.patch b/app-office/dia/files/dia-0.97.1-libpng15.patch
deleted file mode 100644
index 37939748c54a..000000000000
--- a/app-office/dia/files/dia-0.97.1-libpng15.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 59f67782b9e382b2d71aeabbd493799b179bdec0 Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Sun, 27 Feb 2011 20:32:47 +0000
-Subject: Bug 642764 - use png_jmpbuf() rather than direct member access
-
-Fix from Hanno Boeck to make Dia compile with libpng 1.5
-https://bugzilla.gnome.org/show_bug.cgi?id=642764
-(cherry picked from commit 8e28086b95578d17386c3be9aea132064be829a0)
----
-diff --git a/plug-ins/libart/export_png.c b/plug-ins/libart/export_png.c
-index f8bbdc1..33ea6c3 100644
---- a/plug-ins/libart/export_png.c
-+++ b/plug-ins/libart/export_png.c
-@@ -178,7 +178,7 @@ export_png_ok(GtkButton *button, gpointer userdata)
-   }
- 
-   /* set error handling ... */
--  if (setjmp(png->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png))) {
-     fclose(fp);
-     png_destroy_write_struct(&png, &info);
-     message_error(_("Error occurred while writing PNG"));
---
-cgit v0.9