summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2010-07-03 03:51:45 +0000
committerKeri Harris <keri@gentoo.org>2010-07-03 03:51:45 +0000
commite84bf774399d5a6e30db780680b225f5cb15b7d1 (patch)
tree15ab0ce20658f5ed1ab74d32f82fb83d76197c0d /net-misc
parentRestored ~x86-fbsd keywords. (diff)
downloadhistorical-e84bf774399d5a6e30db780680b225f5cb15b7d1.tar.gz
historical-e84bf774399d5a6e30db780680b225f5cb15b7d1.tar.bz2
historical-e84bf774399d5a6e30db780680b225f5cb15b7d1.zip
Respect LDFLAGS
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/pedro/ChangeLog6
-rw-r--r--net-misc/pedro/Manifest5
-rw-r--r--net-misc/pedro/files/pedro-1.5-portage.patch20
-rw-r--r--net-misc/pedro/pedro-1.5.ebuild8
4 files changed, 30 insertions, 9 deletions
diff --git a/net-misc/pedro/ChangeLog b/net-misc/pedro/ChangeLog
index f0acfc77a463..51cf3bb18a9c 100644
--- a/net-misc/pedro/ChangeLog
+++ b/net-misc/pedro/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/pedro
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pedro/ChangeLog,v 1.1 2010/07/02 23:59:34 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pedro/ChangeLog,v 1.2 2010/07/03 03:51:44 keri Exp $
+
+ 03 Jul 2010; <keri@gentoo.org> pedro-1.5.ebuild,
+ +files/pedro-1.5-portage.patch:
+ Respect LDFLAGS
*pedro-1.5 (02 Jul 2010)
diff --git a/net-misc/pedro/Manifest b/net-misc/pedro/Manifest
index 87d4d5077200..f78dc30fc63c 100644
--- a/net-misc/pedro/Manifest
+++ b/net-misc/pedro/Manifest
@@ -1,5 +1,6 @@
+AUX pedro-1.5-portage.patch 806 RMD160 6665d806ad660d28e1cae1399c3c2efb820ebde5 SHA1 730da3571029d84214309a040d3020c84bf54ee3 SHA256 fed1070e65092fd46eb7524d95ce7cef6ea85b799efa86a0a8aba3904d0b7844
DIST pedro-1.5.tgz 702522 RMD160 2d9c0b4208eb450329bd454e2e549ce1a89adc98 SHA1 48ec07046daf0ca683a119d69316286201317276 SHA256 ddefe8e9ce5bd10b94ffaffb48c634c0c07a6d1bc488efefdb20432fda590fb0
DIST pedro-manual-1.5.tar.gz 146376 RMD160 afd4dccc5a4ddb6d94cd150ba81e8baa5708d42d SHA1 752bf50f4d3dbc6b60b3e3750a84c930ff7808b8 SHA256 b9159337a97fb5f76c1c789bdf68e00096c953a7e5ae44089b92f39119cd48f7
-EBUILD pedro-1.5.ebuild 1059 RMD160 4915b360235d85d43eece068b8c1eb20196279bd SHA1 f20b5f48f462dd7f3d22d0c62c53c5b17db266dd SHA256 3f46935af1b936e449d99f04297e56ad80ed95d1ef52b81c6ff9ac74c7102cab
-MISC ChangeLog 311 RMD160 bd011c475660faa11a6db233737b55235e3d4626 SHA1 ef9d673a6b20af6a95b6ec725d5d894f0e8f6426 SHA256 95fd2b4448cd97f5348817aa0476f5b63968c4a037064ab468828d5ee83ce5c2
+EBUILD pedro-1.5.ebuild 1023 RMD160 d5205ff1e792d784b11980cd1fbb25862b604608 SHA1 968033a1e1ec2011ca1a91a66dc4155f46a460e6 SHA256 9560c57e0d9a4226ab58a7c85e145b7870eaf417297f0d630b2d1e948270b4f2
+MISC ChangeLog 415 RMD160 87ef0aeac68c9cff977e69521fbc071816654d76 SHA1 fe743feda47a660668ac2997f7d490a376fa1dbc SHA256 0d6343e2c3813460e9307783cd1374266b48f0761a5fe7d8c758225f0b6b10df
MISC metadata.xml 245 RMD160 e5eaa5eb205dca229307e3c4d12096d094fbfc45 SHA1 a71214bf1b048fada715131473d2b1ab811a29ea SHA256 9a1ed6d0a9490d3409796578e8d3f68d32b504894d3678499458a9a3c25468c0
diff --git a/net-misc/pedro/files/pedro-1.5-portage.patch b/net-misc/pedro/files/pedro-1.5-portage.patch
new file mode 100644
index 000000000000..a5639eac38b2
--- /dev/null
+++ b/net-misc/pedro/files/pedro-1.5-portage.patch
@@ -0,0 +1,20 @@
+--- pedro-1.5.orig/configure 2010-06-15 15:59:50.000000000 +1200
++++ pedro-1.5/configure 2010-07-03 15:29:06.000000000 +1200
+@@ -11292,7 +11292,7 @@
+ ac_config_headers="$ac_config_headers config.h"
+
+ #AC_CONFIG_MACRO_DIR([m4])
+-CPPFLAGS="-O2 -g `pkg-config --cflags glib-2.0`"
++CPPFLAGS="`pkg-config --cflags glib-2.0`"
+ case "${host}" in
+ i[3456789]86-*-mingw32*)
+ WIN32="yes"
+@@ -11300,7 +11300,7 @@
+ ;;
+ *)
+ WIN32="no"
+- LDFLAGS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm"
++ LDFLAGS="$LDFLAGS -L../lib -lpedro `pkg-config --libs glib-2.0` -lm"
+ ;;
+ esac
+ ac_config_files="$ac_config_files Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile"
diff --git a/net-misc/pedro/pedro-1.5.ebuild b/net-misc/pedro/pedro-1.5.ebuild
index 2897df9e2ba5..a998110c4fb1 100644
--- a/net-misc/pedro/pedro-1.5.ebuild
+++ b/net-misc/pedro/pedro-1.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pedro/pedro-1.5.ebuild,v 1.1 2010/07/02 23:59:34 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pedro/pedro-1.5.ebuild,v 1.2 2010/07/03 03:51:44 keri Exp $
EAPI=1
@@ -23,11 +23,7 @@ S="${WORKDIR}"/${P}
src_unpack() {
unpack ${A}
cd "${S}"
-}
-
-src_compile() {
- econf || die "econf failed"
- emake || die "emake failed"
+ epatch "${FILESDIR}"/${P}-portage.patch
}
src_install() {