Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: e96be28aceb719800b719ae04c1d6b85e109e786
  foo-overlay: f7749549a67741868fbb3da8781e42cbac533fa7
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: b22e1805524bc8ed122ae4c2ea41593f9c6cec62
  mythtv: 232ca207c520eb294db060a770aafd30ffa25afb
  • Loading branch information...
commit b88c2f7d2145900f4653fd95ae4ac1d6210f686f 1 parent 07a0ce4
@danielrobbins danielrobbins authored
Showing with 3,494 additions and 1,062 deletions.
  1. +1 −0  app-arch/pixz/Manifest
  2. +42 −0 app-arch/pixz/pixz-1.0.2.ebuild
  3. +4 −4 app-arch/pixz/pixz-9999.ebuild
  4. +3 −3 app-portage/gentoopm/gentoopm-0.2.6.ebuild
  5. +3 −3 app-portage/gentoopm/gentoopm-0.2.7.ebuild
  6. +3 −3 app-portage/gentoopm/gentoopm-9999.ebuild
  7. +3 −3 app-portage/smart-live-rebuild/smart-live-rebuild-1.3.ebuild
  8. +3 −3 app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
  9. +1 −0  dev-lang/gprolog/Manifest
  10. +40 −0 dev-lang/gprolog/files/gprolog-1.4.2-ldflags.patch
  11. +16 −0 dev-lang/gprolog/files/gprolog-1.4.2-links.patch
  12. +30 −0 dev-lang/gprolog/files/gprolog-1.4.2-nodocs.patch
  13. +11 −0 dev-lang/gprolog/files/gprolog-1.4.2-txt-file.patch
  14. +67 −0 dev-lang/gprolog/gprolog-1.4.2.ebuild
  15. +1 −0  dev-lang/tcl/Manifest
  16. +112 −0 dev-lang/tcl/tcl-8.6.0.ebuild
  17. +1 −0  dev-lang/tk/Manifest
  18. +135 −0 dev-lang/tk/tk-8.6.0.ebuild
  19. +2 −0  dev-libs/nss/Manifest
  20. +243 −0 dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch
  21. +212 −0 dev-libs/nss/nss-3.14.1.ebuild
  22. +0 −1  dev-ruby/metasploit_data_models/metadata.xml
  23. +13 −1 .../metasploit_data_models/{metasploit_data_models-0.3.1.ebuild → metasploit_data_models-0.3.1-r1.ebuild}
  24. +1 −0  dev-ruby/robots/Manifest
  25. +11 −0 dev-ruby/robots/metadata.xml
  26. +20 −0 dev-ruby/robots/robots-0.10.1.ebuild
  27. +2 −3 dev-tcltk/blt/blt-2.4z-r10.ebuild
  28. +123 −0 dev-tcltk/blt/blt-2.4z-r11.ebuild
  29. +20 −0 dev-tcltk/blt/files/blt-2.4z-tk8.6.patch
  30. +1 −1  dev-tcltk/blt/metadata.xml
  31. +1 −0  dev-tcltk/itcl/Manifest
  32. +57 −0 dev-tcltk/itcl/itcl-4.0.0.ebuild
  33. +1 −1  dev-tcltk/itcl/metadata.xml
  34. +1 −0  dev-tcltk/thread/Manifest
  35. +1 −1  dev-tcltk/thread/metadata.xml
  36. +47 −0 dev-tcltk/thread/thread-2.7.0.ebuild
  37. +1 −0  dev-vcs/hub/Manifest
  38. +27 −0 dev-vcs/hub/hub-1.10.4.ebuild
  39. +11 −0 dev-vcs/hub/metadata.xml
  40. +4 −2 games-server/crossfire-server/Manifest
  41. +40 −0 games-server/crossfire-server/crossfire-server-1.70.0.ebuild
  42. +0 −10 games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch
  43. +0 −11 games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch
  44. +313 −0 media-libs/freeimage/files/freeimage-3.15.3-r1-unbundling.patch
  45. +639 −0 media-libs/freeimage/files/freeimage-3.15.3-r2-unbundling.patch
  46. +92 −0 media-libs/freeimage/freeimage-3.15.3-r1.ebuild
  47. +99 −0 media-libs/freeimage/freeimage-3.15.3-r2.ebuild
  48. +3 −6 media-libs/libraw/Manifest
  49. +2 −2 media-libs/libraw/libraw-0.14.7.ebuild
  50. +0 −63 media-libs/libraw/libraw-0.15.0_beta1.ebuild
  51. +3 −3 media-libs/libraw/{libraw-0.15.0_beta2.ebuild → libraw-0.15.0_beta3.ebuild}
  52. +3 −3 media-plugins/vdr-mplayer/Manifest
  53. +6 −6 media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild
  54. +1 −1  metadata/dtd/timestamp.chk
  55. +1 −1  metadata/glsa/timestamp.chk
  56. +13 −0 metadata/md5-cache/app-arch/pixz-1.0.2
  57. +1 −1  metadata/md5-cache/app-arch/pixz-9999
  58. +2 −2 metadata/md5-cache/app-portage/gentoopm-0.2.6
  59. +2 −2 metadata/md5-cache/app-portage/gentoopm-0.2.7
  60. +1 −1  metadata/md5-cache/app-portage/gentoopm-9999
  61. +2 −2 metadata/md5-cache/app-portage/smart-live-rebuild-1.3
  62. +1 −1  metadata/md5-cache/app-portage/smart-live-rebuild-9999
  63. +11 −0 metadata/md5-cache/dev-lang/gprolog-1.4.2
  64. +12 −0 metadata/md5-cache/dev-lang/tcl-8.6.0
  65. +14 −0 metadata/md5-cache/dev-lang/tk-8.6.0
  66. +13 −0 metadata/md5-cache/dev-libs/nss-3.14.1
  67. +1 −1  metadata/md5-cache/dev-ruby/{metasploit_data_models-0.3.1 → metasploit_data_models-0.3.1-r1}
  68. +14 −0 metadata/md5-cache/dev-ruby/robots-0.10.1
  69. +1 −1  metadata/md5-cache/dev-tcltk/blt-2.4z-r10
  70. +13 −0 metadata/md5-cache/dev-tcltk/blt-2.4z-r11
  71. +13 −0 metadata/md5-cache/dev-tcltk/itcl-4.0.0
  72. +14 −0 metadata/md5-cache/dev-tcltk/thread-2.7.0
  73. +14 −0 metadata/md5-cache/dev-vcs/hub-1.10.4
  74. +14 −0 metadata/md5-cache/games-server/crossfire-server-1.70.0
  75. +13 −0 metadata/md5-cache/media-libs/freeimage-3.15.3-r1
  76. +13 −0 metadata/md5-cache/media-libs/freeimage-3.15.3-r2
  77. +2 −2 metadata/md5-cache/media-libs/libraw-0.14.7
  78. +0 −13 metadata/md5-cache/media-libs/libraw-0.15.0_beta1
  79. +3 −3 metadata/md5-cache/media-libs/{libraw-0.15.0_beta2 → libraw-0.15.0_beta3}
  80. +3 −3 metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
  81. +0 −14 metadata/md5-cache/sys-cluster/openmpi-1.5.5
  82. +0 −14 metadata/md5-cache/sys-cluster/openmpi-1.6-r1
  83. +0 −14 metadata/md5-cache/sys-cluster/openmpi-1.6.1
  84. +0 −14 metadata/md5-cache/sys-cluster/openmpi-1.6.2
  85. +4 −4 metadata/md5-cache/sys-fs/exfat-utils-0.9.8
  86. +5 −5 metadata/md5-cache/sys-fs/fuse-exfat-0.9.8-r1
  87. +0 −13 metadata/md5-cache/www-client/firefox-17.0.1
  88. +13 −0 metadata/md5-cache/www-client/firefox-17.0.2
  89. +13 −0 metadata/md5-cache/www-client/firefox-18.0
  90. +0 −13 metadata/md5-cache/www-client/seamonkey-2.12.1
  91. +13 −0 metadata/md5-cache/www-client/seamonkey-2.15
  92. +14 −0 metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.17
  93. +1 −1  metadata/news/timestamp.chk
  94. +1 −1  metadata/timestamp
  95. +1 −1  metadata/timestamp.chk
  96. +1 −1  metadata/timestamp.x
  97. +3 −0  sci-libs/fftw/metadata.xml
  98. +0 −4 sys-cluster/openmpi/Manifest
  99. +0 −160 sys-cluster/openmpi/openmpi-1.5.5.ebuild
  100. +0 −159 sys-cluster/openmpi/openmpi-1.6-r1.ebuild
  101. +0 −159 sys-cluster/openmpi/openmpi-1.6.1.ebuild
  102. +0 −158 sys-cluster/openmpi/openmpi-1.6.2.ebuild
  103. +9 −5 sys-fs/exfat-utils/exfat-utils-0.9.8.ebuild
  104. +27 −0 sys-fs/exfat-utils/files/exfat-utils-0.9.8-build-vars.patch
  105. +27 −0 sys-fs/fuse-exfat/files/fuse-exfat-0.9.8-build-vars.patch
  106. +11 −8 sys-fs/fuse-exfat/fuse-exfat-0.9.8-r1.ebuild
  107. +174 −87 www-client/firefox/Manifest
  108. +4 −4 www-client/firefox/{firefox-17.0.1.ebuild → firefox-17.0.2.ebuild}
  109. +371 −0 www-client/firefox/firefox-18.0.ebuild
  110. +28 −29 www-client/seamonkey/Manifest
  111. +41 −27 www-client/seamonkey/{seamonkey-2.12.1.ebuild → seamonkey-2.15.ebuild}
  112. +1 −0  x11-drivers/xf86-video-intel/Manifest
  113. +65 −0 x11-drivers/xf86-video-intel/xf86-video-intel-2.20.17.ebuild
