summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-05-23 17:17:43 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-05-23 17:17:43 +0000
commit6f5de3588ccf40838bf2aac62baa310751a0afd1 (patch)
tree995be1c9d0a4403bc4aea5e65eaba29d300b0940 /www-servers
parentVersion bump. Removed old. Added rewritten init script (diff)
downloadhistorical-6f5de3588ccf40838bf2aac62baa310751a0afd1.tar.gz
historical-6f5de3588ccf40838bf2aac62baa310751a0afd1.tar.bz2
historical-6f5de3588ccf40838bf2aac62baa310751a0afd1.zip
respect CFLAGS
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/hiawatha/ChangeLog6
-rw-r--r--www-servers/hiawatha/Manifest33
-rw-r--r--www-servers/hiawatha/files/hiawatha-9.5-cflags.patch17
-rw-r--r--www-servers/hiawatha/hiawatha-9.5.ebuild4
4 files changed, 42 insertions, 18 deletions
diff --git a/www-servers/hiawatha/ChangeLog b/www-servers/hiawatha/ChangeLog
index 8c15fb6858c4..c9acff9041de 100644
--- a/www-servers/hiawatha/ChangeLog
+++ b/www-servers/hiawatha/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/hiawatha
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/hiawatha/ChangeLog,v 1.2 2014/05/22 13:19:10 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/hiawatha/ChangeLog,v 1.3 2014/05/23 17:17:42 hasufell Exp $
+
+ 23 May 2014; Julian Ospald <hasufell@gentoo.org>
+ +files/hiawatha-9.5-cflags.patch, hiawatha-9.5.ebuild:
+ respect CFLAGS
22 May 2014; Julian Ospald <hasufell@gentoo.org> hiawatha-9.5.ebuild:
add ~x86 keyword
diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest
index 1dd83efb4414..d2cd46b6cd02 100644
--- a/www-servers/hiawatha/Manifest
+++ b/www-servers/hiawatha/Manifest
@@ -1,27 +1,28 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX hiawatha-9.5-cflags.patch 485 SHA256 fdae13ea1a6f7ead9e4cb5786757bd9d941a8775e413154b1961f8e73e25c141 SHA512 64bb15a13d8b370bd1c22ee1fba49badfafee5aa2ba143dd1abf367e767a6bc615627f1419736cef687e521b8a6485440ee6fb1364dfea3302b8062b08047f70 WHIRLPOOL e0daa79bcc07f9b48f27da1c88ee0e476787f175c0ea0d622ddab008af914bfc44676343cd2189317cfa2e82f98ee0db881c6cc9891f99d3a2cfe8896b79ae71
AUX hiawatha.initd 571 SHA256 17da2101aaad6f6d48d6d9f0f12ec6287f5d1af3230121f47eb87363f6cfb9c9 SHA512 70ce782d7faacbf46e6058b8301f6134661b07a58d3e827a67935143fe88cd38954efc829eb07a59b477fa77b65145bc5e5dd1eaa1bb7eda3f895de5a29b4303 WHIRLPOOL 3c16c22f43ef7feed786a283e199d6fa87057a04f1b53ab5cf0f421feead913ea9b0582839f884f533211f1e22db4f4bd057bbbbba49bd9e75c25b8ef6936ed5
DIST hiawatha-9.5.tar.gz 847545 SHA256 c181011db1af187006190fc186689a0707a6f1e7b524c2a4347840e8fdf68b4f SHA512 54c97b6cb7a94cbccc5e1dd0a8c78b9f5f44da250309e09de8601e34bea9ae56a02c9ec7c9eed6cf3814bc98733cc6143ddc37dfa44ea1add8f4f63d56d3e7a3 WHIRLPOOL a612ff56ac0a649bb339197cfdddb67106c9657fe4a25bd8c35cb18fec222557da8e11360570c0f1db9982f9b41fb175e02ab71c5caf034ca6b83f98a2d90a35
-EBUILD hiawatha-9.5.ebuild 2283 SHA256 24563f3cecdc6b32cf76ff45ebd6cb3a3cf83a25e13e6d68a22ad57a1ac374b2 SHA512 d984e0e07e4525ffad31dc117f848cf6d96829075c4d7b700a682a40535c97b277a4402693eb5e0a252d0de8738a087b57610dc60f596305ab3ee0d500536881 WHIRLPOOL 61b2d1a11569473cae45278719fa784dcc010c31a3743db0d9b9d505e9535bce70c61592fa5b612f4445646bebb2b684be38453687df21d9405b86064ed5cbfa
-MISC ChangeLog 477 SHA256 1aab4097920fe64e9d62a570856144b7f875beae3083fdb939b6ff9bc5d55ad2 SHA512 b1d9e52f173a0762b82d8e9326684ab89da9bfb3cc7d67cbd9637835da8cedc6c4c67b95295494dc34e67d66c1c654022d56e2621ecf0327eaf8a05cbce04992 WHIRLPOOL deb512cfddd721196727663344ccf76ae89938550697ed4ac6fff00a8362737dfd72ddc85adc71870720a2dbff6e0fa25c35387b94f535dbedfdf2d8a6ccc2db
+EBUILD hiawatha-9.5.ebuild 2329 SHA256 ec6316b89d74fdb0136fad95674f65e3ad96695e868be0730b14ff8d68a3aefd SHA512 71d46f86fdd56d255a5c14eeeda4088295db258af8c6aa8271db6a61d1b6a2c8e93f5d4e1f83d66111dea3f20b8e9e0715574fab73f36a4941ef1633cf8f4394 WHIRLPOOL cee9816814aa5b3d821ed6d19a1118ae89ca1da35e282863d796fe684b75ffe0703c9f0fd3ccb068ddb849c8863d685d04e75b34e0a27fc12e84c768751f6eb5
+MISC ChangeLog 603 SHA256 8471aec704c574904cbd495c80675f1e0d27c81329567fc95c6af0163ff7510b SHA512 cd28edd83d4d336717faac4796f7d282ea1d3d5bb8f867ca8982ae2c0c8432b1d0933941e722e01d48a778e26076acfe7be5d77f75b9285671a8638a128ef34e WHIRLPOOL c6c6a263c745a9de2449c6e621e07a8510b2cc292e4395260bac83f8138f8d0cf6312e6105e5bce63fc7a939ddcd8e9e2665444a916d6cdc5bd9835a637ed6c2
MISC metadata.xml 712 SHA256 bdeebe9f480e4506078a1ada7f8ab34d618d35de402f53c26b6ff6489c9688a9 SHA512 3c7504874858971052b0646078c8fde703c051f7301b740428bd144f03a4c159517d003474504ba8666982535e130cee89c544c70e8c6833996323ba517ca6d3 WHIRLPOOL 92e4b695e3b4a97e9204d73fa9a31886933887b48fe1c8ce8ec7129fd2bf68d8e9e36b2a5e0e342e7a2c72f147bd37be7371d412a300099ef8d120576e45f941
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCABmBQJTfflPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTf4K3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgCLoP/R8S43gzK71w63gx0aLL+cIW
-XYb/cm3pNWTe0p/y9DGaGYaNFgZ3Lhyfyn5sbEKHVydcQachbIoBKjT7/RXyLMMh
-7MjOdtN8UsTMcerbOilGHz9/0JHGj/u9kWlpo7mBrx2Eie9UlvWPxhvS4O7VeChE
-kvUjZl225clVqVSHEGHmraTl1XnkJ8joMu2TgzeJjguBO3tSc+g1fJ1Qe+Qw8y+r
-nWgSrKePgoP3YgUQbE5CGzaPArT2JsrlUgHN1/l1kxyq8jridrwsVMHAyGGv3F7F
-XZfO398x56baTc+Th+XA9iGQKE0qEcT7leNzNFNwbBnCXA76DLXIcgiUt9sQV3j9
-p20vyVKGuo293jCT92RUNsRtujvpXeqFdWsQ5WZCzkhJYzm9tNvjj3ZqZTdNnFlz
-JwfzqRGHHP+XlWHiLL0yopVYgTFPUl6wuQ7x2bwdn2x/KNzhKwPPorHUClT0IErG
-RYcd8ZYGii+kK6TGRcLuy/mkh7rAzzXwYwQq8r42AeB2aUQw+qSa3SEkmol4WLWL
-ycZRoblTwGBcZO1PKuedvDOJfRhVa4PLqFUmqAPgm8SM8cA1Cn3BUIpagjtSu8Ko
-0RxF28wsiyaIGx6jjwP7Pq9Exkc78RQXAzOAf5jbWaUevSxY+gpEB1cIr92kRNIL
-A0XPriL0swndT72V1amC
-=PbUT
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgdzQQAJovd4+SMfPzoN6tV7AxM0V8
+fItFQrnVfL3FGm28TQ5J8pXXh8HcAQ7EHWnt1YJrbG7dNKtMnxJ0EUn5LJkvQu2B
+eeKIsT94BVTqbDlY8njHOErDGahLw+qkFWPWGrm9Qi7r2NOr6u0C4fKbcmeBxbR7
+BaAjyAgMCoJqFf0D/gEg7SccB2U66iwN2ticyuJ/3qmNU+PTjtmzjCO5+MD9eX85
+40quqdkLHcRl5R+2hOk0uULlykHaSnZZHxH5LxhJMAUAeVSj0G8mysxt/OwPM2YX
+g2nIUZzZv1X8f6CV6WwWr632Zg9738RnB/pNyG1PgyVpp/9EHAJHigu2SXfJQFev
+6tL/kd0+flBA8D2vCCQsJR2jWwlzOhpqN1BM2w/YPk/W4Osu3MrlT091ItNUGL6l
+caj+CWFrfyApS1v6fA3F6emYmemDjo37OhllAF3YKyaPfx8pzi04RKiklNA6rGX1
+BGTzTZkXFkspMw0OOvx/WjZqZjSbpbEpJ4REsqY6bF/Xw3ytGJNOYvtWT0/tFp1U
+N9vD5s0GfqKLBzmhO8Mj7JGBtnhN/8DSfAHOYBNK1Kc6O7/tMK0JU7gAgUZgVoWR
+Ygnj5/ngKbknxFezJvDQDFC/0csB4KTcBOWoexOmEkgHhr1U82mKdaQS2DNDDt5j
+B2+DGCJmttXQ9SjVKekG
+=IkX1
-----END PGP SIGNATURE-----
diff --git a/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch b/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch
new file mode 100644
index 000000000000..4ff33cd0d126
--- /dev/null
+++ b/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch
@@ -0,0 +1,17 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri May 23 16:59:33 UTC 2014
+Subject: make optimization level build-type dependant
+
+--- hiawatha-9.5/CMakeLists.txt
++++ hiawatha-9.5/CMakeLists.txt
+@@ -2,7 +2,9 @@
+ project(Hiawatha C)
+
+ # Compiler
+-set(CMAKE_C_FLAGS "-O2 -Wall -Wextra ${CMAKE_C_FLAGS}")
++set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}")
++set(CMAKE_C_FLAGS_RELEASE "-O2")
++set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2")
+ set(CMAKE_BUILD_TYPE "RelWithDebInfo")
+
+ # Options
diff --git a/www-servers/hiawatha/hiawatha-9.5.ebuild b/www-servers/hiawatha/hiawatha-9.5.ebuild
index 16cfd34d2db6..9ea03746d846 100644
--- a/www-servers/hiawatha/hiawatha-9.5.ebuild
+++ b/www-servers/hiawatha/hiawatha-9.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/hiawatha/hiawatha-9.5.ebuild,v 1.2 2014/05/22 13:19:10 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/hiawatha/hiawatha-9.5.ebuild,v 1.3 2014/05/23 17:17:42 hasufell Exp $
EAPI=5
@@ -35,6 +35,8 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-9.5-cflags.patch
+
rm -r polarssl || die
grep '#ServerId =' config/hiawatha.conf.in 1>/dev/null || die