sci-libs/libpdb: Straighten ebuild by cleaning the buildsystem

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

6 files changed, 119 insertions, 19 deletions

diff --git a/sci-libs/libpdb/ChangeLog b/sci-libs/libpdb/ChangeLog
index e99b07f4a552..16773fce077e 100644
--- a/sci-libs/libpdb/ChangeLog
+++ b/sci-libs/libpdb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/libpdb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libpdb/ChangeLog,v 1.1 2010/03/07 10:42:38 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libpdb/ChangeLog,v 1.2 2012/10/18 16:56:01 jlec Exp $
+
+*libpdb-991112-r1 (18 Oct 2012)
+
+  18 Oct 2012; Justin Lecher <jlec@gentoo.org> libpdb-991112.ebuild,
+  +libpdb-991112-r1.ebuild, +files/libpdb-991112-dynlib+flags.patch,
+  metadata.xml:
+  Straighten ebuild by cleaning the buildsystem
 
 *libpdb-991112 (07 Mar 2010)
 
diff --git a/sci-libs/libpdb/Manifest b/sci-libs/libpdb/Manifest
index 8d64089dbfa8..ec5323231074 100644
--- a/sci-libs/libpdb/Manifest
+++ b/sci-libs/libpdb/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 991112-dynlib.patch 342 RMD160 6f1605efe3450a2f8a9588724be7fec4dee128a3 SHA1 8e030582178de6d5fbc163a9caee0c5aa22dac79 SHA256 4fe0f0017fd8e1f3beff6534ff257bd2b0463f9acbe8b1f2fce3f6237d69007c
-DIST libpdb-991112.shar 123895 RMD160 44c8044b88ae980619dd30893a42c69093409350 SHA1 201c8599289e81353c609961350b252cbe841fd7 SHA256 31101a9e6a98a4359241978cb389acc3d0845171209c87e127a7264b21cedcee
-EBUILD libpdb-991112.ebuild 1002 RMD160 8a77c3f3aee71fece06d2291afb3b8222713b2d7 SHA1 9faca729131a3be5b2f31cced58c72ccf65f7391 SHA256 39ffa23887c1492407f778071a3794660dcf76ecf7d354a509ff414028892af8
-MISC ChangeLog 387 RMD160 ce15380aa4e954f42c749fa4a40c4aa9dc96d30b SHA1 3f05a2b9acf18e02c77536b0842f526a5497fc0e SHA256 7148c906876f53c34ccddd424ee377e674e6db3a60426d42e77817aacedf3d23
-MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
+AUX 991112-dynlib.patch 342 SHA256 4fe0f0017fd8e1f3beff6534ff257bd2b0463f9acbe8b1f2fce3f6237d69007c SHA512 6ce2872dcb4c813d9845bbbf5cd7e59624465dcfd8c5463f437a36d275ec4efcac70333604f01b188ec77c216fa2cf7906f643ca2ddfd94d7e516f6fdd6feb36 WHIRLPOOL 57f7bdaaa38b252b0faa32621599a10a7541a2e7533163c913bd29be2c573b3481079712266d35b38842f68f0f93144c7118f46086de5570e8711789b96324b9
+AUX libpdb-991112-dynlib+flags.patch 1142 SHA256 78433bd1ed95852a7fb1e49d84f108ba301c01d3003c1fb9355d1c51c7272b1e SHA512 6d93db5444f4ecb6127afc5cb20e806c4de55c31d909540403ec73a861c09a577a6bb9e55e2f2a0dbfb35c2fe5093776724f5ed735f3519980b8dd87706c3870 WHIRLPOOL 26e60d3a264e0628f5a3e7ab0c21f725143f526630912dbcdf222e9464e316cdbe822a50aa5d363a5d0d1f0e0b5f64373cafb5ba4e9d174a94bc2685534cd722
+DIST libpdb-991112.shar 123895 SHA256 31101a9e6a98a4359241978cb389acc3d0845171209c87e127a7264b21cedcee SHA512 ae356997d11068736bbbd1a57e4e3a28fa54fd396326bc8fea41485186a1c69ce39c7f81195ae65ddc59c017d85dd123614f56f910c8faffd4791fcfd1b064f4 WHIRLPOOL 8017376c127032727b0e115ea240ef084c8a054c4c5be1545152926cb710243e5210a15e191a635df8f7bc6f1fea8422735888b5881efc199176acab85ef2153
+EBUILD libpdb-991112-r1.ebuild 909 SHA256 580ce77a705c9d7223b33cc5a8604d96ec2c1a1a176bf57872f8da755483a0df SHA512 867796f0e9827284a4e99b969b9526502a0f2248d193ff34dbc4a74f0e5d1cd031e2be70e47cfa9765231edd30f6fb0dcd540c384798fa2e3ab215dea6325eee WHIRLPOOL 57c48c63ad9e2d129c798494aa7eb65550b736b628674bd93d295abae91a4235c43c1f0796bc17586db14264e543f5f3bbf1c6ac4698f20f26b84533a7490cb0
+EBUILD libpdb-991112.ebuild 1011 SHA256 0dee695c84157374768c1e020c026901f50b40dfdbf73c1c29530853dbd174b4 SHA512 9487be8e9adc28eab00819a5edf9eb5bbd1b23ae389f05d56786f70c8777ea9e7be240b15d0c612850cc5f7163ae560d0d5c03336504d5b53484adf5e245d9e5 WHIRLPOOL b59ddbb3d4534dba9d4b2642f8a51395950df668cb1d2315e127583239eecb6504a4b2649b8b4ce1e4fc78f929621e8fb7b129deb8185e21a05775e12ddd4e96
+MISC ChangeLog 623 SHA256 15f030797aad1ee5ccbf00fae73bf1e981153a685a9f95f848678b17cec2303f SHA512 edef8996d83ea6866c7ee7f9d9b1d6dc1189ed201a9bc65d3e5b0107abf93eea9380bbd7038ef910236fdc07a4c994c748fe6ad4634a0ea435f2081abba385c0 WHIRLPOOL ea3806e58876b5f51d5927e8492c4709e4c906f9c9746651d228cac7f41279eb3d33b0293c3c74abbf028c06147f865cc4537b22797776a7a2aa12c73022c848
+MISC metadata.xml 219 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8 SHA512 8e1fa48bb6533db28b30f09f61673779d75cebd0ba8058abb411cb62595788272998bb9d3e1be8a0f6f95ca42722efc6af7e4d5741e15fe72df4ad8c872383c1 WHIRLPOOL 12f73f93602d45fe69385989b4e8e91507665e0d7deb148365fce2c41d9a85e9bcaaa940ce039a554770f4f4b2207e33a2cea5ad784561b3c3a92be8584f4478
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAkuTjgMACgkQgAnW8HDreRafRACguljMwqoZ0XNE+TM3sNqbWEpI
-8dgAn2bVDVisQTrbng7M5oEEyGR1Kb0g
-=a8Sk
+iEYEAREIAAYFAlCANKIACgkQgAnW8HDreRagSwCgn+GFLDxkrwByPA+QsYrddV50
+AVEAmQF7sDoGBx6MwLXfhH5oplRiWFQQ
+=rGEq
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/libpdb/files/libpdb-991112-dynlib+flags.patch b/sci-libs/libpdb/files/libpdb-991112-dynlib+flags.patch
new file mode 100644
index 000000000000..72048b684a93
--- /dev/null
+++ b/sci-libs/libpdb/files/libpdb-991112-dynlib+flags.patch
@@ -0,0 +1,46 @@
+ Makefile | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 760a427..de7e724 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,16 +8,16 @@
+ #	RANLIB should be ':'
+ #
+ SHELL		= /bin/sh
+-RANLIB		= :
++#RANLIB		= :
+ NOTHING		=
+ LINTOPT		= -o $(NOTHING)
+ 
+ OPT		= -O -g
+ DEBUG		=
+-CFLAGS		= $(OPT) $(DEBUG)
++CFLAGS		+= -fPIC
+ LIBRARY		= pdb
+ 
+-LIBARCH		= lib$(LIBRARY).a
++LIBARCH		= lib$(LIBRARY)
+ LINTLIB		= llib-l$(LIBRARY).ln
+ OBJS		= pdb_read.o pdb_sprntf.o pdb_sscanf.o pdb_write.o pdbrun.o ms.o
+ SRCS		= pdb_read.c pdb_sprntf.c pdb_sscanf.c pdb_write.c pdbrun.c ms.c
+@@ -27,10 +27,15 @@ all:		$(LIBARCH) $(LINTLIB)
+ install:	$(LIBARCH)
+ 		install -F /usr/local/lib $(LIBARCH)
+ 
+-$(LIBARCH):     $(OBJS)
++$(LIBARCH).so:     $(OBJS)
++		$(CC) $(LDFLAGS) -shared -Wl,--soname,libpdb.so.0 -o libpdb.so.0.1 $(OBJS)
++		ln -sf libpdb.so.0.1 libpdb.so.0
++		ln -sf libpdb.so.0.1 libpdb.so
++
++$(LIBARCH).a:     $(OBJS)
+ 		@echo "Loading $(LIBARCH) ... "
+-		@ar cru $(LIBARCH) $(OBJS)
+-		@$(RANLIB) $(LIBARCH)
++		$(AR) cru $@ $(OBJS)
++		$(RANLIB) $@
+ 		@echo "done"
+ 
+ $(LINTLIB):	$(SRCS) $(HDRS)
diff --git a/sci-libs/libpdb/libpdb-991112-r1.ebuild b/sci-libs/libpdb/libpdb-991112-r1.ebuild
new file mode 100644
index 000000000000..b39728730b95
--- /dev/null
+++ b/sci-libs/libpdb/libpdb-991112-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libpdb/libpdb-991112-r1.ebuild,v 1.1 2012/10/18 16:56:01 jlec Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="PDB Record I/O Libraries -- c version"
+HOMEPAGE="http://www.cgl.ucsf.edu/Overview/software.html"
+SRC_URI="mirror://gentoo/${P}.shar"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/sharutils"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	"${EPREFIX}/usr/bin/unshar" "${DISTDIR}"/${A} || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-dynlib+flags.patch
+	tc-export CC RANLIB AR
+}
+
+src_compile() {
+	emake ${PN}.so
+	use static-libs && emake ${PN}.a
+}
+
+src_install() {
+	dolib.so ${PN}.so*
+	use static-libs && dolib.a ${PN}.a
+
+	insinto /usr/include/${PN}
+	doins *.h
+}
diff --git a/sci-libs/libpdb/libpdb-991112.ebuild b/sci-libs/libpdb/libpdb-991112.ebuild
index a8748c110718..afc6f0abbed2 100644
--- a/sci-libs/libpdb/libpdb-991112.ebuild
+++ b/sci-libs/libpdb/libpdb-991112.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libpdb/libpdb-991112.ebuild,v 1.2 2010/03/07 11:29:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libpdb/libpdb-991112.ebuild,v 1.3 2012/10/18 16:56:01 jlec Exp $
 
 EAPI="3"
 
-inherit eutils toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="PDB Record I/O Libraries -- c version"
 HOMEPAGE="http://www.cgl.ucsf.edu/Overview/software.html"
diff --git a/sci-libs/libpdb/metadata.xml b/sci-libs/libpdb/metadata.xml
index c6856dc7f2cf..210ad0db014c 100644
--- a/sci-libs/libpdb/metadata.xml
+++ b/sci-libs/libpdb/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>