Use sys-apps/gentoo-functions, bug #504418.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/net-irc/eggdrop/ChangeLog b/net-irc/eggdrop/ChangeLog
index ed510ae9985a3927bde99f8275afc8833e25dc95..b7ab6d29c4e99516928fbb0101415c21dc756882 100644 (file)
--- a/net-irc/eggdrop/ChangeLog
+++ b/net-irc/eggdrop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/eggdrop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.93 2014/11/04 04:14:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.94 2014/12/21 12:08:00 mgorny Exp $
+
+  21 Dec 2014; Michał Górny <mgorny@gentoo.org> eggdrop-1.6.21.ebuild,
+  files/eggdrop-installer:
+  Use sys-apps/gentoo-functions, bug #504418.
 
   04 Nov 2014; Patrick Lauer <patrick@gentoo.org> -eggdrop-1.6.18-r3.ebuild,
   -eggdrop-1.6.19.ebuild:

diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index cceacfa01622db5c05071bde48af04c872f583ff..a3ac0fa447f731898cda5f378d7c82853a97960f 100644 (file)
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,6 +1,28 @@
-AUX eggdrop-installer 2262 SHA256 1d9f239bb1f19b1324f22e5d4f3aef92a00b4201c9390297268fe461dde61dbf SHA512 070d58322b94352f85905421f31cd72855966d68dae9a92378184d202bffa950d8991b103d16f4be0e602970c960fc26c88b0f33a391035ef2952d298e6ef41b WHIRLPOOL 88a9e1b479b7888ca989de59eb05d1a641a05dbb146be529ff901469e882d1136bd567052278ff3879877da95ba80a611a968b6e1a9e419f67602bf4a2d32923
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX eggdrop-installer 2264 SHA256 2faac940a569d63de10e6141f7d30c626bc7e4065f522acf5ee586362e35d1d2 SHA512 921c0c51c5f024ff0b35626abbe92314d770418598cbd267f4e1775d734b63c082243e30a3250e6f9a4e79b3de0d5b60f427f97638cde01c6804bee4b5f77312 WHIRLPOOL d201c231ac3048ab15ff41d5168d9563d50e84d5d82ca329dc861edd2cd0fe8fe9ad69d64cfb3990019f95a3a00ab61565a9c47c9016d163b8b4efb0c6b11df7
 DIST eggdrop-1.6.21-patches-1.0.tar.bz2 322608 SHA256 78b3107b711ce2df1e7752eb60d517774f104ba1ba0623bb116b824ab8d069d7 SHA512 d7d5d740c68997101f360096612700919c890c4254708102e962427de5929ce98f0f2eb5ad8dc8a56de60e8b610d502edeae7de2ac762fe0981134da379b6e64 WHIRLPOOL 202294f941d064b89348b270823d6b5f6e61483d56d32bde699857efe03c9aafec3ad4a9b6d503ffd97eefe6c6d4912e95546bd12f028e95c52d0e31e2086a1d
 DIST eggdrop1.6.21.tar.bz2 999211 SHA256 75bd5573a609eac3940c0b6ca8251c3f38ea5d54b520e1cad93c650b4bc21754 SHA512 9fd9a86c1c4b59a47a5eed4e2306e829a01bac2ad29e990ca9c0ec630d5814fd649a9216dae9ce49f734e3ac1728beb4f479ca10af583bd513f43bbbea23a653 WHIRLPOOL fc8115d6c5f1ac2878bb3811f303fe797f7b813d74f2c5c0be5a703a7e29d652b791a0a5e98842792f2466443c8571c983cd89fd516f36136f62a394060b052d
-EBUILD eggdrop-1.6.21.ebuild 2386 SHA256 80f26a43a9dfbb9602fa933be05b75a1cce47e1075599deb027e2c383e5baf00 SHA512 6c47075fe2a357497a897e756bdad9f635c97f0105340d3827de6020b3eb92681966350c5ad23b083124f9e15ba19156904a197d75674363ec05dc8036a93648 WHIRLPOOL 1b99085425b10772caff95c7f0cfd20663995ac5880eb5a932169dbede3db3ec59a68dcdd86e161dd6deaf92abb185db7c267b8d3bf92b142af551f66efa1dc5
-MISC ChangeLog 13777 SHA256 03f697c63bece77eb500e11e6b916d9d73fe8f0410b7b79b7d4c1bf6080c7aa4 SHA512 960be71ad29036ef31627c24d739f11682d4019a32a833b73532dc27691684a3340e36b97dc7cada983dbdd79323e515f93fd779d95deb281fa0c34127fe47f4 WHIRLPOOL 76cf53dd5f071bb1f31d88b0a9b0cf9253b432d009b51742cc2426766a86644b0d8aad0d1516d4b561d84d592e8b25f14a1b65bd949b2714e6dd668c634b6c32
+EBUILD eggdrop-1.6.21.ebuild 2409 SHA256 14989913fb547fd1ddc5761466f65343a09f667a48838a531ee443212a0e82b4 SHA512 e7648f81ef4231c96bb5c98a95628d7ab12c180ec9b90533c3381b2170e4c71d3302297e3fc80659347f6fb3a1c6579759994a08502e42ed9e1394ea17e3ad3e WHIRLPOOL 5539e4b8c05eda8d53d86d022e64613448b8766752e34a96064426dd272fdbdfaddd66f242acaa2f9886bd3bca3fe34debdb3acd602bf9582e020ad4fb087822
+MISC ChangeLog 13923 SHA256 7b634990e96a93cb779fc3ca0cc8f9c11e0cd9cca669bd3d85ecd797e5bda1b7 SHA512 370337f23bac304f82dbf36d738f258cb60cc282885a816d44a915777e817851d352d82f94eb82cf6c61dd977cdc1c0131e44e2af18826e2719bced43b898989 WHIRLPOOL 11243b22c869e8b480c744fca3b1bc0cb9fd671445c9b7532eb5dd7d3515a38d8eef274a66aa50ddd1c7d9e843d4fa2891f44c80545f23b99eeb0b4d7becf577
 MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUlrghXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVaIP/AzA5XCXY1e9WqJnEI9YvXXQ
