Revision bump. Fixed compilation error 'Error: ‘png_sizeof’ was not declared in this scope' in 0.9.5-r1 to make aseprite work with newer unstable versions of libpng, found this due to a preserve-libs rebuild; this was not found present in 9999 so the sed will not be present of a future version bump.

Package-Manager: portage-2.1.13.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 123 insertions, 10 deletions

diff --git a/dev-games/aseprite/ChangeLog b/dev-games/aseprite/ChangeLog
index c0613b7c5854..9930a6cf0c47 100644
--- a/dev-games/aseprite/ChangeLog
+++ b/dev-games/aseprite/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-games/aseprite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/ChangeLog,v 1.4 2013/07/18 20:48:51 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/ChangeLog,v 1.5 2013/08/10 15:00:11 tomwij Exp $
+
+*aseprite-0.9.5-r1 (10 Aug 2013)
+
+  10 Aug 2013; Tom Wijsman <TomWij@gentoo.org> +aseprite-0.9.5-r1.ebuild,
+  aseprite-9999.ebuild:
+  Revision bump. Fixed compilation error 'Error: ‘png_sizeof’ was not declared
+  in this scope' in 0.9.5-r1 to make aseprite work with newer unstable versions
+  of libpng, found this due to a preserve-libs rebuild; this was not found
+  present in 9999 so the sed will not be present of a future version bump.
 
   18 Jul 2013; Chris Reffett <creffett@gentoo.org> aseprite-0.9.5.ebuild,
   aseprite-9999.ebuild:
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 820312ebe2d4..2743f3af63f9 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -3,16 +3,19 @@ Hash: SHA256
 
 AUX aseprite-0.9.5-as-needed.patch 1119 SHA256 cee86f85a9baffa6f85cd22c096f14271dc6b2f8589e8958d0a93128e7c013c2 SHA512 d8b986cb5dc6f4737453680abee7c2a150aed40df13c807b7b5d1140e3bca7e854ce3c62189d12647933408c2e49e4a85bb3259b1a5964dc93b50e16202547e7 WHIRLPOOL 7b2bbb80c86eb45a202396f5f8f83760eccc3d3a42e47688f8f4c67cf0ee82f8cc7dc665a76fa3bc0bd9a74fadd14af5afc9b1747e258ab61a5a895f6f12a8a1
 DIST aseprite-0.9.5.tar.xz 507744 SHA256 81e0360d9d8a32d6c548775dbacdb1520aac94b54c2d9f1327d52f219737f154 SHA512 fc6df942aefea67fd05e1b688209b70a2d5879a1441f61a6e3ee4d72fcdab4e580e1d4d7392fd493e0a46c45401a3eef759aa3efee17450e4c98df7f310b2d00 WHIRLPOOL 060dcf2754827ab3b30dde55cfcecd25e2d88f6e296b45529737e2194f4a9891d171776d10f9c571890efb9766b64080b85dc3d737102d2ac7be9843d27fdaef
+EBUILD aseprite-0.9.5-r1.ebuild 2678 SHA256 5949d4e373f883da1f13063bb6f2b859b576b633d09aa6ba82044a83a60c6756 SHA512 d3cc5d7de4c7d3c731e2cec933ee6334c0de0481047026f6c801334052b08393fdbac4b2e1335a704f83a77d374551f877c05ca90773ed032084dc28b78f611f WHIRLPOOL fec9b704f0e0c8f96f6a60305a4c75ee743be6047b0e9afc0f9dd6c87b41570f9be2ce1f824fc05b03a7c38e7c057df590090dc49fdbfa46758645dfcc8382f2
 EBUILD aseprite-0.9.5.ebuild 2476 SHA256 ee3901cc30f39c7e47b0ef56c3cd4afc1520901d64a2b0176e9d2eb0ee9adde4 SHA512 b69864e4d12278494f65616b067678d7a9e524bab50c1a0ad52147ea88dddcaa3f0820a20a200f6031b2308dd800de2cffa57f37228cea82c4ce679e0249896e WHIRLPOOL 192a10f50c62bebcfb6f3b66336ded1d4632bbe40a4e6034e9af807f01b6aeb408c60d56fe9e56664c49ca5a88afdd4c7a3763d4f57b478320d0782fcba566d0
