sci-libs/calculix-cgx: Version bump

4 files changed, 19 insertions, 33 deletions

diff --git a/sci-libs/calculix-cgx/ChangeLog b/sci-libs/calculix-cgx/ChangeLog
index 7fd10a2de..6269c040d 100644
--- a/sci-libs/calculix-cgx/ChangeLog
+++ b/sci-libs/calculix-cgx/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculix-cgx-2.1 (29 Jun 2010)
+
+  29 Jun 2010; Oliver Borm (boroli) <oli.borm@web.de>
+  -files/01_cgx_2.0_Makefile.patch, -calculix-cgx-2.0.ebuild,
+  +files/01_cgx_2.1_Makefile.patch, +calculix-cgx-2.1.ebuild:
+  Version bump
+
   24 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   calculix-cgx-2.0.ebuild:
   QA fixes: ghostscript dependency, built_with_use replaced
diff --git a/sci-libs/calculix-cgx/Manifest b/sci-libs/calculix-cgx/Manifest
index 9a1053547..2ab7bf62d 100644
--- a/sci-libs/calculix-cgx/Manifest
+++ b/sci-libs/calculix-cgx/Manifest
@@ -1,26 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 01_cgx_2.0_Makefile.patch 1869 RMD160 cc9d2c466318fb0fef4c020035f823d5a16aa330 SHA1 ea53667875098821b62d813d77fb1a8b6f3d8f9f SHA256 eaac0c32288a2d5f11686e13be92d0e2e8915afe9f72c1d3e53345d00d001ace
-DIST cgx_2.0.all.tar.bz2 1130447 RMD160 8320d83f1f29ade9ab3d44a027f33d50eff844cb SHA1 848d330b4303243f50d48b002be534b8e6bb2409 SHA256 1120ccfad431f783c2c3acb1be7c90abbdfc4c344091d2858d856149f43fa73f
-DIST cgx_2.0.ps.bz2 308416 RMD160 ded460a4b7b849e79b450097999c6a58a7f76aea SHA1 e5ce1b22b1927f85afb8a0fa9d088cbacc0990a7 SHA256 dda54b0603ad2ef669e7408d7cba7f560eaca0fb11586c6826e2d23567397bb2
-EBUILD calculix-cgx-2.0.ebuild 982 RMD160 5cfccc3601872413c79c0d17121dc44568df661e SHA1 380e41fcd1f283d3a1bde31fe82a3e3de5ac55e8 SHA256 33c2c983c0831302ad956646a92ffe0577c320424895dfc2cd50f75104660bd8
-MISC ChangeLog 538 RMD160 e6fa1bb6bd5a465f5160b1310a673e1d1aaee745 SHA1 6619ccfa93d40babfe789b8edb705f18c25ab771 SHA256 e07069bce4234f5d811addc123192a963f5627c1f47c7128fb457357c2410390
+AUX 01_cgx_2.1_Makefile.patch 1811 RMD160 93579edb2cc7473c75ddd2e3168af434828841fd SHA1 d52e2fce26951e381a68b4943853a433389b3e57 SHA256 c512c8841602fdd29d49c0b3babaec2601e87706aef233a9cca4daafdaeb123b
+DIST cgx_2.1.all.tar.bz2 1034690 RMD160 96d7bbec037dbb1595b325da150ef0b8efef8c41 SHA1 ddc2c80a6b66d6c797315be8e9db60299cea1027 SHA256 f602504c62676e419f69d631cbafa16191f5b4984f146c1c17e25f4c94481fca
+DIST cgx_2.1.ps.bz2 344994 RMD160 9bba6bcaa7a49ccf4b5f96ebad0d0dde617799db SHA1 a4aa28dcf62753b6e895abc258a50c7aae1e1f12 SHA256 2471abba7b3dee0f66160219bb9bd34ad3fdf33abd417d53e2595190223517e8
+EBUILD calculix-cgx-2.1.ebuild 985 RMD160 52a77ff9312ccc342a71b0ad998d00507c87f703 SHA1 bd9d60b3719aea883aebe4effdb3f648964c2b36 SHA256 81352a5770244640a44e5bc696efae1d4bba062abaf205b6e905d76e0a780942
+MISC ChangeLog 765 RMD160 d9ae9ee03a6e716ad70892b1d9952e98c22be07c SHA1 8334a7b56a1cff591bf47473ebe7521c0bc35593 SHA256 682766c6136065a37b414a6fe0a5de0e6f5335caa20be2f81b6fb4928684708e
 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQIcBAEBAgAGBQJMI6rWAAoJENwGBM22xffebP8P/i0QFU2zLdNHSZxauRx2EOL1
