Adding adch++ 2.11.0

Package-Manager: portage-2.1.12.2

4 files changed, 244 insertions, 1 deletions

diff --git a/net-p2p/adchpp/ChangeLog b/net-p2p/adchpp/ChangeLog
index 779bbe0..c5a7cc4 100644
--- a/net-p2p/adchpp/ChangeLog
+++ b/net-p2p/adchpp/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*adchpp-2.11.0 (15 Aug 2013)
+
+  15 Aug 2013; Francisco Blas Izquierdo Riera (klondike) +adchpp-2.11.0.ebuild,
+  +files/adchpp-2.11.0-fix_cflags.patch:
+  Update the ebuild to 2.11.0
+
 *adchpp-2.9.0-r1 (10 Feb 2013)
 *adchpp-2.9.0 (10 Feb 2013)
 
diff --git a/net-p2p/adchpp/Manifest b/net-p2p/adchpp/Manifest
index 8caebc8..aa5f64a 100644
--- a/net-p2p/adchpp/Manifest
+++ b/net-p2p/adchpp/Manifest
@@ -1,3 +1,4 @@
+AUX adchpp-2.11.0-fix_cflags.patch 2401 SHA256 7ae9129d2c4480c3b82bdfc487adc59bc3025ca924fb6ee3b161373b0c7ca4d7 SHA512 9410e79d8dd99a94fb41630e1d10be898b7bb272f7f371b057ba384441dab80e4990c1135bfc0cd6f72b25b71cf38254f0b4b2c63122e1f87a2cb5e1b3d930bf WHIRLPOOL f79533897aad85c7013d16a390605e33c2bad73f3aad141faeda1495e76ad2a104d16c0e227b5ade306f7caabc920ec6828ce5d4aaf2c7c95c6263914a1d6694
 AUX adchpp-2.8.0-allow_set_optional_features.patch 2538 SHA256 ebd442a2584fe508ad46bd07527888fc6f5f398b4651a4552bc701e05f2ed043 SHA512 1b95cfc745a361d0f1a61d48f55927c15e12518e822d63f1c17098034442b82ebac01f0506f47bb22cb06c8dd3f00f9c90d5d9caae0495d2ff4e5ede6778ec3b WHIRLPOOL 8bcf9d20cb98dc61a850abe75f29d9b0967faac418a8ad73ca4c328852fae8585558e590841070d09b2cb5410081f2b68860e0e8b8d8fc2b0b6a62d0a95638a7
 AUX adchpp-2.8.0-fix_config_paths.patch 4034 SHA256 7a112f77e3d995a102703b85230610643f69cd4f99b35fcb22c3edc7c5e7a85b SHA512 02f7cff3a78d5dfc3025dc3ba6ab9afdf249af8db2e92083f2155f15774c39b5c04660f8215973c5060e42ba4e498ca6f90b33f3ad8d46d8241e4d244be80895 WHIRLPOOL bcdd543345eafa624494410771f299e3c794d423655e19220974700ce6b322bd99e723d8d94c7410a4769aa214c3b74e61bc91ed2ecd49d285f1a7d67ad39fb5
 AUX adchpp-2.8.0-fix_doc_includes.patch 1668 SHA256 fe421b91ad69b1a8eee9c793ebc75b62aab61db8d8f418d1ba81ec2c1d25e068 SHA512 49399bb64131ddedc090214d0e4dcd675db0527e74218c099073f99756ac17e8b5d735e4b36bd13406b77f580832015ab6daa06ff4e7d7e98564393cd6612dc1 WHIRLPOOL 34ff64398284948d31709263cb929f2d53c6beb256aefc5405743a95b86cb1a97804c7c6183e6e18eba8cdaac4afa3afe64a2bdc76610fe51847230635f5fcc7
