Fix bug #133713, #173748, #175204. Remove old versions

Package-Manager: portage-2.1.2.2

diff --git a/www-servers/gorg/ChangeLog b/www-servers/gorg/ChangeLog
index 7257ed02e7c026ddf8608f58e6a764ad3f9acfc1..768c7389ed10b06be5c0b54320dfde6fbd4f9403 100644 (file)
--- a/www-servers/gorg/ChangeLog
+++ b/www-servers/gorg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/gorg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/ChangeLog,v 1.12 2007/04/19 13:47:17 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/ChangeLog,v 1.13 2007/04/23 17:15:36 rbrown Exp $
+
+*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

diff --git a/www-servers/gorg/Manifest b/www-servers/gorg/Manifest
index 05e02c7b2fde1cbe4ee05310c75aba5c7c19c0f6..a7b9700d50ec862e679151c6f033f378dbe26924 100644 (file)
--- a/www-servers/gorg/Manifest
+++ b/www-servers/gorg/Manifest
@@ -1,50 +1,31 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gorg-0.5.tgz 43224 RMD160 7ea132ed64d0a505e4b09253b34cadfb29a21a9b SHA1 debe42a7f83c2ee255102978bb5e557c137291bb SHA256 e696e37f3ca004641837389e8dbac18e501dc74a4d4c4a9de72cb236c53107b8
-DIST gorg-0.6.1.tgz 56093 RMD160 f6470314a0bf51620762c8a1043cd9a7efe1168f SHA1 2ca7919ec1b6fe24d545efae2f7a467a8c0f6fca SHA256 ff6a3d1da5393db0a2c3ad48c70482d65464368d8754a8682a51fbad2f946b3b
 DIST gorg-0.6.3.tgz 56384 RMD160 dca61e17138763a2785893a83221533eb79ef1fa SHA1 33a306cec67fc208adf5843b272b8e674d1b57bc SHA256 3c4822b6d16a3fb04a772016589c68e6ad5bbcf240a3c621a7a7f8676d6303ce
-DIST gorg-0.6.tgz 55890 RMD160 78c3d465060e5458fa1339b94635db8591edfa58 SHA1 ed4ddab662e00184bd3b139a5e5b228694645f2e SHA256 2e6805c2914b1196bb91625984914f5d8d361c38b01b96f2cc08558dc7c07603
 EBUILD gorg-0.5.ebuild 851 RMD160 98f13307f3a5bfe099ae93b79c4ff7818d95487e SHA1 d53c648468dc6f7b872f260a13c0262665818d8f SHA256 2996872166e842007034fe33a7e34bb0017654bb5063d80244bac11312f67d69
 MD5 2c26e0977104536653558ae90a245bb2 gorg-0.5.ebuild 851
 RMD160 98f13307f3a5bfe099ae93b79c4ff7818d95487e gorg-0.5.ebuild 851
 SHA256 2996872166e842007034fe33a7e34bb0017654bb5063d80244bac11312f67d69 gorg-0.5.ebuild 851
-EBUILD gorg-0.6.1.ebuild 1175 RMD160 b8aad77d4d92aa8f73c384a6c40d75a16a976229 SHA1 0320d1c539a8c385519816122b4cf15bba172402 SHA256 68b7286a5f36a15c591210f09c9a864122ba5e8b6eee5a8fa9ecbde15bee19dc
-MD5 11c3539bf2784b7e4cac3c35d0325ad2 gorg-0.6.1.ebuild 1175
-RMD160 b8aad77d4d92aa8f73c384a6c40d75a16a976229 gorg-0.6.1.ebuild 1175
-SHA256 68b7286a5f36a15c591210f09c9a864122ba5e8b6eee5a8fa9ecbde15bee19dc gorg-0.6.1.ebuild 1175
+EBUILD gorg-0.6.3-r1.ebuild 1605 RMD160 d0d68a6dea4d2833859ec259d1220125b903922d SHA1 9be14c4b806af2fc96af28ccc3f8f3dd9bcc906a SHA256 4d291a2d8d2c72ad0c0d8fba0e853328ac816a78afebfcaf4d5079b7b28c2e35
+MD5 9b2666d6a97d2bd6c969ac5e33ef07be gorg-0.6.3-r1.ebuild 1605
+RMD160 d0d68a6dea4d2833859ec259d1220125b903922d gorg-0.6.3-r1.ebuild 1605
+SHA256 4d291a2d8d2c72ad0c0d8fba0e853328ac816a78afebfcaf4d5079b7b28c2e35 gorg-0.6.3-r1.ebuild 1605
 EBUILD gorg-0.6.3.ebuild 1332 RMD160 f6f00bbcbc4117565231157589916b2904131089 SHA1 59ae2e4c6e7ffbff0923a7f04a457337c6649e2a SHA256 6c79e38832902eb478bc230fe9ceb9fdc257c2d1a957eee200905deeb5e5adc3
 MD5 71bc464f54d80eead9c1b1d47be688ab gorg-0.6.3.ebuild 1332
 RMD160 f6f00bbcbc4117565231157589916b2904131089 gorg-0.6.3.ebuild 1332
 SHA256 6c79e38832902eb478bc230fe9ceb9fdc257c2d1a957eee200905deeb5e5adc3 gorg-0.6.3.ebuild 1332
