Bump to a newer snapshot fixing bug #505928 (by Sergey S. Starikoff) and many other problems. Drop old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 52 insertions, 58 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 51480385d83a..16d9856260d3 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/dia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.163 2014/03/11 11:22:46 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.164 2014/04/17 07:49:39 pacho Exp $
+
+*dia-0.97.3_pre20140417 (17 Apr 2014)
+
+  17 Apr 2014; Pacho Ramos <pacho@gentoo.org> +dia-0.97.3_pre20140417.ebuild,
+  -dia-0.97.2-r1.ebuild:
+  Bump to a newer snapshot fixing bug #505928 (by Sergey S. Starikoff) and many
+  other problems. Drop old.
 
   11 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> dia-0.97.2-r1.ebuild,
   dia-0.97.2-r2.ebuild, +files/dia-0.97.2-freetype251.patch:
diff --git a/app-office/dia/dia-0.97.2-r1.ebuild b/app-office/dia/dia-0.97.3_pre20140417.ebuild
index 37be4b6d4c35..962f892516f0 100644
--- a/app-office/dia/dia-0.97.2-r1.ebuild
+++ b/app-office/dia/dia-0.97.3_pre20140417.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2014 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-r1.ebuild,v 1.12 2014/03/11 11:22:46 polynomial-c Exp $
-
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.3_pre20140417.ebuild,v 1.1 2014/04/17 07:49:39 pacho Exp $
 
+EAPI=5
 GCONF_DEBUG=yes
 GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils gnome2 python multilib
+inherit autotools eutils gnome2 python-single-r1 multilib
 
 DESCRIPTION="Diagram/flowchart creation program"
-HOMEPAGE="http://live.gnome.org/Dia"
+HOMEPAGE="https://wiki.gnome.org/Apps/Dia"
+
+SRC_URI="http://dev.gentoo.org/~pacho/gnome/${PN}-0.97.3_pre20140417.tar.xz"
+S="${WORKDIR}/${PN}-0.97.2"
 
 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"
+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"
+IUSE="cairo doc python"
 
-RDEPEND=">=dev-libs/glib-2
+RDEPEND="
+	>=dev-libs/glib-2:2
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/popt
@@ -33,13 +35,11 @@ RDEPEND=">=dev-libs/glib-2
 	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 )"
+		app-text/docbook-xsl-stylesheets )
+	python? (
+		>=dev-python/pygtk-2
+		${PYTHON_DEPS} )
+"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-apps/sed
@@ -47,33 +47,17 @@ DEPEND="${RDEPEND}
 	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
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159831
-	epatch "${FILESDIR}"/${PN}-0.97.2-glib-2.31.patch #401331
+	DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
+
+	epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159831 , upstream #????
 	epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685
-	epatch "${FILESDIR}"/${PN}-0.97.2-freetype251.patch #493604
 
 	if use python; then
-		python_convert_shebangs -r 2 .
+		python_fix_shebang .
 		sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die #298232
 	fi
 
@@ -82,35 +66,38 @@ src_prepare() {
 		sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die
 	fi
 
-	# Fix naming conflict on Darwin/OSX
+	# Fix naming conflict on Darwin/OSX, upstream bug #????
 	sed -i -e 's/isspecial/char_isspecial/' objects/GRAFCET/boolequation.c || die
 
-	eautoreconf
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+
+	sed -i -e "/localedir/d" configure.in || die
 
+	eautoreconf
 	gnome2_src_prepare
 }
 
+src_configure() {
+	# --exec-prefix makes Python look for modules in the Prefix
+	# --enable-gnome only adds support for deprecated stuff, bug #442294
+	# https://bugzilla.redhat.com/show_bug.cgi?id=996759
+	gnome2_src_configure \
+		--exec-prefix="${EPREFIX}/usr" \
+		--disable-gnome \
+		--disable-libemf \
+		$(use_enable doc db2html) \
+		$(use_with cairo) \
+		$(use_with python) \
+		--without-swig \
+		--without-hardbooks
+}
+
 src_install() {
-	default
+	gnome2_src_install
 
 	# Install second desktop file for integrated mode (bug #415495)
 	sed -e 's|^Exec=dia|Exec=dia --integrated|' \
-			-e '/^Name=/ s|$| (integrated mode)|' \
+			-e '/^Name/ s|$| (integrated mode)|' \
 			"${ED}"/usr/share/applications/dia.desktop \
 			> "${ED}"/usr/share/applications/dia-integrated.desktop || die
 }
-
-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
-}