diff -Naur cinnamon-control-center-3.2.1.ebuild cinnamon-control-center-3.4.0.ebuild @@ -12,7 +13,7 @@ LICENSE="GPL-2+" SLOT="0" -IUSE="+colord +cups debug input_devices_wacom systemd" +IUSE="+colord +cups debug doc input_devices_wacom systemd networkmanager modemmanager" KEYWORDS="~amd64 ~x86" # False positives caused by nested configure scripts @@ -25,19 +26,22 @@ >=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= - >=gnome-extra/cinnamon-desktop-1.0:0= - >=gnome-extra/cinnamon-menus-1.0:0= - >=gnome-extra/cinnamon-settings-daemon-1.0:0= - >=gnome-extra/nm-applet-0.9.8 + >=cinnamon/cinnamon-desktop-3.2:0= + >=cinnamon/cinnamon-menus-3.2:0= + >=cinnamon/cinnamon-settings-daemon-3.2:0= media-libs/fontconfig - >=net-misc/modemmanager-0.7 - >=net-misc/networkmanager-0.9.8:=[modemmanager] + >=media-libs/libcanberra-0.13[gtk3] + >=media-sound/pulseaudio-1.1[glib] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.4.1:3 + >=x11-libs/gtk+-3.8.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier + networkmanager? ( >=net-misc/networkmanager-0.9.8 + >=gnome-extra/nm-applet-0.9.8 + modemmanager? ( >=net-misc/modemmanager-0.7 net-misc/networkmanager[modemmanager] ) + ) colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( @@ -55,7 +59,7 @@ cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) - input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) + input_devices_wacom? ( cinnamon/cinnamon-settings-daemon[input_devices_wacom] ) " DEPEND="${COMMON_DEPEND} @@ -70,11 +74,21 @@ virtual/pkgconfig gnome-base/gnome-common - sys-devel/autoconf-archive + + app-arch/xz-utils " +# Needed for autoreconf +# gnome-base/gnome-common + src_prepare() { # make some panels optional - eapply "${FILESDIR}"/${PN}-2.8.0-optional.patch + #not work in 3.4 +# eapply "${FILESDIR}"/${PN}-2.8.0-optional.patch + +#not work in 3.0 # North Korea causes build failure +# cp "${WORKDIR}"/${PN}-2.8.1-pyongyang/*.png panels/datetime/data/ || die +# epatch "${WORKDIR}"/${PN}-2.8.1-pyongyang/*.patch + eautoreconf gnome2_src_prepare } @@ -83,10 +97,13 @@ # --enable-systemd doesn't do anything in $PN-2.2.5 gnome2_src_configure \ --disable-static \ - --enable-documentation \ $(use_enable colord color) \ $(use_enable cups) \ $(usex debug --enable-debug=yes ' ') \ $(use_enable input_devices_wacom wacom) \ - $(use_enable systemd) + $(usex doc --enable-documentation) \ + $(use_enable systemd) \ + $(use_enable networkmanager) \ + $(use_enable modemmanager) + } sorry for my special category for cinnamon
3.6.5 in tree