-EBUILD gorg-0.6.ebuild 975 RMD160 195a26a3960b1a5b586df63fc220957e6f07d876 SHA1 52658f93f3baa499b638e073565b7fab2079e692 SHA256 2d15b25db2898a5977d713bfdbd64ea87d877fff81a587a9e24318759aaad82f
-MD5 664428238e996c685fb272618f78ad8d gorg-0.6.ebuild 975
-RMD160 195a26a3960b1a5b586df63fc220957e6f07d876 gorg-0.6.ebuild 975
-SHA256 2d15b25db2898a5977d713bfdbd64ea87d877fff81a587a9e24318759aaad82f gorg-0.6.ebuild 975
-MISC ChangeLog 1546 RMD160 f8ca5b32bff526003ede51b0a4028dbe9df5a35d SHA1 4459c88f16be602b7d22bc3886cd0d7f21182475 SHA256 a56301d1b5508d482001c57905d5ab35bb4b53bb21fbf295f10dbec4a11502dc
-MD5 37d586497ecace39ba667ffbf18606aa ChangeLog 1546
-RMD160 f8ca5b32bff526003ede51b0a4028dbe9df5a35d ChangeLog 1546
-SHA256 a56301d1b5508d482001c57905d5ab35bb4b53bb21fbf295f10dbec4a11502dc ChangeLog 1546
-MISC metadata.xml 736 RMD160 4ba23c7f82b623b8c777a558ca624d1709e830de SHA1 68a6b6788bd9fbe4c416a97be49256355c664d4e SHA256 a53a87431f59297aded71cca8cff189e9cdeea12f1735645a87967eb94c05254
-MD5 53aeeb4f7cd0baa78bcb917e2c9655e8 metadata.xml 736
-RMD160 4ba23c7f82b623b8c777a558ca624d1709e830de metadata.xml 736
-SHA256 a53a87431f59297aded71cca8cff189e9cdeea12f1735645a87967eb94c05254 metadata.xml 736
+MISC ChangeLog 1760 RMD160 3a856e18ff62f81348ec04fe3338e148de6cd525 SHA1 8d1038e9050bb6d5fc66e467713674a4e4e96430 SHA256 48affabe0fefb8d352fdab6a9a7cdada3b405c1eb442119710ad78db1980d558
+MD5 b05ad0131ca1980c4b4e23b9cc5b286a ChangeLog 1760
+RMD160 3a856e18ff62f81348ec04fe3338e148de6cd525 ChangeLog 1760
+SHA256 48affabe0fefb8d352fdab6a9a7cdada3b405c1eb442119710ad78db1980d558 ChangeLog 1760
+MISC metadata.xml 735 RMD160 5c80479c7e11e05acaa9587cf9aac9e771f0c41c SHA1 e1c6375fb51f58caa6cea7045f2d85fad76d1a56 SHA256 163f4fb369219700e0c14a7620733af75e41e2394d6d7f6b14a22b41971877c0
+MD5 333cfa60e03f1883252202ea5f0aeea6 metadata.xml 735
+RMD160 5c80479c7e11e05acaa9587cf9aac9e771f0c41c metadata.xml 735
+SHA256 163f4fb369219700e0c14a7620733af75e41e2394d6d7f6b14a22b41971877c0 metadata.xml 735
 MD5 b029295dac54ba211634490495b1aeef files/digest-gorg-0.5 214
 RMD160 86a4ddbacc836f82f4d562608e07bebd813b0ad9 files/digest-gorg-0.5 214
 SHA256 471dd44e3423d07610a74eee12a2d05d3540b9c69bbe4577f1b2014697b1b206 files/digest-gorg-0.5 214
