From: Matti Bickel <mabi@gentoo.org>
Date: Sun, 14 Jan 2007 23:14:21 +0000 (+0000)
Subject: fixing pkg-config data (bug #162036)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=973fcd5f92ce64ad9f20e2d030ce5892dff1c745;p=gentoo.git

fixing pkg-config data (bug #162036)
Package-Manager: portage-2.1.1-r2
---

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 10b7cf435e3d..7b1fa6a06053 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.59 2007/01/13 14:28:52 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.60 2007/01/14 23:14:21 mabi Exp $
+
+  14 Jan 2007; Matti Bickel <mabi@gentoo.org> lua-5.0.3-r1.ebuild,
+  lua-5.1.1-r1.ebuild:
+  fixing pkg-config data (bug #162036)
 
 *lua-5.1.1-r1 (10 Jan 2007)
 *lua-5.0.3-r1 (10 Jan 2007)
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 809933afb253..6eb223c50414 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -60,26 +60,26 @@ EBUILD lua-5.0.2.ebuild 3024 RMD160 74d25ca38c448f0c2ab57c2802bd061b35138600 SHA
 MD5 4e504ff97c115c2cb1167f1b5aa3de42 lua-5.0.2.ebuild 3024
 RMD160 74d25ca38c448f0c2ab57c2802bd061b35138600 lua-5.0.2.ebuild 3024
 SHA256 3bb9270c305b3d2b1b50bb69a22599fededff9f4c837bd4d5d92b555d31a5086 lua-5.0.2.ebuild 3024
-EBUILD lua-5.0.3-r1.ebuild 3607 RMD160 ddf461e70f37e2f5055bfb001d0cf30b87e7c6f7 SHA1 ad80d29237c3694860aa017c63863aabfac83be4 SHA256 f232f77805372e54b312c0adf41213c6eba8a6edb36812e8d2e6968e47e851a5
-MD5 2efb2e4916a0d8353a1e5b4fe0f6112a lua-5.0.3-r1.ebuild 3607
-RMD160 ddf461e70f37e2f5055bfb001d0cf30b87e7c6f7 lua-5.0.3-r1.ebuild 3607
-SHA256 f232f77805372e54b312c0adf41213c6eba8a6edb36812e8d2e6968e47e851a5 lua-5.0.3-r1.ebuild 3607
+EBUILD lua-5.0.3-r1.ebuild 3615 RMD160 6125ce16470349ba39cedfcb7d58c5da2a71b8b9 SHA1 bd5a90f2b693e7ab30f84f64249fb0c7c8bb6561 SHA256 e58a310c11b534e01cfbb09088027c98e769e280c0d1c752cf2b7d53f2f273b6
+MD5 f1e3efcec71b9d074545ac58d4853ad6 lua-5.0.3-r1.ebuild 3615
+RMD160 6125ce16470349ba39cedfcb7d58c5da2a71b8b9 lua-5.0.3-r1.ebuild 3615
+SHA256 e58a310c11b534e01cfbb09088027c98e769e280c0d1c752cf2b7d53f2f273b6 lua-5.0.3-r1.ebuild 3615
 EBUILD lua-5.0.3.ebuild 3091 RMD160 0c4095092f6f2ea6fb9349011a905e387cc744ef SHA1 a26ff9fb4871e80b9fb6b96790843fa09ea7f52c SHA256 5e5232053c6de487ba7a6103f51111f0339a6aa79838988090256548f6b7f069
 MD5 5c82889af9fbb1331fb9966216562c02 lua-5.0.3.ebuild 3091
 RMD160 0c4095092f6f2ea6fb9349011a905e387cc744ef lua-5.0.3.ebuild 3091
 SHA256 5e5232053c6de487ba7a6103f51111f0339a6aa79838988090256548f6b7f069 lua-5.0.3.ebuild 3091
-EBUILD lua-5.1.1-r1.ebuild 2568 RMD160 ac7c73bdd2153456a8c0e28dd04a4e1800dcb4e1 SHA1 d563c9e80fecfc1e9ce536f1354a02a92366b367 SHA256 dfd39fbbffafed1490f09db8039d8dd2b052dda46c54d1afaec014228b2ec763
-MD5 0f8a4f76249b854356cf3666851936b4 lua-5.1.1-r1.ebuild 2568
-RMD160 ac7c73bdd2153456a8c0e28dd04a4e1800dcb4e1 lua-5.1.1-r1.ebuild 2568
-SHA256 dfd39fbbffafed1490f09db8039d8dd2b052dda46c54d1afaec014228b2ec763 lua-5.1.1-r1.ebuild 2568
+EBUILD lua-5.1.1-r1.ebuild 2769 RMD160 deaf651025e90c9a6dee4c8e87e0d462c9ebd0f7 SHA1 a11af2b8fd12475d42c629f6aee52ed58d20a52e SHA256 e1d1721383acc76d987110ec70584a2b67407dda34acb92656a652ad9a5884bd
+MD5 fe0377d1d3a9b02555c9038652d4d199 lua-5.1.1-r1.ebuild 2769
+RMD160 deaf651025e90c9a6dee4c8e87e0d462c9ebd0f7 lua-5.1.1-r1.ebuild 2769
+SHA256 e1d1721383acc76d987110ec70584a2b67407dda34acb92656a652ad9a5884bd lua-5.1.1-r1.ebuild 2769
 EBUILD lua-5.1.1.ebuild 2409 RMD160 6bf631b9855b07bf15b784898be2b495e328ebb5 SHA1 183e2e5b2dcb0a13f9668494176ad350b47c7e86 SHA256 6d434295cd59062f307ddb428e4ef69cf530d568a5e28f3475e1ff5cf3be321d
 MD5 d1a0b67ec27adc9a4850cf611e2ea1d1 lua-5.1.1.ebuild 2409
 RMD160 6bf631b9855b07bf15b784898be2b495e328ebb5 lua-5.1.1.ebuild 2409
 SHA256 6d434295cd59062f307ddb428e4ef69cf530d568a5e28f3475e1ff5cf3be321d lua-5.1.1.ebuild 2409
-MISC ChangeLog 8641 RMD160 a030e235ab9fb6fd14e85a6544d34da1eb63824b SHA1 d1e4546589a147ada2644dbab4c4d4c4a526feb8 SHA256 8d73762b07ecc984d7d7e757680c25c3d17522c82020959d12cc1a4280a2d25d
-MD5 e2efffc02f9e30fa0d4664e7a8dd3d14 ChangeLog 8641
-RMD160 a030e235ab9fb6fd14e85a6544d34da1eb63824b ChangeLog 8641
-SHA256 8d73762b07ecc984d7d7e757680c25c3d17522c82020959d12cc1a4280a2d25d ChangeLog 8641
+MISC ChangeLog 8771 RMD160 3a75a8f20c99e35d8915be72bc89f21057ae7be8 SHA1 bdf283fcde5bb9b02ddf55f5f8ccb273221791a8 SHA256 6d908c1ff8a8ced0982ebe8aa8d351ef663537816a5c25c701257f32fba4acbe
+MD5 28234b9668459796f7f029be5c6fc533 ChangeLog 8771
+RMD160 3a75a8f20c99e35d8915be72bc89f21057ae7be8 ChangeLog 8771
+SHA256 6d908c1ff8a8ced0982ebe8aa8d351ef663537816a5c25c701257f32fba4acbe ChangeLog 8771
 MISC metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 SHA1 76fdc0af8e2d1dbb1214b95c49f8cd2da3d3832a SHA256 6a089a75a70b3b69d4cae78762fdc69afa25678c5b8692c61245f50bc49ab531
 MD5 ae5edc540c3c3ae7307d2ac4c0e16773 metadata.xml 246
 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 metadata.xml 246
@@ -102,7 +102,7 @@ SHA256 5a9bfa07cd7871412eacd8a0285b69aaac0d01b635406b2d2c24569cb0c7042c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFqO39fNMcoUhJ7GwRAtRKAJ4wVKdprjiMWQPvaIOXWT8L4RaidACfQGmL
-RCLx3kYBy7L87qMurK56GlA=
-=TVvA
+iD8DBQFFqrmEfNMcoUhJ7GwRApcrAJ4+bjbNpIieEOCa1f3N7c3fX8Zs3gCfdkuQ
+4OtJgXz5eWSVPNjbfPDJcn8=
+=WCn6
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/lua/lua-5.0.3-r1.ebuild b/dev-lang/lua/lua-5.0.3-r1.ebuild
index d35fcd1006f1..db6a9f5a0a4b 100644
--- a/dev-lang/lua/lua-5.0.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.3-r1.ebuild,v 1.1 2007/01/13 14:28:52 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.3-r1.ebuild,v 1.2 2007/01/14 23:14:21 mabi Exp $
 
 inherit eutils portability
 
@@ -67,7 +67,7 @@ src_unpack() {
 	cat >etc/lua-5.0.pc <<EOF
 prefix=/usr
 exec_prefix=\${prefix}
-includedir=\${prefix}/include
+includedir=\${prefix}/include/lua-5.0
 libdir=\${exec_prefix}/$(get_libdir)
 interpreter=\${exec_prefix}/bin/lua-5.0
 compiler=\${exec_prefix}/bin/luac-5.0
diff --git a/dev-lang/lua/lua-5.1.1-r1.ebuild b/dev-lang/lua/lua-5.1.1-r1.ebuild
index e000b876dcf0..73d30ff3a2e0 100644
--- a/dev-lang/lua/lua-5.1.1-r1.ebuild
+++ b/dev-lang/lua/lua-5.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1-r1.ebuild,v 1.1 2007/01/13 14:28:52 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1-r1.ebuild,v 1.2 2007/01/14 23:14:21 mabi Exp $
 
 inherit eutils portability
 
@@ -26,6 +26,11 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-Makefile.patch
 	epatch "${FILESDIR}"/${P}-module_paths.patch
+	sed -i etc/lua.pc \
+		-e 's:\(prefix= /usr\)/local:\1:' \
+		-e 's:\(INSTALL_INC= ${prefix}/include\):\1/lua-5.1:' \
+		-e 's:\(includedir=${prefix}/include\):\1/lua-5.1:' \
+		-e 's:\(\-llua\):\1-5.1:'
 
 	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html