Revision bump. Respect LDFLAGS, LD and CXX; fixes bugs #476000, #476002 and #476004. Thanks to dlan for contributing patches. Use /run instead of /var/run; fixes bug #451794. EAPI 5.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 500 insertions, 22 deletions

diff --git a/net-proxy/oops/ChangeLog b/net-proxy/oops/ChangeLog
index d5edfaa6c3e9..e9c9ab98b021 100644
--- a/net-proxy/oops/ChangeLog
+++ b/net-proxy/oops/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/oops
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.26 2011/01/10 10:48:34 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.27 2013/12/15 20:26:40 tomwij Exp $
+
+*oops-1.5.24_pre20050503-r5 (15 Dec 2013)
+
+  15 Dec 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/oops-1.5.24-respect-flags.patch, +oops-1.5.24_pre20050503-r5.ebuild:
+  Revision bump. Respect LDFLAGS, LD and CXX; fixes bugs #476000, #476002 and
+  #476004. Thanks to dlan for contributing patches. Use /run instead of
+  /var/run; fixes bug #451794. EAPI 5.
 
   10 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   oops-1.5.24_pre20050503-r4.ebuild,
diff --git a/net-proxy/oops/Manifest b/net-proxy/oops/Manifest
index e9915327bae8..1d5104be5361 100644
--- a/net-proxy/oops/Manifest
+++ b/net-proxy/oops/Manifest
@@ -1,25 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX implicit-decl.patch 304 RMD160 4a14c789a10040bd9d7c108f0ef21ebfd0365807 SHA1 36f77b311a26abd0cc2616c7ff9bb36d0d138691 SHA256 1f6b490904ec7597999f388a818782817aaf401c05b3ee8a6423de1ff751b30e
-AUX libpcreposix.patch 784 RMD160 7f1b44b19f6f139d91902b458789ab452949a3d3 SHA1 d1146b0f5a2b99981f7fdc4d0304c8aaaaec7a0a SHA256 3c5af72112012249d4d9fec033249c5308f1b0431d3ce00c8d0f6aad98d67d80
-AUX modules-as-needed.patch 938 RMD160 826cb10345b052147fbab23aead070749f977722 SHA1 112464fba1af28a7bfe3d6b2a1456896b73a7962 SHA256 38a8739282054477dc4488875a8989579565ba13b8f49ae83e2d6b09348117e1
-AUX oops-1.5.24-pthread-rwlock.patch 1035 RMD160 56f3325959ef144d8487d82792d2bcd73d5bf74c SHA1 59605a5e3bf6bf46468286a473c60374bc00059f SHA256 35ed9aeee36821b09c12cd9d612d8f5117eba75f3cb8a8517f07591f15d78a55
-AUX oops-1.5.24-textrel.patch 803 RMD160 7cc63f2d576e99232392528eb65ed09ea4d0150a SHA1 982151649995f1376d608a783addb04b5ba77489 SHA256 56acbb949120570746c200a97c4a41579366c4a00718baa3af56c7f7d2ea16f3
-AUX oops-1.5.24_pre20050503+db-5.0.patch 526 RMD160 83696b612a160a2e273d9cea10f81de6b6214a84 SHA1 13cb8cc0b2c138dc164b419c09ac408ebc254d92 SHA256 61dd0126f19afd22c98453227ee202b4d55681e7b33713a5b648c59257c9b673
-AUX oops.cfg 17860 RMD160 fc772f270c505c83680568d166e006236ce36105 SHA1 7995c8d80bbe76a7fce45e20f712d5b3469b02bb SHA256 8e414b7261e5798f16ee97f148b883c75a0618997549fd2f701a820bcc0fbb2f
-AUX oops.initd 515 RMD160 da1f9e004a8173f74a2b2086f5ae5c88e4d3bc62 SHA1 37a0a31a0ff9e87c26901332f1d682e538bfa2b7 SHA256 be8deff3c52531ff1e31f47851672e877854082290e78d1f4c998b787f6c7279
-AUX rotate-logs.patch 456 RMD160 935c411b1edb6d6af0e7b15ad1da5ff3851ab449 SHA1 5cf246668df5156b1e9560ab5be20a21d99c67be SHA256 e35932a32b980ccee22bc070885a4f4c385839dae913a6f9656b0c330633d1f0
-DIST oops-1.5.23.tar.gz 473290 RMD160 295122ff9ce7e045cf7ddda035479056ba9e5881 SHA1 6eb9b77a5e4ef67896f46d5e1452506f2dff34de SHA256 b9ab7c0b5b11de7944f098d6f99158fe1b9c3b9cf82fe7827685c6cec8ccfa04
-DIST oops-1.5.24_pre20050503.patch.gz 101103 RMD160 dffdc6842db8c78d87c26fe180302b56608f1f2e SHA1 9d32934752729359056a9a6913b3db9008330994 SHA256 954e59d046096867a8e818bf47190ab06c8416abb80d151757825a664192aded
-EBUILD oops-1.5.24_pre20050503-r2.ebuild 2644 RMD160 ef01bac50beb4a62e14b1873efeed6b14e90754c SHA1 7c865086b91a01b72cc5ff190555e7761724218c SHA256 d3a313a9b32c1c1809a773080b5acb11316053e0025c23895eb50f5140b9c9de
-EBUILD oops-1.5.24_pre20050503-r4.ebuild 2682 RMD160 acfbf4047bf28152dcba5a1e26f2e9bfabfe2347 SHA1 30802391442bc5c3bbcffdaa5c85e5a4c1eac4bf SHA256 0d4dc59b43331e166ad1defebc4235043354452c96ff2e56ed3acdd98c907f86
-MISC ChangeLog 5871 RMD160 88b248ce9156f62cd62d8c8fce02ffb9267bdefd SHA1 d209d4236efca92485094841b2b7288f5188e87f SHA256 a2f52a4e8cf4dc8d89310a7bc4b2c5c6887508f687746630a97a6ff795dbbce1
-MISC metadata.xml 241 RMD160 49452806ed5c451d97e1fa0ea2502e0eee3c41d6 SHA1 e9ba513731cedbbad85c4e23eead942b5c34ccc8 SHA256 62971ad1585c672fdea039fe2b299a5655375b23f78d7c2149901e2b29407bd3
+AUX implicit-decl.patch 304 SHA256 1f6b490904ec7597999f388a818782817aaf401c05b3ee8a6423de1ff751b30e SHA512 30f5388b7877032d9f771dc36516e9f831f4735679ecb3e2286c39412906107374190ed6da3a9052a436de28ad20d8582ddbef08311d137a2d7958b8b7d52f19 WHIRLPOOL 25f8ba7eea23e992f6b9254305f5c3f00c6db492bdb6af7e81df0b7ddd7958cc547e76dd8c8d0ddad6f8d6f96cf5267342afe55c9887b313c30507c817014cdd
+AUX libpcreposix.patch 784 SHA256 3c5af72112012249d4d9fec033249c5308f1b0431d3ce00c8d0f6aad98d67d80 SHA512 b55521d6ed5d7e523dd49991135011b7458f3c175137333b91e603df9194658d24c021b4efd3a70ecf901fac272124fb1d09a374f56a19429fbf9d3fad909145 WHIRLPOOL 1649aacbc21b51d8a2c4b57603467e5c9f5b200e29af4c2ce18f865a732d7b48f78003bbaca3e59915cc0f5d27d90eb064f649af9f7aebb3646b2b602e8b0bf6
+AUX modules-as-needed.patch 938 SHA256 38a8739282054477dc4488875a8989579565ba13b8f49ae83e2d6b09348117e1 SHA512 bbd300099f2d81cb6e40132893fd70fdc629931fa0db63e4a9bf047fe61598edaa9786133403706fa438186b2eca8f06f4100579d1d0492a710fe53c98f1f471 WHIRLPOOL 13a98b24ad04958af5195acf203c669c6d8ec019de45942f0dde783fdd846cb61532ec879496b5df01b21d826b3a42a63515ad9adf0a9d107b7146f6bb4f7007
+AUX oops-1.5.24-pthread-rwlock.patch 1035 SHA256 35ed9aeee36821b09c12cd9d612d8f5117eba75f3cb8a8517f07591f15d78a55 SHA512 1553c75d1ac693a32ab6d80fc87946da6080626c477ea29a4b2d391487edb3c12df7bcb6818b64039132cef156a46a4e19037e127fbc30cda707574f007f49ec WHIRLPOOL c20389f7e33926ac55a152cc03b696d6851dbde75ed6d4e0ce3da4b5dc2349ffd250d5bf5abd181ae3ece91d93da50898156f637fa102610e8961ea69d65f9fd
+AUX oops-1.5.24-respect-flags.patch 11507 SHA256 d9d0bfbcaae8ccd7d3b7d345be5e797d76cae2c230a312dba0b46f12844efab2 SHA512 3b21ddfec0ca62c8ed429481394fc762676b0467609c32d4d6ef29c1203ec8de6b2d37dd63f1940641419ac537bf3cd3ebf4498654a870908eaf855e10023ea9 WHIRLPOOL a37375af55bb1dff424d66d52e6bdf36165b671739e72fc08a1a9c7b72080460653d41fbb566982f937b4ff52f91f3e882ad425bcc7c359ae74f2ba225972002
+AUX oops-1.5.24-textrel.patch 803 SHA256 56acbb949120570746c200a97c4a41579366c4a00718baa3af56c7f7d2ea16f3 SHA512 b3153ed81623295f4d1d358d736882e4b82cdbef05a2079749bfc017c8c1a0c405d9dc1fa6fa22688dc35264ce9430eb26e40147e87a69a9fe7c3a6a7e6e5a21 WHIRLPOOL ee16dc096bc60e6a77f8b5ea47ac5a04efd0c58c18f1ad53103eb9dc492172e0aa4b7ac22aa717fca979286d63088cf198df60b1ae41909694639e9b546f951d
+AUX oops-1.5.24_pre20050503+db-5.0.patch 526 SHA256 61dd0126f19afd22c98453227ee202b4d55681e7b33713a5b648c59257c9b673 SHA512 c899a05304592b77178e8bcf3d2714d037a5d0e3485e17322374fcd5256a0020be38e0ef30a5c1f9cdbe561bac9fa2cbf21a83bc64aecd5e50549d3e6a475274 WHIRLPOOL bebfd7613cfb6fe3da139eab6bef9aefd7da973ae95742f2004ce01ff2ff65d84c2b5716e0b2eb296821d7b703c285a2ea1840b4e0463037ea0c0de444f95a76
+AUX oops.cfg 17860 SHA256 8e414b7261e5798f16ee97f148b883c75a0618997549fd2f701a820bcc0fbb2f SHA512 f92149928479e2afd7aee550a7f384abd34d5432340adcc9a1ba87659c010a87d3e034d03effec5ff7005f4ed26f4b5b6c95e47c24d612cf32cb3e4a7f877b63 WHIRLPOOL d6b39ae4fa6aaf9341874e5963356a3a9239a458d312be202490636855b82417ca44d45efe0565c50231de2cca2772bc70cb9acc72a45d1b622045fb3a100553
+AUX oops.initd 515 SHA256 be8deff3c52531ff1e31f47851672e877854082290e78d1f4c998b787f6c7279 SHA512 6047b8c56209835e5c794f3b4827a470833986a913f8f819a03f542341da3de03e2fc771535c159936bf1cd349777e3c7eeacbbe0dd2758a06e430e19b6686c0 WHIRLPOOL 19c353f5d6d08c90307e0ee0c58fcd3deef43c5ef3cd0f0a589f9f3cb05091aab83c43e52a3f2cb9ecf3c0dfa7b45c232e75f02b32cdca45324950bbc2de9685
+AUX rotate-logs.patch 456 SHA256 e35932a32b980ccee22bc070885a4f4c385839dae913a6f9656b0c330633d1f0 SHA512 37351d3b0acd7aea47d02647242c4d4432e8735a0b02dced74df578e6bcf995cb87580ac247d7cba725fc8e6195cb3de87d4f032139bc0800add0211f9576bd0 WHIRLPOOL fed8945185f752e70dcd26b5090daf9c8550e3b858535afc66f28eaf849e65680cf9cd6003b791d67410ed01bb64c843c85a6e87855b85f431d33f1c990bd458
+DIST oops-1.5.23.tar.gz 473290 SHA256 b9ab7c0b5b11de7944f098d6f99158fe1b9c3b9cf82fe7827685c6cec8ccfa04 SHA512 5d33b19d6a48f3b38cffe7eb17ef0b0a00cc92cb1608a05f196ec747df51e318e8f0a82d1f0c2e254c16a7d97f640ed8bf30be62994f3b81d5ebd3cdc6358be3 WHIRLPOOL d2d9d1da409e91beb5e7761285b360dce3824f3defacc3c7f10305617bcdbd9e8807be645e74c268f4b8126ff330a7c49936ced06247c3bdc2190f8d194b4710
+DIST oops-1.5.24_pre20050503.patch.gz 101103 SHA256 954e59d046096867a8e818bf47190ab06c8416abb80d151757825a664192aded SHA512 230fede3d76ebd35f404055605381555707aed4d3fdf53e5e5074c66500b55360e7546c3faa54466791f485a89e359c3e5576162eef6c17ca49c1006ebfddb0a WHIRLPOOL 6ae6284393ed53d3d083af6abca2b7a5cb2c80d0c02838f5d518f02de12a13122900e2dbe62532953bdd839430d94523d28a8abf555e463d25a807a75f692cff
+EBUILD oops-1.5.24_pre20050503-r2.ebuild 2644 SHA256 d3a313a9b32c1c1809a773080b5acb11316053e0025c23895eb50f5140b9c9de SHA512 86e6d62c32d49491c2f9fb53dfabdd8a5a7b8532380b7e76aafbac9d91f5c77862510b30a2f67e7b712e08ce7bcc6a199e0beeefda2336e23cddcc30118225ea WHIRLPOOL 0b6ac9501262f29ee93d86aec5c0faab2cc5ddb6420792d3e0b224b662ac7f14c728b5b3e3b3690363f121a4320009b9c12a800f1264d3531ed2bf0fb8191bf0
+EBUILD oops-1.5.24_pre20050503-r4.ebuild 2682 SHA256 0d4dc59b43331e166ad1defebc4235043354452c96ff2e56ed3acdd98c907f86 SHA512 da7fd7cdcb764136f150779a8244e190e2b4e734d03f0cffb793dd1af748b04d141918b0b3c3885c8fe69a9ab58d2dd55b0b80ec0c7a68af19e11f04caf2bf9f WHIRLPOOL f5e1aa2a24ae17cff05b31d42edb9f9c27969fb939787c9871caed6e8a074cb4872524a74bab089624b938dd5293c2943b11b7af00344ce6dd6f1b8cbe95b695
+EBUILD oops-1.5.24_pre20050503-r5.ebuild 2933 SHA256 324b9ac2bae971a4141383655531e6ba920ae9794983cd96d1aaf439390833c9 SHA512 c4e9fe7509cdde8dd3b7eaf42bd3bbb48b9a3c998113a9877459fdc3d44d38289518b2e1b1e313891f7fa2980318a5c489101e5e9c110141398456da217baa84 WHIRLPOOL 69345b7cfc6c307e6d28f7b3568c07a5a87eb1f9e8ef86d32e8ee76a985a06116c555a29dd42914ea674b5056efcb2829d9226c0ae3794af9828c8f1c631520e
+MISC ChangeLog 6226 SHA256 12e9ee86d413247bce691d82514b969865fb96b4bfddc9d9b43052fea1b3c0b4 SHA512 235fbe6a0054e59e4b30c419403c5e3bde819bdf19806b93736b0f62bb00e04fb264dabb43f038e9f5ca732e80a74cecf4a094d2cfcd088d125aa40982e489a0 WHIRLPOOL bcff510ee09667f35a37f7c991d3a3d2962c32b74042e171e274958d95508b318d82c85d68dbcb6c474a170ae12cc372f44183494d50ca6cadf585383604a16a
+MISC metadata.xml 241 SHA256 62971ad1585c672fdea039fe2b299a5655375b23f78d7c2149901e2b29407bd3 SHA512 7e1ead60f011cd76b01fe594888286730cdc61806140bbc265730838c2335ce7d304be862844b68f608fd7aa020be66e59a22f0fd4966716b28cafeef895f61b WHIRLPOOL 5486e204cf67ce97a633f670445e3a41fd6e122a11631996e00dc6414a774342dbb621cb7dde28f5582dbd236ddd656bcc9d0dec17ca31a1e4d303d206c7323c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEARECAAYFAk0q4+sACgkQAiZjviIA2XjdXACfaTISL3e6pwOveEjEF459iL3H
-Oi4Anj1a3yBR7uCRV7zt1kbad9k2yRlZ
-=KN62
+iQEcBAEBCAAGBQJSrhAfAAoJEJWyH81tNOV99sAH/jGxjQnVXgt0UfR9ZBTCLxEY
+b2GW3RMd12qm2rlXEECtFKzeOHcZiOX6FmZXVBsio5qGAQ+ijPmjW0XGFQR92bjd
+rpL8BQptISzRJpZkEF/6HtJaIZhguQXZfo0mzBBs7gI9Fe4yCtRYKqmsPsMeaQVu
+fkwbufLU0PODRYozEBVDvpHBc215TzbmytbmFoSwJPaAE7yrlMeBY36VyUF97JBA
+XthEWWJK8IxzeQmjWtC8kA2MCNIrfv2tNiMpDZrExkePyuBhfjEejD68/HVyS/VG
+5WSrsPP6uPDS6vY1Zw+UVmB6xb4YogELhbHm1mrHoW+ZGUyGC951WKBCXgA1rs4=
+=wD7v
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/oops/files/oops-1.5.24-respect-flags.patch b/net-proxy/oops/files/oops-1.5.24-respect-flags.patch
new file mode 100644
index 000000000000..67c814aea2f2
--- /dev/null
+++ b/net-proxy/oops/files/oops-1.5.24-respect-flags.patch
@@ -0,0 +1,352 @@
+diff --git a/configure.in b/configure.in
+index 0b9ac65..a68d7c1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -204,8 +204,6 @@ tm.__tm_gmtoff__ = tm.__tm_gmtoff__*2;
+ AC_DEFINE(HAVE__GMTOFF__) AC_MSG_RESULT(yes)
+ ],[AC_MSG_RESULT(no)])
+ 
+-LD=ld
+-
+ ##
+ ##
+ ##
+@@ -309,18 +307,18 @@ CXXCOMPFLAGS=-c
+ CXXSOFLAGS=$SOFLAGS
+ 
+ case "$host_os" in
+-irix*)    CFLAGS="-D_SGI_MP_SOURCE"
++irix*)    EXTCFLAGS+="-D_SGI_MP_SOURCE"
+ 	  ;;
+-osf*)     CFLAGS="$CFLAGS -D_REENTRANT -DOSF"
++osf*)     EXTCFLAGS+="$CFLAGS -D_REENTRANT -DOSF"
+ 	  LIBS="-oldstyle_liblookup -lpthread $LIBS"
+ 
+ 	  ;;
+-freebsd*) CFLAGS="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
++freebsd*) EXTCFLAGS+="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
+ 	  CXXSOFLAGS="-shared"
+ 	  LIBS="$LEXLIB $LIBS"
+ 	  if test "$large_files" = "yes" ; then
+ 		## FreeBSD need no any special flags for 64bit files
+-		CFLAGS="$CFLAGS -DWITH_LARGE_FILES"
++		EXTCFLAGS+=" -DWITH_LARGE_FILES"
+ 	  fi
+ 	  if test "X$LIBGB_NAME" != "X" ; then
+ 		LIBGB_NAME="$LIBGB_NAME -lstdc++"
+@@ -328,39 +326,38 @@ freebsd*) CFLAGS="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=204
+           rel=`uname -r`
+           case "$rel" in
+             4*)
+-              CFLAGS="$CFLAGS -pthread"
++              EXTCFLAGS+=" -pthread"
+               ;;
+             5*)
+               LIBS="-lc_r $LEXLIB $LIBS"
+               ;;
+             *)
+-              CFLAGS="$CFLAGS -pthread"
++              EXTCFLAGS+=" -pthread"
+               LIBS="-lc_r $LEXLIB $LIBS"
+               ;;
+           esac
+ 	  RPATH_OPTION="-rpath"
+ 	  ;;
+-bsdi*)	  CFLAGS="$CFLAGS -pthread -DBSDOS"
++bsdi*)	  EXTCFLAGS+=" -pthread -DBSDOS"
+           rel=`uname -r`
+           case "$rel" in
+             4*)
+-              CFLAGS="$CFLAGS -pthread"
++              EXTCFLAGS+=" -pthread"
+               ;;
+             5*)
+               LIBS="-lc_r $LEXLIB $LIBS"
+               ;;
+             *)
+-              CFLAGS="$CFLAGS -pthread"
++              EXTCFLAGS+=" -pthread"
+               LIBS="-lc_r $LEXLIB $LIBS"
+               ;;
+           esac
+ 	  LIBS="$LEXLIB $LIBS"
+ 	  CXX=g++
+ 	  ;;
+-gnu*|linux*)   CFLAGS="$CFLAGS -D_REENTRANT -DLINUX"
+-	  CXX=g++
++gnu*|linux*)   EXTCFLAGS+=" -D_REENTRANT -DLINUX"
+ 	  if test "$pthread_in" = "pthreads" ; then
+-		CFLAGS="$CFLAGS -D_MIT_POSIX_THREADS"
++		EXTCFLAGS+=" -D_MIT_POSIX_THREADS"
+ 		LIBS="-lpthreads $LEXLIB -ldb $LIBS"
+ 		echo Probably you have MIT-threads. If yes, swich to LinuxThreads.
+ 	  else
+@@ -369,11 +366,11 @@ gnu*|linux*)   CFLAGS="$CFLAGS -D_REENTRANT -DLINUX"
+ 	  if test "$large_files" = "yes" ; then
+ 		## Linux ext2fs does'nt support large files yet.
+ 		AC_MSG_RESULT(Warning: Linux ext2fs doesn't support large files.)
+-		CFLAGS="$CFLAGS -DWITH_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D__USE_LARGEFILE64 -D__USE_FILE_OFFSET64"
++		EXTCFLAGS+=" -DWITH_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D__USE_LARGEFILE64 -D__USE_FILE_OFFSET64"
+ 	  fi
+ 	  RPATH_OPTION="-rpath"
+ 	  ;;
+-solaris*) CFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS"
++solaris*) EXTCFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS"
+ 	  if test "X$LIBDB_REAL_PATH" != "X" ; then
+ 	  	LIBDB_NAME="-R$LIBDB_REAL_PATH $LIBDB_NAME"
+ 	  fi
+@@ -390,7 +387,7 @@ solaris*) CFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS"
+ 				LIBGB_NAME="$LIBGB_NAME -lstdc++"
+ 	  		fi
+ 			;;
+-		*)	CFLAGS="$CFLAGS -mt"
++		*)	EXTCFLAGS+="-mt"
+ 			SUNPRO_CC_VER=`CC -V 2>&1 | sed 's/.*C++ //' | sed 's/\..*//'`
+ 			if test "$SUNPRO_CC_VER" = "5" ; then
+ 			    CXX="CC -compat=4 -w -fast -xO3 -DNO_MEMBER_TEMPLATES=1"
+@@ -407,14 +404,14 @@ solaris*) CFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS"
+ 			;;
+ 	  esac
+ 	  if test "$large_files" = "yes" ; then
+-		CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DWITH_LARGE_FILES"
++		EXTCFLAGS=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DWITH_LARGE_FILES"
+ 	  fi
+ 	  ;;
+ aix4*)    AC_DEFINE(MODULES)
+ 	  LIBS="$LIBS -ldl $LEXLIB"
+           SOFLAGS=-G
+           case "$CC" in
+-          gcc*)   CFLAGS="-D_THREAD_SAFE $CFLAGS"
++          gcc*)   EXTCFLAGS+=" -D_THREAD_SAFE $CFLAGS"
+ 		  CXX=g++
+                   LIBS="$LIBS -lpthreads -lc_r"
+                   ;;
+@@ -424,7 +421,7 @@ aix4*)    AC_DEFINE(MODULES)
+                   ;;
+ 	  esac
+           if test "$large_files" = "yes" ; then
+-		CFLAGS="$CFLAGS -D_LARGE_FILES -D_LARGE_FILE_API -DWITH_LARGE_FILES"
++		EXTCFLAGS+=" -D_LARGE_FILES -D_LARGE_FILE_API -DWITH_LARGE_FILES"
+ 	  fi
+ 	  ;;
+ esac
+@@ -432,14 +429,14 @@ esac
+ if test "X$MYSQL_PATH" != "X" ; then
+     LIBS="-L$MYSQL_PATH/lib -lmysqlclient $LIBS"
+     AC_DEFINE(HAVE_MYSQL)
+-    CFLAGS="$CFLAGS -I$MYSQL_PATH/include"
++    CFLAGS+=" -I$MYSQL_PATH/include"
+     MYSQL_LIB="-L$MYSQL_PATH/lib -lmysqlclient"
+ fi
+ 
+ if test "X$PGSQL_PATH" != "X" ; then
+     LIBS="$LIBS -L$PGSQL_PATH/lib -lpg"
+     AC_DEFINE(HAVE_PGSQL)
+-    CFLAGS="-I$PGSQL_PATH/include $LIBS"
++    CFLAGS+="-I$PGSQL_PATH/include $LIBS"
+     PGSQL_LIB="-L$PGSQL_PATH/lib -lpg"
+ fi
+ 
+@@ -601,7 +598,7 @@ if test "X$LIBDB_PATH" != "X" ; then
+     esac
+ fi
+ 
+-CFLAGS="$CFLAGS $LIBDB_INCL"
++EXTCFLAGS+=" $LIBDB_INCL"
+ 
+ AC_MSG_CHECKING(for GigaBASE)
+ if test "$LIBGB_PATH" = "no" ; then
+@@ -653,7 +650,7 @@ elif test -r "/usr/local/lib/libz.a"; then
+     AC_DEFINE(HAVE_ZLIB)
+     AC_MSG_RESULT(/usr/local/lib/libz.a)
+     if test "X`echo $CFLAGS | grep '\-I/usr/local/include'`" = "X"; then
+-	CFLAGS="$CFLAGS -I/usr/local/include"
++	EXTCFLAGS+=" -I/usr/local/include"
+     fi
+ elif test -r "/usr/lib/libz.a"; then
+     LIBZ_NAME="/usr/lib/libz.a"
+@@ -689,7 +686,7 @@ EOF
+ 	res=`./confmain`
+     fi
+     if test "$res" = "yes"; then
+-	    CFLAGS="$CFLAGS -export-dynamic"
++	    EXTCFLAGS+=" -export-dynamic"
+ 	    AC_MSG_RESULT(yes)
+     else
+ 	    AC_MSG_RESULT(no)
+@@ -698,7 +695,7 @@ fi
+ rm -f confmain*
+ 
+ echo $CC
+-echo $CFLAGS
++echo $EXTCFLAGS
+ echo $LIBS
+ 
+ if test "${enable_oops_user+set}" != set; then
+@@ -728,8 +725,6 @@ AC_SUBST(MOD_EXT)
+ AC_SUBST(OPT_MODS)
+ AC_SUBST(STATIC_MODULES)
+ AC_SUBST(CHOWN)
+-AC_SUBST(LD)
+-AC_SUBST(LDFLAGS)
+ AC_SUBST(VER)
+ AC_SUBST(LIBGB_PATH)
+ AC_SUBST(LIBGB_NAME)
+@@ -795,6 +790,7 @@ AC_SUBST(LIBDB_INCL)
+ AC_SUBST(LIBZ_NAME)
+ AC_SUBST(EXTRASRC)
+ AC_SUBST(EXTLDFLAGS)
++AC_SUBST(EXTCFLAGS)
+ 
+ AC_DEFINE_UNQUOTED(OOPS_HOME, "$oops_prefix/oops")
+ AC_DEFINE_UNQUOTED(OOPS_SBINDIR, "$oops_sbindir")
+diff --git a/src/Makefile.in b/src/Makefile.in
+index b366c2f..0ac6aff 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1,6 +1,4 @@
+-CC = @CC@
+-CXX = @CXX@
+-LDFLAGS = @LDFLAGS@
++EXTCFLAGS = @EXTCFLAGS@
+ EXTLDFLAGS = @EXTLDFLAGS@
+ INSTALL = @INSTALL@ @SETOWNER@
+ INSTALL_DATA = @INSTALL@ -m 644 @SETOWNER@
+@@ -29,13 +27,13 @@ EXTRAOBJS = $(EXTRASRC:.c=.o)
+ 
+ #CFLAGS = -Wall -ggdb -D_REENTRANT -D_POSIX_PTHREADS_SEMANTICS
+ 
+-CFLAGS = @CFLAGS@ -fPIE @DEFS@
++CFLAGS += -fPIE @DEFS@
+ 
+ VER=@VER@
+ OOPSPATH=@prefix@/oops
+ 
+ .c.o:
+-	${CC} -c ${CFLAGS} ${CDEFS} $<
++	${CC} -c ${CFLAGS} ${EXTCFLAGS} ${CDEFS} $<
+ 
+ all:	extras modules oops
+ 
+@@ -45,7 +43,7 @@ modules::
+ 	cd modules; $(MAKE)
+ 
+ oops:	${OBJS}
+-	${CXX} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
++	${CXX} ${CFLAGS} ${EXTCFLAGS} ${OBJS} ${EXTLDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
+ 
+ mkinstalldirs:
+ 	../mkinstalldirs ${OOPSPATH} \
+@@ -150,7 +148,7 @@ version.h:	version
+ 		echo "#define VERSION \""`cat version`"\""> version.h
+ 
+ lex.yy.o: lex.yy.c y.tab.h oops.h
+-	${CC} ${CFLAGS} ${CDEFS} -c lex.yy.c
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -c lex.yy.c
+ 
+ lex.yy.c: parser.l
+ 	@LEX@ parser.l
+@@ -159,13 +157,13 @@ y.tab.c: parser.y
+ 	@YACC@ -d parser.y
+ 
+ y.tab.o: y.tab.c oops.h
+-	${CC} ${CFLAGS} ${CDEFS} -c y.tab.c
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -c y.tab.c
+ 
+ malloc.o: malloc.c
+-	${CC} ${CFLAGS} ${CDEFS} -DEBUG -c malloc.c
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -DEBUG -c malloc.c
+ 
+ gnu_regex.o: gnu_regex.c
+-	${CC} ${CFLAGS} -DREGEX -c gnu_regex.c
++	${CC} ${CFLAGS} ${EXTCFLAGS} -DREGEX -c gnu_regex.c
+ 
+ clean:
+ 	rm -f *o lex.yy.c  y.tab.[ch] version.h oops DEADJOE
+diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
+index d8e3c50..60c6b73 100644
+--- a/src/modules/Makefile.in
++++ b/src/modules/Makefile.in
+@@ -1,9 +1,4 @@
+-CC = @CC@
+-CXX = @CXX@
+ LIBS = @LIBS@
+-CFLAGS = @CFLAGS@ -fPIC @DEFS@
+-LDFLAGS = @LDFLAGS@
+-LD = @LD@
+ SOFLAGS = @SOFLAGS@
+ OPT_MODS = @OPT_MODS@
+ CXXCOMPFLAGS = @LIBGB_INCL@ @CXXCOMPFLAGS@
+@@ -15,27 +10,30 @@ LIBDB_NAME = @LIBDB_NAME@
+ MYSQL_LIB = @MYSQL_LIB@
+ PGSQL_LIB = @PGSQL_LIB@
+ EXTRASRC = @EXTRASRC@
++EXTCFLAGS = @EXTCFLAGS@
++
++CFLAGS += -fPIC @DEFS@
+ 
+ .SUFFIXES:	.c .cpp .o .so
+ 
+ EXTRAOBJS = $(EXTRASRC:%c=../%o)
+ 
+ .c.o:
+-	${CC} ${CFLAGS} ${LIBDB_INCL} ${CDEFS} -c $<
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${LIBDB_INCL} ${CDEFS} -c $<
+ #
+ .o.so:
+ 	${LD} $(SOFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ .c.so:
+-	${CC} ${CFLAGS} ${LIBDB_INCL} ${SOFLAGS} ${CDEFS} -c $<
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${LIBDB_INCL} ${SOFLAGS} ${CDEFS} -c $<
+ 	${LD} $(SOFLAGS) $(LDFLAGS) -o $@ $(<:.c=.o) $(LIBS)
+ 
+ .cpp.o:
+-	${CXX} ${CFLAGS} ${SOFLAGS} ${CDEFS} $(CXXCOMPFLAGS) $< -o $*.a
++	${CXX} ${CFLAGS} ${EXTCFLAGS} ${SOFLAGS} ${CDEFS} $(CXXCOMPFLAGS) $< -o $*.a
+ 	mv $*.a $*.o
+ 
+ .cpp.so:
+-	${CXX} ${CFLAGS} ${CXXSOFLAGS} ${CDEFS} $< @LIBGB_PATH@ @LIBGB_NAME@ $(LIBS) -o $@
++	${CXX} ${CFLAGS} ${EXTCFLAGS} ${CXXSOFLAGS} ${CDEFS} $< @LIBGB_PATH@ @LIBGB_NAME@ $(LIBS) -o $@
+ 
+ all:	log_dummy.@MOD_EXT@ \
+ 	err.@MOD_EXT@ \
+@@ -97,30 +95,30 @@ custom_log.@MOD_EXT@:	custom_log.c ../modules.h ../oops.h
+ #berkeley_db_api.@MOD_EXT@:	berkeley_db_api.c ../modules.h ../oops.h
+ 
+ berkeley_db_api.o:	berkeley_db_api.c ../modules.h ../oops.h
+-	${CC} ${CFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o
+ 
+ berkeley_db_api.so: berkeley_db_api.c ../modules.h ../oops.h
+-	${CC} ${CFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o
+ 	${LD} $(SOFLAGS) $(LDFLAGS) -L $(LIBDB_PATH)/lib berkeley_db_api.o -o berkeley_db_api.so $(LIBS) $(LIBDB_NAME) 
+ 
+ gigabase_db_api.@MOD_EXT@:	gigabase_db_api.cpp ../modules.h ../oops.h
+ 
+ oopsctl: oopsctl.c ../modules.h ../config.h  ../oops.h
+-	${CC} ${CFLAGS} ${CDEFS} oopsctl.c ${EXTRAOBJS} ${LIBS} -o oopsctl
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} oopsctl.c ${EXTRAOBJS} ${LIBS} -o oopsctl
+ 
+ passwd_pgsql.so: passwd_sql.c ../modules.h ../oops.h
+-	${CC} ${CFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
+ 	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_pgsql.so passwd_pgsql.o $(LIBS) $(PGSQL_LIB)
+ 
+ passwd_mysql.so: passwd_sql.c ../modules.h ../oops.h
+-	${CC} ${CFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
+ 	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_mysql.so passwd_mysql.o $(LIBS) $(MYSQL_LIB)
+ 
+ passwd_pgsql.o: passwd_sql.c ../modules.h ../oops.h
+-	${CC} ${CFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
+ 
+ passwd_mysql.o: passwd_sql.c ../modules.h ../oops.h
+-	${CC} ${CFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
++	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
+ 
+ 
+ clean:
diff --git a/net-proxy/oops/oops-1.5.24_pre20050503-r5.ebuild b/net-proxy/oops/oops-1.5.24_pre20050503-r5.ebuild
new file mode 100644
index 000000000000..cea72dca86fe
--- /dev/null
+++ b/net-proxy/oops/oops-1.5.24_pre20050503-r5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/oops-1.5.24_pre20050503-r5.ebuild,v 1.1 2013/12/15 20:26:40 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+MY_P="${PN}-1.5.23"
+
+DESCRIPTION="An advanced multithreaded caching web proxy"
+HOMEPAGE="http://zipper.paco.net/~igor/oops.eng/"
+SRC_URI="http://zipper.paco.net/~igor/oops/${MY_P}.tar.gz
+	mirror://gentoo/${P}.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre
+	>=sys-libs/db-3"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup oops
+	enewuser oops -1 -1 /var/lib/oops oops
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/${P}.patch"
+	epatch "${FILESDIR}/${P/_*}-textrel.patch"
+	epatch "${FILESDIR}/${P/_*}-pthread-rwlock.patch"
+	epatch "${FILESDIR}/modules-as-needed.patch"
+	epatch "${FILESDIR}/implicit-decl.patch"
+	epatch "${FILESDIR}/libpcreposix.patch"
+	epatch "${FILESDIR}/rotate-logs.patch"
+	epatch "${FILESDIR}/${P}+db-5.0.patch"
+	epatch "${FILESDIR}/${P/_*}-respect-flags.patch"
+	sed -i -e 's:y\.tab\.h:y.tab.c:' src/Makefile.in
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir)/oops \
+		--enable-oops-user=oops \
+		--sysconfdir=/etc/oops \
+		--sbindir=/usr/sbin \
+		--with-regexp=pcre \
+		--localstatedir=/run/oops \
+		--enable-large-files \
+		--with-zlib=-lz \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getCC)"
+
+	sed -i -e '/STRERROR_R/d' src/config.h.in || die
+	sed -i \
+		-e "s|OOPS_LIBDIR = /usr/$(get_libdir)/oops|OOPS_LIBDIR = ${D}/usr/$(get_libdir)/oops|" \
+		-e "s|OOPS_SBINDIR = /usr/sbin|OOPS_SBINDIR = ${D}/usr/sbin|" \
+		-e "s|OOPS_SYSCONFDIR = /etc/oops|OOPS_SYSCONFDIR = ${D}/etc/oops|" \
+		-e "s|OOPS_LOCALSTATEDIR = /var/run/oops|OOPS_LOCALSTATEDIR = ${D}/run/oops|" \
+		-e "s|OOPSPATH=/usr/oops|OOPSPATH=${D}/usr/oops|" \
+		src/Makefile || die
+	sed -i \
+		-e "s|^\(LDFLAGS *= *\)${LDFLAGS}|\1$(raw-ldflags)|" \
+		src/modules/Makefile || die #modules makefile use ld directly
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getCC)" \
+		RANLIB=":" \
+		STRIP=":"
+}
+
+src_install() {
+	dodir /usr/sbin
+	einstall || die "install problem"
+
+	newinitd "${FILESDIR}/oops.initd" oops
+	diropts -m0750 -o root -g oops
+	dodir /etc/oops
+	insinto /etc/oops
+	doins "${FILESDIR}/oops.cfg"
+
+	diropts -m0755 -o oops -g oops
+	keepdir /run/oops
+	diropts -m0770 -o oops -g oops
+	keepdir /var/log/oops
+	keepdir /var/lib/oops/storage
+	keepdir /var/lib/oops/db
+
+	# cleanups
+	rm -rf "${D}/usr/oops"
+	rm -rf "${D}/usr/lib/oops/modules"
+}
+
+pkg_postinst() {
+	#Set proper owner/group if installed from binary package
+	chgrp oops "${ROOT}/etc/oops"
+	chown -R oops:oops "${ROOT}/run/oops" "${ROOT}/var/log/oops" "${ROOT}/var/lib/oops"
+}