Add USE=doc to control docs installation and fix insecure rpaths by linking dynamically

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

4 files changed, 38 insertions, 11 deletions

diff --git a/dev-cpp/libassa/ChangeLog b/dev-cpp/libassa/ChangeLog
index de08345c0718..95cc0de663b2 100644
--- a/dev-cpp/libassa/ChangeLog
+++ b/dev-cpp/libassa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/libassa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/ChangeLog,v 1.12 2011/03/20 19:17:39 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/ChangeLog,v 1.13 2011/07/19 20:33:31 angelos Exp $
+
+  19 Jul 2011; Christoph Mende <angelos@gentoo.org> libassa-3.5.0.ebuild,
+  +files/libassa-3.5.0-link-dynamically.patch:
+  Add USE=doc to control docs installation and fix insecure rpaths by linking
+  dynamically
 
   20 Mar 2011; Christoph Mende <angelos@gentoo.org> libassa-3.5.0.ebuild:
   Made building of static libraries optional and removed .la files
diff --git a/dev-cpp/libassa/Manifest b/dev-cpp/libassa/Manifest
index b2b31cc96d94..e88377dcbd70 100644
--- a/dev-cpp/libassa/Manifest
+++ b/dev-cpp/libassa/Manifest
@@ -5,14 +5,15 @@ AUX libassa-3.5.0-dont-run-ldconfig.patch 532 RMD160 600109fcf579162eda872b8331d
 AUX libassa-3.5.0-fix-tests.patch 8440 RMD160 ed77f9fb1272efea485aff02dba53614e7984a0a SHA1 758f4ffac6e9a08c910ff1f8d8425dec5c187fef SHA256 3142ea069ea97627670afa599794a30d57e79169360d068ef401992f7a75ab63
 AUX libassa-3.5.0-gcc44.patch 1093 RMD160 924d77ba42a188ad896dc1b2415f78af7571e82f SHA1 a2016fc161c6b425a6fbcb704b7ce3ed79b0ab6e SHA256 c6a4e0e310201b600a7b89c0f132e1c6d628954b010ec484a8c943a48b7426a7
 AUX libassa-3.5.0-ldflags.patch 393 RMD160 1e0b514396bf615e5bb595c56c06fabd0b453df6 SHA1 897aa7fe09167ed3a895fe2e7fe4c8fed8576492 SHA256 05811739126bbe21841a658135c1d39be19b0cf9548c2bfb7015d69c66dce7d1
+AUX libassa-3.5.0-link-dynamically.patch 436 RMD160 d639e0772b2179b40622561e997d3b7e182bd0b3 SHA1 126c59f1a486ccdd0499cfb85876abe9a41dfafc SHA256 3026161b9bc5828c664f5c8ee95364aef02726ef8746cb9732932c6f0cb76733
 DIST libassa-3.5.0.tar.gz 586237 RMD160 4919157cdf3fd75c42aed571328c0033867aa5eb SHA1 b3813fa952dec3ece621606a919035f308798a7a SHA256 72a627c74e82ff679cb16ebe3a625b9032d8d1feed4c1da63ebb5106a80b1314
-EBUILD libassa-3.5.0.ebuild 975 RMD160 18a6f5eb482574b83505e58efff730600793662f SHA1 80824acf3b68300488e8ff59ae82a66d619824fa SHA256 0c2d48fa3d3a18cc39982f556cc66bae34f5e09de0a88f1e4bdd48f06052c1eb
-MISC ChangeLog 1650 RMD160 877b68d78f4309a6fadf590b08199d4d5dcaec09 SHA1 838950c91bcb10875bfeb6323d66c0cc4248ee49 SHA256 8bda6fff4cb95d3206f83aad8a4cc75a6326c2af6082fa23e88bc3237efa1ad2
+EBUILD libassa-3.5.0.ebuild 1116 RMD160 2c21a04f49347e3c2e23373e5d4ec6b9c4796596 SHA1 8149289d802f1e58e9229e5e101ddd79d5ea5268 SHA256 fb837608aef5264125b7298fa3dd364bdf93bc5151915d05ba5551d46d01935e
+MISC ChangeLog 1864 RMD160 84434985158529ac1bbc06eeb1f895bf2390d8e2 SHA1 428e37a93dcb3096be37de37fbcd65321447a0e1 SHA256 29285eac853011b754c83b30f9354341a65e4929be1077b29225a630904d5886
 MISC metadata.xml 258 RMD160 6d4c6c4e7c021a3fc82145a078f8e113eb6f521a SHA1 02004f2821b6ac3f69abfbfdafc9744008535258 SHA256 ee85021b7ae93a2e1442a570b114d3c9bf2e577c16b7b1b409914983d5d55485
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2GUr4ACgkQmWq1bYTyC0O7SAD/VXVXsa4V9jYATOqmS3a+5bXC
-hxvt38IYsAwZlb5EbdABAJi7X2EPwN1PwUvwoepc1IkclDNqQKR+hT/1HUS340Rz
-=07LC
+iF4EAREIAAYFAk4l6hsACgkQmWq1bYTyC0Ol0AEAws15PplnwkqpqSVkzioFWXym
+hHK4Xl6JtEyIZb5WCEYBAKPCdNZ8sTKkJJYGJVYKpze0FmKsicicESZE+zELy/w8
+=0/kA
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch b/dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch
new file mode 100644
index 000000000000..883fed474961
--- /dev/null
+++ b/dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch
@@ -0,0 +1,15 @@
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+index 82c2345..6550015 100644
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
+@@ -15,8 +15,8 @@ noinst_PROGRAMS = bytereader
+ ASSADIR = ${top_srcdir}/assa
+ INCLUDES = -I$(top_srcdir)
+ 
+-LDFLAGS += -static
+-LDADD = $(top_builddir)/assa/libassa-@ASSA_RELEASE@.la @WIN32_EXTRA_LIBADD@
++LDFLAGS += -L$(top_builddir)/assa/.libs
++LIBS = -lassa-3.5
+ 
+ bytereader_SOURCES   = bytereader.cpp
+ 
diff --git a/dev-cpp/libassa/libassa-3.5.0.ebuild b/dev-cpp/libassa/libassa-3.5.0.ebuild
index 03da6e14e105..86cee054a811 100644
--- a/dev-cpp/libassa/libassa-3.5.0.ebuild
+++ b/dev-cpp/libassa/libassa-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/libassa-3.5.0.ebuild,v 1.9 2011/03/20 19:17:39 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/libassa-3.5.0.ebuild,v 1.10 2011/07/19 20:33:31 angelos Exp $
 
 EAPI=3
 inherit autotools eutils
@@ -12,23 +12,29 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs"
+IUSE="doc static-libs"
+
+RDEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-dont-run-ldconfig.patch \
 		"${FILESDIR}"/${P}-fix-tests.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-link-dynamically.patch
 	AT_M4DIR="${S}/macros"
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable doc doxygen)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-	find "${ED}" -name "*.la" -delete || die "failed to delete .la files"
+	find "${ED}" -name "*.la" -exec rm -rf {} + || die "failed to delete .la files"
 }