@@ -16,13 +17,15 @@ AUX adchpp-2.9.0-fix_nullptr.patch 930 SHA256 3bf9bdde914746e73e6a1dc9b13196ec54
 AUX adchpp.conf.d 310 SHA256 15955fc380ae76be3b235cb2d87cb55d7e356ff23a1bde47defc06b686e1ec57 SHA512 6a31e68bef59fca8841c88b83ca6f49a3012552921435d04c8c76cb4c7e9b044aa5ebac00ad97f751cb993860f6dd0c449c1d5a5b8a91f4cd7a814fd26813b6d WHIRLPOOL 8ff4e1975e4f8a6d28cababf379776eb57f1cf9b9f1477a423c6a9535956396ae9fec834a6ad79152920da0fcb3050193b26def1153c4da92a5d533d53e5e5e7
 AUX adchpp.init.d 517 SHA256 8be227ebd1e7acd7b80db458d2e9902d2536662e8a8bba8a9a073a6e4a1d781e SHA512 7003108291f8b050f479eb460e51021bfc8d755e00281198725eb1089b8798a84ef462a9771db554471f5da0bf642883079a0d53662cd1d6d30bb5d7f9a6cb48 WHIRLPOOL 6f35cd24dc41ec3c83216dfbaab1c1e2310ddae4df9df36a3e84755bdd591b18ca78a7c648322d587cd5a5b2f00914783a076231c5896d2e66a67223926da317
 AUX adchpp_runner.sh 185 SHA256 3fc062bea86aa313c20315a293c0164bf52fe272c0e46d0e2753cc29b5ca89cb SHA512 60eb17ed3c3d2244bbdf77e00a413a97da82cb2045e0761c7e86951ce31b7e8de7d3470fd420a0f2b09f0f0f46ab1125f49a1f289bc8cfcf49a7436fb79f1e3c WHIRLPOOL 04b60a57145ac8a8bb835a7bd2b23293fa913c78dbdcb93c070b8590188ee930a1cc4a8fe766cba21c50d42d680db359e0d4a051dd1ac7c9b84466b3db7c2503
+DIST adchpp_2.11.0.1_source.tar.gz 9126833 SHA256 cc88cf64ee54eb719499a7a8753f004ff64fd058719ecc3bbb9b13060bb630f4 SHA512 68b0c2cd86a7c95aa045fa5635ff90ec2bf18673c7772744839271b4adc9678e37689ce8dc20f51fa93030fc1cd5c8ddfd45f418caf9eae87f13c8ee249adc01 WHIRLPOOL 222460cc3a478e1068400565b5682839b8510a4369b821c3c66babae1eb259ea1ae59f613ce0f8b4957989469d4e7910b2591104aacd32acf52710ac04dad138
 DIST adchpp_2.8.0_source.tar.gz 8446076 SHA256 7819f18f4fbd5a17f1e06ca9aa66f6c1a31d59cab7b0e600940283aa0e6307c2 SHA512 e8b35a1cbbf641004788b0647f70a0b9b59d7eafcf8b7bef6b5157c5331b703ff30e9dfe8fe2d7097b2a3afbce40e4cdd0655e9fc8d6192702030e2e19c8025b WHIRLPOOL 429af354c8355a91b23b5e9ccba853a5aebb53a5d9d9acd0006adf543483e0145061543c4027f0dfa6b5983d0669dc4f4f20a552a3eb52f10df339c5e4fdec26
 DIST adchpp_2.8.1_source.tar.gz 8551219 SHA256 666e68056d6e4fc1f59ed2822eed914af293fa708fb943a046b40b4ba294a4f3 SHA512 b2c9a8c5a7cc1648f63690ea23c81d0d5ee0a555cd0e3ee2b5b302b195be6fafeb32d520758da124ff0b0f74e3fd12093456004a493e7547afa57ab01250089e WHIRLPOOL d09836ce0a8fcafb4f22775a74401f95864d05b7964e2b1c2fd5966005c93db8806e56c8f7eb11c2e6d7885989a44d6f1c7762ffa68a852b3f6af6211c131dfd
 DIST adchpp_2.9.0_source.tar.gz 8685696 SHA256 fe97b9dad7689c38411c965c75218ee4fc527d68570c9842e53354097cb27636 SHA512 86f1ab8b3cc02d30c9edf978baa93889703ac0c75112a77cc0e2aa7e361552e2b1da7ae9895d86ca394d06ff8f6a19a2faed1e278bd6bca5728bae87f25800b6 WHIRLPOOL a9657078f51b1681321c8229ac699fa2011cc44d30b1a2c19b8b5d3f403560ee08741664cb6a3bf751a5a9c1026602acd305bb1830ac0f2bd719897d420296a5