-EBUILD aseprite-9999.ebuild 2394 SHA256 b6f31607cced58772c9d33d2e60fca1767a307b741946216c7b8d80a7f735d21 SHA512 a45f14a41b872a5ede0e9bfe5d418d45fbb21fbb11bf8b80edb26f5cfb398b6f6c613fbad07a3e7535df7b80d1fb7e4156e8ac121b564d47d29900f00e0894cc WHIRLPOOL 3be44ff548860afdc94b1f5467b19c9d9f223646cf2b9b5f6b6a7729ecd07a1904652883eae2db52311646e8a6191d083dfeb9949fe9509cb4e911ae2db61129
-MISC ChangeLog 962 SHA256 c54803f47737d0bd3cdc900e66f0d1be4e923c4c6ec8b49b31a9feb2eb820ea9 SHA512 936adb6128f40a41995f2db4f2802c14fb65b1b1014e81cf41f9476ce85c8a364c88e1fac27fa01e8878777b5005d2cea897a42e20e0be8241c1850eb758b568 WHIRLPOOL 6954427ee76a716b79e7e139581b896cdfb67a33ce3a5e8d64f4c6e7541241cef74bf4b0f81f4b7dab0911dac67ce3c9da050ad52f056bf692a84284af485713
+EBUILD aseprite-9999.ebuild 2394 SHA256 9eda764e284111930b6c5e5262dbd1ba948e5f3a2d36b32c973ba9e089e3c099 SHA512 015fb5fe84739878e7958257044536580d664470cddebee0a86158d59e35240d670a519d578c3af7a5e187ba08f8109460f7d465bface45575acba3848a261a2 WHIRLPOOL cd820e49ee57e6babcc2d17ff73f1700653e0a144a6a11b991f7a781a28d3b527ef6b821ffd056ce01f5e2eeee9ed7a8704a05f6d9a9cc32819a98169bd9f75d
+MISC ChangeLog 1406 SHA256 7da5f1c2625e38e5a17134e1468b3508df75ab2b76ff44e323110a293c9fbce1 SHA512 b7bf168552e4e7fd82a30385307a4093c6c31888a3037a9a87cca5e67085724ce36aa0f78b790587856b37c0b843690fcfea82f15b6df2687ca51c03c927887d WHIRLPOOL a09e416565c677695da3639c22d81bafeecc279151c69b99883653493fd3727ae029afb65fd7900838051c4075154d90a647c5e9b3a2e0fb147fbe088a14a172
 MISC metadata.xml 504 SHA256 7357a7f89e6b651c245acf452decdce035c06a4ecd0a83a102bf3130c0598a48 SHA512 ec2e86e1f008445391a086e50aac0c5c96c36c5f885cae8a5011fd229710847d55c09f5f34aa1abb806f3ec134a4ae8f751d27b6f714cd49f1ea81c4df5997f3 WHIRLPOOL 70e07be609be829c5a09dfb3010461c6fc03e815dcbafb1adfcb90ce67f8cf3c81f777109cbabf99dd6c6234256e3f2641cd8d4f0a52883d419af23682df5386
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iKYEAREIAGYFAlHoVLhfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1TlqQCgh/i9h876Nd+h8EoxvJS5giIx
-ouoAnjDSwSm+S2+3sTtpFhuP0MulJTIw
-=myyr
+iQEcBAEBCAAGBQJSBlSiAAoJEJWyH81tNOV91EoIAL85jmOibBx76BcGxtKGhsDB
+q5idzlUA5jVdaB+QSziEeyGjux3IVl5oWpacS8kk2SjgnbhXirzlPxvBC1IxpHtr
+LI8Cg9SKs9CDLHRMvrkDmHUd0Li/jfTxA17qU+m4b7AJldw0/Ljaga7UwXYC7LZ1
+Oycy6JXhXrpSiNaId6M6oAMZg9vfKdio5wBHsctQUOBMtjLGlHn9FmZCCWr50vFw
++CVukY19wPxQb9qbcMqBSCff38g17UvRTtGQo/8gLCnqIvHu7sv3yR8mERckzl09
+K9xjecsIgTMSGisqzh4YnHJdxAGajIKwzM+xqMv66DvuV0/Bb/vp88BW2bcFdjo=
+=fi7N
 -----END PGP SIGNATURE-----
