Changeset - 6ef2978775e4
[Not reviewed]
default
4 2 2
Nathan Brink (binki) - 15 years ago 2010-08-31 23:26:39
ohnobinki@ohnopublishing.net
net-irc/atheme: Bump to atheme-5.0.1 with new LDFLAGS patch and removing old patches.

(Portage version: 2.2_rc69-r1/hg/Linux x86_64, signed Manifest commit)
7 files changed with 53 insertions and 76 deletions:
0 comments (0 inline, 0 general)
net-irc/atheme/ChangeLog
Show inline comments
 
# ChangeLog for net-irc/atheme
 
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 
# $Header: $
 

	
 
  01 Sep 2010; Nathan Phillip Brink (ohnobinki)
 
  <ohnobinki@ohnopublishing.net> -atheme-5.0.1.ebuild,
 
  -files/atheme-5.0.1-depend-parallel.patch,
 
  -files/atheme-5.0.1-ldap-as-needed.patch,
 
  -files/atheme-5.0.1-with-ldap.patch, +atheme-5.2.4.ebuild,
 
  +files/atheme-5.2.4-LDFLAGS.patch:
 
  Bump to atheme-5.0.1 with new LDFLAGS patch and removing old patches.
 

	
 
  06 Apr 2010; Nathan Phillip Brink (ohnobinki)
 
  <ohnobinki@ohnopublishing.net> files/atheme.initd:
 
  Replace SVSNAME with SVCNAME, thanks Leho Kraav <leho@kraav.com>.
 

	
 
  16 Feb 2010; Nathan Phillip Brink (ohnobinki)
 
  <ohnobinki@ohnopublishing.net> atheme-5.0.1.ebuild, +files/atheme.initd:
 
  Support installing some stuff form contrib, such as a perl module and a
 
  few database conversion C programs/modules. Added initscript. QA against
 
  bundled libmowgli. Fixed /var paths.
 

	
 
  16 Feb 2010; Nathan Phillip Brink (ohnobinki)
 
  <ohnobinki@ohnopublishing.net> +atheme-5.0.1.ebuild,
net-irc/atheme/Manifest
Show inline comments
 
AUX atheme-5.0.1-depend-parallel.patch 457 RMD160 32c03cad4e1b3432b97370961f5d402006f6f404 SHA1 bbff9d88d95496aa750578012a25ba392627a889 SHA256 abbb351d50baf483bd37e2c2ad5eaa2dcf7a483cb5bda4f25910af8b9dd11305
 
AUX atheme-5.0.1-ldap-as-needed.patch 493 RMD160 3894b824bb6848695b63eae569fa2c6826c60a2e SHA1 ad15750f9c0a952fef7d595dd035e351800a3517 SHA256 da31b6a830860914d160bc0436a20a37f1fbce2c73ed2b8234ab46791e6e376f
 
AUX atheme-5.0.1-with-ldap.patch 758 RMD160 28831504041ba3ec47cede827027e609f0f51d84 SHA1 1abd522ddc6cdb735347afc9013f6c9b8446cc7f SHA256 f65bccd4df149f6e1205a803dc0da29805bc864cb988a75c4ffaee4267db5901
 
-----BEGIN PGP SIGNED MESSAGE-----
 
Hash: SHA1
 

	
 
AUX atheme-5.2.4-LDFLAGS.patch 1231 RMD160 cdabc6adf63fa26ca93bd68f1dfa2b3573b3bd80 SHA1 aa754b71dcd8d26ae460dd444749cf12400f2e98 SHA256 1d32d54587e6d48a1629ae71f905b28362293d21595d738b4dac289e8245bf23
 
AUX atheme.initd 475 RMD160 40635de2781d1859773417ec5da298efeb8c8311 SHA1 cc2e9cacdf36c45e2e2e1a4ab9fd719a1722853b SHA256 afed26af45b190025f7609024e9b60a14dfe0c441107997117f5ec2baa4835b9
 
DIST atheme-services-5.0.1.tar.bz2 694093 RMD160 c97f6a36f628f7d31d88aeb8247645aab2f8c469 SHA1 e351af2a53bd08ed38c25dd601cae026ed4ace29 SHA256 db749339a88fb80397163ddbad219dca857b5a28e7a9bde6e456b769be0491b7
 
