From: Samuli Suominen Date: Thu, 22 Dec 2011 17:36:04 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f5ba89eaef6687b1454b5be491b451625cc729b4;p=gentoo.git Version bump. Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog index 18af3e911654..82aa6ad55d73 100644 --- a/app-office/dia/ChangeLog +++ b/app-office/dia/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/dia # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.133 2011/11/15 23:30:01 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.134 2011/12/22 17:36:04 ssuominen Exp $ + +*dia-0.97.2 (22 Dec 2011) + + 22 Dec 2011; Samuli Suominen +dia-0.97.2.ebuild: + Version bump. 15 Nov 2011; Alexandre Rostovtsev dia-0.97.1.ebuild: QA: eautoreconf should be before gnome2_src_prepare. diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest index 651586cb6c0c..c5801ac72ca4 100644 --- a/app-office/dia/Manifest +++ b/app-office/dia/Manifest @@ -1,17 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX dia-0.97-acinclude-python-fixes.patch 2524 RMD160 0383fe7394fa1dc21fc734e39077b5f743ec0987 SHA1 054b6a43a4cb6dc7243dfa2fa7d6412687bf07e9 SHA256 a4c56ee5b05c01253936b7f9ed4d5b796e8f00a5148e94f7b9bba598595e484c AUX dia-0.97.0-gnome-doc.patch 1961 RMD160 ccc2b5273b8fe030294041ca3277ad28cec8bea6 SHA1 13ee9f0923ecf48b5fbf3e5cf7448ea8985c4bfb SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6 AUX dia-0.97.1-libpng15.patch 879 RMD160 6bfc79c1118de900f2b1cdfad47d82e0cb87cad7 SHA1 7006f1e537b35a49ad7af8788826a2f00d426e7c SHA256 8a3210af5b6d12be6422465d85ce67be048483dee1f57d61d6dcc6e4d5c79cb2 DIST dia-0.97.1.tar.bz2 6836081 RMD160 e6c3cd2872aa7d0bd8ffa502577027d7f45c8982 SHA1 ea35e0e0f2f75b69e22faa38968e0803a8ab4f47 SHA256 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142 +DIST dia-0.97.2.tar.xz 5507004 RMD160 f9270f1f2cb6ad505219463827d02e3759693796 SHA1 dc7ed6f8cd83acc8f421d28f30e4042fe370e9ba SHA256 a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1 EBUILD dia-0.97.1.ebuild 3113 RMD160 e5a9514e488a53252078768a3776c014b9041c76 SHA1 4d33ef2632c182d267c7384a816e05d07f8d7d08 SHA256 6c959a90aa9adc625cd4ca87db32d027ade255a89d8c33011f386cd749ccf172 -MISC ChangeLog 17656 RMD160 656db34839127845b735e0e5cf1d0ede9978c818 SHA1 fbe2088c0bf6ac985908a8486b9168d4655a1a3c SHA256 378e42d787fdaf414ecaa48748469c294d3966936c2495df5e764974068e3acd +EBUILD dia-0.97.2.ebuild 2493 RMD160 db5962af0ab800ed92277fa6421cc67c59297840 SHA1 b5f53e1ee1974279c0e0bf11da9c2c95575cc077 SHA256 4c30befa5c8be9b810a3b691b33a4309dc738be7e094693593506f4403fc99d7 +MISC ChangeLog 17774 RMD160 bcda6232f53aa67ef7f736539d936e8e225e6dc7 SHA1 e908cb6cfb91cb00c14d74dd863ac9fc777bd9cf SHA256 eff93ca6912561f7a0b7f3ff0ae95aefb43d2e7e97f2d398ca1e0b6e6fce129b MISC metadata.xml 578 RMD160 f6c695b300f590287280f5d79e363e83e4f066d7 SHA1 a621978dd1772191b84c756071af83cea2e76436 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7C9f8ACgkQdjK8w9WeBnDHVQEAgCJ0sgg4OBi7KfqthdYeM7SG -eGPYRnMJ6BmM80U+y44A/A5J41iYszkAc0Hfwf+QZThMiSBt+tNcH/OfOXc3QKf9 -=AK/+ +iQEcBAEBAgAGBQJO82pOAAoJEEdUh39IaPFNB+gIAJfV7Viwzr7AY9coHqfw1F5z +FSj6B8bZLBbl1bbew1QTf3eTvNO2xEKaL3EOYbLrbfCKP3qWiE5RM4f02ABygT72 +RmBDck3PYka0PiRYM7Mr0VzeIe/mHojomsQoWbexVBVNJWFUmLZFQZsvllcXEPfP +8ekCEUEuFSflGU0D34Ps4oZ0WcyWa1APtqjRnL5pZCpiShlTE0f0RmymNnM9NCIq +uZTjpigWGwzs5qZpduS4KnIpGCKVmwwacKTqEfP+knc5tHl9OU/eLMQlcoJTQzqF +R9MWT6Ys+0suiET2qb8maYuoBu+yZy5d5Ka+XfUCpgWH5DNk/D1/yNNxE82mYMI= +=d5sP -----END PGP SIGNATURE----- diff --git a/app-office/dia/dia-0.97.2.ebuild b/app-office/dia/dia-0.97.2.ebuild new file mode 100644 index 000000000000..23c32bc1f7e8 --- /dev/null +++ b/app-office/dia/dia-0.97.2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2011 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.1 2011/12/22 17:36:04 ssuominen 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 ~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 + dev-util/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() { + # 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 + python_convert_shebangs -r 2 . + # 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 + 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 +}