backported upstream commit for soname, fixed install rules

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

4 files changed, 61 insertions, 26 deletions

diff --git a/net-libs/libircclient/ChangeLog b/net-libs/libircclient/ChangeLog
index 3eefc1e4335e..75978e6a46a9 100644
--- a/net-libs/libircclient/ChangeLog
+++ b/net-libs/libircclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libircclient
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/ChangeLog,v 1.7 2012/09/07 19:24:24 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/ChangeLog,v 1.8 2012/09/07 20:22:31 hasufell Exp $
+
+  07 Sep 2012; Julian Ospald <hasufell@gentoo.org> libircclient-1.6-r1.ebuild,
+  -files/libircclient-1.6-fpic.patch, +files/libircclient-1.6-shared.patch:
+  backported upstream commit for soname, fixed install rules
 
 *libircclient-1.6-r1 (07 Sep 2012)
 
diff --git a/net-libs/libircclient/files/libircclient-1.6-fpic.patch b/net-libs/libircclient/files/libircclient-1.6-fpic.patch
deleted file mode 100644
index d191d37b738f..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-fpic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libircclient-1.6/src/Makefile.in
-+++ libircclient-1.6/src/Makefile.in
-@@ -1,6 +1,6 @@
- # $Id: libircclient-1.6-fpic.patch,v 1.1 2012/09/07 19:24:24 hasufell Exp $
- CC = @CC@
--CFLAGS = -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
-+CFLAGS = -fPIC -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
- AR=@AR@ cr
- RANLIB=@RANLIB@
- INCLUDES=-I../include
-@@ -26,7 +26,7 @@
- 	cp libircclient.a $(DESTDIR)@prefix@/lib/
- 
- libircclient.so: libircclient.o
--	$(CC) -shared -s -o libircclient.so libircclient.o @LIBS@
-+	$(CC) $(CFLAGS) -shared -o libircclient.so libircclient.o $(LDFLAGS) @LIBS@
- 
- libircclient.dll: libircclient.o
- 	$(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@
diff --git a/net-libs/libircclient/files/libircclient-1.6-shared.patch b/net-libs/libircclient/files/libircclient-1.6-shared.patch
new file mode 100644
index 000000000000..26ce68b23a3b
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.6-shared.patch
@@ -0,0 +1,53 @@
+--- libircclient-1.6/src/Makefile.in
++++ libircclient-1.6/src/Makefile.in
+@@ -1,10 +1,13 @@
+ # $Id: libircclient-1.6-shared.patch,v 1.1 2012/09/07 20:22:31 hasufell Exp $
+ CC = @CC@
+-CFLAGS = -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
++CFLAGS = -fPIC -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
+ AR=@AR@ cr
+ RANLIB=@RANLIB@
++INSTALL = install
++LN = ln -sf
+ INCLUDES=-I../include
+ DESTDIR=
++APIVERSION = 1
+ 
+ OBJS = libircclient.o
+ 
+@@ -14,19 +17,24 @@
+ shared: libircclient.so
+ shared_mingw: libircclient.dll
+ 
+-install: lib
+-	-mkdir -p $(DESTDIR)@prefix@/include
+-	-mkdir -p $(DESTDIR)@prefix@/lib
+-	cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
+-	cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
+-	cp ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
+-	cp ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
+-	cp ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
+-	cp libircclient.so $(DESTDIR)@prefix@/lib/
+-	cp libircclient.a $(DESTDIR)@prefix@/lib/
++install: install-headers install-static install-shared
++install-headers:
++	$(INSTALL) -d $(DESTDIR)@prefix@/include
++	$(INSTALL) -m0644 ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
++	$(INSTALL) -m0644 ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
++	$(INSTALL) -m0644 ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
++	$(INSTALL) -m0644 ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
++	$(INSTALL) -m0644 ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
++install-shared:
++	$(INSTALL) -d $(DESTDIR)@libdir@
++	$(INSTALL) -m0755 libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
++	$(LN) libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
++install-static:
++	$(INSTALL) -d $(DESTDIR)@libdir@
++	$(INSTALL) -m0644 libircclient.a $(DESTDIR)@libdir@/libircclient.a
+ 
+ libircclient.so: libircclient.o
+-	$(CC) -shared -s -o libircclient.so libircclient.o @LIBS@
++	$(CC) $(CFLAGS) -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o $(LDFLAGS) @LIBS@
+ 
+ libircclient.dll: libircclient.o
+ 	$(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@
diff --git a/net-libs/libircclient/libircclient-1.6-r1.ebuild b/net-libs/libircclient/libircclient-1.6-r1.ebuild
index f67ef4128cc4..606ea9da28e2 100644
--- a/net-libs/libircclient/libircclient-1.6-r1.ebuild
+++ b/net-libs/libircclient/libircclient-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/libircclient-1.6-r1.ebuild,v 1.1 2012/09/07 19:24:24 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/libircclient-1.6-r1.ebuild,v 1.2 2012/09/07 20:22:31 hasufell Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -19,7 +19,7 @@ DEPEND="ssl? ( dev-libs/openssl )"
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-fpic.patch \
+		"${FILESDIR}"/${P}-shared.patch \
 		"${FILESDIR}"/${P}-include.patch
 	eautoconf
 }
@@ -37,10 +37,7 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/include/libircclient
-	doins include/*.h
-	dolib.so src/libircclient.so
-	use static && dolib.a src/libircclient.a
+	emake -C src DESTDIR="${D}" $(usex static "install" "install-headers install-shared")
 
 	dodoc Changelog THANKS
 	if use doc ; then