Drop old. Use higher EAPI, introduce static-libs IUSE, don't build static with -fPIC, fix underlinking wrt #367871.

(Portage version: 2.2.0_alpha31/cvs/Linux x86_64)

3 files changed, 76 insertions, 30 deletions

diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog
index 2f828de4e978..1bc6eb77d092 100644
--- a/sys-cluster/ipvsadm/ChangeLog
+++ b/sys-cluster/ipvsadm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/ipvsadm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.46 2011/03/07 19:44:12 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.47 2011/05/18 07:25:17 xarthisius Exp $
+
+*ipvsadm-1.26-r1 (18 May 2011)
+
+  18 May 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  -files/ipvsadm-1.25-r1-build-fixup.diff, -ipvsadm-1.26.ebuild,
+  +ipvsadm-1.26-r1.ebuild, +files/ipvsadm-1.26-buildsystem.patch:
+  Drop old. Use higher EAPI, introduce static-libs IUSE, don't build static
+  with -fPIC, fix underlinking wrt #367871.
 
 *ipvsadm-1.26 (07 Mar 2011)
 
diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.25-r1-build-fixup.diff b/sys-cluster/ipvsadm/files/ipvsadm-1.26-buildsystem.patch
index 03bbf5f867eb..ba8e9450eb35 100644
--- a/sys-cluster/ipvsadm/files/ipvsadm-1.25-r1-build-fixup.diff
+++ b/sys-cluster/ipvsadm/files/ipvsadm-1.26-buildsystem.patch
@@ -1,7 +1,10 @@
---- ipvsadm-1.25/Makefile
-+++ ipvsadm-1.25/Makefile
-@@ -45,11 +45,11 @@
- STATIC_LIBS	= libipvs/libipvs.a
+--- a/Makefile
++++ b/Makefile
+@@ -43,14 +43,13 @@
+ INIT		= $(BUILD_ROOT)/etc/rc.d/init.d
+ MKDIR		= mkdir
+ INSTALL		= install
+-STATIC_LIBS	= libipvs/libipvs.a
  
  ifeq "${ARCH}" "sparc64"
 -    CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
@@ -15,22 +18,32 @@
  
  #####################################
  # No servicable parts below this line
-@@ -92,10 +92,12 @@
+@@ -94,10 +93,12 @@
  all:            libs ipvsadm
  
  libs:
 -		make -C libipvs
 +		$(MAKE) -C libipvs
 +
-+$(STATIC_LIBS): libs
++$(OBJS):	libs
  
