diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2012-08-01 23:21:41 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2012-08-01 23:21:41 +0000 |
commit | 12e8366fc9501bfa4c55a8a54b9049e0c7090e11 (patch) | |
tree | 23e370337caa33737645782ba7737c4167f1414a /sci-visualization/opendx | |
parent | Version bump. (diff) | |
download | historical-12e8366fc9501bfa4c55a8a54b9049e0c7090e11.tar.gz historical-12e8366fc9501bfa4c55a8a54b9049e0c7090e11.tar.bz2 historical-12e8366fc9501bfa4c55a8a54b9049e0c7090e11.zip |
Build for newer imagemagick and add possibility for graphicsmagick as well, fixing bug #314375. Keyword for x86-linux, switch to EAPI 4
Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64
Diffstat (limited to 'sci-visualization/opendx')
-rw-r--r-- | sci-visualization/opendx/ChangeLog | 9 | ||||
-rw-r--r-- | sci-visualization/opendx/Manifest | 48 | ||||
-rw-r--r-- | sci-visualization/opendx/files/20-opendx-revdep | 1 | ||||
-rw-r--r-- | sci-visualization/opendx/files/opendx-4.4.4-magick.patch | 90 | ||||
-rw-r--r-- | sci-visualization/opendx/opendx-4.4.4-r4.ebuild | 27 |
5 files changed, 131 insertions, 44 deletions
diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog index 59b71f014105..e3bd77b42385 100644 --- a/sci-visualization/opendx/ChangeLog +++ b/sci-visualization/opendx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-visualization/opendx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.26 2012/02/15 10:24:29 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.27 2012/08/01 23:21:41 bicatali Exp $ + + 01 Aug 2012; SĂ©bastien Fabbro <bicatali@gentoo.org> + +files/opendx-4.4.4-magick.patch, -files/20-opendx-revdep, + opendx-4.4.4-r4.ebuild: + Build for newer imagemagick and add possibility for graphicsmagick as well, + fixing bug #314375. Keyword for x86-linux, switch to EAPI 4 15 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> opendx-4.4.4-r4.ebuild: Add prefix love. Thanks to Richard Yao <ryao@cs.stonybrook.edu> for the patch. @@ -217,4 +223,3 @@ opendx-4.3.2.ebuild: Initial commit to close #22217. Ebuild by myself and Patrick Kursawe <phosphan@gentoo.org>. - diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest index 5ba7b373414e..7368b9406e02 100644 --- a/sci-visualization/opendx/Manifest +++ b/sci-visualization/opendx/Manifest @@ -1,35 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX 20-opendx-revdep 44 RMD160 9b68b96b8f513a78a51249c7705d93d665bb3d2b SHA1 9389ea70249fe8149a33944a07466dddc9c1ae8d SHA256 fa96c22f9e7870a60c27c02cceb6bb3782d40c07ac53f19d7be7941a12347a01 -AUX opendx-4.3.2-sys.h.patch 1200 RMD160 f3658ac7fd0582b69ab32df5cc23d77f8d5364c8 SHA1 b4eed91d8ad2df57241a74d4ef8452ad0d171296 SHA256 919299f0fbb6e9891a8792641ea58720ae6bb95d4ffc3f6a20cae7b8e2d1729b -AUX opendx-4.4.4-concurrent-make-fix.patch 2388 RMD160 b30b7aa12a3d8c36b90e7d0fd4eb653a828203ee SHA1 786d37fda67bc4cb0ef96f2fbaac927123432658 SHA256 7ce46d4fe5dda470d4a165409de8c69c1bcda1a065ecf782dbe8e1b28ee88dcf -AUX opendx-4.4.4-dx-errno.patch 340 RMD160 39928c8d031394cf59dd6dd06d25f26cd56482b7 SHA1 7be653fb8303a49a5788dee27323192c2127d199 SHA256 046fdd113d0c3c48b2c0efabe11423539e0ab8b0d567df2acfff93f5864ea7e4 -AUX opendx-4.4.4-gcc43.patch 13310 RMD160 b98f8034d26db8440be8c8e02a06aaf24fb7030a SHA1 513a64535c04da9ab65db6b89318002171ef2e4c SHA256 8ca2296f7c36f0dd7dbaf185b3fdf68ea40a09695aaca6c0f65d3970286d225d -AUX opendx-4.4.4-installpaths.patch 11983 RMD160 3ced98143e298e3059dc542bed263e8edac68c5e SHA1 a5ac4b02aa044dec46098594bd1de8e0a9263f4e SHA256 57c8e3654353f759728b9b2ca7665fa04a354bad13f0c2015e270d1f22ccdffd -AUX opendx-4.4.4-libtool.patch 319 RMD160 2b501064b72e84f791ee3c3b3ac3bd83d6fd0de7 SHA1 6548dae81cb9fdf83f2a0a1095851ef40578de0e SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f -AUX opendx-4.4.4-null.patch 584 RMD160 f1a9e2f1446ec2272ea82a16493af11e7a4cd31c SHA1 0d981e396918f1462040b44678f0b3c1ffa8098f SHA256 99edc0c8ef8e87adce6d0453449e15d3b2d134b686daf6ba56caa458c03816c2 -AUX opendx-4.4.4-open.patch 1671 RMD160 9c4ba9d2735049c841c32ab2efa2d778ce80044a SHA1 f59ba51b5e301f4bf20512835adadd3c65f2fd29 SHA256 0b0cbc06ecc8e44d32f16000c6ee2c09b70b7cfbf44ee71a50165dad19314403 -AUX opendx-4.4.4-szip.patch 1482 RMD160 67bef3dade274ac78011bc23913dd8b7724ee13d SHA1 edfb38bb5c73d340716dc6e8ccd01eea0ee5de1a SHA256 c330e0fc642d4f5004fd3173532e2f7223499dc612be298a53b41f423b021a23 -AUX opendx-4.4.4-xdg.patch 785 RMD160 ee1a8bce4a352c7bf3335f5e13bd81664f3fd7c3 SHA1 001cb1ee444631926b43857aac137ce2d9336ba2 SHA256 93e50b0da16f3d28c016fa95ee49530322e83f8527b45abd7415bb14365600c1 -DIST dx-4.4.4.tar.gz 9676049 RMD160 db4cff78c9712a6e1e19265b0f42fdb87ab5ff7b SHA1 c8e4d72d169675c66acd2135599b211d80810f76 SHA256 a9915e17d49c5499edd3df69ffeac0b7ba24f8b38ddf7509712b48eb3c21f1ff -EBUILD opendx-4.4.4-r4.ebuild 2113 RMD160 a00ab4fa86fc46cc7f24ec34886cf23b002c8fb1 SHA1 340d964a1626c671bff78d4a2ac367f14b94d6a8 SHA256 68072a247ac3ea6ab17d221ac7897ca24856a9d758b39ff3397d9c49f7827117 -MISC ChangeLog 8685 RMD160 212cc4f44b54edce4959d368a761e2015bc425fe SHA1 25589297bab0b9dba1becb51743ece1bab49971d SHA256 f2688210c91afc265111009acf77bf0a156824b4eaadf829beb9750a9f1ba997 -MISC metadata.xml 944 RMD160 a70f0044d99e34217b361798981ef884b5bf251c SHA1 3627f383255130427eb1d73a43b563e409cb781a SHA256 c5b382e449be53cd96ad290e8ef5085368b4c6f49f81b23dd6c9f899114bc972 +AUX opendx-4.3.2-sys.h.patch 1200 SHA256 919299f0fbb6e9891a8792641ea58720ae6bb95d4ffc3f6a20cae7b8e2d1729b SHA512 b874bea7a7470b14c9e91e1b5e361316cffa9d5af6391510eaa7ba1377de897519f62bf95f422b0b0f74ba29c84e14a9bb73c79d34bf66618fdb67b574a7f89e WHIRLPOOL 3c0c33fde7dd510e21c6efe973558f3bef18415819b48a300ca213030f803e20f7918ffe5bbd12b31b5faa2fd448111e924078173a270780b42fbedd5a5a761a +AUX opendx-4.4.4-concurrent-make-fix.patch 2388 SHA256 7ce46d4fe5dda470d4a165409de8c69c1bcda1a065ecf782dbe8e1b28ee88dcf SHA512 738f567f19710a746e23bf4f9b76c5b20420008f9bad7d297ca74d45b65ac8766228387db5d77b214ebe6e87ab88d13bfc798dfcbf668cfd246d392fb0deb898 WHIRLPOOL a5c038c8e1a87d6a662920ead4eb3d88836c31d942b158e4f3c73d585bc553d4dbc3d5f97fbbddb1c9417ed8ffc5b34d40f97880e8c2cbeb9dd945e7fc49c0d5 +AUX opendx-4.4.4-dx-errno.patch 340 SHA256 046fdd113d0c3c48b2c0efabe11423539e0ab8b0d567df2acfff93f5864ea7e4 SHA512 9a23d0fd98b7e70202032e09a2ccd04f54b13331f03b83c2de61dc63d009a921b892ce1f7570f15d834471f16fb3c23bfaa28b66db86104d7a8c205aee5456b3 WHIRLPOOL 363f5eaccfa14c04ccf4b58fe1f359d97cec8079e6eacc9bfabf2bd817c2f9e261cbef2f09c4989e903ce61bb3835a83d1eccc2eb7419097db2bb887391dfc92 +AUX opendx-4.4.4-gcc43.patch 13310 SHA256 8ca2296f7c36f0dd7dbaf185b3fdf68ea40a09695aaca6c0f65d3970286d225d SHA512 b61e2cf13092b72f0e575491ceabadf00158a58f0af7d09d28858f96b06d2d6062c025e527b89c3860d945608554a318c00415d6153af6f70792bb5504ec3945 WHIRLPOOL 3bf6e8b49a438751b00a28c030a07474b5f692ea79e077d8cb4df5622abd083f18fa782bcc954100017194db376bc520ab05c889d482a2824cd549aa0ffbaef4 +AUX opendx-4.4.4-installpaths.patch 11983 SHA256 57c8e3654353f759728b9b2ca7665fa04a354bad13f0c2015e270d1f22ccdffd SHA512 a06e21431540138a412ad80168d493495cc2808b2d677efc1055b40875610b94e2089dc58f1d1b693eae590e35c95281d17fcaa9af322e3638dccc6d003c5cff WHIRLPOOL cf6809ede03896cee459c06eb745b97e0902c69f18658cfd42f5c6e59fee0f80e67ff02cd69bb786a66613adb8b338fbee7c9b93f0fc5fcf79c708e79d2faaae +AUX opendx-4.4.4-libtool.patch 319 SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f SHA512 a98d7a19f1e9c096bc9e7ffdfb9e7a6237bf3599a4f6c29aa3994a0c91653e7369626e86ea69f0d32d6b6dcecb9bc889a888fcddde81d9ca52272be49e957864 WHIRLPOOL 690aa67d6c4f12c1aa146394563ed0b68f8ee809d27e1eba47ae5ab885a46377157a47c89ad806fadbb8cb0fafe4173fdfadb37f5bc3058ca05b3974d8c606e6 +AUX opendx-4.4.4-magick.patch 2863 SHA256 0a26b46f72fe354026c0175c85ad762c0ce2d18ad5279a62331bb24a64926ce7 SHA512 e7c35a68768bd58015dbb0d705c4ea82ec09306b5b3e738d45ab4a20fa3ae30b2372c12af55470e59d2b44b3a1bc9bf7bb11289b8c4127b41242772f5ccbcf97 WHIRLPOOL 8b4d284b17ac51bd625b4ca5afc4068613d66bcf24c02f2bf5225b4697c7cfedbb4b794c53a51ebc490f69601c3ada3a32cdb14926042016edd8f3ef862cde1f +AUX opendx-4.4.4-null.patch 584 SHA256 99edc0c8ef8e87adce6d0453449e15d3b2d134b686daf6ba56caa458c03816c2 SHA512 9af10aebd267b181be4ade5009987cffaeabc5e1ff68343e63f836722098ffffa813a8b0c6c514b088221dbb5c4a654dd3a756449069fa0ef8edebc8cffb35b5 WHIRLPOOL 16b8ef20ef47badcbc8a594997215edee83667180dac273f05aeeee38d8758cd83b1539c1857dd47c4a588838e91f1bac89e0338f220cfaac3a47be872e71778 +AUX opendx-4.4.4-open.patch 1671 SHA256 0b0cbc06ecc8e44d32f16000c6ee2c09b70b7cfbf44ee71a50165dad19314403 SHA512 a35889802f28fc7fa91e887c8c8fc9fc6c7757c877e7469f1b01835de2c8c59c3f29a52e3dc6f30587dfd45f30b0783679273af28820c0120c28733dfed12a38 WHIRLPOOL 69f8a246ed2b91203457219040fd40cddc389955ebddeb0665d7a590052e244a115f9b86ce602584b1dde844df848a3abaf7ed5d71d54b4907e48ba67236b5bb +AUX opendx-4.4.4-szip.patch 1482 SHA256 c330e0fc642d4f5004fd3173532e2f7223499dc612be298a53b41f423b021a23 SHA512 2805e914729d06e50fc3c4a5f05bba77f4f26fd3419e1439fc0ae0d16805cfa7934ede9a3af47cad4cb571f9d3ebd0087d9d9bfb91615d51f31647131ff75b9e WHIRLPOOL 86d2f930baacf5ab68400fb7ebc170b9af9005e3e061bb2f06fe44b11ffefd4d6cdd2fd025f19b48af3c7e61de306fe321c832a396c894363f3146a9721847d9 +AUX opendx-4.4.4-xdg.patch 785 SHA256 93e50b0da16f3d28c016fa95ee49530322e83f8527b45abd7415bb14365600c1 SHA512 8aa9dd05fa2d6fe90b85db8b0676cecb0c183cccc6bd229b4c8f5527eff9c23749c1ba8eafdd9baba16bb97ce5d6acfbac41a70ac4dc896b88cfad95c771d793 WHIRLPOOL 43b906145f324230d8255a746a66ebf4c99aef9df65325f857d302f5161f13fd9836666a3af4a8e05977e2f9e139fe80946801a533ae145384f772163431cb28 +DIST dx-4.4.4.tar.gz 9676049 SHA256 a9915e17d49c5499edd3df69ffeac0b7ba24f8b38ddf7509712b48eb3c21f1ff SHA512 e6ef0075a696c442fd4615eb32b9ebd3f85728321a33297e3402b19bbc6210953a6599d643fc0a20bc349fbc72411326c69187223ee0e65560603d8e6f7527ee WHIRLPOOL 6d6931fabfb054ff06464649b2b2ce5f094aa6d0c28f0f2e6ee22176ef4749d78f102ed9d0c27cf3c84ea10038d4502d908ec7a95a597d32f21574b277a54fa0 +EBUILD opendx-4.4.4-r4.ebuild 2135 SHA256 3b621059374caaaf0987fdeff62142154f0124d8c77066e82051dd036c9c0ecb SHA512 be0b2684035ba714744a86ee423a59bfa8e5a2488380cc40ba58cd85ae2043eda8aa4a808e3fc57c7dcdc1ec47225950eca3ab27c172caa0915fa5b6627794c5 WHIRLPOOL cd8e82c7c16aefcef6a23a83424ed13b8a7f8298932002640456b8e1a61578e8fe9a9b8d04ef86631e0bdea75e742430f43441867ff01a0369193ceba9818f97 +MISC ChangeLog 8965 SHA256 439135a47e9e5ce4832b37d3c39e9d88bfb4af61c1cb8fed8b0eceafd947fb3a SHA512 b01fe1a22163dc4e9756de31c605602ed1e90831112c633ad191728887f27145d8eaf7d7aee72137099f7b17fae0566eee8e1814b5ce5a94bcbf038dafe9066b WHIRLPOOL 83a15704265070c9f61e558ab50e6d73b72499dd7b85f740892d86c3b2bca59645ac2c6f79eecc7e6844232839b55f14aa8847142bb43a07647cc67ba6372d83 +MISC metadata.xml 944 SHA256 c5b382e449be53cd96ad290e8ef5085368b4c6f49f81b23dd6c9f899114bc972 SHA512 43133bc016658001ce1e520b7e1eed7cce39860a8a2e6d70a28f6975de93207c9ef2cf1af359b4aaacdb1fe4f7499e1a062a19d229f4ad0930c6f378a0d28307 WHIRLPOOL 6551af1bef56c6d76708959ae99d60394f9b9c6a096a154210f52d315da9ec059a2f6246aef039e9f57e6cfab709b1e5f9eb7440d87e4639f4bbd5e6e4f2fa2a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJPO4fmAAoJEF0huFKJUZL5Yn4P/3QuxS4+ldf3kbSwR4al6Gm8 -ZJD819ELNifE/5bE5y1PPyR1IniwpAxi06tTI4YaXpzBy8LWGMQj4YRqxRmMqNqW -Z7d7kbwRZxQyemtYnpedsoGWvYobSTc8JAKYBOZTBEUJ8TeM3ohyk7aoTL4Dmy9P -1lhKUsOXZAl53E7CD03tWRC9IloO8xzP0u6sU8i6eMqYeGWofX1S9XVmWG0RKRv8 -nx7NpNYiy75rmv0Sr8Z8yGzDUqnc+aWwCF4LMYo9SIlGEvtWAq6Lv55vpHFsEc5J -2DuRjWBNsLaaXc78xji06x/l9OVfHtpAgecB73UpFzFogB7mBtYIxbdD9PTgwwo8 -33qduC0pQogCzsfMcxkvMlOdAWb3tZVuhoZKmNLjX04VMYzw8dk3vLjhDy8KAnrP -wIPTj8g3Bk9A3RIz8RSur90FaTYPxxWJbiQYBrodqm8rAMEkbrG3QQQTVp1LCKmO -wI9hFDsYYq+P8WoV8JdtyIgaflEc+Xbp54PKEMF4/kWIoR1Sc9pjEjUOkHsoBSLs -id1JOb5Rcaq+ULnA97DoUfg5wQNVMZcLg1PGX0GMnQzZkeh9uw2fKHTd6cZjTJB2 -kewBaGMlZry7CuCg1zvJWZzMdfKPlfo+V9DdclaOR90ObN0BdrWrJ+zfIBVmwOVe -vj+I4u0WtpiUhfTPr4x5 -=HqIa +iEYEAREIAAYFAlAZug4ACgkQ1ycZbhPLE2APigCfRm0P1bzq16FQf4SfD6H6frLS +/iAAn2KWTydNbVo7ECu+VjDW8BG4w+Ta +=/BQR -----END PGP SIGNATURE----- diff --git a/sci-visualization/opendx/files/20-opendx-revdep b/sci-visualization/opendx/files/20-opendx-revdep deleted file mode 100644 index f1d735116233..000000000000 --- a/sci-visualization/opendx/files/20-opendx-revdep +++ /dev/null @@ -1 +0,0 @@ -SEARCH_DIRS="/usr/dx/bin /usr/dx/bin_linux" diff --git a/sci-visualization/opendx/files/opendx-4.4.4-magick.patch b/sci-visualization/opendx/files/opendx-4.4.4-magick.patch new file mode 100644 index 000000000000..5b50470970c3 --- /dev/null +++ b/sci-visualization/opendx/files/opendx-4.4.4-magick.patch @@ -0,0 +1,90 @@ +newer magick libraries, use pkg-config, add possibility to link with +graphicsmagick, fix for as-needed + +--- dx-4.4.4.orig/src/exec/dxmods/_im_image.c ++++ dx-4.4.4/src/exec/dxmods/_im_image.c +@@ -329,7 +329,7 @@ + DestroyImageInfo(new_frame_info); + DestroyImageInfo(image_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + DXSetError(ERROR_INTERNAL, "reason = %s, description = %s", + image->exception.reason, +@@ -346,7 +346,7 @@ + DestroyImageInfo(new_frame_info); + DestroyImageInfo(image_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c"); + } +@@ -375,7 +375,7 @@ + DestroyImageInfo(image_info); + DestroyImageInfo(new_frame_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + + DEBUGMESSAGE("back from DestroyImage"); +@@ -491,7 +491,7 @@ + DestroyImage(image); + DestroyImageInfo(image_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + } + return (OK); +--- dx-4.4.4.orig/configure.ac ++++ dx-4.4.4/configure.ac +@@ -799,7 +799,29 @@ + LIB_MAGICK='' + if test "$with_magick" != 'no' + then +- AS_MESSAGE([checking for ImageMagick support ......]) ++ found=0 ++ static_lib="libGraphicsMagick.a" ++ PKG_CHECK_MODULES(GraphicsMagick, GraphicsMagick, [found=1], [found=0]) ++ MAGICK_CFLAGS="$GraphicsMagick_CFLAGS" ++ MAGICK_LIBS="$GraphicsMagick_LIBS" ++ if test $found -eq 0 ++ then ++ static_lib="libMagick.a" ++ PKG_CHECK_MODULES(ImageMagick, ImageMagick, [found=1], [found=0]) ++ MAGICK_CFLAGS="$ImageMagick_CFLAGS" ++ MAGICK_LIBS="$ImageMagick_LIBS" ++ fi ++ if test $found -eq 1 ++ then ++ CFLAGS="$CFLAGS $MAGICK_CFLAGS" ++dnl UNIQUIFY will remove duplicate library tokens leaving the last instance. ++ AC_UTILS_UNIQUIFY([$LIBS $MAGICK_LIBS], LIBS) ++ FMT_LIBS="$FMT_LIBS $static_lib" ++ AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries]) ++ have_magick='yes' ++dnl legacy checks installations without pkg-config ++ else ++ AS_MESSAGE([checking for ImageMagick support (no pkg-config) ......]) + AC_CHECK_PROG(HAVE_MC, Magick-config, yes, no) + + failed=0; +@@ -866,6 +888,7 @@ + fi + fi + fi ++fi + + AC_LANG([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a = true;]])], +--- dx-4.4.4.orig/src/exec/dxmods/Makefile.am ++++ dx-4.4.4/src/exec/dxmods/Makefile.am +@@ -113,4 +113,5 @@ + $(SOURCES6) \ + $(SOURCES7) + ++libDXMODS_la_LIBADD = @MAGICK_LIBS@ + @LOCALMAKE@ diff --git a/sci-visualization/opendx/opendx-4.4.4-r4.ebuild b/sci-visualization/opendx/opendx-4.4.4-r4.ebuild index 1baab9056dca..b3c8be124950 100644 --- a/sci-visualization/opendx/opendx-4.4.4-r4.ebuild +++ b/sci-visualization/opendx/opendx-4.4.4-r4.ebuild @@ -1,21 +1,22 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4-r4.ebuild,v 1.9 2012/02/15 10:24:29 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4-r4.ebuild,v 1.10 2012/08/01 23:21:41 bicatali Exp $ -EAPI=3 +EAPI=4 -inherit eutils flag-o-matic autotools +MYP=dx-${PV} +inherit eutils flag-o-matic autotools multilib -DESCRIPTION="A 3D data visualization tool" +DESCRIPTION="3D data visualization tool" HOMEPAGE="http://www.opendx.org/" -SRC_URI="http://opendx.sdsc.edu/source/${P/open}.tar.gz" +SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz" LICENSE="IBM" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" IUSE="hdf cdf netcdf tiff imagemagick szip smp" -DEPEND="x11-libs/libXmu +RDEPEND="x11-libs/libXmu x11-libs/libXi x11-libs/libXp x11-libs/libXpm @@ -27,11 +28,12 @@ DEPEND="x11-libs/libXmu cdf? ( sci-libs/cdf ) netcdf? ( sci-libs/netcdf ) tiff? ( media-libs/tiff ) - imagemagick? ( >=media-gfx/imagemagick-5.3.4 )" -RDEPEND="${DEPEND}" -# waiting on bug #36349 for media-libs/jasper in imagemagick + imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )" -S=${WORKDIR}/${P/open} +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${MYP}" src_prepare() { epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch" @@ -44,6 +46,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-open.patch" epatch "${FILESDIR}/${P}-szip.patch" epatch "${FILESDIR}/${P}-null.patch" + epatch "${FILESDIR}/${P}-magick.patch" eautoreconf } @@ -74,7 +77,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + default newicon src/uipp/ui/icon50.xpm ${PN}.xpm make_desktop_entry dx "Open Data Explorer" } |