Remove masked gorg package.

8 files changed, 0 insertions, 616 deletions

diff --git a/www-servers/gorg/ChangeLog b/www-servers/gorg/ChangeLog
deleted file mode 100644
index bb82641f8f3c..000000000000
--- a/www-servers/gorg/ChangeLog
+++ /dev/null
@@ -1,197 +0,0 @@
-# ChangeLog for www-servers/gorg
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/ChangeLog,v 1.47 2014/08/22 15:54:14 graaff Exp $
-
-*gorg-0.7.2 (22 Aug 2014)
-
-  22 Aug 2014; Hans de Graaff <graaff@gentoo.org> +gorg-0.7.2.ebuild:
-  Add ruby21. Fix compilation with format-security, bug 520560.
-
-  07 May 2014; Manuel Rüger <mrueg@gentoo.org> gorg-0.7.0.ebuild,
-  gorg-0.7.1.ebuild:
-  Remove ruby18 target.
-
-  08 Jan 2014; Mike Frysinger <vapier@gentoo.org> gorg-0.7.0.ebuild,
-  gorg-0.7.1.ebuild:
-  Inherit the user eclass for enewuser/etc...
-
-*gorg-0.7.1 (25 Dec 2013)
-
-  25 Dec 2013; Hans de Graaff <graaff@gentoo.org> +gorg-0.7.1.ebuild:
-  Version bump to fix incompatibility with fcgi 0.9.x.
-
-  21 Dec 2013; Hans de Graaff <graaff@gentoo.org> -gorg-0.6.4-r1.ebuild,
-  -gorg-0.6.5.ebuild:
-  Cleanup.
-
-  16 Dec 2013; Johannes Huber <johu@gentoo.org> gorg-0.7.0.ebuild:
-  x86 stable, bug #492268
-
-  15 Dec 2013; Agostino Sarubbo <ago@gentoo.org> Manifest:
-  Stable for x86, wrt bug #492268
-
-  15 Dec 2013; Agostino Sarubbo <ago@gentoo.org> gorg-0.7.0.ebuild:
-  Stable for ppc, wrt bug #492268
-
-  15 Dec 2013; Agostino Sarubbo <ago@gentoo.org> gorg-0.7.0.ebuild:
-  Stable for amd64, wrt bug #492268
-
-*gorg-0.7.0 (20 Oct 2013)
-
-  20 Oct 2013; Hans de Graaff <graaff@gentoo.org> +gorg-0.7.0.ebuild:
-  Version bump. Drop mysql USE flag: not used by Gentoo itself, ruby18-only and
-  probably broken/insecure. Add ruby19 and ruby20.
-
-*gorg-0.6.5 (26 Oct 2012)
-
-  26 Oct 2012; Hans de Graaff <graaff@gentoo.org> +gorg-0.6.5.ebuild:
-  Version bump with ruby19 fixes, even though we cannot enable ruby19 due to
-  the dbi dependency yet.
-
-  26 Oct 2012; Hans de Graaff <graaff@gentoo.org> metadata.xml:
-  Add myself as primary maintainer based on discussions at the Gentoo Miniconf
-  in Prague.
-
-  02 Sep 2012; Diego E. Pettenò <flameeyes@gentoo.org> gorg-0.6.4-r1.ebuild:
-  Fix dependency for renamed package.
-
-  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> gorg-0.6.4-r1.ebuild:
-  Update after Ruby packages move.
-
-  08 Mar 2012; Hans de Graaff <graaff@gentoo.org> -gorg-0.6.3-r2.ebuild,
-  -gorg-0.6.4.ebuild:
-  Remove old versions.
-
-  07 Mar 2012; Brent Baude <ranger@gentoo.org> gorg-0.6.4-r1.ebuild:
-  Marking gorg-0.6.4-r1 ppc for bug 403103
-
-  17 Feb 2012; Agostino Sarubbo <ago@gentoo.org> gorg-0.6.4-r1.ebuild:
-  Stable for amd64, wrt bug #403103
-
-  16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> gorg-0.6.4-r1.ebuild:
-  x86 stable wrt bug #403103
-
-  10 Dec 2011; Hans de Graaff <graaff@gentoo.org> gorg-0.6.4-r1.ebuild:
-  Drop ruby19 until all dependencies are also marked for ruby19.
-
-*gorg-0.6.4-r1 (04 Dec 2011)
-
-  04 Dec 2011; Hans de Graaff <graaff@gentoo.org> +gorg-0.6.4-r1.ebuild,
-  +files/gorg-0.6.4-ruby19-date.patch, +files/gorg-0.6.4-ruby19.patch:
-  Convert to ruby-ng.eclass. Add ruby19 support. Thanks to naota for patches
-  and testing in bug 315487.
-
-  09 Apr 2011; Hans de Graaff <graaff@gentoo.org> gorg-0.6.3-r2.ebuild,
-  gorg-0.6.4.ebuild:
-  Update HOMEPAGE to point to a Gentoo-hosted version. Thanks to tove for
-  the suggestion. Fixes bug 317611.
-
-  09 Apr 2011; Hans de Graaff <graaff@gentoo.org> -gorg-0.6.3-r3.ebuild:
-  Remove old version.
-
-  10 Nov 2010; Lance Albertson <ramereth@gentoo.org> metadata.xml:
-  transfer maintainership over to robbat2
-
-  22 Aug 2010; Benedikt Böhm <hollow@gentoo.org> gorg-0.6.3-r2.ebuild,
-  gorg-0.6.3-r3.ebuild, gorg-0.6.4.ebuild:
-  replace dependency on apache with virtual/httpd-fastcgi wrt #308223
-
-  25 Dec 2009; Hans de Graaff <graaff@gentoo.org> gorg-0.6.3-r2.ebuild,
-  gorg-0.6.3-r3.ebuild, gorg-0.6.4.ebuild:
-  Remove obsolete virtual/ruby dependency.
-
-*gorg-0.6.4 (17 Oct 2009)
-
-  17 Oct 2009; Alex Legler <a3li@gentoo.org> +gorg-0.6.4.ebuild:
-  Version bump, fixes caching, bug 289391
-
-*gorg-0.6.3-r3 (24 Aug 2009)
-
-  24 Aug 2009; Lance Albertson <ramereth@gentoo.org> +gorg-0.6.3-r3.ebuild:
-  Add www-server/mod_fcgid dep if both apache2 & fastcgi use flags are
-  enabled.
-  Fixes bug #251177
-
-  13 Jun 2009; Hans de Graaff <graaff@gentoo.org> -gorg-0.5.ebuild,
-  -gorg-0.6.3.ebuild, -gorg-0.6.3-r1.ebuild:
-  Remove old versions.
-
-  06 Jun 2009; nixnut <nixnut@gentoo.org> gorg-0.6.3-r2.ebuild:
-  ppc stable #271954
-
-  03 Jun 2009; Markus Meier <maekke@gentoo.org> gorg-0.6.3-r2.ebuild:
-  amd64/x86 stable, bug #271954
-
-*gorg-0.6.3-r2 (30 Dec 2008)
-
-  30 Dec 2008; Hans de Graaff <graaff@gentoo.org> +gorg-0.6.3-r2.ebuild:
-  Add apache2 and fastcgi USE flags as requested in #251177 and how we handle
-  this for other similar packages. Move to EAPI=2 so that we can handle the
-  mysql USE flag dependency on ruby-dbi better. Don't depend directly on
-  underlying dependencies of ruby-dbi and ruby-fcgi. Fix variable quoting.
-
-  05 Sep 2007; Joshua Nichols <nichoj@gentoo.org> gorg-0.5.ebuild,
-  gorg-0.6.3.ebuild, gorg-0.6.3-r1.ebuild:
-  Removed apache and fastcgi messages. Displays a message during postinstall
-  now. See bug #186107.
-
-  29 Jul 2007; Christian Heim <phreak@gentoo.org> gorg-0.5.ebuild,
-  gorg-0.6.3.ebuild, gorg-0.6.3-r1.ebuild:
-  Fixing the DEPEND/RDEPEND for the move of net-www/apache to
-  www-servers/apache (#78622).
-
-  23 Apr 2007; <rb@gentoo.org> gorg-0.6.3-r1.ebuild:
-  EAPI shouldn't have been set
-
-*gorg-0.6.3-r1 (23 Apr 2007)
-
-  23 Apr 2007; Richard Brown <rbrown@gentoo.org> metadata.xml,
-  -gorg-0.6.ebuild, -gorg-0.6.1.ebuild, +gorg-0.6.3-r1.ebuild:
-  Fix bug #133713, #173748, #175204. Remove old versions
-
-  19 Apr 2007; Richard Brown <rbrown@gentoo.org> gorg-0.6.3.ebuild:
-  dev-db/mysql => virtual/mysql
-
-*gorg-0.6.3 (08 Mar 2007)
-
-  08 Mar 2007; <genstef@gentoo.org> +gorg-0.6.3.ebuild:
-  Version bump for neysx, bug 137258
-
-  10 Feb 2007; Steve Dibb <beandog@gentoo.org> gorg-0.6.1.ebuild:
-  Add ~amd64
-
-  23 Nov 2006; Francesco Riosa <vivo@gentoo.org> gorg-0.6.ebuild,
-  gorg-0.6.1.ebuild:
-  dev-db/mysql => virtual/mysql
-
-  19 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org> gorg-0.5.ebuild:
-  ppc stable
-
-*gorg-0.6.1 (18 May 2006)
-
-  18 May 2006; Lance Albertson <ramereth@gentoo.org> +gorg-0.6.1.ebuild:
-  * Version bump
-  * Fixed +x bit issue with *.cgi/*.fcgi files
-
-*gorg-0.6 (30 Apr 2006)
-
-  30 Apr 2006; Lance Albertson <ramereth@gentoo.org> +gorg-0.6.ebuild:
-  * Version bump
-
-  28 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> gorg-0.5.ebuild:
-  Fix keepdir.
-
-  15 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> gorg-0.5.ebuild:
-  Added ~amd64 keyword as per bug #104720.
-
-  25 Sep 2005; Tobias Scherbaum <dertobi123@gentoo.org> gorg-0.5.ebuild:
-  Added to ~ppc
-
-  13 May 2005; Lance Albertson <ramereth@gentoo.org> gorg-0.5.ebuild:
-  Marked stable on x86
-
-*gorg-0.5 (30 Apr 2005)
-
-  30 Apr 2005; Lance Albertson <ramereth@gentoo.org> +metadata.xml,
-  +gorg-0.5.ebuild:
-  initial commit, thanks neysx for the initial ebuild
diff --git a/www-servers/gorg/Manifest b/www-servers/gorg/Manifest
deleted file mode 100644
index 351da486474f..000000000000
--- a/www-servers/gorg/Manifest
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX gorg-0.6.4-ruby19-date.patch 1010 SHA256 820a263c3c9081a48bbcf768cab1a076038c41f680cb0115aca46d6a357b775c SHA512 ea68f6f7ea028fa9f74d99784d98a1619f4f5e3c454dd6582dc110d4cb3b9383adb652cf14731dbb9dd113455c30f6c6b5a7afa74ba6fc0c00de0d597a0a5173 WHIRLPOOL 04a81d72ab0f2cdf1b99e857317543a3a274791302974fb5b8dbffc840fc48a0bdd1e3cf3e6bd8d989adf986c92278fde0724c00ac2a4d1bbfa688d1957f77c5
-AUX gorg-0.6.4-ruby19.patch 6507 SHA256 da04a3da7112a06e9555d99153625455049392ec4b820a04c2aaebfd031284b9 SHA512 38f20628a828f343765e10bbae75c71d6d4b31249dcaead9545eb9a580372a43cb1f0482cad3a494263572ede157cb317328657ad30da4a0832ee6fb7e286104 WHIRLPOOL 708e48bed484566642270083d06bc94b91accf25113b5601d3c8622fd9ea7e6deff454f81ffa31429b701b61c1e33adedf99f11b079a9c79fe8b59eb8ea8ddc1
-DIST gorg-0.7.0.tar.gz 51507 SHA256 a9b963e17e7310ebbd8c4556a8a20522f4aee4b0ad3885d0b8dbbd36b6608219 SHA512 d45079a598e8e0c7f88f1d29e074b83c69662a0cacbe5d04c0f684521d59322ab153e4f0414f7f347ba4a9161440f8e15e4f498f25cd78ec5cda486098e9660d WHIRLPOOL a224fec4642a7174300f936d258a6e9212daa2c159e1a7d1ac1a1c5757daccdd2dc92990f8a0ddf929f86f0419b121bc6ee8111da9d236b74b91d7aac591c1fb
-DIST gorg-0.7.1.tar.gz 51499 SHA256 74e630eba7dc5136d7ead4b5536d3660500d0f1639f27f8e9a4f214c50f12c57 SHA512 e213e444614b32a63a32d6a564d715bbe903396ca5b435ee8fc6837d58543dd10f2dd469623c7fcf1dcd084531a4fed2971bb64c1b4f5434dff7d5e90b63395d WHIRLPOOL 256ee0bf891ae7dcc603eecff1c5684005cb8b323f53ee46e8caa1372bd1f8e2627845ab4ae4da0e41bd3aa174d758467ba3962ba5d3c3ff5f1b53294f96ee51
-DIST gorg-0.7.2.tar.gz 51623 SHA256 15cd09cd31037b28e19261c5297f0997a17d0e1d63fc2e61a6b9aba4a3f5f2c7 SHA512 8cf53f43180ddede024f2469e1c71f682a332e63e651ee0309d067d893fee787d4e77445655969de6d90e24b660b4fd5ee2d9e11dd0617b104b1615a9bc8f3b8 WHIRLPOOL ba1963a12045ddef0803d37c5957bc5c3c7d5f0640b504f35f1d25e7c7c6806cdb4e1df6d5273c887c72a37dfb39e34e8fbb9260f506d71adb38d95ba0e07322
-EBUILD gorg-0.7.0.ebuild 1476 SHA256 3bbbfeb00e771f6e93e035de2d3b8e8ca164a7712de6ac97c3e6a79657f52b2f SHA512 a70c2638af97159b19ea4b19bb89cd7aa32194208636a66d30a9a0eeee0fd75148f189b51f9f58675420ebe977a4a4d37e69e593aa64a569e32806777c35ca1e WHIRLPOOL d3bf0a5cec17a5ce63a887b0bbc6eefc48c16e6e3da80d32c2a741e77b18d36ef15a12ced09d4f67a8762db9cef9e2788fe5047631b7f79455694dc57f9f5b5b
-EBUILD gorg-0.7.1.ebuild 1479 SHA256 a3297473a62c68816a8f7be8349b2ed56e695c7312357130ca7b3eac9efcb50e SHA512 c4679e9944f033a5daeaada87f6f68f7d30c9bf8c03e25a6148956b41e6fe7f1e7f3486d168b55ac494dd86b4f21c0121bef7499db5b31aac1ae4fa893d94de7 WHIRLPOOL e33d897bea53888f9d671c6d603bb4f3daa0afabf657e55be396a60cff492d2fc249403c3e5c83b606c0820a20ed96f3896eec61b0c487aa61ef2175ad5bf81d
-EBUILD gorg-0.7.2.ebuild 1487 SHA256 36ad524350b0b7986bee2eb2997cd4247af4b1b32926cc26428f1b9af25007bc SHA512 1562179cb0d861b91801ae22f3d135a9ec60cd862695747814a4339c403f2376a89d3b65330d20704d5b6fc924266e39c2b220ae30d72999002bf3760b759f69 WHIRLPOOL a79de65726e7807c28a6d85514bfc1b37bb3c82f99f2fa91e870073bfacbaf7670d4ec83110e2cd72fed2db062aae53862f792f956d06f8521f934e177d993e6
-MISC ChangeLog 6843 SHA256 775de98830a99073f0cf5246df5724d1fbb32f7aa63ca0a8a75671cf1240cc3f SHA512 f398b03184bdbba354927d2fb4157336acc1ac63e9898e4c84743896222c946751de61c6ce40338bbfec9db1c6f42e0e6233796adc1cc2f26169f41957134165 WHIRLPOOL f50f195ec97a936489eebd2251f3a37eaeff91b0a37a642a81babd08f6c3d7947eea285cd16946cb37925be96df2a040d200ed7d16245a111868b874dfb777cf
-MISC metadata.xml 814 SHA256 37fe58dbf8f0843de537db78ba878ca50b7bdab7568d98877c4749842f7395c5 SHA512 ac5251f2ba36f517387df7fb7c4566ff8f454e13aa97e63e2b1b475b131e5417f298f7cc7018d39f029192daa1f499eda658366b674be6d66c12779c6c4ba79b WHIRLPOOL edee03a666e9c2dcc5710d33c3343b94cd190f2efc76618ee84dc479bc1ea825ec74c165d6e46e4b704486a32d88e325b57cabd3c3f08f94f8efcc29953eac92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVfzAAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiegAP/2TwnnJCYA44bnaxWgp2fOkX
-4sAbEe5hjRRh+P8rNvFwauxTGkuxVJqmtxQculJVZF11Dz3lscZ2XaRxTFRgN1CO
-z4r103WWc7YMU+NkDeJpM0s5B0mbHnhLPdlFHcqMRrTn7UUe/Xk5OtzCIQcJKQOU
-Bk07gh7Uzp6IJXvdgEzmsJPO+rDsTwNjEDj1fzJJVop5144XKPGYd1gE28IksH1c
-+Pwu5AmkigMUWCXngt1+1r8ELCHiG/3tcyCFqqSzqrqvyHR+ZR25upS4aIzJArpE
-gDx4xm0JJaX6jIEec/zkw9JDUtfJmJ+tPvatPhECrsM6jKBL0ZgRtI7GvcJQIb1t
-//AiI+N9MGqOmJVz18NB+cYTN77zy/UutB9D5A210S66bYsPaPdffEQ0UwfYIR4e
-5Y028U+1N1H9YeUe436vli3KmRdHt5+xs2nltfl0wiAMgEAOkb7MonPC5xcwiEpd
-IV6JgFRZ3YSsg81Vr56sQ2YvdREZqPDiSdI6Pckvqf8ZIip/mVfuhUHJvefv+zre
-bv1/xzcMrihjofp97f2piLmvmzE3RHjVu8Z/J+Q/XKw3tzVSzJzJSGdVTrmgd+Te
-42Hb8fjeMeTepWTeCfolY04Zau1HUWnFnxHnwW3a+/QcLU4Ri5/DM/Ye6kyAI3AU
-/jTIecIOsbrwWObgbQ6g
-=PAo/
------END PGP SIGNATURE-----
diff --git a/www-servers/gorg/files/gorg-0.6.4-ruby19-date.patch b/www-servers/gorg/files/gorg-0.6.4-ruby19-date.patch
deleted file mode 100644
index 03b6ef8d10f9..000000000000
--- a/www-servers/gorg/files/gorg-0.6.4-ruby19-date.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/lib/gorg/cache.rb b/lib/gorg/cache.rb
-index 543b6a2..00ad1ab 100644
---- a/lib/gorg/cache.rb
-+++ b/lib/gorg/cache.rb
-@@ -22,7 +22,13 @@
- #  . a list of parameters as received by a webserver e.g.
- #  . a list of files it depends on
- 
--require "parsedate"
-+begin
-+  require "parsedate"
-+  $haveparsedate = true
-+rescue LoadError
-+  require "time"
-+  $haveparsedate = false
-+end
- require "fileutils"
- require "find"
- require "digest"
-@@ -106,7 +112,11 @@ module Cache
-       
-         fst = File.stat(f)
-         raise "Size of #{f} has changed from #{fst.size} to #{s.to_i}" unless fst.size == s.to_i
--        raise "Timestamp of #{f} has changed" unless Time.utc(*ParseDate.parsedate(d)) == fst.mtime.utc
-+        if $haveparsedate
-+          raise "Timestamp of #{f} has changed" unless Time.utc(*ParseDate.parsedate(d)) == fst.mtime.utc
-+        else
-+          raise "Timestamp of #{f} has changed" unless Time.parse(d) == fst.mtime.utc
-+        end
-       end
-       mline = meta.shift
-     end
diff --git a/www-servers/gorg/files/gorg-0.6.4-ruby19.patch b/www-servers/gorg/files/gorg-0.6.4-ruby19.patch
deleted file mode 100644
index d155ffaad2fb..000000000000
--- a/www-servers/gorg/files/gorg-0.6.4-ruby19.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff --git a/ext/gorg/xsl/xsl.c b/ext/gorg/xsl/xsl.c
-index d8d40b6..58ffc49 100644
---- a/ext/gorg/xsl/xsl.c
-+++ b/ext/gorg/xsl/xsl.c
-@@ -20,6 +20,13 @@
- 
- #include "xsl.h"
- 
-+#ifndef RARRAY_LEN
-+#define RARRAY_LEN(a) RARRAY(a)->len
-+#endif
-+#ifndef RSTRING_LEN
-+#define RSTRING_LEN(str) RSTRING(str)->len
-+#endif
-+
- /*
-  * Copied from xmlIO.c from libxml2
-  */
-@@ -156,8 +163,8 @@ void *XRootOpen (const char *filename, const char* rw) {
-   
-   if (g_xroot != Qnil)
-   {
--    rbxrootPtr = RSTRING(g_xroot)->ptr;
--    rbxrootLen = RSTRING(g_xroot)->len;
-+    rbxrootPtr = RSTRING_PTR(g_xroot);
-+    rbxrootLen = RSTRING_LEN(g_xroot);
-   }
-   path = (char *) malloc((strlen(filename) + rbxrootLen + 1) * sizeof(char));
-   if (path == NULL)
-@@ -284,10 +291,10 @@ void xslMessageHandler(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...)
-  */
- int looksLikeXML(VALUE v)
- {
--  return    (RSTRING(v)->len > FILENAME_MAX)
--         || (!strncmp(RSTRING(v)->ptr, "<?xml", 5))
--         || (!strncmp(RSTRING(v)->ptr, "<?xsl", 5))
--         || (strstr(RSTRING(v)->ptr, "\n"));
-+  return    (RSTRING_LEN(v) > FILENAME_MAX)
-+         || (!strncmp(RSTRING_PTR(v), "<?xml", 5))
-+         || (!strncmp(RSTRING_PTR(v), "<?xsl", 5))
-+         || (strstr(RSTRING_PTR(v), "\n"));
- //            We could also try with " " but some are stupid enough to use spaces in filenames
- }
-  
-@@ -456,7 +463,7 @@ VALUE check_params(VALUE xparams)
-     // empty array => Qnil
-     // array.length==2, could be 2 params [[p1,v1],[p2,v2]] or 1 param [p,v]
-     // if both items are arrays, we have a list of params, otherwise we have a single param
--    len = RARRAY(ary)->len;
-+    len = RARRAY_LEN(ary);
-     switch (len)
-     {
-       case 0:
-@@ -522,17 +529,17 @@ char *build_params(VALUE rbparams)
- 
-   // Compute total block size in one go
-   tempval = rb_funcall(rbparams, id.to_s, 0);
--  ret = malloc (  ((RARRAY(rbparams)->len)*2+1) * sizeof(void *) // Two pointers per [param, value] + 1 NULL
--                + (RARRAY(rbparams)->len) * 4 * sizeof(char)     // Quotes around values + 1 NULL per value
--                + (RSTRING(tempval)->len) * sizeof(char)         // Size of param names & values
-+  ret = malloc (  ((RARRAY_LEN(rbparams))*2+1) * sizeof(void *) // Two pointers per [param, value] + 1 NULL
-+                + (RARRAY_LEN(rbparams)) * 4 * sizeof(char)     // Quotes around values + 1 NULL per value
-+                + (RSTRING_LEN(tempval)) * sizeof(char)         // Size of param names & values
-                   );
-   if ( ret==NULL)
-     return NULL; // out of memory
- 
-   paramPtr = (char **)ret;
--  paramData = ret + ((RARRAY(rbparams)->len)*2+1) * sizeof(void *);
-+  paramData = ret + ((RARRAY_LEN(rbparams))*2+1) * sizeof(void *);
-   // Copy each param name & value
--  for (i=0; i<RARRAY(rbparams)->len; ++i)
-+  for (i=0; i<RARRAY_LEN(rbparams); ++i)
-   {
-     tempval = rb_ary_entry(rbparams, i); // ith param, i.e. [name, value]
-     
-@@ -542,9 +549,9 @@ char *build_params(VALUE rbparams)
-     // Add param name address to list of pointers
-     *paramPtr++ = paramData;
-     // Copy param name into data block
--    strcpy(paramData, RSTRING(tempstr)->ptr);
-+    strcpy(paramData, RSTRING_PTR(tempstr));
-     // Move data pointer after inserted string
--    paramData += 1+ RSTRING(tempstr)->len;
-+    paramData += 1+ RSTRING_LEN(tempstr);
-     
-     // 2. Copy param value, quoting it with ' or "
-     
-@@ -552,7 +559,7 @@ char *build_params(VALUE rbparams)
-     // Don't bother if param is a mix of ' and ", users should know better :-)
-     // or it's been checked already. Here we expect params to be OK.
-     quotingChar = '"';
--    if ( strchr(RSTRING(tempstr)->ptr, quotingChar) )
-+    if ( strchr(RSTRING_PTR(tempstr), quotingChar) )
-       quotingChar = '\''; // Use ' instead of "
- 
-     // Add para value address in list of pointers
-@@ -561,9 +568,9 @@ char *build_params(VALUE rbparams)
-     // Start with quoting character
-     *paramData++ = quotingChar;
-     // Copy value
--    strcpy(paramData, RSTRING(tempstr)->ptr);
-+    strcpy(paramData, RSTRING_PTR(tempstr));
-     // Move data pointer after inserted string
--    paramData += RSTRING(tempstr)->len;
-+    paramData += RSTRING_LEN(tempstr);
-     // Close quote
-     *paramData++ = quotingChar;
-     // End string with \0
-@@ -593,13 +600,13 @@ VALUE xsl_process_real(VALUE none, VALUE self)
-   if (NIL_P(rbxml))
-     rb_raise(rb_eArgError, "No XML data");
-   rbxml = StringValue(rbxml);
--  if (!RSTRING(rbxml)->len)
-+  if (!RSTRING_LEN(rbxml))
-     rb_raise(rb_eArgError, "No XML data");
-   rbxsl = rb_iv_get(self, "@xsl");
-   if (NIL_P(rbxsl))
-     rb_raise(rb_eArgError, "No Stylesheet");
-   rbxsl = StringValue(rbxsl);
--  if (!RSTRING(rbxsl)->len)
-+  if (!RSTRING_LEN(rbxsl))
-     rb_raise(rb_eArgError, "No Stylesheet");
-   rbxroot = rb_iv_get(self, "@xroot");
-   rbparams = check_params(rb_iv_get(self, "@xparams"));
-@@ -625,7 +632,7 @@ VALUE xsl_process_real(VALUE none, VALUE self)
-   // Parse XSL
-   if (looksLikeXML(rbxsl))
-   {
--    myPointers.docxsl = xmlParseMemory(RSTRING(rbxsl)->ptr, RSTRING(rbxsl)->len);
-+    myPointers.docxsl = xmlParseMemory(RSTRING_PTR(rbxsl), RSTRING_LEN(rbxsl));
- //    myPointers.docxsl = xmlReadMemory(RSTRING(rbxsl)->ptr, RSTRING(rbxsl)->len, ".", NULL, 0);
-     if (myPointers.docxsl == NULL)
-     {
-@@ -641,7 +648,7 @@ VALUE xsl_process_real(VALUE none, VALUE self)
-   }
-   else // xsl is a filename
-   {
--    myPointers.xsl = xsltParseStylesheetFile(RSTRING(rbxsl)->ptr);
-+    myPointers.xsl = xsltParseStylesheetFile(RSTRING_PTR(rbxsl));
-     if (myPointers.xsl == NULL)
-     {
-       my_raise(self, &myPointers, rb_eSystemCallError, "XSL file loading error");
-@@ -652,7 +659,7 @@ VALUE xsl_process_real(VALUE none, VALUE self)
-   // Parse XML 
-   if (looksLikeXML(rbxml))
-   {
--    myPointers.docxml = xmlReadMemory(RSTRING(rbxml)->ptr, RSTRING(rbxml)->len, ".", NULL, xmlOptions);
-+    myPointers.docxml = xmlReadMemory(RSTRING_PTR(rbxml), RSTRING_LEN(rbxml), ".", NULL, xmlOptions);
-     if (myPointers.docxml == NULL)
-     {
-       my_raise(self, &myPointers, rb_eSystemCallError, "XML parsing error");
-@@ -661,7 +668,7 @@ VALUE xsl_process_real(VALUE none, VALUE self)
-   }
-   else // xml is a filename
-   {
--	  myPointers.docxml = xmlReadFile(RSTRING(rbxml)->ptr, NULL, xmlOptions);
-+	  myPointers.docxml = xmlReadFile(RSTRING_PTR(rbxml), NULL, xmlOptions);
-     if (myPointers.docxml == NULL)
-     {
-       my_raise(self, &myPointers, rb_eSystemCallError, "XML file parsing error");
diff --git a/www-servers/gorg/gorg-0.7.0.ebuild b/www-servers/gorg/gorg-0.7.0.ebuild
deleted file mode 100644
index 339a3502d208..000000000000
--- a/www-servers/gorg/gorg-0.7.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.7.0.ebuild,v 1.6 2014/05/07 19:04:51 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-inherit ruby-ng eutils user
-
-DESCRIPTION="Back-end XSLT processor for an XML-based web site"
-HOMEPAGE="http://www.gentoo.org/proj/en/gdp/doc/gorg.xml"
-SRC_URI="https://github.com/gentoo/gorg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="fastcgi"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-
-CDEPEND="
-	>=dev-libs/libxml2-2.6.16
-	>=dev-libs/libxslt-1.1.12"
-DEPEND="${DEPEND} ${CDEPEND}"
-RDEPEND="${RDEPEND} ${CDEPEND}
-		fastcgi? ( virtual/httpd-fastcgi )"
-
-ruby_add_rdepend "
-	fastcgi? ( >=dev-ruby/fcgi-0.8.5-r1 )"
-
-pkg_setup() {
-	enewgroup gorg
-	enewuser  gorg -1 -1 -1 gorg
-}
-
-each_ruby_configure() {
-	${RUBY} setup.rb config --prefix=/usr || die
-}
-
-each_ruby_compile() {
-	${RUBY} setup.rb setup || die
-}
-
-each_ruby_install() {
-	${RUBY} setup.rb config --prefix="${D}"/usr || die
-	${RUBY} setup.rb install                    || die
-
-	# install doesn't seem to chmod these correctly, forcing it here
-	SITE_LIB_DIR=$(ruby_rbconfig_value 'sitelibdir')
-	chmod +x "${D}"/${SITE_LIB_DIR}/gorg/cgi-bin/*.cgi
-	chmod +x "${D}"/${SITE_LIB_DIR}/gorg/fcgi-bin/*.fcgi
-}
-
-all_ruby_install() {
-	keepdir /etc/gorg; insinto /etc/gorg ; doins etc/gorg/*
-	diropts -m0770 -o gorg -g gorg; keepdir /var/cache/gorg
-
-	dodoc Changelog README
-}
diff --git a/www-servers/gorg/gorg-0.7.1.ebuild b/www-servers/gorg/gorg-0.7.1.ebuild
deleted file mode 100644
index 93a21c051cac..000000000000
--- a/www-servers/gorg/gorg-0.7.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.7.1.ebuild,v 1.3 2014/05/07 19:04:51 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-inherit ruby-ng eutils user
-
-DESCRIPTION="Back-end XSLT processor for an XML-based web site"
-HOMEPAGE="http://www.gentoo.org/proj/en/gdp/doc/gorg.xml"
-SRC_URI="https://github.com/gentoo/gorg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="fastcgi"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-CDEPEND="
-	>=dev-libs/libxml2-2.6.16
-	>=dev-libs/libxslt-1.1.12"
-DEPEND="${DEPEND} ${CDEPEND}"
-RDEPEND="${RDEPEND} ${CDEPEND}
-		fastcgi? ( virtual/httpd-fastcgi )"
-
-ruby_add_rdepend "
-	fastcgi? ( >=dev-ruby/fcgi-0.8.5-r1 )"
-
-pkg_setup() {
-	enewgroup gorg
-	enewuser  gorg -1 -1 -1 gorg
-}
-
-each_ruby_configure() {
-	${RUBY} setup.rb config --prefix=/usr || die
-}
-
-each_ruby_compile() {
-	${RUBY} setup.rb setup || die
-}
-
-each_ruby_install() {
-	${RUBY} setup.rb config --prefix="${D}"/usr || die
-	${RUBY} setup.rb install                    || die
-
-	# install doesn't seem to chmod these correctly, forcing it here
-	SITE_LIB_DIR=$(ruby_rbconfig_value 'sitelibdir')
-	chmod +x "${D}"/${SITE_LIB_DIR}/gorg/cgi-bin/*.cgi
-	chmod +x "${D}"/${SITE_LIB_DIR}/gorg/fcgi-bin/*.fcgi
-}
-
-all_ruby_install() {
-	keepdir /etc/gorg; insinto /etc/gorg ; doins etc/gorg/*
-	diropts -m0770 -o gorg -g gorg; keepdir /var/cache/gorg
-
-	dodoc Changelog README
-}
diff --git a/www-servers/gorg/gorg-0.7.2.ebuild b/www-servers/gorg/gorg-0.7.2.ebuild
deleted file mode 100644
index 4a41ce324c0a..000000000000
--- a/www-servers/gorg/gorg-0.7.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.7.2.ebuild,v 1.1 2014/08/22 15:54:14 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-inherit ruby-ng eutils user
-
-DESCRIPTION="Back-end XSLT processor for an XML-based web site"
-HOMEPAGE="http://www.gentoo.org/proj/en/gdp/doc/gorg.xml"
-SRC_URI="https://github.com/gentoo/gorg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="fastcgi"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-CDEPEND="
-	>=dev-libs/libxml2-2.6.16
-	>=dev-libs/libxslt-1.1.12"
-DEPEND="${DEPEND} ${CDEPEND}"
-RDEPEND="${RDEPEND} ${CDEPEND}
-		fastcgi? ( virtual/httpd-fastcgi )"
-
-ruby_add_rdepend "
-	fastcgi? ( >=dev-ruby/fcgi-0.8.5-r1 )"
-
-pkg_setup() {
-	enewgroup gorg
-	enewuser  gorg -1 -1 -1 gorg
-}
-
-each_ruby_configure() {
-	${RUBY} setup.rb config --prefix=/usr || die
-}
-
-each_ruby_compile() {
-	${RUBY} setup.rb setup || die
-}
-
-each_ruby_install() {
-	${RUBY} setup.rb config --prefix="${D}"/usr || die
-	${RUBY} setup.rb install                    || die
-
-	# install doesn't seem to chmod these correctly, forcing it here
-	SITE_LIB_DIR=$(ruby_rbconfig_value 'sitelibdir')
-	chmod +x "${D}"/${SITE_LIB_DIR}/gorg/cgi-bin/*.cgi
-	chmod +x "${D}"/${SITE_LIB_DIR}/gorg/fcgi-bin/*.fcgi
-}
-
-all_ruby_install() {
-	keepdir /etc/gorg; insinto /etc/gorg ; doins etc/gorg/*
-	diropts -m0770 -o gorg -g gorg; keepdir /var/cache/gorg
-
-	dodoc Changelog README
-}
diff --git a/www-servers/gorg/metadata.xml b/www-servers/gorg/metadata.xml
deleted file mode 100644
index 66ac178f3bfc..000000000000
--- a/www-servers/gorg/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>ruby</herd>
-	<maintainer>
-		<email>graaff@gentoo.org</email>
-		<name>Hans de Graaff</name>
-	</maintainer>
-	<maintainer>
-		<email>robbat2@gentoo.org</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
-	<longdescription lang="en">
-		Gorg serves as a back-end XSLT processor for an XML-based web site.
-		Gorg was developed with http://www.gentoo.org in mind and it allows you
-		to serve your own local copy of http://www.gentoo.org. It can use either
-		a cgi or a fastcgi script with apache, or even use its own stand-alone
-		web server. Its name is short for Gentoo.org.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">gentoo/gorg</remote-id>
-	</upstream>
-</pkgmetadata>