commit: b6e182df1ae49872cd8bc166d6cdee7f3fd423d0 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Mon Jan 6 19:48:01 2025 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Mon Jan 6 19:49:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e182df
dev-util/android-sdk-update-manager: treeclean Closes: https://bugs.gentoo.org/350302 (pkgremoved) Closes: https://bugs.gentoo.org/366739 (pkgremoved) Closes: https://bugs.gentoo.org/501586 (pkgremoved) Closes: https://bugs.gentoo.org/517744 (pkgremoved) Closes: https://bugs.gentoo.org/637422 (pkgremoved) Closes: https://bugs.gentoo.org/704198 (pkgremoved) Closes: https://bugs.gentoo.org/738898 (pkgremoved) Closes: https://bugs.gentoo.org/757543 (pkgremoved) Closes: https://bugs.gentoo.org/845294 (pkgremoved) Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-util/android-sdk-update-manager/Manifest | 1 - .../android-sdk-update-manager-24.4.1-r2.ebuild | 97 ---------------------- .../files/80-android.rules | 4 - .../files/android-sdk-update-manager.desktop | 10 --- dev-util/android-sdk-update-manager/metadata.xml | 5 -- profiles/package.mask | 10 --- 6 files changed, 127 deletions(-) diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest deleted file mode 100644 index 9b10cdee2a4c..000000000000 --- a/dev-util/android-sdk-update-manager/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST android-sdk_r24.4.1-linux.tgz 326412652 BLAKE2B 4263a5e942f0ee35069f4fc075504c637381820f40485c9753f5f586f713e614c204b3e5c35968acbc665644aaab4c2e05660e00675d956422cd7d1fc6445ed2 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild deleted file mode 100644 index 6a3fe922894e..000000000000 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop udev - -ANDROID_SDK_DIR="/opt/android-sdk-update-manager" -MY_P="android-sdk_r${PV}-linux" - -DESCRIPTION="Open Handset Alliance's Android SDK" -HOMEPAGE="https://developer.android.com"; -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"; -S="${WORKDIR}/android-sdk-linux" - -LICENSE="android" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="bindist mirror" - -DEPEND="acct-group/android" -RDEPEND=" - ${DEPEND} - >=dev-java/ant-1.10.14-r3:0 - dev-java/swt:3.7[cairo] - media-libs/fontconfig - media-libs/freetype - media-libs/libpulse - sys-libs/ncurses-compat:5[abi_x86_32(-)] - sys-libs/zlib[abi_x86_32(-)] - >=virtual/jdk-1.8 - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender - -" - -QA_PREBUILT="*" - -src_prepare() { - default - rm -rf tools/lib/x86* || die -} - -src_install() { - dodoc tools/NOTICE.txt "SDK Readme.txt" - rm -f tools/NOTICE.txt "SDK Readme.txt" || die - - dodir "${ANDROID_SDK_DIR}/tools" - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die - - # Maybe this is needed for the tools directory too. - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} - - fowners -R root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} - fperms -R 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} - - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die - - SWT_PATH= - SWT_VERSIONS="3.7 3.6" - for version in $SWT_VERSIONS; do - # redirecting stderr to /dev/null - # not sure if this is best, but avoids misleading error messages - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`" - if [ $SWT_PATH ]; then - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT." - break - fi - done - - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die - echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die - - doenvd "${T}/80${PN}" - - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die - - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" - - udev_dorules "${FILESDIR}"/80-android.rules || die - domenu "${FILESDIR}"/android-sdk-update-manager.desktop -} - -pkg_postinst() { - elog "The Android SDK now uses its own manager for the development environment." - elog "Run 'android' to download the full SDK, including some of the platform tools." - elog "You must be in the android group to manage the development environment." - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login." - elog "See https://developer.android.com/sdk/adding-components.html for more" - elog "information." - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"; - elog "You need to run env-update and source /etc/profile in any open shells" - elog "if you get an SWT error." -} diff --git a/dev-util/android-sdk-update-manager/files/80-android.rules b/dev-util/android-sdk-update-manager/files/80-android.rules deleted file mode 100644 index e6eda7c938a0..000000000000 --- a/dev-util/android-sdk-update-manager/files/80-android.rules +++ /dev/null @@ -1,4 +0,0 @@ -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0664", GROUP="android" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0664", GROUP="android" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0664", GROUP="android" -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0664", GROUP="android" diff --git a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop deleted file mode 100644 index 83f1d25990ca..000000000000 --- a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Android SDK update-manager -Type=Application -Comment=Manage/update Android SDK (tools). -Terminal=false -Exec=/opt/android-sdk-update-manager/tools/android -Icon=/opt/android-sdk-update-manager/tools/apps/SdkController/res/drawable-xhdpi/ic_launcher.png -Categories=Development; -GenericName=Android SDK update-manager diff --git a/dev-util/android-sdk-update-manager/metadata.xml b/dev-util/android-sdk-update-manager/metadata.xml deleted file mode 100644 index 8961efbc3c8a..000000000000 --- a/dev-util/android-sdk-update-manager/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 03b4d69fddc8..0af6c18a9205 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -196,16 +196,6 @@ kde-frameworks/kemoticons =sys-kernel/vanilla-kernel-6.12.2 =virtual/dist-kernel-6.12.2 -# Volkmar W. Pogatzki <[email protected]> (2024-12-04) -# Bugs #845294 #757543 #517744 #704198 #366739 #350302 #614318 #637422 -# #738898 #501586. -# Blocks removal of dev-java/swt-3.7.2-r4, bug #944885. -# Users should switch to dev-util/android-sdk-cmdline-tools for a CLI replacement -# or dev-util/android-studio for a GUI replacement. -# Removal on 2025-01-04 -dev-util/android-sdk-update-manager -dev-java/swt:3.7 - # Andreas Sturmlechner <[email protected]> (2024-11-28) # Grave data loss bug. See also: # https://github.com/nicotine-plus/nicotine-plus/issues/3152
