Version bump

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

8 files changed, 113 insertions, 156 deletions

diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index 2e9b249834ba..0ba46434fa96 100644
--- a/sci-mathematics/glpk/ChangeLog
+++ b/sci-mathematics/glpk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-mathematics/glpk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.68 2014/03/24 17:46:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.69 2014/04/05 21:32:03 bicatali Exp $
+
+*glpk-4.54 (05 Apr 2014)
+
+  05 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/glpk-4.54-debundle-system-libs.patch, +glpk-4.54.ebuild,
+  -files/glpk-4.52.1-debundle-amd.patch, -files/glpk-4.52.1-debundle-zlib.patch,
+  -files/glpk-4.52.1-mariadb-5.5.patch, -glpk-4.52.1-r1.ebuild,
+  files/glpk-4.53-debundle-system-libs.patch, glpk-4.53.ebuild:
+  Version bump
 
 *glpk-4.53 (24 Mar 2014)
 
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index c8931a3550dd..9b804eb312f1 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,24 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX glpk-4.52.1-debundle-amd.patch 1229 SHA256 c959878140d824f243ea51aded32a9c1359533e30f73f31249d4e9d5f7ef7787 SHA512 9f67326d7f7efbb02dbf3e99df1d385c793da04659257f4d609e3a67e0954183cf5fcc12d8917ec7f02118e8e488c59502106cd59e0f08eccb1c779d3c489dac WHIRLPOOL 1055b4b66923a3852e903c6a4abfc360d1064d97c2ea57ee79e2e01998c806dae486cc87c77ad73cc7f896272532ddddf8d196fa02c1615123a737d09136fdf7
-AUX glpk-4.52.1-debundle-zlib.patch 1019 SHA256 bf945bc89282480c562eb4e90f235d9c91a152513382e305eb21347b35da78e7 SHA512 06a4e8416549c5786b48b85fc6d23c3cc24cb60cdac3d0ec037476a922f182cb658471b0d8f3f5c0e4a39b763efff1c06d6fa7b3549cfcde9bc35a06e646e9e3 WHIRLPOOL 86e6b5bb24dd93c4d7e7e7dc455c70da334a579d94a516bfb461aac962c086ffa2b6a8b2ca264545feca6962131f758cb3c4a606c178c46743a243bc09dd8d55
-AUX glpk-4.52.1-mariadb-5.5.patch 275 SHA256 9125267c1434e881a48f159db52009663b72155c648e77a5c153d3bdc1b06576 SHA512 32669b38d5ec7b1ae4d97e07cb9fa054952321e516a8a4cd9d64bc1237081bf14be031513cc2db96c142cdb01b2fe602f843eb51864ce71e106a4cff662903d0 WHIRLPOOL f77f9e0a18f1be010bab620ebbd4d7fc9ca6fd2312e03a993435dce829bd4297cc69fc1b03d9afae4a7ec6b3cc108dd4cb584fa8fea21dcacdc9a9552e7cfe4b
-AUX glpk-4.53-debundle-system-libs.patch 1854 SHA256 0f5ffa91adadc9c9adae6b0e6f5325d8d524b2f2f2ecb15e59af8b5829085a5a SHA512 9c9d28e2497ed364545381ed37d3a8908ca62b12f169f42b8f7e2f90c41bc9b42c3d1c8142907aa99f85f2d9355fff734061a3c4fff46f5a2f09c661b165b86b WHIRLPOOL 11a5c5f55b075ef7787ca7b6102230a9eb8be660480afbaf31656c105dc1bb39fb280d4b4bfe92c83461c2f08be4222f4c66673f77960e0821cbc008513e5dc5
+AUX glpk-4.53-debundle-system-libs.patch 1686 SHA256 e9d65747f26a46cd12bafddf7eb976ba95a57f2daefa0b3ba9cd4f2ac2bfb7ba SHA512 424f475f9db47459ceb522b16030bae2ef262c95b5bfbe3a3fe0bd8aa09a1b28d3b5d0023bbf08ef96499d124fb11711da5e6e9624846000d5bc0e8e3134f06f WHIRLPOOL 82febf676ccb6bc4ef9d087ea27be3119edcc41b0f70839651afb6a0115f909160eb0de4dbc099c70e27bc08bf5d06d6f5c9e6f3f0861ad62c22eccd3451e93f
+AUX glpk-4.54-debundle-system-libs.patch 1763 SHA256 9c442dcfe85ea68c63802502f9e7648e9cfa207306b96a2ca4679bb96df46ae4 SHA512 57d5cdff8d9da56b4d5db22655b019d35efa5b938e25622246fa6d5a54421ae9221d5a164894cbd1c19cd46a963eb26132d7ba1f4aa26ff9eb401a155f77949a WHIRLPOOL 7539d64417878de9cfe1bbf73e0fb7ab484729fdaa37081669cae2f6071f29ab6e683477c2efcee3ff0609eac0a94e3fab145f8d75c8dde401e00f3d0957d415
 DIST glpk-4.45.tar.gz 3132439 SHA256 9207cb613d4436d9a66bc1b1f2018176d106cef0e92a3a85500feeec373be98c SHA512 27089b760d89ee16c5a3332d319007af4b05e8d27df0b990311508f856a01461d8b7b40b111bbf1f3dd4d754af84000112f95349d5286e6d3e42e56226f98649 WHIRLPOOL 7c050210e29f4c13b39e85dc10c9aeed846d7ee912c7dac5a83d13b87648a4e4bf4dce365d2575b6ad7994c56570d74ec87c219f101aaccbec39fd0e14353182
 DIST glpk-4.48.tar.gz 3488482 SHA256 abc2c8f895b20a91cdfcfc04367a0bc8677daf8b4ec3f3e86c5b71c79ac6adb1 SHA512 16795e6cf4db302f25e06e5c9a660e5ed8c7b24ffc5126cde0f864e83fa77d4d61838eab4f716291d568963dddf7442a36a39425a62bd58bd00ca73dac4ffa70 WHIRLPOOL c3e826d08cc6033e8553d7d1fb2a556d42622f38a184e8bbc18bf29d872103245218482b749bfb214cf707cc60eaaf54d7e6840537b483cf8e63c2d33b2c313d
