Another ebuild fix

3 files changed, 3 insertions, 174 deletions

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 43bc64b..b4c8399 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,3 +1,2 @@
 AUX access_violation.patch 974 BLAKE2B 9b226e3d7255073bff22448f096fc19f743b97582b2e4de2725c7df84f0895bb63b7eee25d3b82f08090b19b5ea9c1179d57d1eaf994bfabc42e4e04e8f1ec33 SHA512 0d91b71ad9c2646745d91a8a6b3d9228a23dccb3971abf69094ca4f6b3055f92570f01eb6dda62acab8630c05cc9480e846b59bd3b6044a73b31510d72a8f800
-EBUILD compiz-0.9.13.9999.ebuild 3783 BLAKE2B 1438138c5e3af32f3449d13f4548c4b510061adf822cfdc81c4419c18a01d2217f0bbe5b3729bc03ab9ec2c06801ba7c7ce6b0d532ae19d033cc3a8723624c13 SHA512 f3564aa75dc535fc76690d6598803b516b50a563f19277dea4a0c1b4ba97ab0209a2c74824457e161e92d36b8910f03540f3bf91df8eecf459f95cc54240ee37
-EBUILD compiz-9999.ebuild 3651 BLAKE2B 8fe3324b6007040bb2251a5f6b0c72d59f112144049524f2d470a3117cce3fd2e61e41088c332a3b90541597ba3ba2700d3366a40ffc20760cdac39598a7d491 SHA512 e85c8b2b3dbf772d8cb5d8e77528b2ab51cac5951a44df0a54ef1c218e3deeb4d06b4cf3bc68f75b412f25c934ab24fb6b1f671b7d8cd1706f3fc786de00dde7
+EBUILD compiz-9999.ebuild 3678 BLAKE2B 85c332bc19dc4f86667b57d3055c914d1349807c4b6a622a781c8fc8fb5d276e5d905fbaadbc107ba002bd0f28157652f7c056ab9b0238b2b81403e21ff1708e SHA512 180c9cc8793effbcc5316b2ffe36971bd9202546369432a24d53da6ff4e1ffdde58d46fdb533fee86694fa8b4de601274c3c605861da30e10a159a3004af880b
diff --git a/x11-wm/compiz/compiz-0.9.13.9999.ebuild b/x11-wm/compiz/compiz-0.9.13.9999.ebuild
deleted file mode 100644
index 516d56a..0000000
--- a/x11-wm/compiz/compiz-0.9.13.9999.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils eutils gnome2-utils python-single-r1 toolchain-funcs versionator
-
-BRANCH="$(get_version_component_range 1-3)"
-MINOR="$(get_version_component_range 4)"
-
-if [[ ${MINOR} == 9999 ]]; then
-	EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${BRANCH}"
-	inherit bzr
-else
-	SRC_URI="http://launchpad.net/${PN}/${BRANCH}/${PV}/+download/${P}.tar.bz2"
-fi
-
-KEYWORDS="~amd64"
-DESCRIPTION="OpenGL window and compositing manager"
-HOMEPAGE="http://www.compiz.org/"
-
-LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0"
-
-IUSE="+cairo debug dbus fuse gles gnome gtk kde +svg test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMONDEPEND="
-	${PYTHON_DEPS}
-	!x11-wm/compiz-fusion
-	!x11-libs/compiz-bcop
-	!x11-libs/libcompizconfig
-	!x11-libs/compizconfig-backend-gconf
-	!x11-libs/compizconfig-backend-kconfig4
-	!x11-plugins/compiz-plugins-main
-	!x11-plugins/compiz-plugins-extra
-	!x11-plugins/compiz-plugins-unsupported
-	!x11-apps/ccsm
-	!dev-python/compizconfig-python
-	!x11-apps/fusion-icon
-	dev-libs/boost
-	dev-libs/glib:2
-	dev-cpp/glibmm
-	dev-libs/libxml2
-	dev-libs/libxslt
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-python/pyrex
-	dev-libs/protobuf
-	media-libs/libpng
-	x11-base/xorg-server
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXinerama
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/startup-notification
-	virtual/opengl
-	virtual/glu
-	cairo? ( x11-libs/cairo[X] )
-	fuse? ( sys-fs/fuse )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libwnck:3
-		x11-libs/pango
-		gnome? (
-			gnome-base/gnome-desktop
-			gnome-base/gconf
-			x11-wm/metacity
-		)
-	)
-	kde? ( kde-base/kwin:4 )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	dbus? ( sys-apps/dbus )"
-
-DEPEND="${COMMONDEPEND}
-	app-admin/chrpath
-	virtual/pkgconfig
-	x11-proto/damageproto
-	x11-proto/xineramaproto
-	test? (
-		dev-cpp/gtest
-		dev-cpp/gmock
-	)"
-
-RDEPEND="${COMMONDEPEND}
-	dev-python/pygtk
-	x11-apps/mesa-progs
-	x11-apps/xvinfo
-	x11-themes/hicolor-icon-theme"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-		( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
-		&& die "Sorry, but gcc 4.6 or higher is required."
-	fi
-}
-
-src_unpack() {
-	if [[ ${MINOR} == 9999 ]]; then
-		bzr_src_unpack
-	else
-		default
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i -e 's/CYTHON_BIN cython3/CYTHON_BIN cython/' compizconfig/compizconfig-python/CMakeLists.txt
-	epatch "${FILESDIR}"/access_violation.patch
-	eapply_user
-}
-
-src_configure() {
-	use debug && CMAKE_BUILD_TYPE=Debug
-	local mycmakeargs=(
-		"-DUSE_GLES=$(usex gles)"
-		"-DUSE_GNOME=$(usex gnome)"
-		"-DUSE_METACITY=$(usex gnome)"
-		"-DUSE_GTK=$(usex gtk)"
-		"-DUSE_KDE4=$(usex kde)"
-		"-DCOMPIZ_BUILD_TESTING=$(usex test)"
-		"-DCMAKE_BUILD_TYPE=Release"
-		"-DCMAKE_INSTALL_PREFIX=/usr"
-		"-DCOMPIZ_DEFAULT_PLUGINS=composite,opengl,decor,resize,place,move,ccp"
-		"-DCOMPIZ_DISABLE_SCHEMAS_INSTALL=On"
-		"-DCOMPIZ_PACKAGING_ENABLED=On"
-		"-DCOMPIZ_BUILD_WITH_RPATH=Off"
-		"-DCOMPIZ_BUILD_TESTING=Off"
-		"-DCOMPIZ_WERROR=Off"
-		"-Wno-dev"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize
-}
-
-pkg_preinst() {
-	use gnome && gnome2_gconf_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-	gnome2_icon_cache_update
-	if use dbus; then
-		ewarn "The dbus plugin is known to crash compiz in this version. Disable"
-		ewarn "it if you experience crashes when plugins are enabled/disabled."
-	fi
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-	gnome2_icon_cache_update
-}
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
index b6146a0..47a56ef 100644
--- a/x11-wm/compiz/compiz-9999.ebuild
+++ b/x11-wm/compiz/compiz-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
     EGIT_REPO_URI="https://git.launchpad.net/${PN}"
     S="${WORKDIR}/${P}"
 else
-	SRC_URI="http://launchpad.net/${PN}/${BRANCH}/${PV}/+download/${P}.tar.bz2"
+	SRC_URI="http://launchpad.net/${PN}/${BRANCH}/${PV}/+download/${P}.tar.xz"
 fi
 
 KEYWORDS="~amd64"
@@ -139,6 +139,7 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
+	python_fix_shebang "${ED}"
 	python_optimize
 }