diff options
author | Pacho Ramos <pacho@gentoo.org> | 2014-04-17 07:49:40 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2014-04-17 07:49:40 +0000 |
commit | 21e702b15aabf6e044755bb50c176be4069e3ee4 (patch) | |
tree | 518e19118acf964c4c56cf5816a3c66027b63025 /app-office/dia | |
parent | Stable for ia64, wrt bug #507568 (diff) | |
download | historical-21e702b15aabf6e044755bb50c176be4069e3ee4.tar.gz historical-21e702b15aabf6e044755bb50c176be4069e3ee4.tar.bz2 historical-21e702b15aabf6e044755bb50c176be4069e3ee4.zip |
Bump to a newer snapshot fixing bug #505928 (by Sergey S. Starikoff) and many other problems. Drop old.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'app-office/dia')
-rw-r--r-- | app-office/dia/ChangeLog | 9 | ||||
-rw-r--r-- | app-office/dia/Manifest | 21 | ||||
-rw-r--r-- | app-office/dia/dia-0.97.3_pre20140417.ebuild (renamed from app-office/dia/dia-0.97.2-r1.ebuild) | 101 |
3 files changed, 58 insertions, 73 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/Manifest b/app-office/dia/Manifest index a2fa8e7fe0e4..ccbf368c220f 100644 --- a/app-office/dia/Manifest +++ b/app-office/dia/Manifest @@ -8,24 +8,15 @@ AUX dia-0.97.2-glib2.36.patch 3747 SHA256 8dd54b2c04faa53fd4a1740ee16c610c45bf5c AUX dia-0.97.2-implicit-declaration.patch 857 SHA256 4bd8958bb5e8a80b99905fb205d90917ce3ed43f826b1ef185fe98f24de0fbaa SHA512 3d48e779219d2d55befd3ac23e9a382d8cbd7d02377254176e8982df0123f2c420ab543c1d13f887d39a0ea4be47ccb4686b9e2b9e0ebebdbb0d27faa9a6d234 WHIRLPOOL d6e7628afeeda290cee9bd59fb6e760e1f2fc9348cffe09264022d7516f2dcbdcbce493e3ff016918b620fea792a4c275c9009f19387e2cc2e2d8ad189bb69b2 AUX dia-0.97.2-underlinking.patch 1024 SHA256 3b5cbe564c9a48453e4300b89fa24de7454268b388a56036afe187c56e46c951 SHA512 d45eb49c39227e9f11ce999083de0a83c60bfac2a5db2403e4bf083c275efdef6bd1adca678712253ec53f7b3d22a5c23f6f886839c32e6cb07a93c001f45e2e WHIRLPOOL 90ea84704a2a3f14730d54044075cae6339c5f21d1fff00567f0c9834bdeae187c83f4eedc7ae7839f0cccecc2caca7ca133968e914ab79333c3005e431c70a5 DIST dia-0.97.2.tar.xz 5507004 SHA256 a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1 SHA512 493510d038213a50141998e2af29ddcc5e98495c287417dcb6a0880b4e16cad8f1b47d0948e0a5727d88d5640664e8b28d4af3f219dd0343069aaa9895d945ba WHIRLPOOL 600f7f7d8c5707a4b0174fce6db1bdbb48b77ba6390b6c659708f4e10d0e5b33f265e1edfb6dc8e982e39a8d7a72d2645d747b4043ea79544a6812325a8e8f33 -EBUILD dia-0.97.2-r1.ebuild 2813 SHA256 827429dd7f830d78e6ece4b4024e6c8b68d9b3dd9e93857679831f6793ccb33a SHA512 a11686353759b6bd6924e219a554aace057b1f6faba5fb59c2067045af5b27e48c9c8d497cd2877980e26a0a9b601986dd29125c9e3b7a7b737b71bfdb285bf4 WHIRLPOOL 5b94c99fed72c84c8ef5163a10bab2c6347a02e5eff75190089e6c3d9cd9ed1c24aa5f74199f1121b1ea415b91de81f824915c26021e7f38bfb39de32a261745 +DIST dia-0.97.3_pre20140417.tar.xz 5393236 SHA256 d9afac3b2f7bb5fa35733e24f35afd69c7b3cd04af5f6b0a806400a35b5b43db SHA512 1dbd189ca3499a5adb3c6537ffdcfc776b56fb927a3daeb266685dd4a359aa18ea9b472d12865813e823c71652f49e5739ac9d98789629a39e0cd891fe2265a6 WHIRLPOOL 28d4fcd98f853ad0dec48296a0ada9d842eb32a7953a1e11fe59fe21170be4d14e693a53e0d85c392e1b7cf4f117a3206894e3326436c5e53d115c8efb06a842 EBUILD dia-0.97.2-r2.ebuild 2959 SHA256 17de43e2aa4c306191455f294bae95c6e58a1b0f99d76c9ab3321253414ce720 SHA512 afb47212f9d75440c95a598ddf60cd82a0565c4cec6b49af6fd27f286a765034ceeaea0200db3c77efded75c9d89ccc7165f5e73ac91da5310338c9a19df138d WHIRLPOOL 53c1d8a83f68afe8f9c51ab0588aa564c7faec53f3a3393cb52f4ab548052f1df62a9e77b0e36a331c25ec1ec2d04bcf387d8b21a7317c13947d142d9c3458ee -MISC ChangeLog 21637 SHA256 ed41a4f965ecacfc74c13352b4b37d845ca30bd968064cf87828712b0c27d5d0 SHA512 ccee381ef8a17b887acd7b52b51bf65492d82a6f6372f515951a90392cca5001c0c5b3a76f16f33a5666604de730787ba1a14d63cceb3b10634c5e442bca4385 WHIRLPOOL c2757798c2a14c01e1152feda47907cbd6ae76615c5499702916858427d13f132aa4adb4eaa7c44b21ee72ca4ca796227fa0ddf3ee926e97e8c8aacd952862c2 +EBUILD dia-0.97.3_pre20140417.ebuild 2819 SHA256 0ff744a92e9f9d39603504742e9aa706d65f5d517482f07cb680c3ea99e0cd8e SHA512 ea3775db51a67a64e6b17cb985f5b3ec3f9f8a7d5c6df8cfeecfefb7d24ead5664a942f3b7e49276eb9763fc380436b72ccefed54fdb0b288b59edc8ad0f8ec7 WHIRLPOOL 85528d147613c74ab32b390cd120adca5899ebd32e029cb2cf662ba77974cfbcf60c798cc4bfb3380656bb888cab386edb2618b1b01184e9f2a267d89750afb1 +MISC ChangeLog 21881 SHA256 5f0b00dc3357f7b8f877c7ccf4bb084f250d3c7943fb67a4348ba04c4bff6bfa SHA512 a8f4b2e9cfb2620f5dbdcd20d8bc1599b6d36eadbd2544d9552b7c9034f735b058c302d99e9275417c7c5ee58062d290e315b07398584180791338b0987514ed WHIRLPOOL ab68acc2266c3020e43b3cda9ceb325d2771ae96c98dfcbdfecb5d67b2a3414177e61b6a21503449392a080c3db5ea3d7722d7b7f7a52426ee728554b6eef54a MISC metadata.xml 578 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c SHA512 bc6988cb36508fde98810d60e99975bb626bf5f1d938bc289e010a2268da5a044c674bd0b626609358bd98c2e23ea91c1ca678e6ab181645fe4de1d610e0325f WHIRLPOOL d8827938a36ccf7fb2cbde3d0e9134c111e8bf9ab7640942e212964a6be51ff66da905017393ebcfb1a507e9c12be6425f323115d32f2bc6bbc93546a28ba26a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJTHvIHAAoJEPiazRVxLXTFe+wP/iYMVZLPbOrTRBjcEn7UgAIe -bzX27bpCB6RwwiPLw7ySKxl/G13eAgGp4Tbk+cJQelZKpJM2QLBc/iy9Dvlbv1T/ -ts83+0hka7RetpbIL4uBglcbH410y1Y9m1DmTDkPjC7sSz5RnVF/Lk0MWg8pwfGS -t8se+2rsrF4RNZmW71B1sHRTWKd52hlx4uDma5zzkuGYBZXd83FgKuK40Vu/gAzz -iLfomdNPMdH79j5uD1Z2yPh/X5KWLytBP1qwaIcUkJoI13W+gHmttZW7MLTo6mxx -fCcnbrdw4MDio+Qkn8gGJILYprxyGDQ3F1SLJ9W3TfkeSku69i+NF/lQ/1gIdgqM -ivBGNbqY5x6MUn/5i0o0oait4AELwZ9aDmpRdouBq8bdyhfE+MsIxYfJuVpGng7a -fx79+W1mpw+nb3C9zRmo9iCqic66MNeJAPIDnu6wdDS59qPtq2iDd2Ml7vPnbmPB -Pf8nVIndQdDxZRHIfV81I3kTjECPppydcW2AZHLPRODR+fdP7I3EewpVYnN9iILF -3M6BmaE1EoL2eBRQR9NUvXK8XWwYpj5vUm3WF/PCjJ03lBmRgYMVS1q+vtUiCJvb -rbo3lMrNq7AXuMVlw2orUQrv9t2pMMuojdJMRT2JfMeUn9F0cEUYUn55N0P1du68 -PQxzvJDYRKF6T/5RDefn -=APdS +iEYEAREIAAYFAlNPh5QACgkQCaWpQKGI+9R1rgCeMQYacJLprkQgwrjrjsjhqzdj +IxoAni5NOpQce7NbQuTufXoQUlVRzsf5 +=rGeG -----END PGP SIGNATURE----- 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 -} |