-5Adi83FRInVle093awLTmFsJL4En5wNXOCHaT68HQaLXLdNN343iN/aHn0Cxe1a5
-4FvkWrvMfyoHP+5TWA8jb2xENRE5iEzCibhZeZMwpFZDwFatRTPsOPhTZTeZbuig
-LX3fSdHQRHBNxf6kjyEdCYDdm9OcrgtL5jIK6CiGfQtEz4EipdbH6uqYsGyimRHM
-lKlI0QHVQuTBd9Op16RLMlAozrzxCUU6qIGT1cfsk1jqFdEHrhiUQivLngWJB8aV
-KAYlSr+vCNqBY5JI6m+EscV0tn24gkuGnxWH0DjwHpIiFa1dWzuZck21LMqtuDzC
-Y3Iv0D3gASx286VWSX//yQRPadDubCc9d6njDxLCr4UMGafw/GQxCl3ycK3AxcH4
-ZsZHCoD3LouGlOiQUwmTt6fsX4memcsyxsYKgtXpn+Jl3BpnAP/YoPGbFjy5Rm0M
-gCwroC3+CdSNxwzKzFA42DcHP75FJlZfW78Ayk2bRKT9tPSIeYxB6g+7889XTWff
-M0GLYLyG4tOI067rQ2iXv6eCpj7kKWA6OWINiD7C4ODVNZpbndMQry68wtZWh7BS
-hCJRh/RHpRXmtQGWNsvf3IIAP+KCxF8iRfOzBIa1Bx7CeTZFtK3lVruLkICG6UD3
-XtmUhMlTDB5KIWBlmJEI
-=Y+qt
------END PGP SIGNATURE-----
diff --git a/sci-libs/calculix-cgx/calculix-cgx-2.0.ebuild b/sci-libs/calculix-cgx/calculix-cgx-2.1.ebuild
index bce64b272..652b55734 100644
--- a/sci-libs/calculix-cgx/calculix-cgx-2.0.ebuild
+++ b/sci-libs/calculix-cgx/calculix-cgx-2.1.ebuild
@@ -18,10 +18,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples nptl"
 
-DEPEND="doc? ( app-text/ghostscript-gpl )
-	media-libs/mesa[nptl=]
+RDEPEND="media-libs/mesa[nptl=]
 	>=virtual/glut-1.0"
-RDEPEND=${DEPEND}
+DEPEND="${RDEPEND}
+	doc? ( app-text/ghostscript-gpl )"
 
 S=${WORKDIR}/CalculiX/${MY_P}/src/
 
diff --git a/sci-libs/calculix-cgx/files/01_cgx_2.0_Makefile.patch b/sci-libs/calculix-cgx/files/01_cgx_2.1_Makefile.patch
index 72ce0bdd6..f60d17a20 100644
--- a/sci-libs/calculix-cgx/files/01_cgx_2.0_Makefile.patch
+++ b/sci-libs/calculix-cgx/files/01_cgx_2.1_Makefile.patch
@@ -11,10 +11,10 @@
    -lm 
  
  # on 32bit systems change lib64 to lib
-@@ -126,42 +126,6 @@
-  writebp.c \
-  contact.c \
-  makeTriFromElems.c \
+@@ -18,41 +18,6 @@
+ include Makefile.inc
+ 
+ SUTIL = \
 - ../../glut-3.5/src/layerutil.c \
 - ../../glut-3.5/src/glut_dials.c \
 - ../../glut-3.5/src/glut_ext.c \
@@ -24,7 +24,6 @@
 - ../../glut-3.5/src/glut_space.c \
 - ../../glut-3.5/src/glut_shapes.c \
 - ../../glut-3.5/src/glut_tablet.c \
-- ../../glut-3.5/src/glut_vidresize.c \
 - ../../glut-3.5/src/glut_warp.c \
 - ../../glut-3.5/src/glut_8x13.c \
 - ../../glut-3.5/src/glut_9x15.c \