EBUILD atheme-5.0.1.ebuild 2500 RMD160 192536e72d77cb6b90a37c99514c24e27a3e7a4d SHA1 3763c7f0aae9d7cae4a31611d7857315e5e8d747 SHA256 edfeb5bd1c50a8092f72d0690960a7c789a775957a6380ce9ae5105d0ecc731a
 
MISC ChangeLog 944 RMD160 ea5097ba7efd0ffa57d6cd9fe0db58c0e391f772 SHA1 a8340fa2366421dbbff487d8c53861cd882e7560 SHA256 0d2ab1825c10a2f75e1e080c36aa241b79fbbb80960c19da9f40f68c5740dc2c
 
DIST atheme-services-5.2.4.tar.bz2 773400 RMD160 52e327c12baa2a678e24021b08e15683dea77281 SHA1 9e00e671ec4e2065f9f892b64f82d5c55e97dd7a SHA256 a7bf0673289bf550762d25bb4fa428fdeb34d14634836e1ce3149b7bb0d014b8
 
EBUILD atheme-5.2.4.ebuild 2315 RMD160 4b33d54d27a566c84aaa0b4453301d964656fee9 SHA1 5af2338873a5b5b2ec321c7ea9694789d117627a SHA256 7604eecfa2d4c8b33fcd6e9ae94eb925e0e8cf45aef5fc10e24d8b0dd0d494a1
 
MISC ChangeLog 1307 RMD160 10baa7ba57ecb4ce05cebd4399bcb269649b616e SHA1 963ec9108095bb0712f220acda22c2fdd9e2e96c SHA256 7161379437e1c64517658aef9cc32cbc0b69db90ee89ebae0cf4fdbfb3997b56
 
MISC metadata.xml 248 RMD160 529d56c0d04b30a5cec5675e3104bd26911a7666 SHA1 f4fabea23c086a1f70709f74e2f4eb083e2c78aa SHA256 f3c501f041eb7ea6edcd5adfe691133e8c9070f0d7cf7edb4774fce9d496b16e
 
-----BEGIN PGP SIGNATURE-----
 
Version: GnuPG v2.0.14 (GNU/Linux)
 

	
 
iEYEARECAAYFAkx9x+8ACgkQni8M22OVw8BSjQCfXhb3IAWf7j2oMVzZ7J1ZoW0u
 
Er4An1fpQ1hvHZTrY3FlGPfm//3EcCxT
 
=wsOf
 
-----END PGP SIGNATURE-----
net-irc/atheme/atheme-5.2.4.ebuild
Show inline comments
 
file renamed from net-irc/atheme/atheme-5.0.1.ebuild to net-irc/atheme/atheme-5.2.4.ebuild
 
# Copyright 1999-2010 Gentoo Foundation
 
# Distributed under the terms of the GNU General Public License v2
 
# $Header: $
 

	
 
EAPI="3"
 

	
 
inherit autotools eutils flag-o-matic perl-module
 
inherit eutils flag-o-matic perl-module
 

	
 
MY_P=${PN}-services-${PV}
 
DESCRIPTION="A portable and secure set of open-source and modular IRC services"
 
HOMEPAGE="http://atheme.net/"
 
SRC_URI="http://atheme.net/downloads/${MY_P}.tar.bz2"
 

	
 
LICENSE="BSD"
 
SLOT="0"
 
KEYWORDS="~amd64 ~x86"
 
IUSE="debug largenet ldap pcre perl profile ssl"
 

	
 
RDEPEND="dev-libs/libmowgli
 
@@ -26,40 +26,32 @@ DEPEND="${DEPEND}
 
S=${WORKDIR}/${MY_P}
 

	
 
pkg_setup() {
 
	# the dependency calculation puts all of the .c files together and
 
	# overwhelms cc1 with this flag :-(
 
	filter-flags -combine
 

	
 
	enewgroup ${PN}
 
	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
 
}
 

	
 
