Version bump. Remove old.

(Portage version: 2.1.9.29/cvs/Linux x86_64)

3 files changed, 10 insertions, 73 deletions

diff --git a/sys-cluster/corosync/ChangeLog b/sys-cluster/corosync/ChangeLog
index 27f713ff925c..9699d97f676c 100644
--- a/sys-cluster/corosync/ChangeLog
+++ b/sys-cluster/corosync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/corosync
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.10 2010/11/17 07:07:03 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.11 2011/01/07 14:20:43 ultrabug Exp $
+
+*corosync-1.3.0 (07 Jan 2011)
+
+  07 Jan 2011; Ultrabug <ultrabug@gentoo.org> -corosync-1.2.8-r2.ebuild,
+  +corosync-1.3.0.ebuild, -files/corosync-ldflags.patch:
+  Version bump. Remove old.
 
 *corosync-1.2.8-r2 (17 Nov 2010)
 
diff --git a/sys-cluster/corosync/corosync-1.2.8-r2.ebuild b/sys-cluster/corosync/corosync-1.3.0.ebuild
index 7a12e887f5d7..e6bcd8a6435a 100644
--- a/sys-cluster/corosync/corosync-1.2.8-r2.ebuild
+++ b/sys-cluster/corosync/corosync-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-1.2.8-r2.ebuild,v 1.1 2010/11/17 07:07:03 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-1.3.0.ebuild,v 1.1 2011/01/07 14:20:43 ultrabug Exp $
 
 EAPI=3
 
@@ -26,7 +26,6 @@ DEPEND="${RDEPEND}
 	doc? ( sys-apps/groff )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-ldflags.patch"
 	"${FILESDIR}/${PN}-docs.patch"
 )
 
diff --git a/sys-cluster/corosync/files/corosync-ldflags.patch b/sys-cluster/corosync/files/corosync-ldflags.patch
deleted file mode 100644
index 487fed0bf7f0..000000000000
--- a/sys-cluster/corosync/files/corosync-ldflags.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Respect LDFLAGS
-
---- exec/Makefile.am
-+++ exec/Makefile.am
-@@ -81,7 +81,7 @@
- 
- if BUILD_DARWIN
- %.lcrso: %.o
--	$(CC) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@
- 
- libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
- 	$(CC) $(LDFLAGS) $(DARWIN_OPTS) $(TOTEM_OBJS) -o $@ -lpthread
-@@ -122,7 +122,7 @@
- else
- 
- %.lcrso: %.o
--	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
- 
- libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
- 	$(CC) -shared -o $@ \
---- lcr/Makefile.am
-+++ lcr/Makefile.am
-@@ -52,24 +52,24 @@
- if BUILD_DARWIN
- 
- %.lcrso: %.o
--	$(CC) $(CFLAGS) -bundle -bundle_loader ./test $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -bundle -bundle_loader ./test $^ -o $@
- else
- 
- if BUILD_SOLARIS
- 
- %.lcrso: %.o
--	$(CC) $(CFLAGS) -shared $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared $^ -o $@
- else
- 
- %.lcrso: %.o
--	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$@ $^ -o $@
- 
- endif
- 
- endif
- 
- lint:
--	-splint $(LINT_FLAGS) $(CFLAGS) *.c
-+	-splint $(LINT_FLAGS) $(CFLAGS) $(LDFLAGS) *.c
- 
- all-local: $(noinst_LCRSO)
- 	@echo Built Live Component Replacement System
---- services/Makefile.am
-+++ services/Makefile.am
-@@ -68,10 +68,10 @@
- 
- else
- quorum_%.lcrso: %.o
--	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
- 
- service_%.lcrso: %.o
--	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
- endif
- 
- endif