Fix autoconf-2.62 failure, bug #218208; Install liballeg.so symlink, bug #220955

Package-Manager: portage-2.2_pre7/cvs/Linux 2.6.25.4 Intel(R) Core(TM)2 Duo CPU E6750 @ 2.66GHz

4 files changed, 166 insertions, 5 deletions

diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 52e695e0b7c2..8e67f8ee2fe7 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/allegro
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.77 2008/05/13 12:17:58 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.78 2008/06/01 15:55:51 nyhm Exp $
+
+*allegro-4.2.2-r1 (01 Jun 2008)
+
+  01 Jun 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/allegro-4.2.2-autoconf.patch, +allegro-4.2.2-r1.ebuild:
+  Fix autoconf-2.62 failure, bug #218208; Install liballeg.so symlink, bug
+  #220955
 
   13 May 2008; Ferris McCormick <fmccor@gentoo.org> allegro-4.2.2.ebuild:
   Sparc stable, Bug #221821.
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 54c1bca352d7..109577288eec 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX allegro-4.2.2-autoconf.patch 1105 RMD160 bcf408f6f5f02feffb1cba96dc44dbfbc004d3c1 SHA1 4f826fde824031b91c9f73b946768bfe5d265815 SHA256 69060c6984721f09ce1da0c43c4b91f8b0f2f3e113c5c88cd8cd567c0050f5f1
 AUX allegro-4.2.2-exec-stack.patch 4523 RMD160 71b77b6c29a46f478a731e7eff3b47285c89bd80 SHA1 6cd70fb48ca88df77a7bc00f5f5f2e37703b3cf4 SHA256 2d2924b847eac9bdf8cd43f56b11c53d62ae0b496e02d39b4bab6911ada4aa64
 AUX allegro-4.2.2-flags.patch 1776 RMD160 7f9610f4d8a1734eeffdc0835ed27a0d8d5189b6 SHA1 024645cef686d4c82b61518ea632783ec598f050 SHA256 85c869ba264f8d786045b0568b77acc7c7f929aa10f4d00f6b57941f2a1cf1ef
 DIST allegro-4.2.2.tar.gz 3178406 RMD160 ea5b38f2eee95994bd134039822c6b0b6e78e04a SHA1 25e3854432cede0266632019ae912eb33cd18f8e SHA256 3e7fe701fa0fa99e0870e2c10e21e6592b0b58e6eb5e9844aff17db9a25d06a8
+EBUILD allegro-4.2.2-r1.ebuild 2591 RMD160 d4710ebb6f213caf67c94bbc046225d7232de2ae SHA1 bc292aaf8359cb60156a7d0ba34a577ebb57d960 SHA256 41ac774a42593e7938d0c21fba6f039bde8210cd18a6a59cce06df2863f0d572
 EBUILD allegro-4.2.2.ebuild 2455 RMD160 62f08c9ef35bef842835389c994dc1eb441eea58 SHA1 74f5f8c4e0021b3202599bfe638fa9c10bc9f6cd SHA256 ddb33656115023ef17e70c06c5ef8907177b967cbf80945da7be60a3f0d6333d
-MISC ChangeLog 9864 RMD160 5dfcecfe5da7a9dd98cf94438b4dbca8fb06c8c0 SHA1 40a3da4e942a0a54515b8e26fcced11d260065f1 SHA256 387acf6e4ad37904aeba6d5bf991a136da729017486bbe74f46493e1aa43b07d
+MISC ChangeLog 10094 RMD160 f11f0a721573e32a343e4ae771f17c06de963179 SHA1 c5dfa52412a09afca3db46f3ad450b9a61e63dd8 SHA256 0c6c362e7989b5f19a9e9c4a377bca30f29bc179492c0bf83e8ab2edb8fc2e0d
 MISC metadata.xml 636 RMD160 b2926813da5e98049d86fa5e2fc4a75d16b12b69 SHA1 bd01d531b12f11d21d75cd91cf9fa6c34505e2de SHA256 e26af044016a39f2ef99c3796d0cee3e84ca728501af8e71d7f91bd1d9edb3bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgpiGUACgkQdz7hIScOURHEFACg0Rn5clWPKiHtLWvbYiWJUarb
-rMwAn1jNDh20Hi0lMC3uj1rbxDFmZRju
-=lPpA
+iEYEARECAAYFAkhCxo0ACgkQdz7hIScOUREgUgCgsrGESGbPrtxIUpjAGM05cvB2
+ExYAn3qSl0O4DUOGhuwVVZQa0y+6Pu0j
+=SyJH
 -----END PGP SIGNATURE-----
