gentoo resync : 03.11.2017

3 files changed, 108 insertions, 2 deletions

diff --git a/app-emacs/doxymacs/Manifest b/app-emacs/doxymacs/Manifest
index 508335166209..97bfdf91348a 100644
--- a/app-emacs/doxymacs/Manifest
+++ b/app-emacs/doxymacs/Manifest
@@ -1,6 +1,7 @@
 AUX 50doxymacs-gentoo.el 502 SHA256 55d0746f7855c7bc3e09cd332076a64bd7528199475643a20354f37d525d74b4 SHA512 1ce4aee60f650daca6d1597356ccc8d2e411c8d71f4236dd396709c6d2e03699d78626dba1e0f0b7c67701267436d62d56b70c9fbc1a5770e0018e7014badc75 WHIRLPOOL be57d8df024f98ba9ba90154d661fe6bece33ad60e5068f69dbae28cd7cb7dd5d6a068cdc32eeacd53fe08eadf58010dbe3baaf191926b5ee0093317f7d52e53
+AUX doxymacs-1.8.0-gcc7.patch 2868 SHA256 04e9d6d2642bd66845a16a88ed37d92754b98ce6a7c9e18e2c7ff0b4a0709e7c SHA512 2ac07420a59ecd2a90de1dcfe0b0750d527a6e12100bbbf453adbad9e046ab036708c4463e9d50507e099cf2246d867e748903d8b6a8e213b0755288625c1e03 WHIRLPOOL 0e968b90ebdb9d1b2c9e840eaff3343147112fa9bfd4f0b6edd55efb6c30b5a401dd796cbe5956e5b5e02d053c413b8a6f811a54d1eb20afa6e93516ac0a1013
 DIST doxymacs-1.8.0.tar.gz 133600 SHA256 a23fd833bc3c21ee5387c62597610941e987f9d4372916f996bf6249cc495afa SHA512 7461a8a415aadf331f856e4f122712cbedc2907eff9e452f24e6ee83b96903d9944d2cfdbcfeab8a66144a0be508eae723c29f82a081df9723560b10c444f8ac WHIRLPOOL f8b39d0a38032c1364d1d4ccf9a78f87be877fc8655cf29a8b189a01ec0fb76ca2b26b52c19fd780c27243c0ebf5f344331b62f1278efa3c341851ee7a9c86c0
-EBUILD doxymacs-1.8.0-r3.ebuild 679 SHA256 b2b2fe51f524467b3bd6587ffc54538903036ee90ae0c0515b36e5675a0b7da5 SHA512 6d37c93fa0f636cd84ea30041856e1027c8186bb812e2635ff0175f4bc0ecf7af8cb619685125165e83a3a7c31cc02960f8c46ba2642a8ea3732fc0eb392fe56 WHIRLPOOL 6efe238f34c0571ac78dc8114c4e33241a837db3c92a45a0e8234eb60d86b210e6dcef5f922fcf98a90c2b76b4399765c7c3a69d9431da2961279feb180e6d82
+EBUILD doxymacs-1.8.0-r3.ebuild 711 SHA256 94bb74a89a7052a0533220ce8b3232c2a7e667a1d1a5cfb36414c7598c8825f8 SHA512 a90c2f6704d36637630a9a43b1fe8619e08a531716c22361b6066d2476f8c572443521b6afcaad338a2bfce1b5517bd617c28b299b43817507f9c9b85e1b9ef0 WHIRLPOOL 6e5842426d5e77840f0a3a3cbc0d28acde3c594916d75dc51f6aa5386bd5381f190a6c5b1b21ddba56d6b5c6eda1d917c02c165042abdbc6796a3063ffc28ea7
 MISC ChangeLog 2353 SHA256 fc58587c81c790ee684aeafde7c193d6d6bf0d549c66cdcb8e70e28a690ecc35 SHA512 2e9cd10cf790a23950b5ab296423b91c8850316fd74b3d405673246354bc4c94b54ffcf3e3a74024cb4d9cc4a6d9dba66cce3fc6d94498c634963a0a09e5815a WHIRLPOOL bdd01d02847da02264c93233893d53667a23ce835c822856f9b3a54200c3a1df1a5c394fce8199878fa1f6b6a68b4220ab3f2ababc108d6b3655e8559267f581
 MISC ChangeLog-2015 2166 SHA256 88acb57d616e6e28b61160f08b01af93c49fcda34d7068725380abe30ed6d119 SHA512 4bb21d657d5791f988b0845598e1947c31d97c957dcaa3c0dcf52215eb48daf6059c77b7f4b75392672eb4667caa73ac04df6b1109826110f4930fad0b334a4c WHIRLPOOL 327ba9eb3cd869dc27b88cdc9984d63fcb2515ebc5c0943bba7e1f95bce3121bd341a2f90c7f0b5563c274ff468f11e086d8f0c45b485b92b5ccd9076e81cb1b
 MISC metadata.xml 335 SHA256 9e97df755db16d310ec44a2b0d0139e84edadd2e6d0ceaa1177c9d71c4b61bda SHA512 25405ab050cf5173b07c80dd4e0eec376be3e6e666934d2f64ad978dfe8b9ad54a33c6b83adb01b96cff912a97cd64ae1009dad45c83ef0ec7c3dfde2f3fe9da WHIRLPOOL 80369bbea92e8608011d52241525f517a02ac98d94f878f4ff8f52d93e8557d83bb9ca873f25fab3922de724985299a360be7aab0fd052462a92a439ddf27c23
