dlan        14/07/18 06:42:13

  Modified:             ChangeLog ceph-9999.ebuild
  Added:                ceph-0.80.4.ebuild ceph-0.67.9.ebuild
  Removed:              ceph-0.72.2-r3.ebuild ceph-0.67.7.ebuild
                        ceph-0.80.1.ebuild
  Log:
  revision bump, clean old, bug 517122. thanks @babykart
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
0xAABEFD55)

Revision  Changes    Path
1.54                 sys-cluster/ceph/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ceph/ChangeLog?rev=1.54&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ceph/ChangeLog?rev=1.54&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ceph/ChangeLog?r1=1.53&r2=1.54

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChangeLog   6 Jul 2014 12:56:17 -0000       1.53
+++ ChangeLog   18 Jul 2014 06:42:13 -0000      1.54
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.53 
2014/07/06 12:56:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.54 
2014/07/18 06:42:13 dlan Exp $
+
+*ceph-0.80.4 (18 Jul 2014)
+*ceph-0.67.9 (18 Jul 2014)
+
+  18 Jul 2014; Yixun Lan <[email protected]> -ceph-0.67.7.ebuild,
+  +ceph-0.67.9.ebuild, -ceph-0.72.2-r3.ebuild, -ceph-0.80.1.ebuild,
+  +ceph-0.80.4.ebuild, ceph-9999.ebuild:
+  revision bump, clean old, bug 517122. thanks @babykart
 
   06 Jul 2014; Michał Górny <[email protected]> ceph-0.67.7.ebuild,
   ceph-0.72.2-r3.ebuild, ceph-0.80.1.ebuild, ceph-9999.ebuild:



1.12                 sys-cluster/ceph/ceph-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild?r1=1.11&r2=1.12

Index: ceph-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ceph-9999.ebuild    6 Jul 2014 12:56:17 -0000       1.11
+++ ceph-9999.ebuild    18 Jul 2014 06:42:13 -0000      1.12
@@ -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/sys-cluster/ceph/ceph-9999.ebuild,v 1.11 
2014/07/06 12:56:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.12 
2014/07/18 06:42:13 dlan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -121,7 +121,7 @@
        newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
        newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 
-       _python_rewrite_shebang \
+       python_fix_shebang \
                "${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
                "${ED}"/usr/bin/{ceph,ceph-rest-api}
 
@@ -140,7 +140,7 @@
        elog ""
        elog "cd /etc/init.d"
        elog "for dmn in mds.a mon.a osd.0 osd.1 osd.2; do"
-       elog "  ln -s ceph ceph-${dmn};"
-       elog "  rc-update add ceph-${dmn} default;"
+       elog "  ln -s ceph ceph-\${dmn};"
+       elog "  rc-update add ceph-\${dmn} default;"
        elog "done"
 }



1.1                  sys-cluster/ceph/ceph-0.80.4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ceph/ceph-0.80.4.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ceph/ceph-0.80.4.ebuild?rev=1.1&content-type=text/plain

Index: ceph-0.80.4.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.80.4.ebuild,v 1.1 
2014/07/18 06:42:13 dlan Exp $

EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )

if [[ $PV = *9999* ]]; then
        scm_eclass=git-r3
        EGIT_REPO_URI="
                git://github.com/ceph/ceph.git
                https://github.com/ceph/ceph.git";
        SRC_URI=""
        KEYWORDS=""
else
        SRC_URI="http://ceph.com/download/${P}.tar.bz2";
        KEYWORDS="~amd64 ~x86"
fi

inherit autotools eutils multilib python-any-r1 udev ${scm_eclass}

DESCRIPTION="Ceph distributed filesystem"
HOMEPAGE="http://ceph.com/";

LICENSE="LGPL-2.1"
SLOT="0"
IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs 
tcmalloc xfs zfs"