-DIST glpk-4.52.1.tar.gz 2812957 SHA256 3231685b9ff92d30ccbb5c21ba7815b25ba59c7d1e5194e57a880dd1ebb3e95b SHA512 5b79ef7d2d4c50a634aec212270a08cbcbded72cb5a36e645d172e51a3549ac361159f93c2abc4db948241ad1f9205480c09c45718ff7bf0fc54471f77c08dff WHIRLPOOL dce4ceae01b0864fb853a12694ddb9e51a20f9a6a619cdf64b631879125f5aa02b67a1284ff1ecd644df326f6039e54f473dc3dc90bb2a9265d73d62b85349d8
 DIST glpk-4.53.tar.gz 2803321 SHA256 b6601633f0d254f1b6a71c626d8d8e9ec98c6614d3ae7876d10988d701118236 SHA512 077c7c7b3daa79a4c25ba8b357678a974bb4ca2977eb0a92af9939479fdc71be2e1b9224fa6dbc57445609f09b1454ba76d497892b0f78dae5a67bafa4694fae WHIRLPOOL 5da68509be32110dc3735d965237522c398386d1367fe5225f1d686bea0f888250b36586dbbc3f575c8298d1d931447081a5593c6892aaa104e0fbec190dcede
+DIST glpk-4.54.tar.gz 3098202 SHA256 ab72c8078402d34d176eda18c3f9a6ef006e223d530897a4d1d73fb4ad12f9a1 SHA512 7eb815a6d8416dd9f2bb94e9a4aef493c171898404ebc6276fcc1c4f3b4244220213a2bd098707104589348080820a7cb8a717aab73ca513f05b2f9a10aea070 WHIRLPOOL 56ff0baf5e98fdc8e12e4d4db664a4a287dc358dd75839d90d463c04e3e7d97b1023ea93217dd642f6737cccddecdb8f534980e48f8893aff395dc430622de69
 EBUILD glpk-4.45.ebuild 1562 SHA256 f5fc8e5aadca838bba0456123d322c3d98a38bfd822edb7a3b26994cedd8c13f SHA512 a1c9c8a388eac767748878f74cec7d82e7d18c0d6a78905b6101afad68f229792606b3ec99893f9f503cad0e34afec2715bcc290214df2d1cfa9b2ee833080d6 WHIRLPOOL b3cd55afcd07ebb4e839a72c7512b27687ba744ff8af1e49dc220e728a8234eeef6fbb894a4612497a288c33356a7ad40d1551a27cbce452ab09787076737d8a
 EBUILD glpk-4.48.ebuild 1357 SHA256 b9b9cdb82831c47e4a3cba28bde55361debfe519358fbe59798d97892fc6f1c7 SHA512 8d46c78cc56a213bd6089a697fb3ccd0bc48477ecaf4923462d2b6cc11a1ce1b3ecd03b0c880c488f88362d200af814557d77adde9108fa6f8d6f77f07304147 WHIRLPOOL b74f385e7c27b3e0c56022c1d1e517755a0baa9c811ab447c1d421e9ba61b477c6fadffab8aa202580e6641a9938cac6069040c5052daabacf0493d7fe0238fa