-MD5 112c974192554a99d31a8941bc4469ee files/digest-gorg-0.6 214
-RMD160 e6d8c2f0dea553170bfd0b5dd825476712fff6f3 files/digest-gorg-0.6 214
-SHA256 feac95777a2aade5dc79587c11aaa21034427db57f9ad0345aedf829894878f6 files/digest-gorg-0.6 214
-MD5 4d3e9a075e9cdbaa096445a7cda36993 files/digest-gorg-0.6.1 220
-RMD160 450e00643c12ba652615bdc4569e2620701d0182 files/digest-gorg-0.6.1 220
-SHA256 96a199de419aaf7eb656281cefd7d0412b2166d60c2d8c840af159820b216766 files/digest-gorg-0.6.1 220
 MD5 e177c6752b29fcf24692a6b73f827f02 files/digest-gorg-0.6.3 220
 RMD160 0c563c490c9f94f4ec022fa6a39631c6155f8a81 files/digest-gorg-0.6.3 220
 SHA256 0cd84257e9b473bdfd670fb28c20b3824dc14d70542ec3c8b592ef76d75bd8df files/digest-gorg-0.6.3 220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGJ3LtuVcO4Ng+sIkRAjPwAKCGSCGLFsDlFaRPCpOtAtapdNEklwCgrZ58
-DK1h0AUSHjpUDspiZsDkFaE=
-=DLmT
------END PGP SIGNATURE-----
+MD5 e177c6752b29fcf24692a6b73f827f02 files/digest-gorg-0.6.3-r1 220
+RMD160 0c563c490c9f94f4ec022fa6a39631c6155f8a81 files/digest-gorg-0.6.3-r1 220
+SHA256 0cd84257e9b473bdfd670fb28c20b3824dc14d70542ec3c8b592ef76d75bd8df files/digest-gorg-0.6.3-r1 220

diff --git a/www-servers/gorg/files/digest-gorg-0.6 b/www-servers/gorg/files/digest-gorg-0.6
deleted file mode 100644 (file)
index 5e653bf..0000000
--- a/www-servers/gorg/files/digest-gorg-0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ba3fad912e6e0f60de36665d1c834373 gorg-0.6.tgz 55890
-RMD160 78c3d465060e5458fa1339b94635db8591edfa58 gorg-0.6.tgz 55890
-SHA256 2e6805c2914b1196bb91625984914f5d8d361c38b01b96f2cc08558dc7c07603 gorg-0.6.tgz 55890

diff --git a/www-servers/gorg/files/digest-gorg-0.6.1 b/www-servers/gorg/files/digest-gorg-0.6.1
deleted file mode 100644 (file)
index 7597b27..0000000
--- a/www-servers/gorg/files/digest-gorg-0.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2ef4caf8822c063a47812ec5c2d1db5a gorg-0.6.1.tgz 56093
-RMD160 f6470314a0bf51620762c8a1043cd9a7efe1168f gorg-0.6.1.tgz 56093
-SHA256 ff6a3d1da5393db0a2c3ad48c70482d65464368d8754a8682a51fbad2f946b3b gorg-0.6.1.tgz 56093

diff --git a/www-servers/gorg/files/digest-gorg-0.6.3-r1 b/www-servers/gorg/files/digest-gorg-0.6.3-r1
new file mode 100644 (file)
index 0000000..61af72a
--- /dev/null
+++ b/www-servers/gorg/files/digest-gorg-0.6.3-r1
@@ -0,0 +1,3 @@
+MD5 e32c7e3b4604a483ec9cdc1af648be8f gorg-0.6.3.tgz 56384
+RMD160 dca61e17138763a2785893a83221533eb79ef1fa gorg-0.6.3.tgz 56384
+SHA256 3c4822b6d16a3fb04a772016589c68e6ad5bbcf240a3c621a7a7f8676d6303ce gorg-0.6.3.tgz 56384

