Fix build.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

3 files changed, 143 insertions, 4 deletions

diff --git a/dev-libs/radlib/ChangeLog b/dev-libs/radlib/ChangeLog
index bf096eec681f..6ca0cb7805e8 100644
--- a/dev-libs/radlib/ChangeLog
+++ b/dev-libs/radlib/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for dev-libs/radlib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/radlib/ChangeLog,v 1.1 2013/02/19 23:00:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/radlib/ChangeLog,v 1.2 2013/02/20 18:19:03 flameeyes Exp $
+
+*radlib-2.12.0-r1 (20 Feb 2013)
+
+  20 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/radlib-2.12.0-build.patch, +radlib-2.12.0-r1.ebuild,
+  -radlib-2.12.0.ebuild:
+  Fix build.
 
 *radlib-2.12.0 (19 Feb 2013)
 
   19 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org> +radlib-2.12.0.ebuild,
   +metadata.xml:
   Initial import of radlib needed for wview.
-
diff --git a/dev-libs/radlib/files/radlib-2.12.0-build.patch b/dev-libs/radlib/files/radlib-2.12.0-build.patch
new file mode 100644
index 000000000000..4f4ce750ad35
--- /dev/null
+++ b/dev-libs/radlib/files/radlib-2.12.0-build.patch
@@ -0,0 +1,128 @@
+Index: radlib-2.12.0/debug/Makefile.am
+===================================================================
+--- radlib-2.12.0.orig/debug/Makefile.am
++++ radlib-2.12.0/debug/Makefile.am
+@@ -13,32 +13,4 @@ raddebug_SOURCES  = \
+ 		$(top_srcdir)/debug/raddebug.c

+ 

+ # define libraries

+-raddebug_LDADD   = -lrad -lpthread 

+-

+-if MYSQL

+-raddebug_LDADD   += -lmysqlclient

+-else

+-if PGRESQL

+-raddebug_LDADD   += -lpq

+-endif

+-endif

+-if SQLITE

+-raddebug_LDADD   += -lsqlite3

+-endif

+-

+-# define library directories

+-raddebug_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib

+-INCLUDES         += -I$(prefix)/include -I/usr/include

+-

+-if MYSQL

+-raddebug_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql

+-else

+-if PGRESQL

+-raddebug_LDFLAGS += -L$(prefix)/pgsql/lib

+-INCLUDES         += -I$(prefix)/pgsql/include

+-endif

+-endif

+-

+-if CROSSCOMPILE

+-raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o

+-endif

++raddebug_LDADD   = ../src/librad.la

+Index: radlib-2.12.0/msgRouter/Makefile.am
+===================================================================
+--- radlib-2.12.0.orig/msgRouter/Makefile.am
++++ radlib-2.12.0/msgRouter/Makefile.am
+@@ -13,32 +13,4 @@ radmrouted_SOURCES  = \
+ 		$(top_srcdir)/msgRouter/msgRouter.c

+ 

+ # define libraries

+-radmrouted_LDADD   = -lrad -lpthread

+-

+-if MYSQL

+-radmrouted_LDADD   += -lmysqlclient

+-else

+-if PGRESQL

+-radmrouted_LDADD   += -lpq

+-endif

+-endif

+-if SQLITE

+-radmrouted_LDADD   += -lsqlite3

+-endif

+-

+-# define library directories

+-radmrouted_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib

+-INCLUDES           += -I$(prefix)/include -I/usr/include

+-

+-if MYSQL

+-radmrouted_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql

+-else

+-if PGRESQL

+-radmrouted_LDFLAGS += -L$(prefix)/lib -L$(prefix)/pgsql/lib

+-INCLUDES           += -I$(prefix)/pgsql/include

+-endif

+-endif

+-

+-if CROSSCOMPILE

+-radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o

+-endif

++radmrouted_LDADD   = ../src/librad.la

+Index: radlib-2.12.0/src/Makefile.am
+===================================================================
+--- radlib-2.12.0.orig/src/Makefile.am
++++ radlib-2.12.0/src/Makefile.am
+@@ -12,6 +12,9 @@ SUBDIRS =
+ #define the library to be built

+ lib_LTLIBRARIES = librad.la

+ 

++librad_la_LDFLAGS =

++librad_la_LIBADD = -lpthread

++

+ if MYSQL

+ MY_INCLUDES 	= \

+ 		-I$(prefix)/include/mysql \

+@@ -21,32 +24,30 @@ MY_SOURCES  	= \
+ 		$(top_srcdir)/src/raddatabase.c

+ MYSQL_HDRS	= \

+ 		$(top_srcdir)/h/raddatabase.h

++librad_la_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql

++librad_la_LIBADD += -lmysqlclient

+ endif

+ if PGRESQL

+-PG_INCLUDES 	= \

+-		-I$(prefix)/include \

+-		-I/usr/include

+ PG_SOURCES	= \

+ 		$(top_srcdir)/database/postgresql/pg_database.c \

+ 		$(top_srcdir)/src/raddatabase.c

+ PGSQL_HDRS	= \

+ 		$(top_srcdir)/h/raddatabase.h \

+ 		$(top_srcdir)/database/postgresql/_pg-types.h

++librad_la_LDFLAGS += -L$(prefix)/lib -L$(prefix)/pgsql/lib

++librad_la_LIBADD += -lpq

+ endif

+ if SQLITE

+-SQ_INCLUDES 	= \

+-		-I$(prefix)/include \

+-		-I/usr/include

+ SQ_SOURCES	= \

+ 		$(top_srcdir)/src/radsqlite.c

+ SQLITE_HDRS	= \

+ 		$(top_srcdir)/h/radsqlite.h

++librad_la_LIBADD += -lsqlite3

+ endif

+ 

+ # define include directories

+ INCLUDES = \

+ 		-I$(top_srcdir)/h \

+-		-I$(prefix)/include \

+ 		-D_GNU_SOURCE \

+ 		$(MY_INCLUDES) \

+ 		$(PG_INCLUDES) \

diff --git a/dev-libs/radlib/radlib-2.12.0.ebuild b/dev-libs/radlib/radlib-2.12.0-r1.ebuild
index efbab486e01a..400b5f72eb75 100644
--- a/dev-libs/radlib/radlib-2.12.0.ebuild
+++ b/dev-libs/radlib/radlib-2.12.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/radlib/radlib-2.12.0.ebuild,v 1.1 2013/02/19 23:00:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/radlib/radlib-2.12.0-r1.ebuild,v 1.1 2013/02/20 18:19:03 flameeyes Exp $
 
 EAPI=5
 
-inherit autotools-utils
+inherit autotools-utils autotools
 
 DESCRIPTION="Rapid Application Development Library"
 HOMEPAGE="http://www.radlib.teel.ws/"
@@ -23,6 +23,11 @@ DEPEND="${RDEPEND}"
 
 RESTRICT_USE="^^ ( mysql postgres )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable mysql)