Make multilib compatible, #378991; respect CFLAGS

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

5 files changed, 72 insertions, 9 deletions

diff --git a/dev-tcltk/togl/ChangeLog b/dev-tcltk/togl/ChangeLog
index 496bca982253..10c167e8f1c9 100644
--- a/dev-tcltk/togl/ChangeLog
+++ b/dev-tcltk/togl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/togl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/togl/ChangeLog,v 1.18 2011/07/11 15:05:08 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/togl/ChangeLog,v 1.19 2011/08/15 17:15:10 jlec Exp $
+
+*togl-2.0-r2 (15 Aug 2011)
+
+  15 Aug 2011; Justin Lecher <jlec@gentoo.org> togl-2.0-r1.ebuild,
+  +togl-2.0-r2.ebuild, metadata.xml:
+  Make multilib compatible, #378991; respect CFLAGS
 
   11 Jul 2011; Matt Turner <mattst88@gentoo.org> togl-2.0-r1.ebuild:
   Added ~mips, bug 298612
diff --git a/dev-tcltk/togl/Manifest b/dev-tcltk/togl/Manifest
index cdf035b4d967..8ba4c49c3627 100644
--- a/dev-tcltk/togl/Manifest
+++ b/dev-tcltk/togl/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST Togl2.0-src.tar.gz 244968 RMD160 a0124141b824922306af3a1b4ba6ddcf857f6218 SHA1 7ebb028a75f733d0ac2dca851e23c03f33cc4843 SHA256 b7d4a90bbad3aca618d505ee99e7fd8fb04c829f63231dda2360f557ba3f7610
-EBUILD togl-2.0-r1.ebuild 922 RMD160 946a4f75990520dda69dec621b303e6c4eef6f7c SHA1 9d559a36a593f7954decdbdb77f5651783192a36 SHA256 4c7ff9ca8271976bbbeef3757a558655bdd0944936dd11d2f19aa5d6f1275262
-MISC ChangeLog 2009 RMD160 2b0e41a1b1f4cd479eaf59ae325eaf75b4c9e814 SHA1 838fed8c3b665203edc2115cf90c1d16024644df SHA256 608b5706f8db986fd7668aad676f2e352d19c150fea888f61f68bf67b590e8aa
-MISC metadata.xml 1021 RMD160 e6d7e73ed6e5912c32494911e030c2ac5d40cb3a SHA1 c0225ea57646e884ae2628cb7dab8cb92bbb79da SHA256 3fc8be915fc103fcb55abe80b166d463b09f599fe74897af7d2d724323b76790
+EBUILD togl-2.0-r1.ebuild 918 RMD160 409d49ae74958d959acaa3395d1b59d7e1b451f3 SHA1 bd92ae5b4498ad114cb56c9416b917a2a32c7604 SHA256 7684b29a41c0aaacb636e70e774a970daf17597e3799237b15c2255b2d56daa0
+EBUILD togl-2.0-r2.ebuild 998 RMD160 73aad6df779aeff2d58993deeee2f4ed3913b90d SHA1 ee0f8ea1ac9d8581b7487647d2aaf638cbaa38c5 SHA256 798f7a2290205180dd3df41520c2885c3a485ce620a3779d95c7c5c5a0c4a7c8
+MISC ChangeLog 2190 RMD160 b7395fbb09317599e83b1fded7f18c988e95c821 SHA1 04754214a9c7fb78ae5a895a6a6b1bb20d9636cd SHA256 5bd76e7afc34702bcfcb387df7fc12979d0a4f14410b211180379d29ab07e8dc
+MISC metadata.xml 1023 RMD160 3e11bc95b3aa3faec898a2e7e1b6e15be1bd8f52 SHA1 8e000dfee4f3ce9471e8eabb7b736ad1dc4e400e SHA256 764aa2f7f55973589d540103c4d37cd9c23b239342dd232d1a860672a004d80c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk5JVCMACgkQgAnW8HDreRZUxgCgmgX2RUKxWpc8OTauxM2VeI9E
+Lu0AoMBm+IJzCu7FnvlySelO70HDQjYO
+=60SX
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/togl/metadata.xml b/dev-tcltk/togl/metadata.xml
index 9282f5a6fdd3..ef797583d3d2 100644
--- a/dev-tcltk/togl/metadata.xml
+++ b/dev-tcltk/togl/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
-<longdescription>
+	<herd>tcltk</herd>
+	<longdescription>
 Togl is a Tk widget for OpenGL rendering. Togl was originally based on
 OGLTK, written by Benjamin Bederson at the University of New Mexico. Togl's
 main features are:
diff --git a/dev-tcltk/togl/togl-2.0-r1.ebuild b/dev-tcltk/togl/togl-2.0-r1.ebuild
index 26d2e13c06d2..7a7a290138ea 100644
--- a/dev-tcltk/togl/togl-2.0-r1.ebuild
+++ b/dev-tcltk/togl/togl-2.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/togl/togl-2.0-r1.ebuild,v 1.15 2011/07/11 15:05:08 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/togl/togl-2.0-r1.ebuild,v 1.16 2011/08/15 17:15:10 jlec Exp $
 
-EAPI="2"
+EAPI=2
 
 MY_P="Togl${PV}"
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug +threads"
 
-RDEPEND="dev-lang/tk
+RDEPEND="
+	dev-lang/tk
 	virtual/opengl"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-tcltk/togl/togl-2.0-r2.ebuild b/dev-tcltk/togl/togl-2.0-r2.ebuild
new file mode 100644
index 000000000000..6891ab63d1b4
--- /dev/null
+++ b/dev-tcltk/togl/togl-2.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/togl/togl-2.0-r2.ebuild,v 1.1 2011/08/15 17:15:10 jlec Exp $
+
+EAPI=4
+
+MY_P="Togl${PV}"
+
+DESCRIPTION="A Tk widget for OpenGL rendering"
+HOMEPAGE="http://togl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug +threads"
+
+RDEPEND="
+	dev-lang/tk
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+
+# tests directory is missing
+RESTRICT="test"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	sed \
+		-e 's:-fomit-frame-pointer::g' \
+		-e 's:-O2::g' \
+		-i configure || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug symbols) \
+		$(use_enable threads)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "failed to install"
+	dohtml doc/* || die "no html"
+	dodoc README* || die "no README"
+}