View
1  app-arch/pixz/Manifest
@@ -1 +1,2 @@
+DIST pixz-1.0.2.zip 24418 SHA256 10464b3f974867982d45af66d5b29ae360952d327677400d6d1dde480a14ed9d SHA512 033078412acab9ad49913133e4dc41e2069253d0dec35006c263988e5db823be232c6a83722b847e25b8535a4801439b2e7b8434fecfb4d5025a6b2a539cce8e WHIRLPOOL 975a06ae05eb4d8335b36ca3a987669d92c06f7730418f8776e4aa7f12d22bb919414457a195cf677afb63fb97d8fe00c4ea0c886ee027995fba97b589a272a4
DIST pixz-1.0.tar.gz 17736 SHA256 912c60de88f7eca2e1c6fe13eec5371f723018dca933796c47cd50bf6a349fc9 SHA512 5b0df7ed8ff4c54ffe899decd1f0874aa7a0245cd4968f416c457508583c9048f483592ac933620b2325815052803508a2bf0d70ab679333288e5249c0dbc5c2 WHIRLPOOL 5b6ea1fc5d66ccab4bf07ecf291c6110abc73dc46ced312eb564c7bad950052d4f214563df72bb04eb2d723f0b1b1ece71c2aa59d3d4a2fa480b4fb740cdbb98
View
42 app-arch/pixz/pixz-1.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-1.0.2.ebuild,v 1.1 2013/01/09 21:30:13 zerochaos Exp $
+
+EAPI=4
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Parallel Indexed XZ compressor"
+HOMEPAGE="https://github.com/vasi/pixz"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/vasi/pixz.git"
+ inherit git-2
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/vasi/${PN}/archive/v${PV}.zip -> ${P}.zip"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="static"
+
+LIB_DEPEND=">=app-arch/libarchive-2.8[static-libs(+)]
+ >=app-arch/xz-utils-5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+
+src_configure() {
+ use static && append-ldflags -static
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" OPT=""
+}
+
+src_install() {
+ dobin pixz
+ dodoc README TODO
+}
View
8 app-arch/pixz/pixz-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-9999.ebuild,v 1.3 2012/12/06 03:09:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-9999.ebuild,v 1.4 2013/01/09 21:30:13 zerochaos Exp $
EAPI=4
@@ -14,8 +14,8 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
KEYWORDS=""
else
- SRC_URI="mirror://github/vasi/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ SRC_URI="https://github.com/vasi/${PN}/archive/v${PV}.zip -> ${P}.zip"
+ KEYWORDS="~amd64 ~arm ~x86"
fi
LICENSE="BSD-2"
View
6 app-portage/gentoopm/gentoopm-0.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.6.ebuild,v 1.7 2012/12/17 20:02:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.6.ebuild,v 1.8 2013/01/09 21:38:33 zerochaos Exp $
EAPI=5
PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
@@ -13,7 +13,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~mips x86 ~amd64-fbsd ~x86-fbsd"
IUSE="doc"
RDEPEND="|| (
View
6 app-portage/gentoopm/gentoopm-0.2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.7.ebuild,v 1.2 2012/12/17 20:02:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.7.ebuild,v 1.3 2013/01/09 21:38:33 zerochaos Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="doc"
RDEPEND="|| (
View
6 app-portage/gentoopm/gentoopm-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-9999.ebuild,v 1.2 2012/12/17 20:02:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-9999.ebuild,v 1.3 2013/01/09 21:38:33 zerochaos Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
@@ -20,7 +20,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="doc"
RDEPEND="|| (
View
6 app-portage/smart-live-rebuild/smart-live-rebuild-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.ebuild,v 1.4 2012/12/31 23:18:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.ebuild,v 1.5 2013/01/09 21:40:28 zerochaos Exp $
EAPI=5
PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
@@ -13,7 +13,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~mips x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
View
6 app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild,v 1.2 2012/12/17 20:02:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild,v 1.3 2013/01/09 21:40:28 zerochaos Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
@@ -18,7 +18,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
View
1  dev-lang/gprolog/Manifest
@@ -1,2 +1,3 @@
DIST gprolog-1.4.0.tar.gz 3239624 SHA256 804a2fdd980d8ed9ba0b5e45e24aaad5e4ca08f67a532ea2b3813b9f8d99c6d0 SHA512 2e541b311ee9c156c1d6f60f3697267bd9959ebc41ab5a73519485c34e8f7ebe1cdda06c1c9e0c10d88a30d31ddc8e59838b1cfeb6dba3057a712a2547d7eead WHIRLPOOL bd016deec281414d92c12295df59a86be4f07ecb5c995f34bacc8986be61819f24d440775092e6f93116a3f084059788360b1e910e9d48f344a6cff2c997d309
DIST gprolog-1.4.1.tar.gz 3273781 SHA256 e2819ed9c426138d3191e4d97ae5121cf97e132eecf102400f87f1e372a05b72 SHA512 fb7cc456de4a4dcce77ce94cdfe58dad0f21f1d71907b8e2247353e9910e1c62c7d49f407c60094ce4ecd039005da2039fa683997273b67919a7e515d0f6fe71 WHIRLPOOL 345561d76f10c74b1ed171d0626f5e95e797fd40dc6b167554c1969b7eb13200ab778b46d72754eb8b2e34fc14b441c54a3b6d1b2bea0ea3fe5d04043db7a0ca
+DIST gprolog-1.4.2.tar.gz 3358528 SHA256 d5856a5b6a0f237db4b09264861898ef5b55339dd2798cc4333190cf9f604578 SHA512 b93eb522e1aacac08b347b84d0d82d146ae29b7331754f71f02a89bfab3038a1f5c40dbc936118edfddb8ea07e44e3283b2130756d2027b0a90467a45506dc84 WHIRLPOOL f5b82c68208ad85640f48b1910e40ae774788c11e114af8258911b6a8b2d3df3f36a49e03d79a5393e331ab843d52ee7eecbdf0b90986e0dbce2ea1a668e9ef9
View
40 dev-lang/gprolog/files/gprolog-1.4.2-ldflags.patch
@@ -0,0 +1,40 @@
+diff -ur gprolog-1.4.2.orig/src/Ma2Asm/Makefile.in gprolog-1.4.2/src/Ma2Asm/Makefile.in
+--- gprolog-1.4.2.orig/src/Ma2Asm/Makefile.in 2012-01-10 18:24:39.000000000 +0100
++++ gprolog-1.4.2/src/Ma2Asm/Makefile.in 2013-01-09 20:07:58.000000000 +0100
+@@ -19,7 +19,7 @@
+
+ ma2asm@EXE_SUFFIX@: ma2asm@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@ \
+ ma2asm_inst@OBJ_SUFFIX@ ma2asm_inst.c
+- $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
++ $(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
+
+
+ clean:
+diff -ur gprolog-1.4.2.orig/src/TopComp/Makefile.in gprolog-1.4.2/src/TopComp/Makefile.in
+--- gprolog-1.4.2.orig/src/TopComp/Makefile.in 2012-01-10 18:24:39.000000000 +0100
++++ gprolog-1.4.2/src/TopComp/Makefile.in 2013-01-09 20:07:58.000000000 +0100
+@@ -15,10 +15,10 @@
+
+ $(GPLC)@EXE_SUFFIX@: top_comp.c copying.c ../EnginePl/wam_regs.h \
+ ../EnginePl/gp_config.h ../EnginePl/machine1.c decode_hexa.c copying.c prolog_path.c
+- $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
++ $(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
+
+ $(HEXGPLC)@EXE_SUFFIX@: hexfilter.c decode_hexa.c
+- $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
++ $(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
+
+
+
+diff -ur gprolog-1.4.2.orig/src/Wam2Ma/Makefile.in gprolog-1.4.2/src/Wam2Ma/Makefile.in
+--- gprolog-1.4.2.orig/src/Wam2Ma/Makefile.in 2012-01-10 18:24:38.000000000 +0100
++++ gprolog-1.4.2/src/Wam2Ma/Makefile.in 2013-01-09 20:07:58.000000000 +0100
+@@ -12,7 +12,7 @@
+ $(CC) $(CFLAGS) -c wam2ma.c
+
+ wam2ma@EXE_SUFFIX@: wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
+- $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
++ $(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
+
+
+ clean:
View
16 dev-lang/gprolog/files/gprolog-1.4.2-links.patch
@@ -0,0 +1,16 @@
+diff -ur gprolog-1.4.2.orig/src/Makefile.in gprolog-1.4.2/src/Makefile.in
+--- gprolog-1.4.2.orig/src/Makefile.in 2012-10-02 17:55:53.000000000 +0200
++++ gprolog-1.4.2/src/Makefile.in 2013-01-09 20:09:59.000000000 +0100
+@@ -81,10 +81,10 @@
+
+ # --- Links --- #
+
+-install-links: uninstall-links
++install-links:
+ if test $(LINKS_DIR) != none; then \
+ ./mkinstalldirs $(LINKS_DIR); \
+- (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
++ (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) $(INSTALL_DIR)/bin/$$i .; done); \
+ fi
+
+ uninstall-links:
View
30 dev-lang/gprolog/files/gprolog-1.4.2-nodocs.patch
@@ -0,0 +1,30 @@
+diff -ur gprolog-1.4.2.orig/src/Makefile.in gprolog-1.4.2/src/Makefile.in
+--- gprolog-1.4.2.orig/src/Makefile.in 2012-10-02 17:55:53.000000000 +0200
++++ gprolog-1.4.2/src/Makefile.in 2013-01-09 20:11:14.000000000 +0100
+@@ -97,7 +97,7 @@
+ # --- Documentation --- #
+
+ install-doc:
+- if test $(DOC_DIR) != none; then \
++ if test $(DOC_DIR) != $(DESTDIR)none; then \
+ ./mkinstalldirs $(DOC_DIR); \
+ (F=`cd ../doc; echo $(DOC_FILES)`; \
+ for i in $$F; do $(INSTALL_DATA) ../doc/$$i $(DOC_DIR); done); \
+@@ -113,7 +113,7 @@
+ # --- HTML --- #
+
+ install-html:
+- if test $(HTML_DIR) != none; then \
++ if test $(HTML_DIR) != $(DESTDIR)none; then \
+ ./mkinstalldirs $(HTML_DIR); \
+ (F=`cd ../doc/html_node; echo $(HTML_FILES)`; \
+ for i in $$F; do $(INSTALL_DATA) ../doc/html_node/$$i $(HTML_DIR); done); \
+@@ -129,7 +129,7 @@
+ # --- Examples --- #
+
+ install-examples:
+- if test $(EXAMPLES_DIR) != none; then \
++ if test $(EXAMPLES_DIR) != $(DESTDIR)none; then \
+ ./mkinstalldirs $(EXAMPLES_DIR)/ExamplesPl; \
+ (F=`cd ../examples/ExamplesPl; echo $(EXPL_FILES)`; \
+ for i in $$F; do $(INSTALL_DATA) ../examples/ExamplesPl/$$i $(EXAMPLES_DIR)/ExamplesPl; done); \
View
11 dev-lang/gprolog/files/gprolog-1.4.2-txt-file.patch
@@ -0,0 +1,11 @@
+diff -ur gprolog-1.4.2.orig/src/Makefile.in gprolog-1.4.2/src/Makefile.in
+--- gprolog-1.4.2.orig/src/Makefile.in 2012-10-02 17:55:53.000000000 +0200
++++ gprolog-1.4.2/src/Makefile.in 2013-01-09 20:12:15.000000000 +0100
+@@ -60,7 +60,6 @@
+ install-system:
+ ./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
+ $(INSTALL_DIR)/include $(INSTALL_DIR)/lib
+- for i in $(TXT_FILES); do $(INSTALL_DATA) ../$$i $(INSTALL_DIR); done
+ for i in $(BIN_FILES); do $(INSTALL_PROGRAM) */$$i $(INSTALL_DIR)/bin; done
+ for i in $(OBJ_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
+ for i in $(LIB_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
View
67 dev-lang/gprolog/gprolog-1.4.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.2.ebuild,v 1.1 2013/01/09 19:18:26 keri Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="GNU Prolog is a native Prolog compiler with constraint solving over finite domains (FD)"
+HOMEPAGE="http://www.gprolog.org/"
+SRC_URI="mirror://gnu/gprolog/${P}.tar.gz"
+S="${WORKDIR}"/${P}
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-ldflags.patch
+ epatch "${FILESDIR}"/${P}-links.patch
+ epatch "${FILESDIR}"/${P}-nodocs.patch
+ epatch "${FILESDIR}"/${P}-txt-file.patch
+}
+
+src_configure() {
+ CFLAGS_MACHINE="`get-flag -march` `get-flag -mcpu` `get-flag -mtune`"
+
+ append-flags -fno-strict-aliasing
+ use debug && append-flags -DDEBUG
+
+ if gcc-specs-pie ; then
+ # gplc generates its own native ASM; disable PIE
+ append-ldflags -nopie
+ fi
+
+ cd "${S}"/src
+ econf \
+ CFLAGS_MACHINE="${CFLAGS_MACHINE}" \
+ --with-c-flags="${CFLAGS}" \
+ --with-install-dir=/usr/$(get_libdir)/${P} \
+ --with-links-dir=/usr/bin \
+ $(use_with doc doc-dir /usr/share/doc/${PF}) \
+ $(use_with doc html-dir /usr/share/doc/${PF}/html) \
+ $(use_with examples examples-dir /usr/share/doc/${PF}/examples)
+}
+
+src_compile() {
+ cd "${S}"/src
+ emake
+}
+
+src_test() {
+ cd "${S}"/src
+ emake check
+}
+
+src_install() {
+ cd "${S}"/src
+ emake DESTDIR="${D}" install
+
+ cd "${S}"
+ dodoc ChangeLog NEWS PROBLEMS README VERSION
+}
View
1  dev-lang/tcl/Manifest
@@ -2,3 +2,4 @@ DIST tcl8.4.19-src.tar.gz 3658647 SHA256 1c244722fb409e8774c5d45d6a0b21edc3e4541
DIST tcl8.5.10-src.tar.gz 4498413 SHA256 f582063edd5419a39ee8f7b5c8f95d557b5daad13efb0ed2f0967ca185613bb7 SHA512 d48c5e74e1dcdae92cf71d9f557eee581fadbc552b458d50034d412a07434b58a3302f64d4ef0af91e92cab10f3f86a18cd64bc9e5be906e1807f40cc20cb344 WHIRLPOOL 0e7d2ae1a275c1f0e669beaf5a55dceced34829f43c0e3e275e1cbb99b4fd2325a1fa43993959dcbed2abd27d6317a0eca2702115068a2d35ebacda9d5e56a8c
DIST tcl8.5.11-src.tar.gz 4484001 SHA256 8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a SHA512 1696a3375de2f1ee436d475ada39c6d3c2aac4128bf7c0410650cbecdc11dddb77282c4fe2882692e50c70cdbe3b2dd9970082b812c3b2c27d34f76de2776bfc WHIRLPOOL ff3b40952fccac2e5f82f7adbd1e9aaf25ea4f665947cb569ae0c1809558325ec3c8b72027a71ca5174bbf95a6a531eedfe29b6892bbfd777fb9ad2397720b39
DIST tcl8.5.13-src.tar.gz 4513204 SHA256 9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a SHA512 e1c9f36dd0e1afd81f42d249fe0191f10d6e0eab73042e32c9c0af09063ebf19bc2a24364743fa7b6798c588e77fa81654e6e7eb7591e1aaf4b222e20ecc6c84 WHIRLPOOL f1c1b67508c5d5c85de7d76d075a577ef14b5df05ca5bb0a0d0d78261134e8d85accb82a27f135877585820d52f0d363ebde74cfd890dbfafbf3766985315b61
+DIST tcl8.6.0-src.tar.gz 8636908 SHA256 354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade SHA512 ea64d2bb5b37b55bc424c759c67b5624e7d9a13b8bede744fd635cf668ff9e4a8681e41d94849f6c0a3564ee177268cbc3e5f287448b5a93179098d678e321f8 WHIRLPOOL 20266218a014df4c0b4661cab8040354e9643c8b305bf62f36e7ba7cbaba93d5d5d860324c2f461da8cee45a06150f13f830e0b07e8d5d0b4f5536b59f68fdb8
View
112 dev-lang/tcl/tcl-8.6.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.0.ebuild,v 1.1 2013/01/09 20:10:24 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug +threads"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+src_prepare() {
+ find \
+ "${SPARENT}"/{compat,pkgs}/* \
+ "${SPARENT}"/doc/try.n \
+ -delete || die
+
+ epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+ # Bug 125971
+ epatch "${FILESDIR}"/${PN}-8.5.13-conf.patch
+
+ # Bug 354067
+ epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
+
+ # workaround stack check issues, bug #280934
+ use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+ tc-export CC
+
+ sed \
+ -e 's:-O2::g' \
+ -e 's:-O::g' \
+ -i tcl.m4 || die
+
+ eautoconf
+}
+
+src_configure() {
+ econf \
+ --with-encoding=utf8 \
+ $(use_enable threads) \
+ $(use_enable debug symbols)
+}
+
+src_install() {
+ #short version number
+ local v1=$(get_version_component_range 1-2)
+ local mylibdir=$(get_libdir)
+
+ S= default
+
+ # fix the tclConfig.sh to eliminate refs to the build directory
+ # and drop unnecessary -L inclusion to default system libdir
+
+ sed \
+ -e "/^TCL_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+ -e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+ -e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+ -e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+ -e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+ -e "/^TCL_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
+ -e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+ -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+ if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+ sed \
+ -e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+ -e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+ -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+ fi
+
+ # install private headers
+ insinto /usr/${mylibdir}/tcl${v1}/include/unix
+ doins "${S}"/*.h
+ insinto /usr/${mylibdir}/tcl${v1}/include/generic
+ doins "${SPARENT}"/generic/*.h
+ rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+ # install symlink for libraries
+ dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+ dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+ dosym tclsh${v1} /usr/bin/tclsh
+
+ dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+}
+
+pkg_postinst() {
+ for version in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 8.6 ${version}; then
+ echo
+ ewarn "You're upgrading from <${P}, you must recompile the other"
+ ewarn "packages on your system that link with tcl after the upgrade"
+ ewarn "completes. To perform this action, please run revdep-rebuild"
+ ewarn "in package app-portage/gentoolkit."
+ ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
+ ewarn "upgrade them before this recompilation, too,"
+ echo
+ fi
+ done
+}
View
1  dev-lang/tk/Manifest
@@ -2,3 +2,4 @@ DIST tk8.4.19-src.tar.gz 3362694 SHA256 d056fe6c204ac31539616e1069522dd5864a580b
DIST tk8.5.10-src.tar.gz 3807862 SHA256 f6ac59a3414a0989c9ca30237b3c14ceee95733eb486739ffc271c8055e37c9f SHA512 c5261dabd12994d6f5eeab1b13aaab53c846608bf33a73b5d92a38868ba4a2c386fe28ec903347d00186266a75646a418fdd9705e7a41e7e6d46e7928067ae72 WHIRLPOOL f73cc598c84b9ad2210c9618827cf49b977b0ca79efca13c948cfc70ad85b3c34b929e6471e8101376252be22ab63994c22ad8e619b77919c0fd1810c3e9105c
DIST tk8.5.11-src.tar.gz 3809826 SHA256 d35810b33a0931656f1d128e7e0776cc0c4d8b9c72af322cab5a7ee30485eb70 SHA512 c00cc0cdaafbee24d104fb55c90f61143090ad38b47cc5e77e724638ac357dce83417da3adeca7afc881262cd145b286ad5e9957e53338639f2b2426a81750ec WHIRLPOOL adf52b59e26a9458cf47e2acf90ec1cd3d0b072829b96fb1473cfb2a7fa40fadc393fce884a3262e881a77c66b5b4ef1fab0d084a65b1ca8a712a9f4f3122ca1
DIST tk8.5.13-src.tar.gz 4086092 SHA256 9e83ba2704ad73a65986eb7cdc51e432a5db6eca8d8691e33caceef40ed0c563 SHA512 5b705026d3d80c35bd60311c3df5489a7970c1648f98d843d6ee57c9336de5e63aed488f670f15f2c0bffccbc2402cc98c383c057b7d86f1db4c36340e34e209 WHIRLPOOL e523bfa0ce407f4d5157df7fee93c6d60012bf5b46a4cbd4e4692ad0ce872650563d12db11bfa94ba19b0a5aad1ef9fdd4b02dfb11f0de253839c69adb26a718
+DIST tk8.6.0-src.tar.gz 4239836 SHA256 5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6 SHA512 e78c3f3a8dacd6c1aaa4587f7e4e2a2a6a5adf3957c89bf450cea82d85701242729ccf6232cef71138685926f6a44fe683aa6425d0c4738326637e88b3d9e38d WHIRLPOOL 8344adaa74913eb3dd13d8240a451ebdfe0225a67ea7516e18d4a3920b2e448380c53fe6d2916e36518b3e9b02df0e15c41c9e1a6f1ca30f1b6790a408fdf30b
View
135 dev-lang/tk/tk-8.6.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.6.0.ebuild,v 1.1 2013/01/09 20:38:08 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +threads truetype aqua xscreensaver"
+
+RDEPEND="
+ !aqua? (
+ media-libs/fontconfig
+ x11-libs/libX11
+ x11-libs/libXt
+ truetype? ( x11-libs/libXft )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ )
+ ~dev-lang/tcl-${PV}"
+DEPEND="${RDEPEND}
+ !aqua? ( x11-proto/xproto )"
+
+# Not bumped to 8.6
+RESTRICT=test
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+src_prepare() {
+ find \
+ "${SPARENT}"/compat/* \
+ -delete || die
+
+ epatch \
+ "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
+ "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+ epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
+ eprefixify Makefile.in
+
+ # Bug 125971
+ epatch "${FILESDIR}"/${PN}-8.5.13-conf.patch
+
+ # Bug 354067 : the same applies to tcl, since the patch is about tcl.m4, just
+ # copy the tcl patch
+ epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch
+
+ # Make sure we use the right pkg-config, and link against fontconfig
+ # (since the code base uses Fc* functions).
+ sed \
+ -e 's/FT_New_Face/XftFontOpen/g' \
+ -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+ -e 's:xft freetype2:xft freetype2 fontconfig:' \
+ -i configure.in || die
+ rm -f configure || die
+
+ tc-export CC
+
+ sed \
+ -e 's:-O2::g' \
+ -e 's:-O::g' \
+ -i tcl.m4 || die
+
+ eautoconf
+}
+
+src_configure() {
+ local mylibdir=$(get_libdir)
+
+ econf \
+ --with-tcl="${EPREFIX}/usr/${mylibdir}" \
+ $(use_enable threads) \
+ $(use_enable aqua) \
+ $(use_enable truetype xft) \
+ $(use_enable xscreensaver xss) \
+ $(use_enable debug symbols)
+}
+
+src_test() {
+ Xemake test
+}
+
+src_install() {
+ #short version number
+ local v1=$(get_version_component_range 1-2)
+ local mylibdir=$(get_libdir)
+
+ S= default
+
+ # normalize $S path, bug #280766 (pkgcore)
+ local nS="$(cd "${S}"; pwd)"
+
+ # fix the tkConfig.sh to eliminate refs to the build directory
+ # and drop unnecessary -L inclusion to default system libdir
+
+ sed \
+ -e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+ -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+ -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
+ -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+ -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+ -e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
+ -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+ if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+ sed \
+ -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+ -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+ fi
+
+ # install private headers
+ insinto /usr/${mylibdir}/tk${v1}/include/unix
+ doins "${S}"/*.h
+ insinto /usr/${mylibdir}/tk${v1}/include/generic
+ doins "${SPARENT}"/generic/*.h
+ rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
+
+ # install symlink for libraries
+ dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+ dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+ dosym wish${v1} /usr/bin/wish
+
+ dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+}
View
2  dev-libs/nss/Manifest
@@ -9,4 +9,6 @@ DIST nss-3.13.5.tar.gz 6087983 SHA256 ee8b995ebc971308a5bc8b50eb391cd925d6ee7c5e
DIST nss-3.13.6-add_spi+cacerts_ca_certs.patch 70095 SHA256 66779b7c64f0f71662f29f8127f78eac086b1415778872cdbfdf3017bacbca9f SHA512 3aaf7671a179e28f2bb80a9d9f753337e15ed46df97724a9517c58f436b4e835815b974de9344bb422326b0625de52e6444523b37f36d4bdcda0a05e9839ce4c WHIRLPOOL 48bd80ffef3ca7f007f02f654cb33e7887bd4b5ce91e5ef2b9c88ca888aeda5ce8d02f41c4ed38b553ade572256fbf84a42de87814c5e6b4252950bd2555a74a
DIST nss-3.13.6.tar.gz 6109538 SHA256 f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0 SHA512 45bc254eb238ea23fdd8d2c9128a22cebe15fda9ed5c9c1d112b5756d4d2b76e7f3a99d3600254bdcd6eeb18bda224d52e676e169207193798200f0d41baa29d WHIRLPOOL 8172b4a29a513ed931d8b9c5b72270e448282ff7454ea8aea9fba23e667f8c76417861f3f716857ba05e38f0ee940fc21d86d7343e1ffc780a849c37929b94aa
DIST nss-3.14-add_spi+cacerts_ca_certs.patch 52742 SHA256 15ed527acdf49922fcfab624c8d796d908e65217f40887963bb2457c7e1585cd SHA512 60f1123d98ebd0f6f5d03f5f9accd77e4a2e287be576a1d339902ee5f6b5e3ddfb6e4c96260c4a1902e5b89fed5865c8f5fa721105868ef11c204e845f591a8c WHIRLPOOL 2dfa0738ab7b15493c3935a9d8297dc9734b8f12895373e58853c84c2257d4f0145a5600081da4d63e0f59341a8756d366fe1b5ce6214c54e91aabe2ef76f3e5
+DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
+DIST nss-3.14.1.tar.gz 5814063 SHA256 80a5d4872da13d0272636ad04e1beddcf8d4572bcc0d47dbea1d12fb592fb7e5 SHA512 f62a7ebcdade8815379f80929c63de1284c3ca3f5c87214cb5b327f6689635118d301969d4ef0e1940c7a426253b13ce54acd68a91abc23ab32626341217580e WHIRLPOOL 8b292433ec764cfe857bd7cb25c216905b785c536176ece14571c9e7017a93c7a8562502645d71eed7da9f5cc52c65564c294a8a2b75ea43bda19049d6c393bb
DIST nss-3.14.tar.gz 6068755 SHA256 b01868959d50263265aacc5a09f9a9eefbbde5f35604c2977f9714696f1d3e2b SHA512 c5aba091fddcdd57a8cda879a90cf05eeacedf5d734be8eaaec9051aaa6c468b0c8b9816db3cb864859702f90f49fd37971eca98754763b778dcd5fb3d1f7358 WHIRLPOOL b795c55c4dcb7878c4e887b6dc52213d1c31e09ea969df0d8b642b1010b5900c8734de70287141be2ca93a77631b312e68e9e781689f158bb104c501882046ae
View
243 dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch
@@ -0,0 +1,243 @@
+diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile
+--- a/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ b/mozilla/security/nss/config/Makefile 2012-12-15 07:27:20.650148987 -0600
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ../..
++DEPTH = ../..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++ # Create the nss.pc file
++ mkdir -p $(DIST)/lib/pkgconfig
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@exec_prefix@,\$${prefix}," \
++ -e "s,@libdir@,\$${prefix}/gentoo/nss," \
++ -e "s,@includedir@,\$${prefix}/include/nss," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss.pc.in > nss.pc
++ chmod 0644 nss.pc
++ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
++
++ # Create the nss-config script
++ mkdir -p $(DIST)/bin
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss-config.in > nss-config
++ chmod 0755 nss-config
++ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in
+--- a/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600
++++ b/mozilla/security/nss/config/nss-config.in 2012-12-15 07:27:20.651148959 -0600
+@@ -0,0 +1,145 @@
++#!/bin/sh
++
++prefix=@prefix@
++
++major_version=@NSS_MAJOR_VERSION@
++minor_version=@NSS_MINOR_VERSION@
++patch_version=@NSS_PATCH_VERSION@
++
++usage()
++{
++ cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++ [--prefix[=DIR]]
++ [--exec-prefix[=DIR]]
++ [--includedir[=DIR]]
++ [--libdir[=DIR]]
++ [--version]
++ [--libs]
++ [--cflags]
++Dynamic Libraries:
++ nss
++ ssl
++ smime
++ nssutil
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_ssl=yes
++lib_smime=yes
++lib_nss=yes
++lib_nssutil=yes
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix=$optarg
++ ;;
++ --prefix)
++ echo_prefix=yes
++ ;;
++ --exec-prefix=*)
++ exec_prefix=$optarg
++ ;;
++ --exec-prefix)
++ echo_exec_prefix=yes
++ ;;
++ --includedir=*)
++ includedir=$optarg
++ ;;
++ --includedir)
++ echo_includedir=yes
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ ;;
++ --libdir)
++ echo_libdir=yes
++ ;;
++ --version)
++ echo ${major_version}.${minor_version}.${patch_version}
++ ;;
++ --cflags)
++ echo_cflags=yes
++ ;;
++ --libs)
++ echo_libs=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ nssutil)
++ lib_nssutil=yes
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++ exec_prefix=`pkg-config --variable=exec_prefix nss`
++fi
++if test -z "$includedir"; then
++ includedir=`pkg-config --variable=includedir nss`
++fi
++if test -z "$libdir"; then
++ libdir=`pkg-config --variable=libdir nss`
++fi
++
++if test "$echo_prefix" = "yes"; then
++ echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++ echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++ echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++ echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++ echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++ libdirs="-Wl,-R$libdir -L$libdir"
++ if test -n "$lib_ssl"; then
++ libdirs="$libdirs -lssl${major_version}"
++ fi
++ if test -n "$lib_smime"; then
++ libdirs="$libdirs -lsmime${major_version}"
++ fi
++ if test -n "$lib_nss"; then
++ libdirs="$libdirs -lnss${major_version}"
++ fi
++ if test -n "$lib_nssutil"; then
++ libdirs="$libdirs -lnssutil${major_version}"
++ fi
++ echo $libdirs
++fi
++
+diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in
+--- a/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
++++ b/mozilla/security/nss/config/nss.pc.in 2012-12-15 07:27:20.651148959 -0600
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3
++Cflags: -I${includedir}
++
+diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile
+--- a/mozilla/security/nss/Makefile 2012-11-13 19:14:07.000000000 -0600
++++ b/mozilla/security/nss/Makefile 2012-12-15 07:27:57.235162137 -0600
+@@ -44,7 +44,7 @@
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
+-nss_build_all: build_coreconf build_nspr build_dbm all
++nss_build_all: build_coreconf build_dbm all
+
+ nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
+
+@@ -106,12 +106,6 @@
+ --with-dist-prefix='$(NSPR_PREFIX)' \
+ --with-dist-includedir='$(NSPR_PREFIX)/include'
+
+-build_nspr: $(NSPR_CONFIG_STATUS)
+- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
+-
+-clobber_nspr: $(NSPR_CONFIG_STATUS)
+- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber
+-
+ build_dbm:
+ ifdef NSS_DISABLE_DBM
+ @echo "skipping the build of DBM"
+diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn
+--- a/mozilla/security/nss/manifest.mn 2012-03-20 09:46:49.000000000 -0500
++++ b/mozilla/security/nss/manifest.mn 2012-12-15 07:27:20.652148933 -0600
+@@ -10,6 +10,6 @@
+
+ RELEASE = nss
+
+-DIRS = lib cmd
++DIRS = lib cmd config
View
212 dev-libs/nss/nss-3.14.1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.1.ebuild,v 1.1 2013/01/09 23:07:36 anarchy Exp $
+
+EAPI=3
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+NSPR_VER="4.9.2"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+ http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch
+ http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3_pem.support"
+
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="utils"
+
+DEPEND="virtual/pkgconfig
+ >=dev-libs/nspr-${NSPR_VER}"
+
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}
+ >=dev-db/sqlite-3.5
+ sys-libs/zlib"
+
+src_setup() {
+ export LC_ALL="C"
+}
+
+src_prepare() {
+ # Custom changes for gentoo
+ epatch "${FILESDIR}/${PN}-3.14.1-gentoo-fixups.patch"
+ epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch"
+ epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
+ epatch "${DISTDIR}/${PN}-3.13.3_pem.support"
+ epatch "${FILESDIR}/${PN}-3.13.5-x32.patch"
+
+ cd "${S}"/mozilla/security/coreconf || die
+ # hack nspr paths
+ echo 'INCLUDES += -I'"${EPREFIX}"'/usr/include/nspr -I$(DIST)/include/dbm' \
+ >> headers.mk || die "failed to append include"
+
+ # modify install path
+ sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+ -i source.mk || die
+
+ # Respect LDFLAGS
+ sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die
+
+ # Ensure we stay multilib aware
+ sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib"
+
+ # Fix pkgconfig file for Prefix
+ sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+ "${S}"/mozilla/security/nss/config/Makefile || die
+
+ epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch"
+
+ # dirty hack
+ cd "${S}"/mozilla/security/nss || die
+ sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+ lib/ssl/config.mk || die
+ sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+ cmd/platlibs.mk || die
+}
+
+src_compile() {
+ strip-flags
+
+ echo > "${T}"/test.c || die
+ $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+ case $(file "${T}"/test.o) in
+ *32-bit*x86-64*) export USE_x32=1;;
+ *64-bit*|*ppc64*|*x86_64*) export USE_64=1;;
+ *32-bit*|*ppc*|*i386*) ;;
+ *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+ esac
+
+ export NSPR_INCLUDE_DIR=`nspr-config --includedir`
+ export NSPR_LIB_DIR=`nspr-config --libdir`
+ export BUILD_OPT=1
+ export NSS_USE_SYSTEM_SQLITE=1
+ export NSDISTMODE=copy
+ export NSS_ENABLE_ECC=1
+ export XCFLAGS="${CFLAGS}"
+ export FREEBL_NO_DEPEND=1
+ export ASFLAGS=""
+
+ cd "${S}"/mozilla/security/coreconf || die
+ emake -j1 CC="$(tc-getCC)" || die "coreconf make failed"
+ cd "${S}"/mozilla/security/dbm || die
+ emake -j1 CC="$(tc-getCC)" || die "dbm make failed"
+ cd "${S}"/mozilla/security/nss || die
+ emake -j1 CC="$(tc-getCC)" || die "nss make failed"
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+# */${local_libdir}/libfreebl3.so*
+# */${local_libdir}/libnssdbm3.so*
+# */${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+ local shlibsign="$1"
+ local libdir="$2"
+ einfo "Resigning core NSS libraries for FIPS validation"
+ shift 2
+ for i in ${NSS_CHK_SIGN_LIBS} ; do
+ local libname=lib${i}.so
+ local chkname=lib${i}.chk
+ "${shlibsign}" \
+ -i "${libdir}"/${libname} \
+ -o "${libdir}"/${chkname}.tmp \
+ && mv -f \
+ "${libdir}"/${chkname}.tmp \
+ "${libdir}"/${chkname} \
+ || die "Failed to sign ${libname}"
+ done
+}
+
+cleanup_chk() {
+ local libdir="$1"
+ shift 1
+ for i in ${NSS_CHK_SIGN_LIBS} ; do
+ local libfname="${libdir}/lib${i}.so"
+ # If the major version has changed, then we have old chk files.
+ [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+ && rm -f "${libfname}.chk"
+ done
+}
+
+src_install () {
+ MINOR_VERSION=12
+ cd "${S}"/mozilla/security/dist || die
+
+ dodir /usr/$(get_libdir) || die
+ cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+ # We generate these after stripping the libraries, else they don't match.
+ #cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed"
+ cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+
+ # Install nss-config and pkgconfig file
+ dodir /usr/bin || die
+ cp -L */bin/nss-config "${ED}"/usr/bin || die
+ dodir /usr/$(get_libdir)/pkgconfig || die
+ cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+ # all the include files
+ insinto /usr/include/nss
+ doins public/nss/*.h || die
+ cd "${ED}"/usr/$(get_libdir) || die
+ local n=
+ for file in *$(get_libname); do
+ n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
+ mv ${file} ${n} || die
+ ln -s ${n} ${file} || die
+ if [[ ${CHOST} == *-darwin* ]]; then
+ install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
+ fi
+ done
+
+ local nssutils
+ # Always enabled because we need it for chk generation.
+ nssutils="shlibsign"
+ if use utils; then
+ # The tests we do not need to install.
+ #nssutils_test="bltest crmftest dbtest dertimetest
+ #fipstest remtest sdrtest"
+ nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
+ cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
+ nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
+ pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
+ symkeyutil tstclnt vfychain vfyserv"
+ fi
+ cd "${S}"/mozilla/security/dist/*/bin/ || die
+ for f in $nssutils; do
+ dobin ${f} || die
+ done
+
+ # Prelink breaks the CHK files. We don't have any reliable way to run
+ # shlibsign after prelink.
+ declare -a libs
+ for l in ${NSS_CHK_SIGN_LIBS} ; do
+ libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
+ done
+ OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}"
+ echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss" || die
+ unset libs liblist
+ doenvd "${T}/90nss" || die
+}
+
+pkg_postinst() {
+ # We must re-sign the libraries AFTER they are stripped.
+ generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir)
+}
+
+pkg_postrm() {
+ cleanup_chk "${EROOT}"/usr/$(get_libdir)
+}
View
1  dev-ruby/metasploit_data_models/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ruby</herd>
<maintainer>
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
View
14 ...odels/metasploit_data_models-0.3.1.ebuild → ...ls/metasploit_data_models-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/metasploit_data_models/metasploit_data_models-0.3.1.ebuild,v 1.2 2013/01/09 04:29:39 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/metasploit_data_models/metasploit_data_models-0.3.1-r1.ebuild,v 1.1 2013/01/10 02:58:34 zerochaos Exp $
EAPI=5
@@ -24,3 +24,15 @@ IUSE=""
#ruby_add_bdepend "test? ( dev-ruby/rails dev-ruby/pry )"
ruby_add_rdepend ">=dev-ruby/activerecord-3.2.10[postgres]"
+
+each_ruby_install() {
+ ruby_fakegem_install_gemspec
+
+ local _gemlibdirs="${RUBY_FAKEGEM_EXTRAINSTALL}"
+ for directory in app bin lib script spec; do
+ [[ -d ${directory} ]] && _gemlibdirs="${_gemlibdirs} ${directory}"
+ done
+
+ [[ -n ${_gemlibdirs} ]] && \
+ ruby_fakegem_doins -r ${_gemlibdirs}
+}
View
1  dev-ruby/robots/Manifest
@@ -0,0 +1 @@
+DIST robots-0.10.1.gem 10752 SHA256 5adaa171721570a5aa8a82e2e6f20d22248627821eb741ff6d8089cc60dc2f90 SHA512 57d5619e172961128c7e2f4175f299ecde28615680dc9fa2721ab86053515da46cae03b03dbdbf9a03a96387a361eefb013a7b3c3b3e61a26592ec4998d10bc5 WHIRLPOOL 7b154117287686f6da10143381fa510525c4fe3e0e91740926e53db45b1554ffa7a5cfe5aae62edb6a32d983323b3646833b71d8a508550f380b12393c104f3d
View
11 dev-ruby/robots/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>zerochaos@gentoo.org</email>
+<name>Rick Farina</name>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
View
20 dev-ruby/robots/robots-0.10.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/robots/robots-0.10.1.ebuild,v 1.1 2013/01/10 04:23:23 zerochaos Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="The database layer for Metasploit"
+HOMEPAGE="https://rubygems.org/gems/robots"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
View
5 dev-tcltk/blt/blt-2.4z-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r10.ebuild,v 1.15 2012/12/05 07:22:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r10.ebuild,v 1.16 2013/01/09 21:27:59 jlec Exp $
EAPI="3"
@@ -79,7 +79,6 @@ src_configure() {
--with-gnu-ld \
$(use_enable jpeg) \
$(use_with X x)
-
}
src_compile() {
View
123 dev-tcltk/blt/blt-2.4z-r11.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r11.ebuild,v 1.1 2013/01/09 21:27:59 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_V_SUFFIX="-8.5.2"
+
+DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
+HOMEPAGE="
+ http://blt.sourceforge.net/
+ http://jos.decoster.googlepages.com/bltfortk8.5.2"
+SRC_URI="
+ http://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz
+ http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
+
+IUSE="jpeg static-libs X"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+ dev-lang/tk
+ jpeg? ( virtual/jpeg )
+ X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+ epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch"
+ epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
+ # From blt-2.4z-6mdk.src.rpm
+ epatch "${FILESDIR}"/blt2.4z-64bit.patch
+
+ #epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fix.patch
+ epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
+
+ epatch "${FILESDIR}"/${P}-ldflags.patch
+
+ # Set the correct libdir and drop RPATH
+ sed \
+ -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
+ -e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \
+ -e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \
+ -i configure* || die "sed configure* failed"
+ sed \
+ -e "/^scriptdir =/s:lib:$(get_libdir):" \
+ -i Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
+
+ sed \
+ -e "/AR/s:ar:$(tc-getAR):g" \
+ -i src/Makefile.in || die
+
+ epatch \
+ "${FILESDIR}"/${P}-linking.patch \
+ "${FILESDIR}"/${P}-darwin.patch \
+ "${FILESDIR}"/${P}-gbsd.patch \
+ "${FILESDIR}"/${P}-tk8.6.patch
+
+ append-cflags -DUSE_INTERP_RESULT -fPIC
+}
+
+src_configure() {
+ LC_ALL=C \
+ econf \
+ --x-includes="${EPREFIX}/usr/include" \
+ --x-libraries="${EPREFIX}/usr/$(get_libdir)" \
+ --with-blt="${EPREFIX}/usr/$(get_libdir)" \
+ --with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+ --with-tk="${EPREFIX}/usr/$(get_libdir)" \
+ --with-tclincls="${EPREFIX}/usr/include" \
+ --with-tkincls="${EPREFIX}/usr/include" \
+ --with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
+ --with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
+ --with-cc="$(tc-getCC)" \
+ --with-cflags="${CFLAGS}" \
+ --with-gnu-ld \
+ $(use_enable jpeg) \
+ $(use_with X x)
+}
+
+src_compile() {
+ # parallel borks
+ emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ sed \
+ -e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+ -e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+ -e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+ -e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
+ -i demos/{,scripts/}*.tcl || die
+
+ dodir /usr/bin \
+ /usr/$(get_libdir)/blt2.4/demos/bitmaps \
+ /usr/share/man/mann \
+ /usr/include
+
+ emake INSTALL_ROOT="${D}" install || die "make install failed"
+
+ dodoc NEWS PROBLEMS README
+ dohtml html/*.html
+ for f in `ls "${ED}"/usr/share/man/mann` ; do
+ mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt}
+ done
+
+ # bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
+ cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
+
+ # fix for linking against shared lib with -lBLT or -lBLTlite
+ dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
+ dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname)
+
+ use static-libs || \
+ find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \
+ xargs -r -0 rm -fv
+}
View
20 dev-tcltk/blt/files/blt-2.4z-tk8.6.patch
@@ -0,0 +1,20 @@
+--- src/tkButton.c.orig 2013-01-04 23:24:45.000000000 -0500
++++ src/tkButton.c 2013-01-04 23:28:29.000000000 -0500
+@@ -526,8 +526,6 @@
+ static Blt_TileChangedProc TileChangedProc;
+ static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd;
+
+-EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char *script));
+-
+ #if (TK_MAJOR_VERSION > 4)
+ EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin,
+ int padX, int padY, int innerWidth, int innerHeight, int *xPtr,
+@@ -1890,7 +1888,7 @@
+ }
+ }
+ if ((butPtr->type != TYPE_LABEL) && (butPtr->command != NULL)) {
+- return TkCopyAndGlobalEval(butPtr->interp, butPtr->command);
++ return Tcl_EvalObjEx(butPtr->interp, butPtr->command, TCL_EVAL_GLOBAL);
+ }
+ return TCL_OK;
+ }
View
2  dev-tcltk/blt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>tcltk</herd>
+ <herd>tcltk</herd>
</pkgmetadata>
View
1  dev-tcltk/itcl/Manifest
@@ -1,2 +1,3 @@
DIST itcl3.4.1.tar.gz 263316 SHA256 5330832ce72da97610497a58eca904287d0ff91f9ec741a4e4810d5b933c8568 SHA512 288c9b636f1814371bedd33d570a8d46055e136953685a111b76f3b89a6c7aaa1ee9223ceaae1c5ce43198195cb1adc2b178d7c4101d7fd14cb7e756c98bf2b0 WHIRLPOOL c513678bfef5f76b875af68d0bf97fd86b9a9673bb87efbb295dc3faa9a8b011c4c34ed6eddbf648f11b804656e6c99103e8f0ea2c06abc5b1c308b1a5df78cc
DIST itcl3.4b1.tar.gz 306342 SHA256 dc99fcf6c00b00774dbfb94ccc437ea3e6315a198645b6d2acf8acba8fdb4608 SHA512 230776b5d14b57b63fb4e93f7bb5bc5cfa9532a5dba286cefae02d2c5fa58566cea12d8d62303eaa5797e956d3534acc8a9015c18555f925bb72e32362e7e241 WHIRLPOOL 02b32ba77f6e9eb520929abcb4a1dbc11e782793903da757bf4189788224faf218279380d557ed9ba36c24e8e6cd57a9821c4985153bfa9f7281daa19637a476
+DIST itcl4.0.0.tar.gz 409850 SHA256 facbe365c6bc769429255e253f456a5c78ad5c13da720fcd43adc1efc2200869 SHA512 130fcc712c7a319b524dfca0e1f622233d8bd93aaea7d19538daa9ad366ae421e9b2c75473ccb22ec02a548afb0c4cbe794536804d68940bcba0cf555f778543 WHIRLPOOL 62ff53beccf567049f83b249b4eb93a380465eb8de52e4c1f7574948d7e348f29479f22704a57993e574f2ef86942abeb004007e0abf3f9aed0502c6d4b4dd82
View
57 dev-tcltk/itcl/itcl-4.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-4.0.0.ebuild,v 1.1 2013/01/09 21:59:12 jlec Exp $
+
+EAPI=4
+
+inherit eutils multilib versionator
+
+MY_P="${PN}${PV}"
+TCL_VER="8.6.0"
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+HOMEPAGE="http://incrtcl.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/tcl/Tcl/${TCL_VER}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/tcl-8.6"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+# somehow broken
+RESTRICT=test
+
+src_configure() {
+ econf \
+ --with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+ --with-tclinclude="${EPREFIX}"/usr/include \
+ --disable-rpath
+}
+
+src_compile() {
+ # adjust install_name on darwin
+ if [[ ${CHOST} == *-darwin* ]]; then
+ sed -i \
+ -e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
+ "${S}"/Makefile || die 'sed failed'
+ fi
+
+ sed 's:-pipe::g' -i Makefile || die
+
+ emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_install() {
+ default
+
+ cat >> "${T}"/34${PN} <<- EOF
+ LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}$(get_version_component_range 1-2)/"
+ EOF
+ doenvd "${T}"/34${PN}
+}
View
2  dev-tcltk/itcl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>tcltk</herd>
+ <herd>tcltk</herd>
</pkgmetadata>
View
1  dev-tcltk/thread/Manifest
@@ -1,2 +1,3 @@
DIST thread2.6.2.tar.gz 267344 SHA256 7f7b6a10102989f55b57946837e965e307b3dddfc65ac50438422ce937dcff7c SHA512 57d10c010d98c2249bc5d82a8a0a51ea6aca199f7649cdaaccf63a060e264897e004f5021c5925302393f5b388642355effa57c7eb6b7a4425be7a0a1054f8dc WHIRLPOOL 2d580b4d7836a60a0c82148dd78297ab765ef0c6ec5c212209891185967df864004efec37c477acfd7443c6375e81f0d2a264ff5e26d8ab14f102d45960b8213
DIST thread2.6.6.tar.gz 281212 SHA256 d8fbfab2bed21d4c43bb0eb6d17b095378849e5a2e1a748b1b3d02e75b5aeb29 SHA512 3fed9311d622e3b31617d96fba5ee2932cd50a4b9e438b314c3d616b7147d3f3e93829771bede1e4f3378b4a0dcaf8d99eba99a7b4bcaab80ef35dc40ae0a7d9 WHIRLPOOL 4fde8e8e955c8378825d0def51e2d99d4df7791dd1aeb98cf174b232366e6f885c2a7dac2ebd03d7e568481878b064ba362df5831f197d8f33455c777de77cb6
+DIST thread2.7.0.tar.gz 293785 SHA256 c10ac6873fdf1e62f55fccb633f4a595fc9924f7a5390a507605943ad7093870 SHA512 bc133a4a6d59bd2608cd3aae15a573d2bc79f3c66bf1c7e33a734779c7c9c4fca568f071af45134fb703f9f037369c8c20655c0ede3d3c1d31f585ab85aff7e3 WHIRLPOOL 929a6fa47383ab4fb56cbe6b49f49a559a39c05cbd751974df01ab5233ca13e62c394c17e1c88b85ffe76cf2a499fd76edba6196543cfc157828c0f4ca56ecf2
View
2  dev-tcltk/thread/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>tcltk</herd>
+ <herd>tcltk</herd>
</pkgmetadata>
View
47 dev-tcltk/thread/thread-2.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/thread-2.7.0.ebuild,v 1.1 2013/01/09 21:28:09 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib
+
+DESCRIPTION="Tcl Thread extension"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug gdbm"
+
+DEPEND="
+ dev-lang/tcl[threads]
+ gdbm? ( sys-libs/gdbm )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}${PV}
+
+RESTRICT="test"
+
+src_prepare() {
+ # Search for libs in libdir not just exec_prefix/lib
+ sed -i -e 's:${exec_prefix}/lib:${libdir}:' \
+ aclocal.m4 || die "sed failed"
+
+ sed -i -e "s/relid'/relid/" tclconfig/tcl.m4 || die
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --with-tclinclude="${EPREFIX}/usr/include"
+ --with-tcl="${EPREFIX}/usr/$(get_libdir)"
+ )
+ use gdbm && myconf+=( --with-gdbm )
+ use debug && myconf+=( --enable-symbols )
+ autotools-utils_src_configure
+}
View
1  dev-vcs/hub/Manifest
@@ -0,0 +1 @@
+DIST hub-1.10.4.tar.gz 57056 SHA256 13ef06c55573fe159be3ae6f3ee92522e0e094e4a4e2f8eb06ca4052eace55ec SHA512 8ff2b14404d956b18fb430eb87adf717559fb8267f059a7decebd7adaa2fd38d9ea6275526eb81292e86e9d2b170f93dc39ca032d94fc7f7857d4f97f4150e3c WHIRLPOOL 0d6ce0eef7257b3bb322821959eb5e5c856144de9fbc427ce30913763f2bc719047cc5d5a3922d967732b4bf9ec1cc5cc2ae34dc14431aba97acd94d0da69463
View
27 dev-vcs/hub/hub-1.10.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/hub-1.10.4.ebuild,v 1.1 2013/01/10 04:09:49 ottxor Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby18 ruby19"
+RUBY_FAKEGEM_TASK_DOC=
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+RUBY_S="*-${PN}-*"
+
+inherit ruby-fakegem
+
+ruby_add_bdepend "test? ( dev-ruby/webmock dev-util/cucumber )"
+
+DESCRIPTION="command-line wrapper for git that makes you better at GitHub"
+HOMEPAGE="http://defunkt.io/hub/"
+SRC_URI="https://github.com/defunkt/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+DEPEND=">=dev-vcs/git-1.7.3"
+
+pkg_postinst() {
+ einfo "You may want to add 'alias git=hub' to your .bashrc"
+}
View
11 dev-vcs/hub/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>ottxor@gentoo.org</email>
+ <name>Christoph Junghans</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">defunkt/hub</remote-id>
+ </upstream>
+</pkgmetadata>
View
6 games-server/crossfire-server/Manifest
@@ -1,2 +1,4 @@
-DIST crossfire-1.60.0.maps.tar.gz 28826670 RMD160 5217bd81a1ed9238316cb3b86ca6b128a62f3fb0 SHA1 504202695d37f69c70a1b9b0174a750d341c9d3b SHA256 f21005c1f6e81ae02012cef047bb63fe08faa14bb54f5e72c512fd81b8a38528
-DIST crossfire-1.60.0.tar.gz 6323410 RMD160 7ad2b9b7e4099d74dae78147a7af28d421021b3e SHA1 3437639b4fb105848bd8d5b5de39d4fa0cbd2508 SHA256 db60901128d44715ca354c17ec8ba22756de398156836f02cfc60afa406ec563
+DIST crossfire-1.60.0.maps.tar.gz 28826670 SHA256 f21005c1f6e81ae02012cef047bb63fe08faa14bb54f5e72c512fd81b8a38528 SHA512 5ba9bea0574841ff820df27693e5ab3dc5c10f06cc481537214e5dd319f9c68c9c93eca2c8970e1993bea47a8a805e40c953efc53ad9b92e351b728703cb2a42 WHIRLPOOL b800f006d1048ad3cde2f3d286fb4b1bc8d0c6ce2bb0f73d0517f16321193e3ea643831399bd04621b38ec53c7837ef0f105fbf07b435452cbb93d9a3ee4feca
+DIST crossfire-1.60.0.tar.gz 6323410 SHA256 db60901128d44715ca354c17ec8ba22756de398156836f02cfc60afa406ec563 SHA512 92ca8e47147969c7942c8754b59bf0f6063d673a640d4c631f1b076a7a4f00885b9b0a93762da20c514d7b8ab47aed84002c9e7886456bff7877879cd6dad7be WHIRLPOOL 4e3d2ba1132849f6d8d4b790b3fb49d89c406bb484bd0afd545ed375fe21f17e09bd026bb0dc9476bc34ef1ed9ee704e1f704f45d80b978175e2a176099c9cc8
+DIST crossfire-1.70.0.maps.tar.gz 28911538 SHA256 64b1bccef796fde9559a84b4486cf380710b9db70c2c45a1b0f67adf3d822aa9 SHA512 6c6349033950fc0bc60938d9784e420a4f594fdb6c3e0f281591445ae6c9e073caf1c5bb6627f0fe7f4b7a7a8afeafa1b41e948dbdfd9fe8fef1f41857afa06a WHIRLPOOL b5d1869b84f314dc054eadb22a5cfa83bb1721fcc1417b83e36586f2e3f65a90f2593eaecbb0e808d200aed563a5060961a1312d0afb0d9885b2a304263a8c48
+DIST crossfire-1.70.0.tar.gz 6626864 SHA256 f6679aa19f7b041a779d26215a7f0062ab7a1fd96185527c207485e084b4654d SHA512 c19f52aaf2292cacb47f186603d6a48769e84aea2973d5fa9028594001706a3e13452e540f2352e279c2f49a839282efb2624a0fd177b1729a2a6df0a5db4fc5 WHIRLPOOL 39652a4dc9c2d1096721c1462378a5b9481194ab1e0188a4bcbe9b8ebbd4981d5dea176cf243a8d23ed133df97dfaebf4831e5a5a5a446d75aa8ebf37daa47d8
View
40 games-server/crossfire-server/crossfire-server-1.70.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.70.0.ebuild,v 1.1 2013/01/10 05:37:03 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils games
+
+MY_P="${P/-server/}"
+DESCRIPTION="server for the crossfire clients"
+HOMEPAGE="http://crossfire.real-time.com/"
+SRC_URI="mirror://sourceforge/crossfire/${MY_P}.tar.gz
+ mirror://sourceforge/crossfire/crossfire-${PV}.maps.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+RESTRICT="test"
+
+DEPEND="net-misc/curl
+ X? (
+ x11-libs/libXaw
+ media-libs/libpng:0
+ )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ rm -f "${WORKDIR}"/maps/Info/combine.pl # bug #236205
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ keepdir "${GAMES_STATEDIR}"/crossfire/{datafiles,maps,players,template-maps,unique-items}
+ dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO
+ insinto "${GAMES_DATADIR}/crossfire"
+ doins -r "${WORKDIR}/maps"
+ prepgamesdirs
+}
View
10 games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch
@@ -1,10 +0,0 @@
---- socket/metaserver.c.old 2011-10-10 16:23:40.513409319 +0200
-+++ socket/metaserver.c 2011-10-10 16:23:46.617408594 +0200
-@@ -48,7 +48,6 @@
-
- #ifdef HAVE_CURL_CURL_H
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
-
View
11 games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch
@@ -1,11 +0,0 @@
---- crossedit/png.c.old 2011-02-21 14:50:43.000000000 +0100
-+++ crossedit/png.c 2011-02-21 14:51:20.000000000 +0100
-@@ -269,7 +269,7 @@
- png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
- return PNGX_OUTOFMEM;
- }
-- if (setjmp (png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
- return PNGX_DATA;
- }
View
313 media-libs/freeimage/files/freeimage-3.15.3-r1-unbundling.patch
@@ -0,0 +1,313 @@
+--- Makefile.gnu
++++ Makefile.gnu
+@@ -11,7 +11,14 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+
+-LIBRARIES = -lstdc++
++PKG_CONFIG ?= $(PKG_CONFIG)
++LIBRARIES = -lmng -ljpeg \
++ $(shell $(PKG_CONFIG) --libs libpng) \
++ $(shell $(PKG_CONFIG) --libs libtiff-4) \
++ $(shell $(PKG_CONFIG) --libs zlib) \
++ $(shell $(PKG_CONFIG) --libs libopenjpeg) \
++ $(shell $(PKG_CONFIG) --libs OpenEXR) \
++ $(shell $(PKG_CONFIG) --libs libraw)
+
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -64,13 +71,15 @@
+ $(AR) r $@ $(MODULES)
+
+ $(SHAREDLIB): $(MODULES)
+- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
+
+ install:
+ install -d $(INCDIR) $(INSTALLDIR)
+- install -m 644 -o root -g root $(HEADER) $(INCDIR)
+- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++ install -m 644 $(HEADER) $(INCDIR)
++ifneq ($(STATICLIB),)
++ install -m 644 $(STATICLIB) $(INSTALLDIR)
++endif
++ install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+ ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+ # ldconfig
+--- Source/FreeImage/J2KHelper.cpp
++++ Source/FreeImage/J2KHelper.cpp
+@@ -21,7 +21,7 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+
+ /**
+ Divide an integer by a power of 2 and round upwards
+--- Source/FreeImage/PluginEXR.cpp
++++ Source/FreeImage/PluginEXR.cpp
+@@ -22,16 +22,16 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../OpenEXR/IlmImf/ImfIO.h"
+-#include "../OpenEXR/Iex/Iex.h"
+-#include "../OpenEXR/IlmImf/ImfOutputFile.h"
+-#include "../OpenEXR/IlmImf/ImfInputFile.h"
+-#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
+-#include "../OpenEXR/IlmImf/ImfChannelList.h"
+-#include "../OpenEXR/IlmImf/ImfRgba.h"
+-#include "../OpenEXR/IlmImf/ImfArray.h"
+-#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
+-#include "../OpenEXR/Half/half.h"
++#include <ImfIO.h>
++#include <Iex.h>
++#include <ImfOutputFile.h>
++#include <ImfInputFile.h>
++#include <ImfRgbaFile.h>
++#include <ImfChannelList.h>
++#include <ImfRgba.h>
++#include <ImfArray.h>
++#include <ImfPreviewImage.h>
++#include <half.h>
+
+
+ // ==========================================================
+--- Source/FreeImage/PluginJ2K.cpp
++++ Source/FreeImage/PluginJ2K.cpp
+@@ -21,7 +21,7 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+
+ // ==========================================================
+ // Plugin Interface
+--- Source/FreeImage/PluginJP2.cpp
++++ Source/FreeImage/PluginJP2.cpp
+@@ -21,7 +21,7 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+
+ // ==========================================================
+ // Plugin Interface
+--- Source/FreeImage/PluginPNG.cpp
++++ Source/FreeImage/PluginPNG.cpp
+@@ -37,8 +37,8 @@
+
+ // ----------------------------------------------------------
+
+-#include "../ZLib/zlib.h"
+-#include "../LibPNG/png.h"
++#include <zlib.h>
++#include <png.h>
+
+ // ----------------------------------------------------------
+
+--- Source/transupp.c
++++ Source/transupp.c
+@@ -15,8 +15,7 @@
+ /* Although this file really shouldn't have access to the library internals,
+ * it's helpful to let it call jround_up() and jcopy_block_row().
+ */
+-#define JPEG_INTERNALS
+-
++#include <jerror.h>
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "transupp.h" /* My own external interface */
+--- Source/FreeImage/ZLibInterface.cpp
++++ Source/FreeImage/ZLibInterface.cpp
+@@ -19,10 +19,10 @@
+ // Use at your own risk!
+ // ==========================================================
+
+-#include "../ZLib/zlib.h"
++#include <zlib.h>
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
++#define OS_CODE 0x03
+
+ /**
+ Compresses a source buffer into a target buffer, using the ZLib library.
+--- Source/FreeImage/PluginG3.cpp
++++ Source/FreeImage/PluginG3.cpp
+@@ -20,7 +20,7 @@
+ // Use at your own risk!
+ // ==========================================================
+
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+--- Source/FreeImage/PluginJPEG.cpp
++++ Source/FreeImage/PluginJPEG.cpp
+@@ -35,11 +35,15 @@
+ #undef FAR
+ #include <setjmp.h>
+
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
++#include <string.h>
++#include <stdio.h>
++#include <jconfig.h>
++#include <jpeglib.h>
++#include <jerror.h>
+ }
+
++#define SIZEOF(object) ((size_t) sizeof(object))
++
+ #include "FreeImage.h"
+ #include "Utilities.h"
+
+--- Source/FreeImageToolkit/JPEGTransform.cpp
++++ Source/FreeImageToolkit/JPEGTransform.cpp
+@@ -25,10 +25,11 @@
+ #undef FAR
+ #include <setjmp.h>
+
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
+-#include "../LibJPEG/transupp.h"
++#include <string.h>
++#include <stdio.h>
++#include <jpeglib.h>
++#include <jerror.h>
++#include "transupp.h"
+ }
+
+ #include "FreeImage.h"
+--- Makefile.fip
++++ Makefile.fip
+@@ -11,7 +11,14 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+
+-LIBRARIES = -lstdc++
++PKG_CONFIG ?= pkg-config
++LIBRARIES = -lmng -ljpeg \
++ $(shell $(PKG_CONFIG) --libs libpng) \
++ $(shell $(PKG_CONFIG) --libs libtiff-4) \
++ $(shell $(PKG_CONFIG) --libs zlib) \
++ $(shell $(PKG_CONFIG) --libs libopenjpeg) \
++ $(shell $(PKG_CONFIG) --libs OpenEXR) \
++ $(shell $(PKG_CONFIG) --libs libraw)
+
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -65,14 +72,18 @@
+ $(AR) r $@ $(MODULES)
+
+ $(SHAREDLIB): $(MODULES)
+- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
+
+ install:
+ install -d $(INCDIR) $(INSTALLDIR)
+- install -m 644 -o root -g root $(HEADER) $(INCDIR)
+- install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
+- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++ install -m 644 $(HEADER) $(INCDIR)
++ install -m 644 $(HEADERFIP) $(INCDIR)
++ifneq ($(STATICLIB),)
++ install -m 644 $(STATICLIB) $(INSTALLDIR)
++endif
++ install -m 755 $(SHAREDLIB) $(INSTALLDIR)
++ ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
++ ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+
+ clean:
+ rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
+--- Makefile.srcs
++++ Makefile.srcs
+@@ -88,6 +88,7 @@
+ Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ Source/FreeImageToolkit/Rescale.cpp \
+ Source/FreeImageToolkit/Resize.cpp \
++ Source/transupp.c
+ INCLS = \
+ Source/FreeImage.h \
+ Source/CacheFile.h \
+@@ -116,3 +117,9 @@
+ -ISource \
+ -ISource/Metadata \
+ -ISource/FreeImageToolkit \
++ $(shell $(PKG_CONFIG) --cflags-only-I libpng) \
++ $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4) \
++ $(shell $(PKG_CONFIG) --cflags-only-I zlib) \
++ $(shell $(PKG_CONFIG) --cflags-only-I libopenjpeg) \
++ $(shell $(PKG_CONFIG) --cflags-only-I OpenEXR) \
++ $(shell $(PKG_CONFIG) --cflags-only-I libraw)
+--- Source/FreeImage/PluginRAW.cpp
++++ Source/FreeImage/PluginRAW.cpp
+@@ -19,7 +19,7 @@
+ // Use at your own risk!
+ // ==========================================================
+
+-#include "../LibRawLite/libraw/libraw.h"
++#include <libraw.h>
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+--- Source/Metadata/XTIFF.cpp
++++ Source/Metadata/XTIFF.cpp
+@@ -29,7 +29,7 @@
+ #pragma warning (disable : 4786) // identifier was truncated to 'number' characters
+ #endif
+
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+--- Source/FreeImage/PluginTIFF.cpp
++++ Source/FreeImage/PluginTIFF.cpp
+@@ -37,9 +37,9 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+ #include "../Metadata/FreeImageTag.h"
+-#include "../OpenEXR/Half/half.h"
++#include <half.h>
+
+ #include "FreeImageIO.h"
+ #include "PSDParser.h"
+--- Source/tiffiop.h
++++ Source/tiffiop.h
+@@ -30,7 +30,9 @@
+ * ``Library-private'' definitions.
+ */
+
+-#include "tif_config.h"
++#include <tiffconf.h>
++#define HAVE_SEARCH_H
++#define HAVE_FCNTL_H
+
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
+--- fipMakefile.srcs
++++ fipMakefile.srcs
+@@ -94,7 +94,8 @@
+ Wrapper/FreeImagePlus/src/fipMultiPage.cpp \
+ Wrapper/FreeImagePlus/src/fipTag.cpp \
+ Wrapper/FreeImagePlus/src/fipWinImage.cpp \
+- Wrapper/FreeImagePlus/src/FreeImagePlus.cpp
++ Wrapper/FreeImagePlus/src/FreeImagePlus.cpp \
++ Source/transupp.c
+ INCLUDE = -I. \
+ -ISource \
+ -ISource/Metadata \
View
639 media-libs/freeimage/files/freeimage-3.15.3-r2-unbundling.patch
@@ -0,0 +1,639 @@
+lots of fixes here:
+ - use system graphics libraries
+ - make all of them optional
+ - drop root users from install (fix user installs)
+ - make static lib build optional
+ - link with CXX and CXXFLAGS (since this is C++ code)
+
+--- Makefile.gnu
++++ Makefile.gnu
+@@ -11,7 +11,24 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+
+-LIBRARIES = -lstdc++
++PKG_CONFIG ?= pkg-config
++
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++
++LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
++LIBRARIES-$(USE_EXR) += $(shell $(PKG_CONFIG) --libs OpenEXR)
++LIBRARIES-$(USE_JPEG) += -ljpeg
++LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg)
++LIBRARIES-$(USE_MNG) += -lmng
++LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng)
++LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw)
+
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -64,13 +81,15 @@
+ $(AR) r $@ $(MODULES)
+
+ $(SHAREDLIB): $(MODULES)
+- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
+
+ install:
+ install -d $(INCDIR) $(INSTALLDIR)
+- install -m 644 -o root -g root $(HEADER) $(INCDIR)
+- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++ install -m 644 $(HEADER) $(INCDIR)
++ifneq ($(STATICLIB),)
++ install -m 644 $(STATICLIB) $(INSTALLDIR)
++endif
++ install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+ ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+ # ldconfig
+--- Source/FreeImage/J2KHelper.cpp
++++ Source/FreeImage/J2KHelper.cpp
+@@ -21,7 +21,7 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+
+ /**
+ Divide an integer by a power of 2 and round upwards
+--- Source/FreeImage/PluginEXR.cpp
++++ Source/FreeImage/PluginEXR.cpp
+@@ -22,16 +22,16 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../OpenEXR/IlmImf/ImfIO.h"
+-#include "../OpenEXR/Iex/Iex.h"
+-#include "../OpenEXR/IlmImf/ImfOutputFile.h"
+-#include "../OpenEXR/IlmImf/ImfInputFile.h"
+-#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
+-#include "../OpenEXR/IlmImf/ImfChannelList.h"
+-#include "../OpenEXR/IlmImf/ImfRgba.h"
+-#include "../OpenEXR/IlmImf/ImfArray.h"
+-#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
+-#include "../OpenEXR/Half/half.h"
++#include <ImfIO.h>
++#include <Iex.h>
++#include <ImfOutputFile.h>
++#include <ImfInputFile.h>
++#include <ImfRgbaFile.h>
++#include <ImfChannelList.h>
++#include <ImfRgba.h>
++#include <ImfArray.h>
++#include <ImfPreviewImage.h>
++#include <half.h>
+
+
+ // ==========================================================
+--- Source/FreeImage/PluginJ2K.cpp
++++ Source/FreeImage/PluginJ2K.cpp
+@@ -21,7 +21,7 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+
+ // ==========================================================
+ // Plugin Interface
+--- Source/FreeImage/PluginJP2.cpp
++++ Source/FreeImage/PluginJP2.cpp
+@@ -21,7 +21,7 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+
+ // ==========================================================
+ // Plugin Interface
+--- Source/FreeImage/PluginPNG.cpp
++++ Source/FreeImage/PluginPNG.cpp
+@@ -37,8 +37,8 @@
+
+ // ----------------------------------------------------------
+
+-#include "../ZLib/zlib.h"
+-#include "../LibPNG/png.h"
++#include <zlib.h>
++#include <png.h>
+
+ // ----------------------------------------------------------
+
+--- Source/transupp.c
++++ Source/transupp.c
+@@ -15,8 +15,7 @@
+ /* Although this file really shouldn't have access to the library internals,
+ * it's helpful to let it call jround_up() and jcopy_block_row().
+ */
+-#define JPEG_INTERNALS
+-
++#include <jerror.h>
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "transupp.h" /* My own external interface */
+--- Source/FreeImage/ZLibInterface.cpp
++++ Source/FreeImage/ZLibInterface.cpp
+@@ -19,10 +19,10 @@
+ // Use at your own risk!
+ // ==========================================================
+
+-#include "../ZLib/zlib.h"
++#include <zlib.h>
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
++#define OS_CODE 0x03
+
+ /**
+ Compresses a source buffer into a target buffer, using the ZLib library.
+--- Source/FreeImage/PluginG3.cpp
++++ Source/FreeImage/PluginG3.cpp
+@@ -20,7 +20,7 @@
+ // Use at your own risk!
+ // ==========================================================
+
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+--- Source/FreeImage/PluginJPEG.cpp
++++ Source/FreeImage/PluginJPEG.cpp
+@@ -35,11 +35,15 @@
+ #undef FAR
+ #include <setjmp.h>
+
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
++#include <string.h>
++#include <stdio.h>
++#include <jconfig.h>
++#include <jpeglib.h>
++#include <jerror.h>
+ }
+
++#define SIZEOF(object) ((size_t) sizeof(object))
++
+ #include "FreeImage.h"
+ #include "Utilities.h"
+
+--- Source/FreeImageToolkit/JPEGTransform.cpp
++++ Source/FreeImageToolkit/JPEGTransform.cpp
+@@ -25,10 +25,11 @@
+ #undef FAR
+ #include <setjmp.h>
+
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
+-#include "../LibJPEG/transupp.h"
++#include <string.h>
++#include <stdio.h>
++#include <jpeglib.h>
++#include <jerror.h>
++#include "transupp.h"
+ }
+
+ #include "FreeImage.h"
+--- Makefile.fip
++++ Makefile.fip
+@@ -11,7 +11,24 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+
+-LIBRARIES = -lstdc++
++PKG_CONFIG ?= pkg-config
++
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++
++LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
++LIBRARIES-$(USE_EXR) += $(shell $(PKG_CONFIG) --libs OpenEXR)
++LIBRARIES-$(USE_JPEG) += -ljpeg
++LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg)
++LIBRARIES-$(USE_MNG) += -lmng
++LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng)
++LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw)
+
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -65,14 +82,1