install setup utility, bug #155123

Package-Manager: portage-2.1.2-r12

diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 4f22d16a47fbe996a2aefcd03076e2db6d164e30..4de45e5ea04082458e5a6f631e6470f7f10af922 100644 (file)
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/allegro
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.64 2007/02/03 00:47:30 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.65 2007/03/01 00:04:41 nyhm Exp $
+
+  28 Feb 2007; Tristan Heaven <nyhm@gentoo.org> allegro-4.2.1.ebuild:
+  install setup utility, bug #155123
 
   03 Feb 2007; Tristan Heaven <nyhm@gentoo.org> allegro-4.2.1.ebuild:
   Add jack USE flag

diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 784d449f888dbe0e72d32af5de72cc7dcbe7a39a..74998dfb368576e858d26594687f74a25510a21e 100644 (file)
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -13,10 +13,10 @@ AUX allegro-4.2.1-exec-stack.patch 4523 RMD160 71b77b6c29a46f478a731e7eff3b47285
 MD5 38a8238eb574242bc74fbd53ff5edffb files/allegro-4.2.1-exec-stack.patch 4523
 RMD160 71b77b6c29a46f478a731e7eff3b47285c89bd80 files/allegro-4.2.1-exec-stack.patch 4523
 SHA256 2d2924b847eac9bdf8cd43f56b11c53d62ae0b496e02d39b4bab6911ada4aa64 files/allegro-4.2.1-exec-stack.patch 4523
-AUX allegro-4.2.1-flags.patch 1803 RMD160 a763db13a5e81fe5b3807cdfe1111d0db70717a0 SHA1 7c0c508edde5140df47ce7fcb901534141edb220 SHA256 a2160c80f33c2e91436c5f00867d23a98f290e250f956b0ebfebca624f3bb283
-MD5 9fffed43ea886a0c1467ec8a0d4c9b60 files/allegro-4.2.1-flags.patch 1803
-RMD160 a763db13a5e81fe5b3807cdfe1111d0db70717a0 files/allegro-4.2.1-flags.patch 1803
-SHA256 a2160c80f33c2e91436c5f00867d23a98f290e250f956b0ebfebca624f3bb283 files/allegro-4.2.1-flags.patch 1803
+AUX allegro-4.2.1-flags.patch 1776 RMD160 7f9610f4d8a1734eeffdc0835ed27a0d8d5189b6 SHA1 024645cef686d4c82b61518ea632783ec598f050 SHA256 85c869ba264f8d786045b0568b77acc7c7f929aa10f4d00f6b57941f2a1cf1ef
+MD5 57da91fdaf9c88f0a49e688130a50129 files/allegro-4.2.1-flags.patch 1776
+RMD160 7f9610f4d8a1734eeffdc0835ed27a0d8d5189b6 files/allegro-4.2.1-flags.patch 1776
+SHA256 85c869ba264f8d786045b0568b77acc7c7f929aa10f4d00f6b57941f2a1cf1ef files/allegro-4.2.1-flags.patch 1776
 DIST allegro-4.1.14.tar.gz 2774495 RMD160 511712ca0c4deb81d1426093240261948a71f53c SHA1 3b2cf8089304f7904ba0e4dfba3ef46bd99b8a37 SHA256 ee7c6d04f7e64778baf2c161bc0b564d5298a5dc575c3de3d5fce939c5d11b13
 DIST allegro-4.2.0.tar.gz 3056173 RMD160 e1602ea2f8bc1761be0ee34001e9d77d3a6ea3ff SHA1 5b4a542c038ee196564f9107de59fe30a8caeaf5 SHA256 d8df27558bc083298d6933c843d4fdaf9afc0aa1607276acc96ed8fa9a39060c
 DIST allegro-4.2.1.tar.gz 3107022 RMD160 acbc976409b9db92d5588b41cb389c06b6d4d2ea SHA1 1593f24fe92eae58512447145511c84398ca8926 SHA256 a800a4c61db448e327c13b898fa9bdc00bea43319266a27ad37435f68c5d414b
@@ -32,14 +32,14 @@ EBUILD allegro-4.2.0-r2.ebuild 2638 RMD160 6e5eb7166b729b650af6134252cfb432cfd59
 MD5 530e290e583319a69de77e8ebf867b32 allegro-4.2.0-r2.ebuild 2638
 RMD160 6e5eb7166b729b650af6134252cfb432cfd592fd allegro-4.2.0-r2.ebuild 2638
 SHA256 f080e7afb9a00bf020fa7e93268e06afeaca901204108d5ef28cbfbe3d71f592 allegro-4.2.0-r2.ebuild 2638