src_prepare() {
 
	epatch "${FILESDIR}"/${P}-with-ldap.patch
 
	epatch "${FILESDIR}"/${P}-ldap-as-needed.patch
 
	epatch "${FILESDIR}"/${P}-depend-parallel.patch
 
	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
 

	
 
	# fix docdir
 
	find -regex '.*/Makefile\..*in' \
 
		| xargs sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' \
 
		|| die
 
	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
 

	
 
	# basic logging config directive fix
 
	sed -i -e 's;var/\(.*\.log\);\1;g' dist/* || die
 

	
 
	eaclocal -I m4
 
	eautoheader
 
	eautoconf
 

	
 
	# QA against bundled libs
 
	rm -rf libmowgli || die
 
}
 

	
 
src_configure() {
 
	econf --enable-fhs-paths \
 
		--sysconfdir="${EPREFIX}"/etc/${PN} \
 
		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 
		--localstatedir="${EPREFIX}"/var \
 
		$(use debug || echo --enable-propolice) \
 
		$(use_enable largenet large-net) \
 
		$(use_with ldap) \
 
@@ -91,13 +83,13 @@ src_install() {
 

	
 
	# contributed scripts and such:
 
	insinto /usr/share/doc/${PF}/contrib
 
	doins contrib/*.{pl,php,py,rb} || die
 
	# various conversion programs
 
	doins contrib/{anope_convert.c,ircs_crypto_trans.c} || die
 

	
 
	if use perl; then
 
		perlinfo
 
		insinto "${VENDOR_LIB}"
 
		doins -r contrib/Atheme{,.pm} || die
 
	fi
 
}
 
\ No newline at end of file
 
}
net-irc/atheme/files/atheme-5.0.1-depend-parallel.patch
Show inline comments
 
deleted file
net-irc/atheme/files/atheme-5.0.1-ldap-as-needed.patch
Show inline comments
 
deleted file
net-irc/atheme/files/atheme-5.0.1-with-ldap.patch
Show inline comments
 
deleted file
net-irc/atheme/files/atheme-5.2.4-LDFLAGS.patch
Show inline comments
 
new file 100644
 
Author: Nathan Phillip Brink <binki@ohnopub.net>
 
Purpose: To make sure that LDFLAGS are actually used in the correct places in atheme. Adds LDFLAGS to buildsys.module.mk, somewhat similar to the ``${PLUGIN} ${PLUGIN_NOINST}:'' rule for shared objects in buildsys.mk.in. Also fixes a loss of LDFLAGS in configure.ac if the platform is ``Tru64''.
 

	
 
diff -r 40ec7097b8e3 buildsys.module.mk
 
--- a/buildsys.module.mk	Tue Jun 29 01:36:51 2010 -0500
 
+++ b/buildsys.module.mk	Tue Aug 31 22:03:14 2010 -0400
 
@@ -7,7 +7,7 @@
 
 
 
 .c$(PLUGIN_SUFFIX):
 
 	${COMPILE_STATUS}
 
-	if ${CC} ${PLUGIN_CFLAGS} ${PLUGIN_LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${LIBS} -o $@ $<; then \
 
+	if ${CC} ${CFLAGS} ${PLUGIN_CFLAGS} ${CPPFLAGS} ${PLUGIN_LDFLAGS} ${LDFLAGS} -o $@ $< ${LIBS}; then \
 
 		${COMPILE_OK}; \
 
 	else \
 
 		${COMPILE_FAILED}; \
 
diff -r 40ec7097b8e3 configure.ac
 
--- a/configure.ac	Tue Jun 29 01:36:51 2010 -0500
 
+++ b/configure.ac	Tue Aug 31 22:03:14 2010 -0400
 
@@ -339,7 +339,7 @@
 
 	if test "$Tru" = yes -a "$CC" != gcc; then
 
 		AC_MSG_RESULT([Tru64: -shared -expect_unresolved '*'])
 
 		PICFLAGS="-shared -expect_unresolved '*' "
 
-		LDFLAGS="-call_shared"
 
+		LDFLAGS="${hold_ldflags} -call_shared"
 
 	fi
 
 
 
 	if test "$CC" = tcc -a "$TenDRA" = no; then
0 comments (0 inline, 0 general)