CDEPEND="
        app-arch/snappy
        dev-libs/boost:=[threads]
        dev-libs/fcgi
        dev-libs/libaio
        dev-libs/libedit
        dev-libs/leveldb[snappy]
        nss? ( dev-libs/nss )
        cryptopp? ( dev-libs/crypto++ )
        sys-apps/keyutils
        sys-apps/util-linux
        dev-libs/libxml2
        fuse? ( sys-fs/fuse )
        libatomic? ( dev-libs/libatomic_ops )
        xfs? ( sys-fs/xfsprogs )
        zfs? ( sys-fs/zfs )
        gtk? (
                x11-libs/gtk+:2
                dev-cpp/gtkmm:2.4
                gnome-base/librsvg
        )
        radosgw? (
                dev-libs/fcgi
                dev-libs/expat
                net-misc/curl
        )
        tcmalloc? ( dev-util/google-perftools )
        $(python_gen_any_dep '
        ' )
        ${PYTHON_DEPS}
        "
DEPEND="${CDEPEND}
        virtual/pkgconfig"
RDEPEND="${CDEPEND}
        sys-apps/hdparm
        $(python_gen_any_dep '
        dev-python/flask[${PYTHON_USEDEP}]
        dev-python/requests[${PYTHON_USEDEP}]
        ' )"
REQUIRED_USE="
        ^^ ( nss cryptopp )
        "

STRIP_MASK="/usr/lib*/rados-classes/*"

PATCHES=(
        "${FILESDIR}"/${PN}-fix-gnustack.patch
        "${FILESDIR}"/${PN}-0.79-libzfs.patch
)

pkg_setup() {
        python-any-r1_pkg_setup
}

src_prepare() {
        [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"

        epatch_user
        eautoreconf
}

src_configure() {
        econf \
                --without-hadoop \
                --docdir="${EPREFIX}/usr/share/doc/${PF}" \
                --includedir=/usr/include \
                $(use_with debug) \
                $(use_with fuse) \
                $(use_with libaio) \
                $(use_with libatomic libatomic-ops) \
                $(use_with nss) \
                $(use_with cryptopp) \
                $(use_with radosgw) \
                $(use_with gtk gtk2) \
                $(use_enable static-libs static) \
                $(use_with tcmalloc) \
                $(use_with xfs libxfs) \
                $(use_with zfs libzfs)
}

src_install() {
        default

        prune_libtool_files --all

        exeinto /usr/$(get_libdir)/ceph
        newexe src/init-ceph ceph_init.sh

        insinto /etc/logrotate.d/
        newins "${FILESDIR}"/ceph.logrotate ${PN}

        chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*

        keepdir /var/lib/${PN}
        keepdir /var/lib/${PN}/tmp
        keepdir /var/log/${PN}/stat

        newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
        newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}

        python_fix_shebang \
                "${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
                "${ED}"/usr/bin/{ceph,ceph-rest-api}

        #install udev rules
        udev_dorules udev/50-rbd.rules
        udev_dorules udev/95-ceph-osd.rules
}

pkg_postinst() {
        elog "We suggest to install following packages"
        elog " sys-block/parted         to manage disk partions"
        elog " sys-fs/btrfs-progs       to use btrfs filesytem"
        elog " sys-fs/cryptsetup        to use encrypted devices with dm-crypt"
        elog ""
        elog "To have many daemons of one type, create your own script:"
        elog ""
        elog "cd /etc/init.d"
        elog "for dmn in mds.a mon.a osd.0 osd.1 osd.2; do"
        elog "  ln -s ceph ceph-\${dmn};"
        elog "  rc-update add ceph-\${dmn} default;"
        elog "done"
}



1.1                  sys-cluster/ceph/ceph-0.67.9.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ceph/ceph-0.67.9.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ceph/ceph-0.67.9.ebuild?rev=1.1&content-type=text/plain

Index: ceph-0.67.9.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.67.9.ebuild,v 1.1 
2014/07/18 06:42:13 dlan Exp $

EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )

if [[ $PV = *9999* ]]; then
        scm_eclass=git-r3
        EGIT_REPO_URI="
                git://github.com/ceph/ceph.git
                https://github.com/ceph/ceph.git";
        SRC_URI=""
        KEYWORDS=""
else
        SRC_URI="http://ceph.com/download/${P}.tar.bz2";
        KEYWORDS="~amd64 ~x86"
fi

inherit autotools eutils multilib python-any-r1 udev ${scm_eclass}

DESCRIPTION="Ceph distributed filesystem"
HOMEPAGE="http://ceph.com/";

LICENSE="LGPL-2.1"
SLOT="0"
IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs 
tcmalloc"

CDEPEND="
        app-arch/snappy
        dev-libs/boost:=[threads]
        dev-libs/fcgi
        dev-libs/libaio
        dev-libs/libedit
        dev-libs/leveldb[snappy]
        nss? ( dev-libs/nss )
        cryptopp? ( dev-libs/crypto++ )
        sys-apps/keyutils
        sys-apps/util-linux
        dev-libs/libxml2
        fuse? ( sys-fs/fuse )
        libatomic? ( dev-libs/libatomic_ops )
        gtk? (
                x11-libs/gtk+:2
                dev-cpp/gtkmm:2.4
                gnome-base/librsvg
        )
        radosgw? (
                dev-libs/fcgi
                dev-libs/expat
                net-misc/curl
        )
        tcmalloc? ( dev-util/google-perftools )
        $(python_gen_any_dep '
        ' )
        ${PYTHON_DEPS}
        "
DEPEND="${CDEPEND}
        virtual/pkgconfig"
RDEPEND="${CDEPEND}
        sys-apps/hdparm
        $(python_gen_any_dep '
        dev-python/flask[${PYTHON_USEDEP}]
        dev-python/requests[${PYTHON_USEDEP}]
        ' )"
REQUIRED_USE="
        ^^ ( nss cryptopp )
        "

STRIP_MASK="/usr/lib*/rados-classes/*"

pkg_setup() {
        python-any-r1_pkg_setup
}

src_prepare() {
        if [ ! -z ${PATCHES[@]} ]; then
                epatch ${PATCHES[@]}
        fi
        sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
                > "${T}"/${PN}.initd || die
        sed -e '/^ceph_sbindir =/s:$(exec_prefix)::' -i src/Makefile.am || die

        epatch_user
        eautoreconf
}

src_configure() {
        econf \
                --without-hadoop \
                --docdir="${EPREFIX}/usr/share/doc/${PF}" \
                --includedir=/usr/include \
                $(use_with debug) \
                $(use_with fuse) \
                $(use_with libaio) \
                $(use_with libatomic libatomic-ops) \
                $(use_with nss) \
                $(use_with cryptopp) \
                $(use_with radosgw) \
                $(use_with gtk gtk2) \
                $(use_enable static-libs static) \
                $(use_with tcmalloc)
}

src_install() {
        default

        prune_libtool_files --all

        exeinto /usr/$(get_libdir)/ceph
        newexe src/init-ceph ceph_init.sh

        insinto /etc/logrotate.d/
        newins "${FILESDIR}"/ceph.logrotate ${PN}

        chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*

        keepdir /var/lib/${PN}
        keepdir /var/lib/${PN}/tmp
        keepdir /var/log/${PN}/stat

        newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
        newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}

        python_fix_shebang \
                "${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
                "${ED}"/usr/bin/{ceph,ceph-rest-api}

        #install udev rules
        udev_dorules udev/50-rbd.rules
        udev_dorules udev/95-ceph-osd.rules
}

pkg_postinst() {
        elog "We suggest to install following packages"
        elog " sys-block/parted         to manage disk partions"
        elog " sys-fs/btrfs-progs       to use btrfs filesytem"
        elog " sys-fs/cryptsetup        to use encrypted devices with dm-crypt"
        elog ""
        elog "To have many daemons of one type, create your own script:"
        elog ""
        elog "cd /etc/init.d"
        elog "for dmn in mds.a mon.a osd.0 osd.1 osd.2; do"
        elog "  ln -s ceph ceph-\${dmn};"
        elog "  rc-update add ceph-\${dmn} default;"
        elog "done"
}




Reply via email to