diff --git a/www-servers/gorg/gorg-0.6.1.ebuild b/www-servers/gorg/gorg-0.6.1.ebuild
deleted file mode 100644 (file)
index 5fc2eef..0000000
--- a/www-servers/gorg/gorg-0.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.6.1.ebuild,v 1.3 2007/02/10 13:57:59 beandog Exp $
-
-inherit ruby
-
-DESCRIPTION="Back-end XSLT processor for an XML-based web site"
-HOMEPAGE="http://gentoo.neysx.org/mystuff/gorg/gorg.xml"
-SRC_URI="http://gentoo.neysx.org/mystuff/gorg/${P}.tgz"
-IUSE="apache fastcgi mysql"
-
-SLOT="0"
-USE_RUBY="ruby18"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=dev-libs/libxml2-2.6.16
-               >=dev-libs/libxslt-1.1.12"
-RDEPEND="apache? ( net-www/apache )
-                fastcgi? ( >=www-apache/mod_fcgid-1.05
-                                       >=dev-ruby/ruby-fcgi-0.8.5-r1 )
-                mysql?   (     >=virtual/mysql-4.0
-                                       >=dev-ruby/ruby-dbi-0.0.21
-                                       >=dev-ruby/mysql-ruby-2.5 )"
-
-src_install() {
-       ruby_src_install
-
-       # install doesn't seem to chmod these correctly, forcing it here
-       chmod +x ${D}/usr/lib/ruby/site_ruby/*/gorg/cgi-bin/*.cgi
-       chmod +x ${D}/usr/lib/ruby/site_ruby/*/gorg/fcgi-bin/*.fcgi
-
-       keepdir /etc/gorg
-       diropts -m0750 -o apache -g apache; dodir /var/cache/gorg
-       keepdir /var/cache/gorg
-       insinto etc/gorg ; doins ${S}/etc/gorg/*
-       dodoc Changelog
-}

diff --git a/www-servers/gorg/gorg-0.6.3-r1.ebuild b/www-servers/gorg/gorg-0.6.3-r1.ebuild
new file mode 100644 (file)
index 0000000..1ec0024
--- /dev/null
+++ b/www-servers/gorg/gorg-0.6.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.6.3-r1.ebuild,v 1.1 2007/04/23 17:15:36 rbrown Exp $
+
+inherit ruby eutils
+
+DESCRIPTION="Back-end XSLT processor for an XML-based web site"
+HOMEPAGE="http://gentoo.neysx.org/mystuff/gorg/gorg.xml"
+SRC_URI="http://gentoo.neysx.org/mystuff/gorg/${P}.tgz"
+IUSE="apache fastcgi mysql"
+
+EAPI="0"
+SLOT="0"
+USE_RUBY="ruby18"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/ruby
+       >=dev-libs/libxml2-2.6.16
+       >=dev-libs/libxslt-1.1.12"
+RDEPEND="${DEPEND}
+       apache? ( net-www/apache )
+       fastcgi? ( >=dev-ruby/ruby-fcgi-0.8.5-r1
+               apache? ( >=www-apache/mod_fcgid-1.05 )
+       )
+       mysql? ( >=dev-ruby/ruby-dbi-0.0.21 >=dev-ruby/mysql-ruby-2.5 )"
+
+pkg_setup() {
+       if use mysql && ! built_with_use dev-ruby/ruby-dbi mysql ; then
+               eerror "You must compile ruby-dbi with the mysql USE flag enabled"
+               die
+       fi
+       enewgroup gorg
+       enewuser  gorg -1 -1 -1 gorg
+}
+
+src_compile() {
+       # Fix listen issue w/ webrick
+       sed -i -e 's/WEBrick::HTTPServer.new(/WEBrick::HTTPServer.new( :BindAddress=>"127.0.0.1",/' lib/gorg/www.rb
+
+       ruby_src_compile
+}
+
+src_install() {
+       ruby_einstall
+
+       # install doesn't seem to chmod these correctly, forcing it here
+       SITE_LIB_DIR=`$RUBY -r rbconfig -e 'puts Config::CONFIG["sitelibdir"]'`
+       chmod +x ${D}/${SITE_LIB_DIR}/gorg/cgi-bin/*.cgi
+       chmod +x ${D}/${SITE_LIB_DIR}/gorg/fcgi-bin/*.fcgi
+
+       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.6.ebuild b/www-servers/gorg/gorg-0.6.ebuild
deleted file mode 100644 (file)
index c291eed..0000000
--- a/www-servers/gorg/gorg-0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.6.ebuild,v 1.3 2006/11/23 20:41:51 vivo Exp $
-
-inherit ruby
-
-DESCRIPTION="Back-end XSLT processor for an XML-based web site"
-HOMEPAGE="http://gentoo.neysx.org/mystuff/gorg/gorg.xml"
-SRC_URI="http://gentoo.neysx.org/mystuff/gorg/${P}.tgz"
-IUSE="apache fastcgi mysql"
-
-SLOT="0"
-USE_RUBY="ruby18"
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
-
-DEPEND=">=dev-libs/libxml2-2.6.16
-               >=dev-libs/libxslt-1.1.12"
-RDEPEND="apache? ( net-www/apache )
-                fastcgi? ( >=www-apache/mod_fcgid-1.05
-                                       >=dev-ruby/ruby-fcgi-0.8.5-r1 )
-                mysql?   (     >=virtual/mysql-4.0
-                                       >=dev-ruby/ruby-dbi-0.0.21
-                                       >=dev-ruby/mysql-ruby-2.5 )"
-
-src_install() {
-       ruby_src_install
-       keepdir /etc/gorg
-       diropts -m0750 -o apache -g apache; dodir /var/cache/gorg
-       keepdir /var/cache/gorg
-       insinto etc/gorg ; doins ${S}/etc/gorg/*
-       dodoc Changelog
-}

diff --git a/www-servers/gorg/metadata.xml b/www-servers/gorg/metadata.xml
index 7946f95ca104ed237357bd2b4be10af7c478b932..ef2bb339d568f0b933f2e122a381906cda104d82 100644 (file)
--- a/www-servers/gorg/metadata.xml
+++ b/www-servers/gorg/metadata.xml
@@ -15,7 +15,7 @@
                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. 
+               web server. Its name is short for Gentoo.org.
        </longdescription>
 </pkgmetadata>