Fix ldflags and ldlibs ordering to respect users flags. Install target had all, which caused everything to get rebuilt at install phase which is not desired behavior. Thanks to leio wrt #249050.

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27-gentoo-r3 i686

5 files changed, 99 insertions, 5 deletions

diff --git a/x11-terms/evilvte/ChangeLog b/x11-terms/evilvte/ChangeLog
index eb3f70df2183..8a6f1b81bbf5 100644
--- a/x11-terms/evilvte/ChangeLog
+++ b/x11-terms/evilvte/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-terms/evilvte
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/evilvte/ChangeLog,v 1.4 2008/11/26 13:42:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/evilvte/ChangeLog,v 1.5 2008/11/27 06:14:45 ssuominen Exp $
+
+*evilvte-0.4.4_pre6-r1 (27 Nov 2008)
+
+  27 Nov 2008; <ssuominen@gentoo.org>
+  +files/evilvte-0.4.4_pre6-fix_ldflags_and_ldlibs_for_asneeded.patch,
+  evilvte-0.4.4_pre6.ebuild, +evilvte-0.4.4_pre6-r1.ebuild:
+  Fix ldflags and ldlibs ordering to respect users flags. Install target had
+  all, which caused everything to get rebuilt at install phase which is not
+  desired behavior. Thanks to leio wrt #249050.
 
 *evilvte-0.4.4_pre6 (26 Nov 2008)
 
diff --git a/x11-terms/evilvte/Manifest b/x11-terms/evilvte/Manifest
index 66647f76086b..fa19ffa9d5be 100644
--- a/x11-terms/evilvte/Manifest
+++ b/x11-terms/evilvte/Manifest
@@ -1,6 +1,8 @@
+AUX evilvte-0.4.4_pre6-fix_ldflags_and_ldlibs_for_asneeded.patch 1301 RMD160 84d95664cc464e6fae42366e04dde8b2e913d02a SHA1 8634fe98787473781d995222a071c03105a80d9f SHA256 bdf01ea7282e39af087190b5b864a6b8eb14d0e93a0e288bd54531a6719c105f
 DIST evilvte-0.4.3.tar.gz 41374 RMD160 a8b234a6612fc10e3fa5a1a4c617b3e9eab1b94f SHA1 c295667d99b602ca03f75f40275d308eabfa0333 SHA256 2306e3445ca402d356935927f86b0c515857df2785e273449fb4f724373200dc
 DIST evilvte-0.4.4~pre6.tar.gz 36058 RMD160 f12d38016d167d7676303f24afcbd6ed1e9959fd SHA1 21564a005b74dc3454aff1497cd4b55453b01384 SHA256 42084fc6ea160b6305bc08460d51c2dd96e55571cfeaa7f16ab8f16ec71f9877
 EBUILD evilvte-0.4.3.ebuild 1082 RMD160 38ce8713d317b4ab37cd35430741278a56751010 SHA1 ee4c46ec6f4984ba7cd9d2f625181f8ad0df516d SHA256 45cf86ba42e608b9061a88e8c726dc8718ff07f3d77d0138f979e500fb26b28f
-EBUILD evilvte-0.4.4_pre6.ebuild 1134 RMD160 273c881b1f3d5722f121d0014e78174228c7f8bc SHA1 c4e24805454aae17790ba562951f4347d2b78f82 SHA256 5d18219d4d73e7182287f9fc2f6c7a49f59d4ebca9c41932d5fd6e8a4b73b412
-MISC ChangeLog 774 RMD160 52d1d04d63779512acf028bcee67e92538b16f9b SHA1 754a74aff463bf5c4a7c747dab636edf677ddec7 SHA256 a339b615848dc446fdb466582e95830847fdf2bd280974a14a1cc3e5b864f603
+EBUILD evilvte-0.4.4_pre6-r1.ebuild 1236 RMD160 1884cad339c0a3581d45bf7adfd7b6b865ca4078 SHA1 fd2d738b62636f401fef27d1468d601e404ec776 SHA256 57dd3135f9b2c1269fce04f4414f29cd7f4fe6c4b73c1f4748aa6e8696d1d7aa
+EBUILD evilvte-0.4.4_pre6.ebuild 1155 RMD160 e39ee48e06e9d22fe82479d6eb2455669298286a SHA1 cb85f3e1e92294b696b2e2e261453fdd2a009766 SHA256 c5e19cf38ce8ec86a885ba9989e6608d78be865c7428c5cde11fae935feae04a
+MISC ChangeLog 1183 RMD160 18158196e819eec139bbb908542ac64071699b26 SHA1 42a04d4088cd1889a10a685a4e836b78b3cc6f7a SHA256 07c7f2b9c186393244bbf1d9810033cef36ec9ae2c725c3c3b9197ddc6d65763
 MISC metadata.xml 233 RMD160 02b014714ae152bfc523f7d155372324dcf656e5 SHA1 ff3a1bd8e82e12b7dbdde71668ca0d516e90c433 SHA256 6a5d890ad57145660da24daae686a19a7efdb54bb6ec23cfe986a904576e17c9