+EBUILD adchpp-2.11.0.ebuild 4005 SHA256 7fb9b52d75391e4296204317069eaddb122e3cc9f453f469d2bf135baf1665fb SHA512 55b383894df2eccc470306ecccc9d1f13142d608d305f4215c0dd5c7c92ea75cf9e9a326fe0b5ee1581b76468ad45753cb92f3b888c6564788824b4ca9d3c82f WHIRLPOOL 21993bf74271a5d82a8ec7d8d1a7a414b5a4be2dcc4e2badad4083438059ddc971c7fd5e46be8d18b12b5e423367f2709d6a913f3c53cf34ea338469ab39fd50
 EBUILD adchpp-2.8.0.ebuild 4099 SHA256 c1115000de26fb362a30d5b7de5fa72fb58e09eb0d8898e2e2856f1f704fe917 SHA512 1c5c8ea7debd93bed566fbdc9f19c5edde99267d71434ccb2c540f486257efcb1beea536a204e47e4a80006fffcb116619932ffad92669c8535d6786ed3cef1a WHIRLPOOL 79fb246ddfa6b3d9d7939d73b2801927ab1fb8b0418347bdffddd62d5e888369461811d85c32f2a476d0a25e33c76697f7d27385541e4fca8a936b84660672ca
 EBUILD adchpp-2.8.1-r3.ebuild 4174 SHA256 ff097f091651ded4edc3786575ef74a395f87a851ee01f3a35961fec73e0958d SHA512 a63b815ece9fc0f4cdfde0c8d66ee78494c2b96e80b0a44ca8334a89d6f3395a9712200e4156a66dd696fc72d7690015a5f360dccbaca2a89d2079e8b9d4312d WHIRLPOOL 0fc82c8720afa63fe1cbed8dbcc23319dd79f8ed0f626c7df0d39d99e58219431b81e6228f662b33c00f2ce86ca7e659a168387c58072eb17ee42746df1a32da
 EBUILD adchpp-2.9.0-r1.ebuild 4207 SHA256 05e7064b333be8ef13562055558e6e4399d120d8c85843a8f6c5f5f9bf6d8f0b SHA512 705d5e21cbf9960977cb24f732d2d9cb852d86173baffd79e8db3468b37b5de9dc7139341080faad24904ced58732c6f6c53a760b86e190ef1f95ccd7e1c6aec WHIRLPOOL 19046ed14aadb09fc8df85f66f86803c60aad7c966a6178cf7087cbae32a6d7f4b23fe9716b091628aa3266d296f3358abb8430e07c64a65ae5d0f8c1d1c3838
 EBUILD adchpp-2.9.0.ebuild 4002 SHA256 ec7397d234e6f2bff49714badd4808d1d7438b8c1a5ba7a9eb89b6550e818a7b SHA512 7fa1e4a3b866420331789951f2cac879d6d9fffa7a5fbc148aeea7aadee707a69aeaa9d5129e24e5e74fc1d8d510be26c3581e63593277d6f7d91c523932b8fd WHIRLPOOL d966a9bd09ecc04c28f1aba08f17a510f4ee0dc6fd1d64775efce34e2fe957ca196013d86c7d4e82e7ad2ac4c07a18218b56c85faf8287fff7419d352541bf78
