Respect CC, LDFLAGS. Move sed commands to src_prepare. Bug #333849

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 73 insertions, 7 deletions

diff --git a/sci-chemistry/gperiodic/ChangeLog b/sci-chemistry/gperiodic/ChangeLog
index 7abbc7df69f8..9440ce57dcef 100644
--- a/sci-chemistry/gperiodic/ChangeLog
+++ b/sci-chemistry/gperiodic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/gperiodic
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/ChangeLog,v 1.12 2009/10/07 20:40:43 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/ChangeLog,v 1.13 2010/08/22 20:01:10 hwoarang Exp $
+
+*gperiodic-2.0.10-r1 (22 Aug 2010)
+
+  22 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  +gperiodic-2.0.10-r1.ebuild:
+  Respect CC, LDFLAGS. Move sed commands to src_prepare. Bug #333849
 
   07 Oct 2009; Markus Meier <maekke@gentoo.org> gperiodic-2.0.10.ebuild:
   amd64/x86 stable, bug #285466
diff --git a/sci-chemistry/gperiodic/Manifest b/sci-chemistry/gperiodic/Manifest
index 93fe53bf1059..9600d1af8004 100644
--- a/sci-chemistry/gperiodic/Manifest
+++ b/sci-chemistry/gperiodic/Manifest
@@ -3,14 +3,15 @@ Hash: SHA1
 
 DIST gperiodic-2.0.10.tar.gz 131213 RMD160 9a4a16c4578342b4044d93e3327623cec98c762e SHA1 ce7a4d5271aaf283afa0c8299b2ee9b04da257fe SHA256 78d72870c51c39e4a35c804c05b8ef5e39f88d42eced52b2934e21d74fb8d096
 DIST gperiodic-2.0.7.tar.gz 124798 RMD160 0e2f0dff05005c7c018bd996b1957b841de80fff SHA1 fa1277c4f1d34fbdb2da95b38a6b7f59e23caf03 SHA256 e7cdb11effa7e3adbf5ac60a16b5092359093ffa93282f25a6855094a0fa250f
+EBUILD gperiodic-2.0.10-r1.ebuild 1640 RMD160 3ccdaf41857e38b3faece4f869d0b21df0069b11 SHA1 5a28065994153a8b81ccba1c9bdb97fbf024c1f2 SHA256 fbcbfc000f92fd24af4c9d2b84177581ee851edd549d7ca5ebfb72a4469ce230
 EBUILD gperiodic-2.0.10.ebuild 1699 RMD160 e0a2eff440b150edd6473dd468f4d2cd59f8da66 SHA1 3ed2d0e4b7e2652608c12e42059dd62dd0689891 SHA256 6f2ea25d522af6e37b39340d076e7a8742c50bad1880596905953bc8f0e5b253
 EBUILD gperiodic-2.0.7.ebuild 1769 RMD160 8deffb8148b1184c60762e35678e967e64979004 SHA1 56ddcb4666cd73939c8ebc221167558721912ff4 SHA256 8d70c83d492c388e66567bb779330851a5362a61753f92192438aa71891632de
-MISC ChangeLog 2946 RMD160 07d24f15c0167b86d004c92cf30e8d78b33b75b1 SHA1 38e1aecdcb870e7b5cdea0e0ddf6df4c92765b72 SHA256 15a87b673dde1bd8d2141988669d531e1f459994e13650bca90d64f1717998b6
+MISC ChangeLog 3138 RMD160 ba1f99a8cfc2d4e20465ac92392a70e002722113 SHA1 5bfcd56faa73ad7a4ada5503342b98d1982df284 SHA256 747cf5629c1b6bdf4f5660984e0d0ccc5973457838507b8a016ef9f8d8c629e0
 MISC metadata.xml 382 RMD160 7d7c62b16a0a51c6733c7f29cd5e1625d7e6ce58 SHA1 463e1bc95782151502631a9062b725c35ddb0b65 SHA256 e0a66fccfe95f1349201a16861d28ea5d85021f2f168dd7af9e3cc7fb75edd38
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkrM/PYACgkQkKaRLQcq0GJOyACeLpFaqm8/v1ZHi3rQu2SU0dI2
-iUsAoJeZL65iMEEwZkEPtnFT2eAHyz0O
-=GTil
+iEYEARECAAYFAkxxgtQACgkQ9/cejkQaxBCiYACeMhE+1Q6qViV4X30Yr4XC/dzD
+qDMAn2DWOYDsEpLWvFljzlFThhvGgnIp
+=816A
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/gperiodic/gperiodic-2.0.10-r1.ebuild b/sci-chemistry/gperiodic/gperiodic-2.0.10-r1.ebuild
new file mode 100644
index 000000000000..8cecda1924f0
--- /dev/null
+++ b/sci-chemistry/gperiodic/gperiodic-2.0.10-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.10-r1.ebuild,v 1.1 2010/08/22 20:01:11 hwoarang Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Periodic table application for Linux"
+SRC_URI="http://www.frantz.fi/software/${P}.tar.gz"
+HOMEPAGE="http://www.frantz.fi/software/gperiodic.php"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="nls"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	=x11-libs/gtk+-2*
+	x11-libs/cairo[X]
+	nls? ( sys-devel/gettext )"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
+
+src_prepare() {
+	sed -i -e "s|-DGTK_DISABLE_DEPRECATED|${CFLAGS}|" \
+		-e "/make clean/d" -e "/^CC/s:^.*$:CC=$(tc-getCC):" \
+		-e "s:\$(CFLAGS):& \${LDFLAGS}:" \
+		Makefile || die
+
+	if ! use nls; then
+		sed -i -e "/make -C po/d" Makefile || die
+	fi
+	sed -i -e "s|/usr/bin|${D}/usr/bin|" \
+		-e "s|/usr/share|${D}/usr/share|" Makefile || die
+	sed -i -e "s|/usr/share|${D}/usr/share|" po/Makefile || die
+}
+
+src_install() {
+	# Create directories - Makefile is quite broken.
+	dodir /usr/bin
+	dodir /usr/share/pixmaps
+	dodir /usr/share/applications
+
+	emake install || die "make install failed."
+
+	# Fix permissions
+	chmod 644 "${D}/usr/share/pixmaps/*"
+	chmod 644 "${D}/usr/share/applications/*"
+
+	# Fix the chemistry category in the .desktop file, bug 97202.
+	sed -i -e "s|Chemestry|Chemistry|" "${D}/usr/share/applications/gperiodic.desktop"
+
+	# The man page seems to have been removed too.
+#	doman man/gperiodic.1
+	dodoc AUTHORS ChangeLog README NEWS || die
+	newdoc po/README README.translation || die
+}