diff --git a/x11-terms/evilvte/evilvte-0.4.4_pre6-r1.ebuild b/x11-terms/evilvte/evilvte-0.4.4_pre6-r1.ebuild
new file mode 100644
index 000000000000..fa351c768b69
--- /dev/null
+++ b/x11-terms/evilvte/evilvte-0.4.4_pre6-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/evilvte/evilvte-0.4.4_pre6-r1.ebuild,v 1.1 2008/11/27 06:14:45 ssuominen Exp $
+
+MY_P=${P/_/\~}
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="VTE based, super lightweight terminal emulator"
+HOMEPAGE="http://www.calno.com/evilvte"
+SRC_URI="http://www.calno.com/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/vte
+	>=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-fix_ldflags_and_ldlibs_for_asneeded.patch
+
+	if [[ -f /etc/${PN}/config.h ]]; then
+		cp /etc/${PN}/config.h src/ || die "copying config.h failed."
+	fi
+}
+
+src_compile() {
+	./configure --prefix=/usr || die "./configure failed."
+	emake LDFLAGS="${LDFLAGS}" OPTFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc Changelog
+	insinto /etc/${PN}
+	doins src/config.h || die "doins failed."
+}
+
+pkg_postinst() {
+	elog "Edit /etc/${PN}/config.h and re-emerge for custom configuration."
+}
diff --git a/x11-terms/evilvte/evilvte-0.4.4_pre6.ebuild b/x11-terms/evilvte/evilvte-0.4.4_pre6.ebuild
index dbdcdd28d969..6e8930b42b0f 100644
--- a/x11-terms/evilvte/evilvte-0.4.4_pre6.ebuild
+++ b/x11-terms/evilvte/evilvte-0.4.4_pre6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/evilvte/evilvte-0.4.4_pre6.ebuild,v 1.1 2008/11/26 13:42:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/evilvte/evilvte-0.4.4_pre6.ebuild,v 1.2 2008/11/27 06:14:45 ssuominen Exp $
 
 MY_P=${P/_/\~}
 
@@ -32,7 +32,7 @@ src_unpack() {
 
 src_compile() {
 	./configure --prefix=/usr || die "./configure failed."
-	emake OPTFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed."
+	emake LDFLAGS="${LDFLAGS}" OPTFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed."
 }
 
 src_install() {
diff --git a/x11-terms/evilvte/files/evilvte-0.4.4_pre6-fix_ldflags_and_ldlibs_for_asneeded.patch b/x11-terms/evilvte/files/evilvte-0.4.4_pre6-fix_ldflags_and_ldlibs_for_asneeded.patch
new file mode 100644
index 000000000000..9c3f97e6ad1a
--- /dev/null
+++ b/x11-terms/evilvte/files/evilvte-0.4.4_pre6-fix_ldflags_and_ldlibs_for_asneeded.patch
@@ -0,0 +1,33 @@
+diff -ur evilvte-0.4.4~pre6.orig/configure evilvte-0.4.4~pre6/configure
+--- evilvte-0.4.4~pre6.orig/configure	2008-11-15 12:01:06.000000000 +0200
++++ evilvte-0.4.4~pre6/configure	2008-11-27 08:03:39.000000000 +0200
+@@ -78,7 +78,7 @@
+ echo "deskdir=\$(DESTDIR)$deskdir" >> src/config.o
+ echo "ICON_DIR=$ICON_DIR" >> src/config.o
+ echo "ICON_DIR_INSTALL=\$(DESTDIR)$ICON_DIR" >> src/config.o
+-echo "LDFLAGS=-L/usr/local/lib -lvte -lgtk-x11-2.0" >> src/config.o
++echo "LDLIBS=-L/usr/local/lib -lvte -lgtk-x11-2.0" >> src/config.o
+ echo "PROG=$PROG" >> src/config.o
+ echo "EVILVTE_VERSION=$EVILVTE_VERSION" >> src/config.o
+ echo "SUSE_DETECTED=$SUSE_DETECTED" >> src/config.o
+diff -ur evilvte-0.4.4~pre6.orig/Makefile evilvte-0.4.4~pre6/Makefile
+--- evilvte-0.4.4~pre6.orig/Makefile	2008-11-15 12:01:06.000000000 +0200
++++ evilvte-0.4.4~pre6/Makefile	2008-11-27 08:10:46.000000000 +0200
+@@ -16,7 +16,7 @@
+ 	sh src/evilvte.sh
+ 
+ evilvte: src/evilvte.h $(OBJ)
+-	$(CC) -o $(PROG) $(OBJ) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(OBJ) $(LDLIBS) -o $(PROG)
+ 
+ strip: all
+ 	strip --remove-section=.comment --remove-section=.note $(PROG)
+@@ -32,7 +32,7 @@
+ misc/evilvte.1:
+ 	sh src/manpage.sh
+ 
+-install: all
++install:
+ 	install -d $(bindir)
+ 	install -m 755 $(PROG) src/showvte $(bindir)
+ 	install -d $(ICON_DIR_INSTALL)