-MISC ChangeLog 2303 SHA256 f8f76fa041e413b670bb9d9bedd0f1a680910f426159a9cc761e31a5d490a612 SHA512 def8c9dae9b5c4aab689d9ed466cb0bc25418112b446b0b12e59b0baaa7b7f2a86fdc783f969838dd6493f6e81c67cdcc13560e4c8ebff402c2a67ba0cd5f0a3 WHIRLPOOL 132a2d7597ea778a1caaa3927b475c305a7adacb0237cd0d1f98001ab080490ce8f6b909b862561b94447ff3496b12fd68aed9ae1564a337a5f010cb182b7a3b
+MISC ChangeLog 2485 SHA256 314ae5f6cdf593c09b0a144b3cea79fb6284f1b68ab3ab25b41c7097d5820c49 SHA512 d8c5462680fc6bc34ec5a2bf03a6eb73b25980b4b3d830ad11b1a5dac7a38ad0bca2d8ca709d599987df21e45bbc17c0a0753a21eb7c2f90e0cded644806becc WHIRLPOOL fced850d7b8169b936ce84feee7f41875aa69db7e8f3160d8173b2fc9409f63a508528f1fda36abf5126df1b07aaf1c2993aa353f4704e756a71c9ebd18868a2
 MISC TODO 112 SHA256 4d3a6f431d988c8ac37e6bbdb8fc946ddc591cce2029a83a339e0b16e4954d4c SHA512 297523e8d11393dc37db2616561e027cd39191cfbdc5b0fe5cc95b3b8f038e90b491ad10feb256506fad996e5b427990a6aa479976524cf22f873588705bbbb6 WHIRLPOOL 5f06b3cd7e94f6d5f905be92ab915f71763b009572d69b63de0e92411fb97591696bf4bb67913a1acc8b72291add029f4ccc6fe76cf3d640766e78caf056412d
 MISC metadata.xml 407 SHA256 f5001e99b6181be8bac1b3ba8dbbce6ff2d63084ea64816cbb16d53a6871738b SHA512 2d89602c893366202dd7bb25928869e85febc1bda1e3e1a6547149aa84a38eae542629356de26dede7d72eae1d0262a06edd50b963fb02c403f60164a393eea1 WHIRLPOOL 32509c63bbafb3c1b5e6c9c75cfa2fbcc47afeaa6903d266c8f8d167e5895f7c44c8759647c6f073630f56c5a12fdb14ea3c8742df9639ae8bd4dfa5c43f6cbf
