Version Bump thanks Maximilian Bräutigam, Fix for underlinking detected by gold

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

5 files changed, 40 insertions, 77 deletions

diff --git a/sci-chemistry/gabedit/ChangeLog b/sci-chemistry/gabedit/ChangeLog
index 6d3c735944c8..751a7ae57711 100644
--- a/sci-chemistry/gabedit/ChangeLog
+++ b/sci-chemistry/gabedit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/gabedit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/ChangeLog,v 1.13 2011/10/05 19:47:00 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/ChangeLog,v 1.14 2012/03/13 16:33:06 jlec Exp $
+
+*gabedit-2.4.2 (13 Mar 2012)
+
+  13 Mar 2012; Justin Lecher <jlec@gentoo.org> -gabedit-2.3.8.ebuild,
+  -gabedit-2.3.9.ebuild, +gabedit-2.4.2.ebuild,
+  +files/gabedit-2.4.2-gold.patch:
+  Version Bump thanks Maximilian Bräutigam, Fix for underlinking detected by
+  gold
 
 *gabedit-2.4.0 (05 Oct 2011)
 
diff --git a/sci-chemistry/gabedit/Manifest b/sci-chemistry/gabedit/Manifest
index dfb513c87f95..08205c11feee 100644
--- a/sci-chemistry/gabedit/Manifest
+++ b/sci-chemistry/gabedit/Manifest
@@ -2,20 +2,19 @@
 Hash: SHA512
 
 AUX CONFIG.Gentoo 349 RMD160 58d51cff8684f93400ebc05a035d3111e9f49ac7 SHA1 096e2a1020bbfc69b847c8ce67285283c6db4e3e SHA256 9ecf7149934fee3f91024cb13b4431808b62febb2a4e77b1191734e446396b8f
+AUX gabedit-2.4.2-gold.patch 564 RMD160 5b30beaeafe96049ea93972ee9f1f5e1f2aa4a4d SHA1 dbbb3d41a0f502cb7cb195d22b2b301aab3af814 SHA256 a75ed9aaf44a3415171e3553f94e832086e14945a3eb268cf007ffd92e3e2b76
 DIST GabeditSrc236.tar.gz 1860371 RMD160 3fe3cd34cbd32d5483de2ef242ba17d1b6cd5835 SHA1 e5829d9faa9016206f7ed8846409e9d23e120f6e SHA256 034d92568bf81e650b76731b74473813f7fbe93e3dde6aa6679f9289331839c9
-DIST GabeditSrc238.tar.gz 4256128 RMD160 32811a7dba95df26b3f41fb3b3a64d30d6601334 SHA1 c623d62c4532d00ec9b4bf7112da2eaa6da81060 SHA256 3b29cff9d135b2cc3c7c96d8b806c11219db2010fb6724ac76178c7e3f82730c
-DIST GabeditSrc239.tar.gz 2005721 RMD160 c9b6c459fb21c87269f69b70600959e82ed42b74 SHA1 e1b1c9863041c8a1c14d5cd0be0cc9cf41e0234c SHA256 84613320da8c02621e714347e2bf41767f20528c11a983ede35219590d606e78
 DIST GabeditSrc240.tar.gz 2005689 RMD160 24924a9b98498973e3149c2e73579999b366c052 SHA1 9c53590051da363f419a6b746594bf9f9aa92737 SHA256 dc5b008be44e4462d09475fcee4c93289845a3d2c863f22e5602e0d22ebd8b6f
+DIST GabeditSrc242.tar.gz 2018984 RMD160 51fdf579671c76a3cd0b1458d82c38dc1e458377 SHA1 3c61b588c966c03be0dda988b96c413cca62e958 SHA256 a868bb528be9286c10aa193d8be71e99a7f4b2a8237e258d572d755a8f1ff020
 EBUILD gabedit-2.3.6.ebuild 1451 RMD160 d9d087a0bfddbd5344d3da25a685828043ffe61f SHA1 c4d7363990a6859656e27f6477c907964b8364f0 SHA256 23fc057f4126d3be35611f2b81f010c372ec52abf32c8eb6679c93e81985480b
-EBUILD gabedit-2.3.8.ebuild 1398 RMD160 4aeffeece9512fb6e0006fedf2616127cda3d10d SHA1 b4b36300575349fe110706d2ccfd2ea5a67e22c8 SHA256 41ce869286b8285e72802143e5d13a2a8b49807265d39c9dc9efb7a1cd472b73
-EBUILD gabedit-2.3.9.ebuild 1398 RMD160 f35c81d2f07a5d5c4723de60e672e7b2089db500 SHA1 6907d922ed5f4e7f87f9c098d8bb28576dca7735 SHA256 e66197e5c38fca53a1e566ec04d1f963cf1800f53e1737e4798e2abc209ec6e7
 EBUILD gabedit-2.4.0.ebuild 1362 RMD160 04981603b8fb0fdab0405a44b08dbff84acc6bac SHA1 2e59bdc0c29bd2d5521f01f45f837064efc08f75 SHA256 e4de993c3e1a338a89432e600cfafa7f35c1327b5a352aca54f409de84780141