- ipvsadm:	$(OBJS) $(STATIC_LIBS)
+-ipvsadm:	$(OBJS) $(STATIC_LIBS)
 -		$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-+		$(CC) $(LDFLAGS) $(OPTFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
++ipvsadm:	$(OBJS)
++		$(CC) $(LDFLAGS) $(OPTFLAGS) $(CFLAGS) -o $@ $^ -Llibipvs -lipvs $(LIBS)
  
- install:        all
+-install:        all
++install:
  		if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
-@@ -115,7 +117,7 @@
+@@ -108,15 +109,13 @@
+ 		$(INSTALL) -m 0644 ipvsadm.8 $(MAN)
+ 		$(INSTALL) -m 0644 ipvsadm-save.8 $(MAN)
+ 		$(INSTALL) -m 0644 ipvsadm-restore.8 $(MAN)
+-		[ -d $(INIT) ] || $(MKDIR) -p $(INIT)
+-		$(INSTALL) -m 0755 ipvsadm.sh $(INIT)/ipvsadm
+ 
+ clean:
+ 		rm -f ipvsadm $(NAME).spec $(NAME)-$(VERSION).tar.gz
  		rm -rf debian/tmp
  		find . -name '*.[ao]' -o -name "*~" -o -name "*.orig" \
  		  -o -name "*.rej" -o -name core | xargs rm -f
@@ -39,20 +52,20 @@
  
  distclean:	clean
  
-@@ -148,4 +150,4 @@
+@@ -149,4 +148,4 @@
  		dpkg-buildpackage
  
  %.o:	%.c
 -		$(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
 +		$(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
---- ipvsadm-1.25/libipvs/Makefile
-+++ ipvsadm-1.25/libipvs/Makefile
-@@ -1,14 +1,14 @@
+--- a/libipvs/Makefile
++++ b/libipvs/Makefile
+@@ -1,32 +1,39 @@
  # Makefile for libipvs
  
  CC		= gcc
 -CFLAGS		= -Wall -Wunused -Wstrict-prototypes -g -fPIC
-+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes -fPIC
++OPTFLAGS = -Wall -Wunused -Wstrict-prototypes
  ifneq (0,$(HAVE_NL))
 -CFLAGS		+= -DLIBIPVS_USE_NL
 +DEFINES += -DLIBIPVS_USE_NL
@@ -65,16 +78,36 @@
  		    echo "-DHAVE_NET_IP_VS_H"; fi;)
  
  .PHONY		= all clean install dist distclean rpm rpms
-@@ -21,10 +21,10 @@
+-STATIC_LIB	= libipvs.a
+-SHARED_LIB	= libipvs.so
+ 
+-all:		$(STATIC_LIB) $(SHARED_LIB)
++TARGETS = libipvs.so
+ 
+-$(STATIC_LIB):	libipvs.o ip_vs_nl_policy.o
++ifeq (1,$(STATIC_LIB))
++TARGETS += libipvs.a
++endif
++
++all:		$(TARGETS)
++
++libipvs.a:	libipvs.o ip_vs_nl_policy.o
  		ar rv $@ $^
  
- $(SHARED_LIB):	libipvs.o ip_vs_nl_policy.o
+-$(SHARED_LIB):	libipvs.o ip_vs_nl_policy.o
 -		$(CC) -shared -Wl,-soname,$@ -o $@ $^
++libipvs.so:	libipvs.lo ip_vs_nl_policy.lo
 +		$(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^
++
++%.lo:		%.c
++		$(CC) -fPIC $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
  
  %.o:		%.c
 -		$(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
 +		$(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
  
  clean:
- 		rm -f *.[ao] *~ *.orig *.rej core *.so
+-		rm -f *.[ao] *~ *.orig *.rej core *.so
++		rm -f *.[ao] *~ *.orig *.rej core *.so *.lo
+ 
+ distclean:	clean
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.26.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild
index 4e51dde3fcd9..0ebc42a92850 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.26.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild
@@ -1,22 +1,25 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.26.ebuild,v 1.1 2011/03/07 19:44:12 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild,v 1.1 2011/05/18 07:25:17 xarthisius Exp $
 
-EAPI=3
-inherit linux-info toolchain-funcs eutils
+EAPI=4
 
-DESCRIPTION="utility to administer the IP virtual server services offered by the Linux kernel"
+inherit eutils linux-info toolchain-funcs
+
+DESCRIPTION="utility to administer the IP virtual server services"
 HOMEPAGE="http://linuxvirtualserver.org/"
 SRC_URI="http://www.linuxvirtualserver.org/software/kernel-2.6/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.2
-		dev-libs/libnl"
-DEPEND="${RDEPEND}"
+	dev-libs/libnl
+	dev-libs/popt"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 pkg_setup() {
 	if kernel_is 2 4; then
@@ -26,7 +29,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.25-r1-build-fixup.diff
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+	use static-libs && export STATIC=1
 }
 
 src_compile() {
@@ -34,7 +38,9 @@ src_compile() {
 		INCLUDE="-I.. -I." \
 		CC="$(tc-getCC)" \
 		HAVE_NL=1 \
-		 || die "error compiling source"
+		STATIC_LIB=${STATIC} \
+		POPT_LIB="$(pkg-config --libs popt)" \
+		 || die
 }
 
 src_install() {
@@ -47,8 +53,7 @@ src_install() {
 	newinitd "${FILESDIR}"/ipvsadm-init ipvsadm
 	keepdir /var/lib/ipvsadm
 
-	insinto /usr/$(get_libdir)
-	dolib.a libipvs/libipvs.a || die
+	use static-libs && dolib.a libipvs/libipvs.a
 	dolib.so libipvs/libipvs.so || die
 
 	insinto /usr/include/ipvs