summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-04-08 08:28:30 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-04-08 08:28:30 +0000
commit04c5cdceeec6e82da47c62eac730654a787be0e9 (patch)
tree8f94a8c5f1f9c4b81713d2b2dda459df77ca21ad /media-libs/allegro
parentStable for amd64 wrt bug #464418 (diff)
downloadgentoo-2-04c5cdceeec6e82da47c62eac730654a787be0e9.tar.gz
gentoo-2-04c5cdceeec6e82da47c62eac730654a787be0e9.tar.bz2
gentoo-2-04c5cdceeec6e82da47c62eac730654a787be0e9.zip
Use subslot operator for the libpng dependency (and thus, libpng16 upgrade)
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-libs/allegro')
-rw-r--r--media-libs/allegro/ChangeLog5
-rw-r--r--media-libs/allegro/allegro-4.4.2-r1.ebuild14
2 files changed, 11 insertions, 8 deletions
diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 9819b106eb7d..0e7698125f0f 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/allegro
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.141 2013/02/10 17:18:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.142 2013/04/08 08:28:30 ssuominen Exp $
+
+ 08 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> allegro-4.4.2-r1.ebuild:
+ Use subslot operator for the libpng dependency (and thus, libpng16 upgrade)
10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> allegro-5.0.8.ebuild:
Stable for ppc, wrt bug #455488
diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild
index 73ab6dee89f2..ff0cefd8b815 100644
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r1.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/media-libs/allegro/allegro-4.4.2-r1.ebuild,v 1.7 2013/02/09 10:48:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.4.2-r1.ebuild,v 1.8 2013/04/08 08:28:30 ssuominen Exp $
-EAPI=2
+EAPI=5
CMAKE_IN_SOURCE_BUILD=1
inherit cmake-utils eutils
@@ -18,7 +18,7 @@ IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
RDEPEND="alsa? ( media-libs/alsa-lib )
jack? ( media-sound/jack-audio-connection-kit )
jpeg? ( virtual/jpeg )
- png? ( media-libs/libpng:0 )
+ png? ( media-libs/libpng:0= )
svga? ( media-libs/svgalib )
vorbis? ( media-libs/libvorbis )
X? (
@@ -94,20 +94,20 @@ src_configure() {
src_install() {
cmake-utils_src_install
- dohtml docs/html/*.html || die
+ nonfatal dohtml docs/html/*.html
#176020 (init_dialog.3), #409305 (key.3)
pushd docs/man >/dev/null
local manpage
for manpage in $(ls -d *.3); do
- newman ${manpage} ${PN}-${manpage} || die
+ newman ${manpage} ${PN}-${manpage}
done
popd >/dev/null
if use X; then
- newbin setup/setup ${PN}-setup || die
+ newbin setup/setup ${PN}-setup
insinto /usr/share/${PN}
- doins {keyboard,language,setup/setup}.dat || die
+ doins {keyboard,language,setup/setup}.dat
newicon misc/icon.png ${PN}.png
make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
fi