diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2012-03-04 20:22:27 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2012-03-04 20:22:27 +0000 |
| commit | a09c350e9085316cee5d1d590986bf1227f0c676 (patch) | |
| tree | 0ef41000c3f1fe4cbdacbde430979a80ef7d294b /media-libs | |
| parent | Revert static-libs handling, #406905; push changes from 8.5.10 to .11 (diff) | |
| download | gentoo-2-a09c350e9085316cee5d1d590986bf1227f0c676.tar.gz gentoo-2-a09c350e9085316cee5d1d590986bf1227f0c676.tar.bz2 gentoo-2-a09c350e9085316cee5d1d590986bf1227f0c676.zip | |
Fix install of HTML doc. Bug #321571
(Portage version: 2.1.10.49/cvs/Linux i686)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/allegro/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/allegro/allegro-4.4.2.ebuild | 9 | ||||
| -rw-r--r-- | media-libs/allegro/files/allegro-4.4.2-gentoo.patch | 16 |
3 files changed, 25 insertions, 6 deletions
diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog index e89b0f4cc6f7..145c13f1191b 100644 --- a/media-libs/allegro/ChangeLog +++ b/media-libs/allegro/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/allegro # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.117 2012/02/21 07:13:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.118 2012/03/04 20:22:27 tupone Exp $ + + 04 Mar 2012; Tupone Alfredo <tupone@gentoo.org> allegro-4.4.2.ebuild, + +files/allegro-4.4.2-gentoo.patch: + Fix install of HTML doc. Bug #321571 by zimous *allegro-5.0.5 (21 Feb 2012) diff --git a/media-libs/allegro/allegro-4.4.2.ebuild b/media-libs/allegro/allegro-4.4.2.ebuild index debfe6b2cb71..7deee6328397 100644 --- a/media-libs/allegro/allegro-4.4.2.ebuild +++ b/media-libs/allegro/allegro-4.4.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.ebuild,v 1.4 2011/10/11 21:28:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.4.2.ebuild,v 1.5 2012/03/04 20:22:27 tupone Exp $ EAPI=2 CMAKE_IN_SOURCE_BUILD=1 @@ -31,9 +31,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) x11-libs/libXxf86vm opengl? ( virtual/opengl virtual/glu ) - ) - !media-libs/allegrogl - !media-libs/jpgalleg" + )" DEPEND="${RDEPEND} dev-util/pkgconfig X? ( @@ -46,6 +44,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-shared.patch \ "${FILESDIR}"/${P}-underlink.patch \ + "${FILESDIR}"/${P}-gentoo.patch \ "${FILESDIR}"/${P}-rpath.patch sed -i \ diff --git a/media-libs/allegro/files/allegro-4.4.2-gentoo.patch b/media-libs/allegro/files/allegro-4.4.2-gentoo.patch new file mode 100644 index 000000000000..119d9c789508 --- /dev/null +++ b/media-libs/allegro/files/allegro-4.4.2-gentoo.patch @@ -0,0 +1,16 @@ +--- docs/CMakeLists.txt.old 2012-03-04 20:20:05.566881387 +0100 ++++ docs/CMakeLists.txt 2012-03-04 20:20:50.659714153 +0100 +@@ -71,11 +71,12 @@ + string(REGEX MATCH "[^/]*._tx" basename ${page}) + string(REPLACE "._tx" "" basename ${basename}) + +- set(page ${CMAKE_CURRENT_SOURCE_DIR}/${page}) + if(${page} MATCHES "/build/") ++ set(page ${CMAKE_CURRENT_SOURCE_DIR}/${page}) + set(txt_out ${CMAKE_CURRENT_BINARY_DIR}/build/${basename}.txt) + set(html_out ${CMAKE_CURRENT_BINARY_DIR}/build/${basename}.html) + else() ++ set(page ${CMAKE_CURRENT_SOURCE_DIR}/${page}) + set(txt_out ${CMAKE_CURRENT_BINARY_DIR}/txt/${basename}.txt) + set(html_out ${CMAKE_CURRENT_BINARY_DIR}/html/${basename}.html) + endif() |