-EBUILD glpk-4.52.1-r1.ebuild 1534 SHA256 233d98b1f230b449768d47f01feb0ec54b2413d7ad696b1c4c95ac7f2e773b97 SHA512 7e45803a001f721f031e7b7c760bcd4b35ca32a6a911baa4a3e1f661bd73c1bd17f8bdd3814832cfaf988650676787b19c794a0b9c36cdda023c8f88b69d00c2 WHIRLPOOL e292c8da36889bb677e13dd8a497e5f124df80a544f8de9152543dc6ecfe5c99dbf6cf299c9887768aac71a81eaf80be7365d738d9745dd4caf92a2a1ad148f8
 EBUILD glpk-4.53.ebuild 1454 SHA256 c696782b10d4f68d192eeba23bc9788507ddf66d5aa73a328e7dedb5b0b02943 SHA512 3687f839a6d90cba479e9b98fe52dc5fb50a3c1f5821d14a0776a493ed231479d0755d2b91fe43b1fd4103120628e80c31381e3d85f1f7e46e86ea7c140f2844 WHIRLPOOL 46791d8ea0e651ba06d7ecdcf21a532cbe23b6aeb35314516aeb81e6197c8bb378fb26c4dfe1a2a268d7a9402904b025e5f8ba407630af634673b402ccbca704