diff --git a/media-libs/allegro/allegro-4.2.2-r1.ebuild b/media-libs/allegro/allegro-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..e127fa7972ab
--- /dev/null
+++ b/media-libs/allegro/allegro-4.2.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.2-r1.ebuild,v 1.1 2008/06/01 15:55:51 nyhm Exp $
+
+inherit autotools multilib eutils
+
+DESCRIPTION="cross-platform multimedia library"
+HOMEPAGE="http://alleg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
+
+LICENSE="Allegro"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X alsa arts esd fbcon jack oss svga vga"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	arts? ( kde-base/arts )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm
+	)
+	svga? ( media-libs/svgalib )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	X? (
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+	)"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-exec-stack.patch \
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-autoconf.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--enable-linux \
+		--enable-static \
+		--enable-staticprog \
+		--disable-asm \
+		--disable-mmx \
+		--disable-sse \
+		$(use_enable oss ossdigi) \
+		$(use_enable oss ossmidi) \
+		$(use_enable alsa alsadigi) \
+		$(use_enable alsa alsamidi) \
+		$(use_enable esd esddigi) \
+		$(use_enable arts artsdigi) \
+		$(use_with X x) \
+		$(use_enable X xwin-shm) \
+		$(use_enable X xwin-vidmode) \
+		$(use_enable X xwin-dga) \
+		$(use_enable X xwin-dga2) \
+		$(use_enable fbcon) \
+		$(use_enable svga svgalib) \
+		$(use_enable vga) \
+		$(use_enable jack jackdigi) \
+		|| die
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	dosym liballeg-${PV}.so /usr/$(get_libdir)/liballeg.so \
+		|| die "dosym failed"
+
+	if use X ; then
+		newbin setup/setup ${PN}-setup || die "newbin failed"
+		insinto /usr/share/${PN}
+		doins {keyboard,language,setup/setup}.dat || die "doins failed"
+		newicon misc/alex.png ${PN}.png
+		make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
+	fi
+
+	dodoc AUTHORS CHANGES THANKS readme.txt todo.txt
+	doman docs/man/*.3
+	doinfo docs/info/${PN}.info
+	dohtml docs/html/*
+	docinto txt
+	dodoc docs/txt/*.txt
+	docinto rtf
+	dodoc docs/rtf/*.rtf
+	docinto build
+	dodoc docs/build/*.txt
+}
+
+pkg_postinst() {
+	ewarn "Please run \"revdep-rebuild --library liballeg.so.4.2\""
+	ewarn "if you are upgrading allegro from 4.2.0."
+}
diff --git a/media-libs/allegro/files/allegro-4.2.2-autoconf.patch b/media-libs/allegro/files/allegro-4.2.2-autoconf.patch
new file mode 100644
index 000000000000..b6f60f3f01e9
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.2.2-autoconf.patch
@@ -0,0 +1,48 @@
+--- aclocal.m4
++++ aclocal.m4
+@@ -193,7 +193,6 @@
+ dnl Variables:
+ dnl  allegro_sv_procfs=(yes|no)
+ dnl
+-AC_MSG_CHECKING(for System V sys/procfs)
+ AC_DEFUN(ALLEGRO_ACTEST_SV_PROCFS, [
+   AC_CHECK_HEADER(sys/procfs.h, [
+     AC_TRY_COMPILE(
+@@ -209,7 +208,6 @@
+     [allegro_sv_procfs=no]
+   ])
+ ])
+-AC_MSG_RESULT($allegro_sv_procfs)
+ 
+ dnl
+ dnl Test if sys/procfs.h tells us argc/argv.
+@@ -217,7 +215,6 @@
+ dnl Variables:
+ dnl  allegro_procfs_argcv=(yes|no)
+ dnl
+-AC_MSG_CHECKING(if sys/procfs.h tells us argc/argv)
+ AC_DEFUN(ALLEGRO_ACTEST_PROCFS_ARGCV, [
+   AC_TRY_COMPILE(
+     [#include  <sys/procfs.h>],
+@@ -226,7 +223,6 @@
+     [allegro_procfs_argcv=no]
+   )
+ ])
+-AC_MSG_RESULT($allegro_procfs_argcv)
+ 
+ dnl
+ dnl Test for getexecname() on Solaris
+@@ -234,13 +230,11 @@
+ dnl Variables:
+ dnl  allegro_sys_getexecname=(yes|no)
+ dnl
+-AC_MSG_CHECKING(for getexecname)
+ AC_DEFUN(ALLEGRO_ACTEST_SYS_GETEXECNAME,
+    [AC_CHECK_LIB(c, getexecname,
+       [allegro_sys_getexecname=yes],
+       [allegro_sys_getexecname=no])]
+ )
+-AC_MSG_RESULT($allegro_sys_getexecname)
+ 
+ dnl
+ dnl Test for X-Windows support.