diff --git a/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild b/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
index 9cd5531e5936..5d9ed4e59e7f 100644
--- a/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
+++ b/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ KEYWORDS="amd64 x86"
 DEPEND=">=dev-libs/libxml2-2.6.13"
 RDEPEND="${DEPEND}"
 
+ELISP_PATCHES="${P}-gcc7.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_configure() {
diff --git a/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch b/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch
new file mode 100644
index 000000000000..b30a955baa87
--- /dev/null
+++ b/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch
@@ -0,0 +1,104 @@
+Fix compilation with GCC 7.
+https://bugs.gentoo.org/635746
+
+--- doxymacs-1.8.0.orig/c/doxymacs_parser.c
++++ doxymacs-1.8.0/c/doxymacs_parser.c
+@@ -70,6 +70,7 @@
+ 
+ hash_entry *symbol_hash[HASH_SIZE];
+ 
++static inline unsigned int hash(const char *s);
+ inline unsigned int hash(const char *s)
+ {
+     unsigned int h = 0;
+@@ -82,6 +83,7 @@
+     return abs(h % HASH_SIZE);
+ }
+ 
++static inline void AddToHash(completion_list *cl);
+ inline void AddToHash(completion_list *cl)
+ {
+     unsigned int h = hash(cl->symbol);
+@@ -96,6 +98,7 @@
+ }
+ 
+ /* mmmmm... free hash */
++static inline void FreeHash(void);
+ inline void FreeHash(void)
+ {
+     unsigned int i;
+@@ -117,6 +120,7 @@
+ 
+ /* XML Helper Functions */
+ 
++static inline char *XMLTagChild(xmlNodePtr node, const char *name);
+ inline char *XMLTagChild(xmlNodePtr node, const char *name)
+ {
+     xmlNodePtr cur = node->xmlChildrenNode;
+@@ -141,6 +145,7 @@
+     return NULL;
+ }
+ 
++static inline char *XMLTagAttr(xmlNodePtr node, const char *attr);
+ inline char *XMLTagAttr(xmlNodePtr node, const char *attr)
+ {
+     xmlAttrPtr props = node->properties;
+@@ -167,6 +172,7 @@
+ 
+ /* Look up functions for symbols and descriptions */
+ 
++static inline completion_list *LookUpSymbol(const char *symbol);
+ inline completion_list *LookUpSymbol(const char *symbol)
+ {
+     unsigned int h = hash(symbol);
+@@ -187,6 +193,7 @@
+     return NULL;
+ }
+ 
++static inline desc_url_list *LookUpDesc(completion_list *entry, const char *desc);
+ inline desc_url_list *LookUpDesc(completion_list *entry, const char *desc)
+ {
+     desc_url_list *cur = entry->descs;
+@@ -206,6 +213,8 @@
+ 
+ /* Add the given name, description and url to our completion list */
+ 
++static inline int AddToCompletionList(const char *name,
++                                      const char *desc, const char *url);
+ inline int AddToCompletionList(const char *name,
+                                const char *desc, const char *url)
+ {
+@@ -274,6 +283,7 @@
+ }
+ 
+ /* Encode the given string so that {X}Emacs will understand it */
++static inline char *Encode(const char *s);
+ inline char *Encode(const char *s)
+ {
+     unsigned int extra_len = 0;
+@@ -341,6 +351,7 @@
+ 
+ /* Output the completion list in a way {X}Emacs can easily read in */
+ 
++static inline int OutputCompletionList(void);
+ inline int OutputCompletionList(void)
+ {
+     completion_list *cur = comp_list;
+@@ -400,6 +411,7 @@
+ 
+ /* Clean up */
+ 
++static inline void FreeCompletionList(void);
+ inline void FreeCompletionList(void)
+ {
+     completion_list *cur = comp_list;
+@@ -428,7 +440,8 @@
+ }
+ 
+ /* Add the members of a compound to the completion list */
+-
++static inline int AddCompoundMembers(xmlNodePtr compound,
++                                     const char *name, const char *url);
+ inline int AddCompoundMembers(xmlNodePtr compound,
+                               const char *name, const char *url)
+ {