-MISC ChangeLog 9809 SHA256 5a435e09700a866936afb483db358f9d2b159c715f636d634d7868b7c1e35de7 SHA512 940ab3b2f4e336df714f3b0aad1f9bee8548fca4a45416b7432e308b2f46f9304965e53ad34bce3aa8b0a5d31942fa96c9b6727452cb1ae2da5b822ed0b7217f WHIRLPOOL e3ae23e1aa7e29efa62e4b478a8d3b3454c0e472a255274add21bf3e60d878476a64af640fcd32bee95d845b7f47d1dd9eb75430bb32d10e999387b44f7cb404
+EBUILD glpk-4.54.ebuild 1500 SHA256 8c38347ce12196026ebfeac2b051a662b3e268cd4858eeed1988ec04d3a275a0 SHA512 94229c631a0bd679acc505012623f9a5f318324fdd8b353a07174f172b87c6834a5f1c898659cf0287d937d6971b22a41b2e472ec9b84303541a1b6a63690e89 WHIRLPOOL 444a719bc3c7e80bd20a8e7aa7e8ec8a77e0200c3351dd138bee798104408d17c76c934f175bc2c8fec554d48e0e55da0438c630d1b5435bb8caeb1ea0e9158d
+MISC ChangeLog 10181 SHA256 4ef25b7c1b15ca894df8ea572ee2e566bc5411558d80c4f6ee3ea3e0b1eab553 SHA512 7a0d90ef727e5f315e6c67a27fa60ec6b1d20a8bdbbe4abcf93b48bb0d8b1ca3091deb191bc13a2d5205c3b1d5d5f906d6bbe9b2b925cb832fe1234f337b1536 WHIRLPOOL 86c226c3d68b94385f2e5dc5116326e5971c01c08eccad870433c07eeb24b5a51b2bf07236d3525c0b6f4fa8b442681afbfcf3bb1c9ca154ad15c125c06fcb48
 MISC metadata.xml 539 SHA256 9852c32e609e676d105ea516f5295fda6be6a8f19fcb7e10e3dac775432a14dd SHA512 c9774b7447177264f04b2f16b68fad7b26c0e23d9d88a7b4f7eae646de1666c5ebc47ab98911c7e6e2fd6997e9ae46ee6fd2aee4d081200f5c6c643b85febb46 WHIRLPOOL 15b10e19d077f9eeaf7e5c65bbaa15d6f8852b27b4bb00c3e9d8969ae8e8e7409b99179ced297614dc305e2558c59a000ae007c28b9b3b02dc20c74bd4868753
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlMwb3YACgkQ1ycZbhPLE2AdewCeNK0cHslFinkvTcnYGxbb87D4
-bFoAnj0/Md2Q05zIB25sr/+yUH1wcyhF
-=ZXGw
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/glpk/files/glpk-4.52.1-debundle-amd.patch b/sci-mathematics/glpk/files/glpk-4.52.1-debundle-amd.patch
deleted file mode 100644
index e8a24e914e69..000000000000
--- a/sci-mathematics/glpk/files/glpk-4.52.1-debundle-amd.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Do not use embedded copy of AMD and COLAMD libraries from suitesparse
-Author: Sébastien Villemot <sebastien@debian.org>
-Forwarded: not-needed
-Last-Update: 2013-06-25
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure.ac
-+++ b/configure.ac
-@@ -142,6 +142,11 @@
- 
- AC_CHECK_LIB([z], [gzopen])
- 
-+AC_CHECK_LIB([amd], [amd_1])
-+AC_CHECK_LIB([colamd], [colamd])
-+
-+AC_CHECK_HEADER([amd.h])
-+
- AC_CONFIG_FILES(
-    [src/Makefile examples/Makefile Makefile])
- AC_OUTPUT
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,10 +6,8 @@
- 
- libglpk_la_CPPFLAGS = \
- -I$(srcdir) \
---I$(srcdir)/amd \
- -I$(srcdir)/bflib \
- -I$(srcdir)/cglib \
---I$(srcdir)/colamd \
- -I$(srcdir)/env \
- -I$(srcdir)/minisat \
- -I$(srcdir)/misc \
-@@ -99,18 +97,6 @@
- glpssx01.c \
- glpssx02.c \
- glptsp.c \
--amd/amd_1.c \
--amd/amd_2.c \
--amd/amd_aat.c \
--amd/amd_control.c \
--amd/amd_defaults.c \
--amd/amd_dump.c \
--amd/amd_info.c \
--amd/amd_order.c \
--amd/amd_post_tree.c \
--amd/amd_postorder.c \
--amd/amd_preprocess.c \
--amd/amd_valid.c \
- bflib/fhv.c \
- bflib/fhvint.c \
- bflib/luf.c \
-@@ -119,7 +105,6 @@
- bflib/sva.c \
- cglib/cfg.c \
- cglib/cfg1.c \
--colamd/colamd.c \
- env/alloc.c \
- env/env.c \
- env/error.c \
diff --git a/sci-mathematics/glpk/files/glpk-4.52.1-debundle-zlib.patch b/sci-mathematics/glpk/files/glpk-4.52.1-debundle-zlib.patch
deleted file mode 100644
index 6eb2130eda8e..000000000000
--- a/sci-mathematics/glpk/files/glpk-4.52.1-debundle-zlib.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Do not use embedded copy of zlib
-Author: Sébastien Villemot <sebastien@debian.org>
-Forwarded: not-needed
-Last-Update: 2013-06-25
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -13,8 +13,7 @@
- -I$(srcdir)/env \
- -I$(srcdir)/minisat \
- -I$(srcdir)/misc \
---I$(srcdir)/proxy \
---I$(srcdir)/zlib
-+-I$(srcdir)/proxy
- 
- libglpk_la_LDFLAGS = \
- -version-info 36:1:0 \
-@@ -144,21 +143,6 @@
- misc/wclique.c \
- misc/wclique1.c \
- proxy/proxy.c \
--proxy/proxy1.c \
--zlib/adler32.c \
--zlib/compress.c \
--zlib/crc32.c \
--zlib/deflate.c \
--zlib/gzclose.c \
--zlib/gzlib.c \
--zlib/gzread.c \
--zlib/gzwrite.c \
--zlib/inffast.c \
--zlib/inflate.c \
--zlib/inftrees.c \
--zlib/trees.c \
--zlib/uncompr.c \
--zlib/zio.c \
--zlib/zutil.c
-+proxy/proxy1.c
- 
- ## eof ##
---- a/configure.ac
-+++ b/configure.ac
-@@ -140,6 +140,8 @@
-    AC_MSG_RESULT([no])
- fi
- 
-+AC_CHECK_LIB([z], [gzopen])
-+
- AC_CONFIG_FILES(
-    [src/Makefile examples/Makefile Makefile])
- AC_OUTPUT
diff --git a/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch b/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch
deleted file mode 100644
index 06aa8e5de95c..000000000000
--- a/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glpk-4.52.1/src/glpsql.c.orig	2014-02-05 22:14:21.487843989 +0100
-+++ glpk-4.52.1/src/glpsql.c	2014-02-05 22:14:32.764510562 +0100
-@@ -1106,8 +1106,6 @@
- #define byte_defined 1
- #endif
- 
--#include <my_global.h>
--#include <my_sys.h>
- #include <mysql.h>
- 
- struct db_mysql
diff --git a/sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch
index f981cfe182b4..326e61301541 100644
--- a/sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch
+++ b/sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch
@@ -1,8 +1,7 @@
 Remove suitesparse (camd,colamd) and zlib bundles
 