-MISC ChangeLog 2100 RMD160 ab0238461f1007e41f8f84fcda83545b77ce2771 SHA1 49b6f6bbc111a562e304c3d7a2ff1fb6f620177d SHA256 1249a17957d25646b4bebc849495fc45f10aeacace51e26447e6df5e34f3f4ad
+EBUILD gabedit-2.4.2.ebuild 1409 RMD160 719782c5083a9ff65662464ec990b0882d44b52e SHA1 fd8b138731f539a09edc13ee4b93aea7dfa37f0d SHA256 b4de2a14a3e54f3dd4ee617da474bed09683bc4895af0d2ff4e7f1a127221e57
+MISC ChangeLog 2369 RMD160 95d69ac668b360dd00201b54b6ae026c2673bd43 SHA1 9ca200ac84e0ece4c80825309ef5e63b6f25d76d SHA256 e78512178018807b7a0b214bafa6d9d05ea310f1028e197aa65d8af1cd4788d0
 MISC metadata.xml 399 RMD160 666330a3d5d2e9eb2a672d061a9ffb736e5fc91d SHA1 57f155e6d8a5d27a4ad1d44aa5fa8f04816f1f39 SHA256 84b421a712659d7b575f11178187125dcf8c37f23bee78dcef123e6376fc1d22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6MtD8ACgkQgAnW8HDreRaTEwCgk5LO/FqQ0IiezDCRpe7dObDY
-lccAoLTbo033gTcAlUOuGLHfVy/J9BjF
-=ChfB
+iEYEAREKAAYFAk9fdscACgkQgAnW8HDreRYXogCfc/xJOVN6s2DznA76iNEFXU20
+lMMAoKmmxV5MIo4+rEiFlnwG4n3I+FNc
+=B1/L
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/gabedit/files/gabedit-2.4.2-gold.patch b/sci-chemistry/gabedit/files/gabedit-2.4.2-gold.patch
new file mode 100644
index 000000000000..68823d0d7663
--- /dev/null
+++ b/sci-chemistry/gabedit/files/gabedit-2.4.2-gold.patch
@@ -0,0 +1,16 @@
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ae08e60..eee2b46 100644
+--- a/Makefile
++++ b/Makefile
+@@ -62,7 +62,7 @@ all: gabedit
+ gabedit: $(SUBDIRS)

+ 	$(MKDIR) tmp

+ 	cp $(OBJECTS) tmp

+-	$(CC) $(LDFLAGS) tmp/*.o -o gabedit $(GLTOPS) $(X11LIB) $(GTKLIB) $(OGLLIB) $(JPEGLIB) $(LIBPTHREAD) $(WIN32LIB) $(OMPLIB) -g

++	$(CC) $(LDFLAGS) tmp/*.o -o gabedit $(GLTOPS) $(X11LIB) $(GTKLIB) $(OGLLIB) $(JPEGLIB) $(LIBPTHREAD) $(WIN32LIB) $(OMPLIB) -g -lm

+ 	@$(RMTMP) > ptmp

+ 	rmdir tmp

+ 	@$(RM) ptmp

diff --git a/sci-chemistry/gabedit/gabedit-2.3.9.ebuild b/sci-chemistry/gabedit/gabedit-2.3.9.ebuild
deleted file mode 100644
index b2fdb43a511f..000000000000
--- a/sci-chemistry/gabedit/gabedit-2.3.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/gabedit-2.3.9.ebuild,v 1.1 2011/07/24 09:09:47 jlec Exp $
-
-EAPI=4
-
-inherit toolchain-funcs versionator
-
-MY_PN=${PN/g/G}
-MY_PV=$(delete_all_version_separators)
-MY_P="${MY_PN}Src${MY_PV}"
-
-DESCRIPTION="GUI for computational chemistry packages"
-HOMEPAGE="http://gabedit.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/GabeditDevloppment/${MY_PN}${MY_PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ~x86"
-IUSE="openmp"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-	x11-libs/gl2ps
-	x11-libs/pango
-	virtual/opengl
-	virtual/glu"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	tc-export CC
-	sed -i "/rmdir tmp/d" "${S}"/Makefile
-	sed \
-		-e "/GTK_DISABLE_DEPRECATED/s:define:undef:g" \
-		-i "${S}/Config.h" || die
-	sed -e 's:-g::g' -i Makefile || die
-	cp "${FILESDIR}"/CONFIG.Gentoo "${S}"/CONFIG
-
-	if use openmp && tc-has-openmp; then
-		cat <<- EOF >> "${S}/CONFIG"
-			OMPLIB=-fopenmp
-			OMPCFLAGS=-DENABLE_OMP -fopenmp
-		EOF
-	fi
-	echo "COMMONCFLAGS = ${CFLAGS} -DENABLE_DEPRECATED \$(OMPCFLAGS) \$(DRAWGEOMGL)" >> CONFIG
-}
-
-src_compile() {
-	emake clean
-	emake external_gl2ps=1
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ChangeLog
-}
diff --git a/sci-chemistry/gabedit/gabedit-2.3.8.ebuild b/sci-chemistry/gabedit/gabedit-2.4.2.ebuild
index cb3cedd76029..6e6f877d1776 100644
--- a/sci-chemistry/gabedit/gabedit-2.3.8.ebuild
+++ b/sci-chemistry/gabedit/gabedit-2.4.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/gabedit-2.3.8.ebuild,v 1.2 2011/06/21 06:04:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/gabedit-2.4.2.ebuild,v 1.1 2012/03/13 16:33:06 jlec Exp $
 
 EAPI=4
 
-inherit toolchain-funcs versionator
+inherit eutils toolchain-funcs versionator
 
 MY_PN=${PN/g/G}
 MY_PV=$(delete_all_version_separators)
@@ -12,7 +12,7 @@ MY_P="${MY_PN}Src${MY_PV}"
 
 DESCRIPTION="GUI for computational chemistry packages"
 HOMEPAGE="http://gabedit.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/GabeditDevloppment/${MY_PN}${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="as-is"
@@ -36,6 +36,9 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	tc-export CC
+
+	epatch "${FILESDIR}"/${P}-gold.patch
+
 	sed -i "/rmdir tmp/d" "${S}"/Makefile
 	sed \
 		-e "/GTK_DISABLE_DEPRECATED/s:define:undef:g" \