+LrAB5oc9zjAymsgfy4VyM/hPo8+PGpUmNgzv2B+sq3v4ATtz19TyxQX8KeUwGQno
+4/diLzEfSPAiFFasXcwIA3LXNM5hO/4jdaql7K5hp3wHVydntg6FuubVmZcN8qby
+R+zypu6PJcKEV7zZJwF6NrpErLAClJjMQbFSc2Jj9+ycjD2RpFm4vuV5PISgi8h2
+EmPlv7UwXM8FeNeKfc14GYrH9ZvbeigcHjkVZNtuzcoJ6waw/uW2fSoCgWBTCckg
+aUFKpGFXPb5pLqm+MLBtDwnzSiFatStZMVKZp5a7UaEA22KEaHZ84VdFCw1QiCrC
+IAealM6Ug96R22y/S2T/yEev5BuIiKfD2uGeluF+ZMYWQstSdrmEP4mrXAUz96Er
+xcKLrZATty5dQr1uk5xLcgB0VfqvF0q0nts4ZR3kS6DRP7ezfKq7hLSjp7tdtzvi
+WdkFMq8lyuZvEAiMfzeccSsIhoo7u51NwtbT3pSithA746D1eOu7PKEbzFXFwzyR
+wGCMon+dzmN+2TxVLnqR6mpfMAHROXcysRKtpEY2TUhNcATOsqm9oclF/OhdXJqo
+BQ7bG6sHVSGOJnPcbG3f6Uo5/nuZ66JcfUElES3gZ6iGk9qlq06zEVPXA3pjQord
+qumsDNrMprxmaWM6rYmA
+=5cNP
+-----END PGP SIGNATURE-----

diff --git a/net-irc/eggdrop/eggdrop-1.6.21.ebuild b/net-irc/eggdrop/eggdrop-1.6.21.ebuild
index 4e5619aa8ed1c8a35f06ac3acb1b56faaf95f28a..e8aea034bfe180ce18b7683736bb3c706edd442d 100644 (file)
--- a/net-irc/eggdrop/eggdrop-1.6.21.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.6.21.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/net-irc/eggdrop/eggdrop-1.6.21.ebuild,v 1.5 2014/11/03 13:37:41 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.21.ebuild,v 1.6 2014/12/21 12:08:00 mgorny Exp $
 
 EAPI=4
 
@@ -21,6 +21,7 @@ IUSE="debug mysql postgres ssl static vanilla"
 REQUIRED_USE="vanilla? ( !mysql !postgres !ssl )"
 
 DEPEND="dev-lang/tcl
+       sys-apps/gentoo-functions
        !vanilla? (
                mysql? ( virtual/mysql )
                postgres? ( virtual/postgresql[server] )

diff --git a/net-irc/eggdrop/files/eggdrop-installer b/net-irc/eggdrop/files/eggdrop-installer
index 3864f3fb93e13c1a6eab064446ac4107e5ec6404..97f421f86c26a3b2178d374ab2b4b2cf765b7505 100644 (file)
--- a/net-irc/eggdrop/files/eggdrop-installer
+++ b/net-irc/eggdrop/files/eggdrop-installer
@@ -1,10 +1,10 @@
 #!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/files/eggdrop-installer,v 1.10 2007/03/14 17:52:24 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/files/eggdrop-installer,v 1.11 2014/12/21 12:08:00 mgorny Exp $
 
-source /etc/init.d/functions.sh || {
-       echo "${0}: Could not source /etc/init.d/functions.sh!"
+source /lib/gentoo/functions.sh || {
+       echo "${0}: Could not source /lib/gentoo/functions.sh!"
        exit 1
 }