-diff -Nur glpk-4.53.orig/configure.ac glpk-4.53/configure.ac
---- glpk-4.53.orig/configure.ac	2014-03-24 10:40:24.406906149 -0700
-+++ glpk-4.53/configure.ac	2014-03-24 10:41:15.637207696 -0700
+--- configure.ac.orig	2014-03-24 10:40:24.406906149 -0700
++++ configure.ac	2014-03-24 10:41:15.637207696 -0700
 @@ -140,6 +140,13 @@
     AC_MSG_RESULT([no])
  fi
@@ -17,9 +16,8 @@ diff -Nur glpk-4.53.orig/configure.ac glpk-4.53/configure.ac
  AC_CONFIG_FILES(
     [src/Makefile examples/Makefile Makefile])
  AC_OUTPUT
-diff -Nur glpk-4.53.orig/src/Makefile.am glpk-4.53/src/Makefile.am
---- glpk-4.53.orig/src/Makefile.am	2014-03-24 10:40:24.413906191 -0700
-+++ glpk-4.53/src/Makefile.am	2014-03-24 10:41:15.636207690 -0700
+--- src/Makefile.am.orig	2014-03-24 10:40:24.413906191 -0700
++++ src/Makefile.am	2014-03-24 10:41:15.636207690 -0700
 @@ -6,15 +6,12 @@
  
  libglpk_la_CPPFLAGS = \