-EBUILD allegro-4.2.1.ebuild 2085 RMD160 09639cf07460c61207e3f319ee2a00caa40178d6 SHA1 7771e8788d88a712b5622346c1f505b516660db6 SHA256 d4ba2b94313f8039e0c78af9c8051ad7d8aea47a125109f4a658159c2e17414d
-MD5 7f0863882243a4651f540fe1b8aa1995 allegro-4.2.1.ebuild 2085
-RMD160 09639cf07460c61207e3f319ee2a00caa40178d6 allegro-4.2.1.ebuild 2085
-SHA256 d4ba2b94313f8039e0c78af9c8051ad7d8aea47a125109f4a658159c2e17414d allegro-4.2.1.ebuild 2085
-MISC ChangeLog 8320 RMD160 04178940a2d29a2e452f40f0bb05eea7777ca4c7 SHA1 06561f6e1e5fff655e4e37ee158c49a09322b27d SHA256 872fd29e034531c12acfa15f94cfbddb422206f9892c3f5dbb9e279459653bf4
-MD5 7f46e2262e13b0bc0aa09c51d97fa60d ChangeLog 8320
-RMD160 04178940a2d29a2e452f40f0bb05eea7777ca4c7 ChangeLog 8320
-SHA256 872fd29e034531c12acfa15f94cfbddb422206f9892c3f5dbb9e279459653bf4 ChangeLog 8320
+EBUILD allegro-4.2.1.ebuild 2389 RMD160 3fdbb9a81aca72aa354ee209545f8446786de271 SHA1 d7dd8edc1dc724842b88d1482c6b2d29e33827d1 SHA256 e0650a9b249f1a631dced5928cc71022803bb02c88e757c138b6ad3ed4971e95
+MD5 3e6453254c5af2caa453884347457b2f allegro-4.2.1.ebuild 2389
+RMD160 3fdbb9a81aca72aa354ee209545f8446786de271 allegro-4.2.1.ebuild 2389
+SHA256 e0650a9b249f1a631dced5928cc71022803bb02c88e757c138b6ad3ed4971e95 allegro-4.2.1.ebuild 2389
+MISC ChangeLog 8428 RMD160 283b469dbbf2a3b3e62bbd797b41f58327ca95f9 SHA1 e0f50361e81267ef791b4282a0b3c8293579b63c SHA256 a2e3c879e363f8dc1190f6f021b357d7373c0ecd6ceddc33e8196d9b90f882ea
+MD5 baad70be7eda9a658ce7b00615967620 ChangeLog 8428
+RMD160 283b469dbbf2a3b3e62bbd797b41f58327ca95f9 ChangeLog 8428
+SHA256 a2e3c879e363f8dc1190f6f021b357d7373c0ecd6ceddc33e8196d9b90f882ea ChangeLog 8428
 MISC metadata.xml 636 RMD160 b2926813da5e98049d86fa5e2fc4a75d16b12b69 SHA1 bd01d531b12f11d21d75cd91cf9fa6c34505e2de SHA256 e26af044016a39f2ef99c3796d0cee3e84ca728501af8e71d7f91bd1d9edb3bc
 MD5 69afb3c206fdd20a361ee6dbff286ace metadata.xml 636
 RMD160 b2926813da5e98049d86fa5e2fc4a75d16b12b69 metadata.xml 636
@@ -59,7 +59,7 @@ SHA256 fb81d91cb8e7ed036c469f90249f937d0b3039cc7a2ef92674e6e452787182fb files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFw9uqdz7hIScOURERAs3iAKCfG+DyXucfMAN4OO2MCGoNwUp0fgCeNVlW
-qPznfAAW+24cgk7DF737v4U=
-=vk7j
+iD8DBQFF5higdz7hIScOURERAkwZAKDqariyqyiZB2wIAcFH7JTa7QwsigCbB4Wi
+EaDzjmPr+baR5iLKx44Ii4E=
+=khwQ
 -----END PGP SIGNATURE-----

diff --git a/media-libs/allegro/allegro-4.2.1.ebuild b/media-libs/allegro/allegro-4.2.1.ebuild
index a00b2e1f3068c8d9de4ac795133c307048971a8c..47918159553064c923c36f48f6a1c4b282f95dee 100644 (file)
--- a/media-libs/allegro/allegro-4.2.1.ebuild
+++ b/media-libs/allegro/allegro-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.1.ebuild,v 1.4 2007/02/03 00:47:30 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.1.ebuild,v 1.5 2007/03/01 00:04:41 nyhm Exp $
 
 inherit autotools eutils
 
@@ -11,7 +11,7 @@ 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 mmx oss sse svga vga"
+IUSE="X alsa arts esd fbcon jack oss svga vga"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
        esd? ( media-sound/esound )
@@ -49,8 +49,9 @@ src_compile() {
        econf \
                --enable-linux \
                --enable-static \
-               $(use_enable mmx) \
-               $(use_enable sse) \
+               --disable-asm \
+               --disable-mmx \
+               --disable-sse \
                $(use_enable oss ossdigi) \
                $(use_enable oss ossmidi) \
                $(use_enable alsa alsadigi) \
@@ -73,7 +74,14 @@ src_compile() {
 src_install() {
        emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
-       # Different format versions of the Allegro documentation
+       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}.png "Settings"
+       fi
+
        dodoc AUTHORS CHANGES THANKS readme.txt todo.txt
        doman docs/man/*.3
        doinfo docs/info/${PN}.info
@@ -85,3 +93,7 @@ src_install() {
        docinto build
        dodoc docs/build/*.txt
 }
+
+pkg_postinst() {
+       ewarn "Please run \"revdep-rebuild --library liballeg.so.4.2\""
+}

diff --git a/media-libs/allegro/files/allegro-4.2.1-flags.patch b/media-libs/allegro/files/allegro-4.2.1-flags.patch
index 57435622b5d7e7ac067730de6f675213cc8f3257..c79e684151b2e2f39e1611544d38db663a6bd24c 100644 (file)
--- a/media-libs/allegro/files/allegro-4.2.1-flags.patch
+++ b/media-libs/allegro/files/allegro-4.2.1-flags.patch
@@ -22,7 +22,7 @@
 -  else
 -    CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
 -  fi
-+  CFLAGS="$CFLAGS -funroll-loops -ffast-math $WFLAGS"
++  CFLAGS="$CFLAGS $WFLAGS"
    ALLEGRO_SFLAGS="-x assembler-with-cpp"
    ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"
  else