Permalink
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: 7fab868b10f811e211e89dc312a00d68b9f10692
  foo-overlay: 4ee427c6573d50d9ce03f6671dce87274c57ee9f
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: 6df4f4e5f6d2ef66832f10c027cd9328e3ee249f
  for-gentoo: 9f867277dd44351ab9445c69fec73f432d39fd7c
  • Loading branch information...
1 parent 3fd4de2 commit 96f37994377936553422b156a86001b7f6025c9a @danielrobbins danielrobbins committed Jan 28, 2013
Showing 5,695 changed files with 8,581 additions and 12,654 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
@@ -1,2 +1,2 @@
-DIST cdemu-daemon-1.4.0.tar.gz 174194 SHA256 369238cbcb923f3e4b54e9f5b346bea3199944344376cb7a4ea96643e1389854 SHA512 c84dcbc671a1c307ef1fbb7fc6ee52e5f7ec592f9231bc935b15dd1064ddf9316191dc85bbc686dfb5b244d434366e101e7debaf2fdd0ea366d53116f76c9714 WHIRLPOOL df53f67916c7fa4f4e6b8e888d4fdb828f7d878ac037ba7134530d12ef97f01ecd59b99aad9d734f8d6c5e3e0a6f7b36bf22af466cd0f71494b02c44c1608e6b
DIST cdemu-daemon-1.5.0.tar.bz2 133865 SHA256 d0e122c7769ba11b640bb140657d1f31dc827904578437ac1d5aa84dcc88a74f SHA512 bd8a0bc1aafe23422f73832463bcf36003f221595d149b7859594791c0e08c752e2b7b136f228468cb2df0575bdf3a4c24913338e94f549d8b06271e7d75423c WHIRLPOOL 1f15fb77b6dcbce8c26e4bc495ef923a96d3284516dd3adba6da049761af4b7008178583d1c00548787e4e591206c5f33849ae8b2e6ac2e7f1c6f25a694a2b11
+DIST cdemu-daemon-2.0.0.tar.bz2 61590 SHA256 9def5ac371bdc64ed1b7b8fd3dffa9573561deaa7cf4b52c8a2744d852dfc53f SHA512 71daf0c745df2daf4c0344e8c85d146de8c3f68b1f0a8f8f402a1bcfee7a29e32e6c0fb54fac873e2abd2912327eca9a8bbbe3584ba7afc70dd151057575bbd6 WHIRLPOOL 8aa953fcf26570492a5b959e172f9b287c858e0578fd271b269c2884c29324624787ee27e9133827a2734b1c5267e7afb5b14c8d624065d9e6025ee8ebab2012
@@ -1,14 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/cdemud-1.5.0.ebuild,v 1.4 2012/04/09 12:10:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/cdemu-daemon-1.5.0.ebuild,v 1.1 2013/01/28 00:22:03 tetromino Exp $
EAPI="4"
DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-daemon-${PV}.tar.bz2"
+SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~hppa x86"
IUSE="pulseaudio"
@@ -21,8 +21,6 @@ RDEPEND=">=dev-libs/glib-2.28:2
!pulseaudio? ( >=media-libs/libao-0.8.0[alsa] )"
DEPEND="${RDEPEND}"
-S=${WORKDIR}/cdemu-daemon-${PV}
-
src_prepare() {
if ! use pulseaudio; then
sed -e 's:AUDIO_DRIVER=pulse:AUDIO_DRIVER=alsa:' \
@@ -1,30 +1,36 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/cdemud-1.4.0.ebuild,v 1.2 2012/01/18 12:08:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/cdemu-daemon-2.0.0.ebuild,v 1.1 2013/01/28 00:22:03 tetromino Exp $
-EAPI="4"
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+
+inherit cmake-utils
DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-daemon-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0/4" # subslot = CDEMU_DAEMON_INTERFACE_VERSION in CMakeLists.txt
+KEYWORDS="~amd64 ~hppa ~x86"
IUSE="pulseaudio"
-RDEPEND=">=dev-libs/dbus-glib-0.61
- >=dev-libs/glib-2.14:2
- >=dev-libs/libmirage-${PV}
+RDEPEND=">=dev-libs/glib-2.26:2
+ >=dev-libs/libmirage-${PV}:=
>=media-libs/libao-0.8.0[pulseaudio?]
sys-apps/dbus
>=sys-fs/vhba-20101015
!pulseaudio? ( >=media-libs/libao-0.8.0[alsa] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/cdemu-daemon-${PV}
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
src_prepare() {
+ DOCS="AUTHORS README"
+
+ sed -e 's/-DG_DISABLE_DEPRECATED//' -i CMakeLists.txt || die
+
if ! use pulseaudio; then
sed -e 's:AUDIO_DRIVER=pulse:AUDIO_DRIVER=alsa:' \
-i session/cdemu-daemon-session.sh || die "sed failed"
File renamed without changes.
View
@@ -1,2 +1,2 @@
-DIST cdemu-client-1.4.0.tar.gz 119584 SHA256 d3223c9410217f45cd1df25a85cf3dc3cf361410e31911840efc79c729202ed2 SHA512 20da8d801bcd82f34e6ddfbee873f2e32c1f836777961dec01b09aaa6932e257cc0f27d4b7f0e0b8be5f5e90bb13d0f62f654faf3d4cf668fedb381c53a3d5cc WHIRLPOOL 597ea50cd2707491f9d73c1890d2f24213a413e3e8600f165683b1624b667bb860e1396a6c6356090a41f2ee1920470823fa6ac3028a16b75ecd6970a0909ad4
DIST cdemu-client-1.5.0.tar.bz2 97987 SHA256 d4d7e3d232f799830c1c480d69f8789468552602e2737b0b0207f4d449095f99 SHA512 42e43e3a0fb240107c2500d1d4b3f9ed1e1df352c768e6b9ecb019a03f561a4a086df0ae16c744cb22e86db4ed1d3aed1a4171c4e881b89920b9897e6e41cdfd WHIRLPOOL ddf8908f2e80971206d8402fcd1ad0884ffe74314eecefa445359907b7fc94d08ea251250ea825cbc0e589eb691439d3a50e680b2c901e0604966806b011aeab
+DIST cdemu-client-2.0.0.tar.bz2 28346 SHA256 a049df0d97b46bedf8604123c9ac6207f6b506855da6c379550513cb40e45603 SHA512 c510087a3c2a343beb99f4a02c9db0407ee4a27fb640af5343fac081aab10afa616ce3477fc2baf7aefbcde12b2de0c80e330be33e82ed7f60cf6eb3b03f854f WHIRLPOOL 1e3843d3ce6dab95726f563ea385e9a091055585f537b57942b2e51a547b342369c7577bf55f63a75fa378f95300c1eeaf8c00be0a42a04384654a13bff42fae
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-1.4.0.ebuild,v 1.2 2012/01/18 12:08:27 ago Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="Command-line tool for controlling the CDEmu daemon (cdemud)"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+cdemud"
-
-RDEPEND="dev-python/dbus-python
- cdemud? ( >=app-cdr/cdemud-1.4.0 )"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.21"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- python_convert_shebangs -r 2 src
-}
@@ -1,23 +1,23 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-1.5.0.ebuild,v 1.5 2012/04/09 12:10:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-1.5.0.ebuild,v 1.6 2013/01/28 00:22:41 tetromino Exp $
EAPI="4"
PYTHON_DEPEND="2"
inherit eutils python
-DESCRIPTION="Command-line tool for controlling the CDEmu daemon (cdemud)"
+DESCRIPTION="Command-line tool for controlling cdemu-daemon"
HOMEPAGE="http://cdemu.org"
SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~hppa x86"
-IUSE="+cdemud"
+IUSE="+cdemu-daemon"
RDEPEND="dev-python/dbus-python
- cdemud? ( >=app-cdr/cdemud-1.4.0 )"
+ cdemu-daemon? ( ~app-cdr/cdemu-daemon-${PV} )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.21"
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.0.0.ebuild,v 1.1 2013/01/28 00:22:41 tetromino Exp $
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+PYTHON_COMPAT=( python2_6 python2_7 )
+PLOCALES="de fr no pl sl sv"
+
+inherit cmake-utils eutils fdo-mime l10n python-single-r1
+
+DESCRIPTION="Command-line tool for controlling cdemu-daemon"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="+cdemu-daemon"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ cdemu-daemon? ( app-cdr/cdemu-daemon:0/4 )"
+DEPEND="${RDEPEND}
+ dev-util/desktop-file-utils
+ >=dev-util/intltool-0.21
+ >=sys-devel/gettext-0.18"
+
+S=${WORKDIR}/cdemu-client-${PV}
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ python_fix_shebang src/cdemu
+ epatch "${FILESDIR}/${PN}-2.0.0-bash-completion-dir.patch"
+ # build system doesn't respect LINGUAS :/
+ rm_po() {
+ rm po/$1.po || die
+ }
+ l10n_for_each_disabled_locale_do rm_po
+}
+
+src_configure() {
+ DOCS="AUTHORS README"
+ local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
@@ -0,0 +1,13 @@
+diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
+index 6f33b7c..5261c18 100644
+--- a/cdemu-client/CMakeLists.txt
++++ b/cdemu-client/CMakeLists.txt
+@@ -41,7 +41,7 @@ install (
+
+ install (
+ FILES data/cdemu-bashcomp
+- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
++ DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion
+ RENAME cdemu-client
+ )
+
@@ -6,6 +6,6 @@
<name>Alexandre Rostovtsev</name>
</maintainer>
<use>
- <flag name='cdemud'>Pull <pkg>app-cdr/cdemud</pkg> dependency, useful in chroot environment (bug #315491). Do not disable until you know what you are doing.</flag>
+ <flag name='cdemu-daemon'>Pull <pkg>app-cdr/cdemu-daemon</pkg> dependency, useful in chroot environment (bug #315491). Do not disable until you know what you are doing.</flag>
</use>
</pkgmetadata>
View
@@ -1,2 +1,2 @@
-DIST gcdemu-1.4.0.tar.gz 127488 SHA256 c8a1f7b6ced6926e49315f3f69a51253ec4ec523b7bd362ddeb08408c5a505a0 SHA512 55e07e07b617ac55655762c267abfc2aac912132d5923e98c2416e38acaa896cdbaaeebdcf566b07c2d9b61b823d60950b47af5f04f3dd11a2f597052a265a6f WHIRLPOOL 4f0bff1cc2243e32f9eee0d33be82007bd98a26c7c764d660da7e211749fe80f29e3f806ca53b7df8e214ea88ff6428fd0ff02dbd83c581effe5eb1ca033fd89
DIST gcdemu-1.5.0.tar.bz2 106163 SHA256 43f3da30eb95759618d258acd312f45a7fe4a9792952954c77b0fea9459d0c85 SHA512 8e599426c4f8817164ef44f4d06b823dd549e57b5e9b00ae8df7510ea2468c51e444c61ab8cf089b8e9cccd068b6df392ab34e2ba1d8c84dd18f5b783b240ed1 WHIRLPOOL 19d34d926e5df188abf605c11a3530bd9ab4e05e15cf36683aefe38dee25f10411ef6f1f230bf419915f91173f3591ad729423dccbd48c11c092f730f9f3c2e7
+DIST gcdemu-2.0.0.tar.bz2 39502 SHA256 c6afa3b720618389119fd12c6006218510c1515d77637f27087b06f1a258c54f SHA512 af2ba5ac7bc8ef9ef442c511a28e0d77309b6b1d58170803ed072b712a52a5283e5b4c4c3b2c79cf687b1decfb87128a2cd956dfb8a0f32143ba8d9efe23c610 WHIRLPOOL b33ebb8c184c93e8e1e7d3fea4c99d6f3c4f063a8e4c80eca8829348d477eb1fc55581c41b123ccd878f8f28c24e9b817831f3fd55886b687d92baaab3d55a08
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-1.4.0.ebuild,v 1.3 2012/05/03 07:51:49 jdhore Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-
-inherit gnome2 python
-
-DESCRIPTION="Gtk+ GUI for controlling the CDEmu daemon (cdemud)"
-HOMEPAGE="http://cdemu.org/"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="libnotify"
-
-RDEPEND=">=app-cdr/cdemud-1.4.0
- >=dev-python/dbus-python-0.71
- dev-python/gconf-python
- >=dev-python/pygobject-2.6:2
- >=dev-python/pygtk-2.6
- gnome-base/gconf:2
-
- libnotify? ( dev-python/notify-python )"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.21
- virtual/pkgconfig
- sys-devel/gettext"
-
-DOCS="AUTHORS ChangeLog README"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- python_convert_shebangs 2 src/gcdemu
- gnome2_src_prepare
-}
@@ -1,23 +1,23 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-1.5.0.ebuild,v 1.4 2012/05/03 07:51:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-1.5.0.ebuild,v 1.5 2013/01/28 00:24:30 tetromino Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
inherit gnome2 python
-DESCRIPTION="Gtk+ GUI for controlling the CDEmu daemon (cdemud)"
+DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
HOMEPAGE="http://cdemu.org/"
SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
-RDEPEND=">=app-cdr/cdemud-1.5.0
+RDEPEND="~app-cdr/cdemu-daemon-${PV}
>=dev-libs/glib-2.28:2
dev-libs/gobject-introspection
dev-python/pygobject:3
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-2.0.0.ebuild,v 1.1 2013/01/28 00:24:30 tetromino Exp $
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+PYTHON_COMPAT=( python2_6 python2_7 )
+PLOCALES="de fr no pl sl zh_CN"
+
+# cmake-utils after gnome2, to make sure cmake-utils is used for building
+inherit gnome2 cmake-utils l10n python-single-r1
+
+DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
+HOMEPAGE="http://cdemu.org/"
+SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+ app-cdr/cdemu-daemon:0/4
+ >=dev-libs/glib-2.28:2
+ dev-libs/gobject-introspection
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ sys-apps/dbus
+ x11-libs/gdk-pixbuf[introspection]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/libnotify[introspection]"
+DEPEND="${COMMON_DEPEND}
+ dev-util/desktop-file-utils
+ >=dev-util/intltool-0.21
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ python_fix_shebang src/gcdemu
+ # build system doesn't respect LINGUAS :/
+ rm_po() {
+ rm po/$1.po || die
+ }
+ l10n_for_each_disabled_locale_do rm_po
+}
+
+src_configure() {
+ DOCS="AUTHORS README"
+ local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
+ cmake-utils_src_configure
+}
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>app-doc</herd>
- <maintainer>
- <email>app-doc@gentoo.org</email>
- </maintainer>
+<herd>app-doc</herd>
</pkgmetadata>
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>app-doc</herd>
- <maintainer>
- <email>app-doc@gentoo.org</email>
- </maintainer>
+<herd>app-doc</herd>
</pkgmetadata>
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>app-doc</herd>
- <maintainer>
- <email>app-doc@gentoo.org</email>
- </maintainer>
+<herd>app-doc</herd>
</pkgmetadata>
Oops, something went wrong.

0 comments on commit 96f3799

Please sign in to comment.