diff --git a/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch
new file mode 100644
index 000000000000..a3140341a483
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch
@@ -0,0 +1,86 @@
+Remove suitesparse (camd,colamd) and zlib bundles
+bicatali - apr 2014
+
+--- configure.ac.orig	2014-04-05 14:18:56.045148287 -0700
++++ configure.ac	2014-04-05 14:23:24.878803309 -0700
+@@ -59,6 +59,11 @@
+ dnl Check for math library
+ AC_CHECK_LIB([m], [exp])
+ 
++AC_CHECK_LIB([amd], [amd_1])
++AC_CHECK_LIB([colamd], [colamd])
++AC_CHECK_HEADER([amd.h])
++AC_CHECK_LIB([z], [gzopen])
++
+ dnl Check for <sys/time.h> header
+ AC_CHECK_HEADER([sys/time.h],
+    AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A]))
+--- src/Makefile.am.orig	2014-04-05 14:19:16.401273769 -0700
++++ src/Makefile.am	2014-04-05 14:21:56.696259485 -0700
+@@ -6,15 +6,12 @@
+ 
+ libglpk_la_CPPFLAGS = \
+ -I$(srcdir) \
+--I$(srcdir)/amd \
+ -I$(srcdir)/bflib \
+ -I$(srcdir)/cglib \
+--I$(srcdir)/colamd \
+ -I$(srcdir)/env \
+ -I$(srcdir)/minisat \
+ -I$(srcdir)/misc \
+--I$(srcdir)/proxy \
+--I$(srcdir)/zlib
++-I$(srcdir)/proxy
+ 
+ libglpk_la_LDFLAGS = \
+ -version-info 37:1:1 \
+@@ -92,18 +89,6 @@
+ glpssx02.c \
+ glptsp.c \
+ lux.c \
+-amd/amd_1.c \
+-amd/amd_2.c \
+-amd/amd_aat.c \
+-amd/amd_control.c \
+-amd/amd_defaults.c \
+-amd/amd_dump.c \
+-amd/amd_info.c \
+-amd/amd_order.c \
+-amd/amd_post_tree.c \
+-amd/amd_postorder.c \
+-amd/amd_preprocess.c \
+-amd/amd_valid.c \
+ bflib/btf.c \
+ bflib/btfint.c \
+ bflib/fhv.c \
+@@ -117,7 +102,6 @@
+ bflib/sva.c \
+ cglib/cfg.c \
+ cglib/cfg1.c \
+-colamd/colamd.c \
+ env/alloc.c \
+ env/dlsup.c \
+ env/env.c \
+@@ -150,21 +134,6 @@
+ misc/wclique.c \
+ misc/wclique1.c \
+ proxy/proxy.c \
+-proxy/proxy1.c \
+-zlib/adler32.c \
+-zlib/compress.c \
+-zlib/crc32.c \
+-zlib/deflate.c \
+-zlib/gzclose.c \
+-zlib/gzlib.c \
+-zlib/gzread.c \
+-zlib/gzwrite.c \
+-zlib/inffast.c \
+-zlib/inflate.c \
+-zlib/inftrees.c \
+-zlib/trees.c \
+-zlib/uncompr.c \
+-zlib/zio.c \
+-zlib/zutil.c
++proxy/proxy1.c
+ 
+ ## eof ##
diff --git a/sci-mathematics/glpk/glpk-4.52.1-r1.ebuild b/sci-mathematics/glpk/glpk-4.54.ebuild
index cfd9490b97b0..b1fc60931b0a 100644
--- a/sci-mathematics/glpk/glpk-4.52.1-r1.ebuild
+++ b/sci-mathematics/glpk/glpk-4.54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.52.1-r1.ebuild,v 1.2 2014/02/05 21:54:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.54.ebuild,v 1.1 2014/04/05 21:32:03 bicatali Exp $
 
 EAPI=5
 
@@ -18,19 +18,17 @@ IUSE="doc examples gmp odbc mysql static-libs"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="
-	sci-libs/amd
-	sci-libs/colamd
-	sys-libs/zlib:=
-	gmp? ( dev-libs/gmp:= )
+	sci-libs/amd:0=
+	sci-libs/colamd:=
+	sys-libs/zlib:0=
+	gmp? ( dev-libs/gmp:0= )
 	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )"
+	odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.52.1-debundle-amd.patch
-	"${FILESDIR}"/${PN}-4.52.1-debundle-zlib.patch
-	"${FILESDIR}"/${PN}-4.52.1-mariadb-5.5.patch
+	"${FILESDIR}"/${PN}-4.54-debundle-system-libs.patch
 )
 
 src_configure() {
@@ -55,6 +53,7 @@ src_install() {
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
 }