diff --git a/dev-games/aseprite/aseprite-0.9.5-r1.ebuild b/dev-games/aseprite/aseprite-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..c3f453d81cce
--- /dev/null
+++ b/dev-games/aseprite/aseprite-0.9.5-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/aseprite-0.9.5-r1.ebuild,v 1.1 2013/08/10 15:00:11 tomwij Exp $
+
+EAPI="5"
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="http://www.aseprite.org"
+SRC_URI="http://aseprite.googlecode.com/files/aseprite-${PV}.tar.xz"
+
+LICENSE="GPL-2 FTL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug memleak static test"
+
+RDEPEND="dev-libs/tinyxml
+	media-libs/allegro:0[X,png]
+	media-libs/giflib
+	media-libs/libpng:0
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+PATCHES=( "${FILESDIR}"/aseprite-0.9.5-as-needed.patch )
+
+DOCS=( docs/quickref.odt
+	docs/files/ase.txt
+	docs/files/fli.txt
+	docs/files/msk.txt
+	docs/files/pic.txt
+	docs/files/picpro.txt )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Fix to make flag-o-matic work.
+	if use debug ; then
+		sed -i '/-DNDEBUG/d' CMakeLists.txt || die
+	fi
+
+	# Only do a static link with Allegro if the user explicitly wants it.
+	if ! use static ; then
+		sed -i '/-DALLEGRO_STATICLINK/d' CMakeLists.txt || die
+	fi
+
+	# Remove long compiling tests for users with FEATURES="-test",
+	# also removes the gtest dependency from the build.
+	if ! use test ; then
+		sed -i '/^find_unittests/d' src/CMakeLists.txt || die
+		sed -i '/include_directories(.*third_party\/gtest.*)/d' src/CMakeLists.txt || die
+		sed -i '/add_subdirectory(gtest)/d' third_party/CMakeLists.txt || die
+	fi
+
+	# Fix from https://465450.bugs.gentoo.org/attachment.cgi?id=345154
+	# for "error: ‘png_sizeof’ was not declared in this scope".
+	sed -i 's/png_\(sizeof\)/\1/g' src/file/png_format.cpp || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUGMODE -D_DEBUG
+
+	local mycmakeargs
+
+	mycmakeargs=(
+		-DENABLE_UPDATER=OFF
+		-DUSE_SHARED_ALLEGRO4=ON
+		-DUSE_SHARED_CURL=ON
+		-DUSE_SHARED_GIFLIB=ON
+		-DUSE_SHARED_JPEGLIB=ON
+		-DUSE_SHARED_LIBLOADPNG=ON
+		-DUSE_SHARED_LIBPNG=ON
+		-DUSE_SHARED_TINYXML=ON
+		-DUSE_SHARED_ZLIB=ON
+		-DFULLSCREEN_PLATFORM=ON
+		$(cmake-utils_use_enable memleak)
+		$(cmake-utils_use_use static STATIC_LIBC)
+	)
+
+	if use test ; then
+		mycmakeargs+=(
+			-DUSE_SHARED_GTEST=ON
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "Warning: aseprite might not choose the resolution correctly; so, you might need"
+	elog "         to change the resolution once using the -resolution WxH[xBPP] argument."
+	elog ""
+	elog "         On subsequent runs, aseprite will remember the resolution you have set."
+	elog ""
+	elog "         For example: \`aseprite -resolution 1440x900\`"
+}
diff --git a/dev-games/aseprite/aseprite-9999.ebuild b/dev-games/aseprite/aseprite-9999.ebuild
index a740c3ae10a2..14754066708d 100644
--- a/dev-games/aseprite/aseprite-9999.ebuild
+++ b/dev-games/aseprite/aseprite-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/aseprite-9999.ebuild,v 1.2 2013/07/18 20:48:51 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/aseprite-9999.ebuild,v 1.3 2013/08/10 15:00:11 tomwij Exp $
 
-EAPI=5
+EAPI="5"
 
 inherit cmake-utils flag-o-matic git-2