From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3D8E9138206 for ; Sun, 24 Apr 2016 12:07:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA9D621C03A; Sun, 24 Apr 2016 12:07:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C05A421C025 for ; Sun, 24 Apr 2016 12:07:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C7EFC340C97 for ; Sun, 24 Apr 2016 12:07:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC1C9965 for ; Sun, 24 Apr 2016 12:07:22 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1461499604.684ef5bfe738933598f61b853be0a47a6aed2cba.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/, media-gfx/tuxpaint/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild X-VCS-Directories: media-gfx/tuxpaint/files/ media-gfx/tuxpaint/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 684ef5bfe738933598f61b853be0a47a6aed2cba X-VCS-Branch: master Date: Sun, 24 Apr 2016 12:07:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1e2cd8c0-4073-4647-87b9-f3214e7ed749 X-Archives-Hash: 5db56fadf28151f72f94bfe090ba5769 commit: 684ef5bfe738933598f61b853be0a47a6aed2cba Author: Pacho Ramos gentoo org> AuthorDate: Sun Apr 24 11:18:15 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Apr 24 12:06:44 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684ef5bf media-gfx/tuxpaint: Bump EAPI, set proper slot information in RDEPEND Package-Manager: portage-2.2.28 .../tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch | 4 +- .../tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch | 4 +- media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild | 83 ++++++++++++++++++++++ 3 files changed, 87 insertions(+), 4 deletions(-) diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch index 3370d67..f864a83 100644 --- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch @@ -1,6 +1,6 @@ === modified file 'Makefile' ---- Makefile 2011-08-09 15:19:01 +0000 -+++ Makefile 2011-08-09 15:19:43 +0000 +--- a/Makefile 2011-08-09 15:19:01 +0000 ++++ b/Makefile 2011-08-09 15:19:43 +0000 @@ -871,7 +871,7 @@ $(ARCH_LIBS) @echo diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch index 25e80cd..2970eac 100644 --- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch @@ -1,8 +1,8 @@ http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829 No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433) ---- src/tuxpaint.c 2011/07/29 21:27:39 1.828 -+++ src/tuxpaint.c 2011/08/08 17:59:12 1.829 +--- a/src/tuxpaint.c 2011/07/29 21:27:39 1.828 ++++ b/src/tuxpaint.c 2011/08/08 17:59:12 1.829 @@ -13425,12 +13425,7 @@ { png_init_io(png_ptr, fi); diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild new file mode 100644 index 0000000..7942616 --- /dev/null +++ b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit gnome2-utils multilib toolchain-funcs + +DESCRIPTION="Drawing program designed for young children" +HOMEPAGE="http://www.tuxpaint.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="nls" + +RDEPEND=" + app-text/libpaper + dev-libs/fribidi + gnome-base/librsvg:2 + >=media-libs/libpng-1.2:0= + >=media-libs/freetype-2:2 + media-libs/libsdl + media-libs/sdl-image[png] + media-libs/sdl-mixer + media-libs/sdl-pango + media-libs/sdl-ttf + x11-libs/cairo +" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) +" + +PATCHES=( + # Sanitize the Makefile and correct a few other issues + "${FILESDIR}/${PN}-0.9.20-gentoo.patch" + "${FILESDIR}/${P}-libpng1.5.patch" #378199 + "${FILESDIR}/${P}-LDFLAGS.patch" #334571 + "${FILESDIR}/${P}-underlinking.patch" #484434 +) + +src_prepare() { + default + sed -i \ + -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \ + -e "s:/lib/:/$(get_libdir)/:" \ + -e "s:/share/doc/tuxpaint.*:/share/doc/${PF}:g" \ + Makefile || die +} + +src_compile() { + # parallel build may break things + emake -j1 CC="$(tc-getCC)" \ + $(use nls && echo ENABLE_GETTEXT=1) +} + +src_install () { + emake -j1 PKG_ROOT="${D}" \ + $(use nls && echo ENABLE_GETTEXT=1) install + + rm -f docs/COPYING.txt docs/INSTALL.txt + dodoc docs/*.txt +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + + if ! has_version "${CATEGORY}/${PN}"; then + elog "" + elog "For additional graphic stamps, you can emerge the" + elog "media-gfx/tuxpaint-stamps package." + elog "" + fi +} + +pkg_postrm() { + gnome2_icon_cache_update +}