diff --git a/net-p2p/adchpp/adchpp-2.11.0.ebuild b/net-p2p/adchpp/adchpp-2.11.0.ebuild
new file mode 100644
index 0000000..433be58
--- /dev/null
+++ b/net-p2p/adchpp/adchpp-2.11.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+SCONS_MIN_VERSION=1.2.0
+
+inherit eutils scons-utils toolchain-funcs
+
+DESCRIPTION="ADC protocol hub made by the people behind DC++"
+HOMEPAGE="http://adchpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.1_source.tar.gz"
+S="${WORKDIR}/${PN}_${PV}_source"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+#TODOS:
+#Add info on script and bloom uses
+#Python use only on x86 builds
+#Select languages
+IUSE="+bloom debug doc +lua pch +python +ruby +script +ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	python? ( || ( dev-lang/python:2.5 dev-lang/python:2.6 dev-lang/python:2.7 ) )
+	ruby? ( >=dev-lang/ruby-1.9.2 dev-lang/ruby:1.9 )
+	sys-libs/readline"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.40
+	>=sys-devel/gcc-4.4
+	ruby? ( >=dev-ruby/rubygems-1.8 )
+	doc? ( >=app-text/asciidoc-8.6 )"
+
+#This sets some useful variables needed for configure and install
+pkg_setup() {
+	if use x86; then
+		export tarch=x86
+	elif use amd64; then
+		export tarch=x64
+	elif use ia64; then
+		export tarch=ia64
+	else
+		die "Invalid arch"
+	fi
+
+	if use debug; then
+		export tmode=debug
+	else
+		export tmode=release
+	fi
+	#Shortcut for the packages library dir
+	export libpath="/usr/$(get_libdir)/${P}"
+	export logpath="/var/log/${PN}"
+	export etcpath="/etc/${PN}"
+	export sharepath="/usr/share/${P}"
+	export varpath="/var/lib/${PN}"
+
+	#Create the users
+	enewgroup adchpp
+	enewuser adchpp -1 -1 -1 "adchpp"
+}
+
+src_configure() {
+	mylangs=""
+	use lua && mylangs=$mylangs,lua
+	use python && mylangs=$mylangs,python
+	use ruby && mylangs=$mylangs,ruby
+
+	myplugins=""
+	use bloom && myplugins=$myplugins,Bloom
+	use script && myplugins=$myplugins,Script
+
+	myesconsargs=(
+		plugins=$myplugins
+		langs=$mylangs
+		mode=$tmode
+		$(use_scons ssl secure)
+		$(use_scons pch gch)
+		$(use_scons doc docs)
+		arch=$tarch
+#to use propper ruby
+		ruby=ruby19
+	)
+}
+
+src_prepare() {
+	epatch  "${FILESDIR}/${PN}-2.8.0-fix_config_paths.patch" \
+		"${FILESDIR}/${PN}-2.11.0-fix_cflags.patch"
+	sed -e "s:%%ADCHPPLIB%%:$libpath:g" \
+		"${FILESDIR}/adchpp_runner.sh" > adchpp_runner.sh
+	sed -e "s:%%ADCHPPLIB%%:$libpath:g" \
+	    -e "s:%%ADCHPPSHARE%%:$sharepath:g" \
+	    -e "s:%%ADCHPPETC%%:$etcpath:g" \
+	    -e "s:%%ADCHPPLOG%%:$logpath:g" \
+		-i etc/adchpp.xml -i etc/Script.xml \
+		-i rbutil/adchpp.rb -i pyutil/adchpp.py
+}
+
+src_compile() {
+	tc-export CC CXX
+	export LINKFLAGS="${LDFLAGS}"
+	export CCFLAGS="${CFLAGS}"
+	export CCFLAGS="${CXXFLAGS}"
+	escons || die
+}
+
+src_install() {
+	if use doc; then
+		newdoc build/docs/readme.html readme.txt
+		dohtml -r build/docs/user_guide/
+	fi
+	newbin adchpp_runner.sh adchppd
+	exeinto "$libpath"
+	doexe "build/$tmode-default-$tarch/bin/"adchppd
+	doexe "build/$tmode-default-$tarch/bin/"*.so
+	keepdir "$logpath"
+	fowners root:adchpp  "$logpath"
+	fperms 0770 "$logpath"
+	insinto "$etcpath"
+	doins etc/adchpp.xml
+	fowners root:adchpp  "$etcpath"
+	fperms 0770 "$etcpath"
+	#For some reason the core starts login here before booting
+	dosym "$logpath" "$etcpath/logs"
+	if use ssl; then
+		exeinto "$sharepath"
+		doexe linux/generate_certs.sh
+		keepdir "$etcpath/certs"
+		fperms 0700 "$etcpath/certs"
+		fowners adchpp:adchpp  "$etcpath/certs"
+		keepdir "$etcpath/certs/trusted"
+		fperms 0700 "$etcpath/certs/trusted"
+		fowners adchpp:adchpp  "$etcpath/certs/trusted"
+	fi
+	if use script; then
+		insinto "$etcpath"
+		doins etc/Script.xml
+		insinto "$sharepath/scripts"
+		doins plugins/Script/examples/*
+		fperms 0750 "$sharepath/scripts"
+		fowners root:adchpp  "$sharepath/scripts"
+		keepdir "$etcpath/FL_DataBase"
+		fowners adchpp:adchpp "$etcpath/FL_DataBase"
+		fperms 0770 "$etcpath/FL_DataBase"
+		dosym "$etcpath/FL_DataBase" "$sharepath/scripts/FL_DataBase"
+	fi
+	if use ruby; then
+		insinto "$sharepath"
+		doins -r rbutil
+	fi
+	if use python; then
+		insinto "$sharepath"
+		doins -r pyutil
+	fi
+	newinitd "${FILESDIR}/${PN}.init.d" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf.d" "${PN}"
+}
diff --git a/net-p2p/adchpp/files/adchpp-2.11.0-fix_cflags.patch b/net-p2p/adchpp/files/adchpp-2.11.0-fix_cflags.patch
new file mode 100644
index 0000000..a60a79b
--- /dev/null
+++ b/net-p2p/adchpp/files/adchpp-2.11.0-fix_cflags.patch
@@ -0,0 +1,78 @@
+diff -ur adchpp_2.9.0_source.orig/SConstruct adchpp_2.9.0_source/SConstruct
+--- adchpp_2.9.0_source.orig/SConstruct	2013-02-07 21:31:11.952964272 +0100
++++ adchpp_2.9.0_source/SConstruct	2013-02-07 21:33:06.574966920 +0100
+@@ -6,9 +6,9 @@
+ from build_util import Dev
+ 
+ gcc_flags = {
+-	'common': ['-g', '-Wall', '-Wextra', '-Wno-unused-parameter', '-Wno-unused-value', '-Wno-missing-field-initializers', '-Wno-address', '-Wno-unknown-pragmas', '-fexceptions'],
++	'common': ['-fexceptions'],
+ 	'debug': [], 
+-	'release' : ['-O3', '-fno-ipa-cp-clone']
++	'release' : []
+ }
+ 
+ gcc_xxflags = {
+@@ -45,7 +45,7 @@
+ }
+
+ gcc_link_flags = {
+-	'common' : ['-g', '$UNDEF', '-time'],
++	'common' : ['$UNDEF', '-time'],
+ 	'debug' : [],
+ 	'release' : ['-O3']				
+ }
+@@ -77,6 +77,22 @@
+ langs = ['lua', 'python', 'ruby']
+ 
+ defEnv = Environment(ENV = os.environ)
++
++if 'CC' in os.environ:
++	defEnv.Replace(CC = os.environ['CC'])
++
++if 'CXX' in os.environ:
++	defEnv.Replace(CXX = os.environ['CXX'])
++
++if 'CCFLAGS' in os.environ:
++	defEnv.Replace(CCFLAGS = os.environ['CCFLAGS'].split())
++
++if 'CXXFLAGS' in os.environ:
++	defEnv.Replace(CXXFLAGS = os.environ['CXXFLAGS'].split())
++
++if 'LINKFLAGS' in os.environ:
++	defEnv.Replace(CXXFLAGS = os.environ['LINKFLAGS'].split())
++
+ opts = Variables('custom.py', ARGUMENTS)
+ 
+ if sys.platform == 'win32':
+@@ -111,6 +127,21 @@
+ 
+ env = Environment(ENV = os.environ, tools = [defEnv['tools'], 'swig'], toolpath = ['tools'], options = opts, TARGET_ARCH = TARGET_ARCH, MSVS_ARCH = TARGET_ARCH)
+ 
++if 'CC' in os.environ:
++	env.Replace(CC = os.environ['CC'])
++
++if 'CXX' in os.environ:
++	env.Replace(CXX = os.environ['CXX'])
++
++if 'CCFLAGS' in os.environ:
++	env.Replace(CCFLAGS = os.environ['CCFLAGS'].split())
++
++if 'CXXFLAGS' in os.environ:
++	env.Replace(CXXFLAGS = os.environ['CXXFLAGS'].split())
++
++if 'LINKFLAGS' in os.environ:
++	env.Replace(CXXFLAGS = os.environ['LINKFLAGS'].split())
++
+ # filter out boost from dependencies to get a speedier rebuild scan
+ # this means that if boost changes, scons -c needs to be run
+ # delete .sconsign.dblite to see the effects of this if you're upgrading
+@@ -143,8 +174,6 @@
+ 
+ 	if env['savetemps']:
+ 		env.Append(CCFLAGS = ['-save-temps', '-fverbose-asm'])
+-	else:
+-		env.Append(CCFLAGS = ['-pipe'])
+ 
+ 	# require i686 instructions for atomic<int64_t>, used by boost::lockfree (otherwise lockfree
+ 	# lists won't actually be lock-free).